From 2ff7c12fd277fe59db947782ace23a1d1f97b74d Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Sun, 29 Oct 2017 05:41:29 +0100 Subject: Return empty contact list for unknown property ids in mock --- .../controller/api/integration/organization/MockOrganization.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockOrganization.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockOrganization.java index 4eaca8fb642..5584f8a95fb 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockOrganization.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockOrganization.java @@ -85,7 +85,7 @@ public class MockOrganization implements Organization { @Override public List> contactsFor(PropertyId propertyId) { - return properties.get(propertyId).contacts; + return properties.getOrDefault(propertyId, new PropertyInfo()).contacts; } @Override -- cgit v1.2.3 From 5b18f9b0ff3a16a05c128ea786f09e2231627d03 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Sun, 29 Oct 2017 05:52:20 +0100 Subject: Fixed test >_< --- .../responses/opsdb-tenant-with-new-id-without-applications.json | 6 ++++++ .../restapi/application/responses/tenant-without-applications.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/opsdb-tenant-with-new-id-without-applications.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/opsdb-tenant-with-new-id-without-applications.json index f00b3c5bb1a..3f4b6017971 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/opsdb-tenant-with-new-id-without-applications.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/opsdb-tenant-with-new-id-without-applications.json @@ -5,5 +5,11 @@ "userGroup": "group1", "applications": [ + ], + "propertyUrl": "www.properties.tld/4321", + "contactsUrl": "www.contacts.tld/4321", + "issueCreationUrl": "www.issues.tld/4321", + "contacts": [ + ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json index 88ec5ec7d3d..69669b5dfb8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json @@ -5,4 +5,4 @@ "applications": [ ] -} \ No newline at end of file +} -- cgit v1.2.3