Register applications in TenantApplications before activating their sessions

1 files changed, 14 insertions, 14 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java
index b34f7a0c487..f97bc443a38 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java
@@ -51,17 +51,17 @@ public class ListApplicationsHandlerTest {
         final String url = "http://myhost:14000/application/v2/tenant/mytenant/application/";
         assertResponse(url, Response.Status.OK,
                 "[]");
-        applicationRepo.createPutTransaction(
-                new ApplicationId.Builder().tenant("tenant").applicationName("foo").instanceName("quux").build(),
-                1).commit();
+        ApplicationId id1 = ApplicationId.from("mytenant", "foo", "quux");
+        applicationRepo.createApplication(id1);
+        applicationRepo.createPutTransaction(id1, 1).commit();
         assertResponse(url, Response.Status.OK,
                 "[\"" + url + "foo/environment/dev/region/us-east/instance/quux\"]");
-        applicationRepo.createPutTransaction(
-                new ApplicationId.Builder().tenant("tenant").applicationName("bali").instanceName("quux").build(),
-                1).commit();
+        ApplicationId id2 = ApplicationId.from("mytenant", "bali", "quux");
+        applicationRepo.createApplication(id2);
+        applicationRepo.createPutTransaction(id2, 1).commit();
         assertResponse(url, Response.Status.OK,
-                "[\"" + url + "foo/environment/dev/region/us-east/instance/quux\"," +
-                        "\"" + url + "bali/environment/dev/region/us-east/instance/quux\"]"
+                "[\"" + url + "bali/environment/dev/region/us-east/instance/quux\"," +
+                        "\"" + url + "foo/environment/dev/region/us-east/instance/quux\"]"
         );
     }
 
@@ -82,12 +82,12 @@ public class ListApplicationsHandlerTest {
 
     @Test
     public void require_that_listing_works_with_multiple_tenants() throws Exception {
-        applicationRepo.createPutTransaction(new ApplicationId.Builder()
-                .tenant("tenant")
-                .applicationName("foo").instanceName("quux").build(), 1).commit();
-        applicationRepo2.createPutTransaction(new ApplicationId.Builder()
-                .tenant("tenant")
-                .applicationName("quux").instanceName("foo").build(), 1).commit();
+        ApplicationId id1 = ApplicationId.from("mytenant", "foo", "quux");
+        applicationRepo.createApplication(id1);
+        applicationRepo.createPutTransaction(id1, 1).commit();
+        ApplicationId id2 = ApplicationId.from("foobar", "quux", "foo");
+        applicationRepo2.createApplication(id2);
+        applicationRepo2.createPutTransaction(id2, 1).commit();
         String url = "http://myhost:14000/application/v2/tenant/mytenant/application/";
         assertResponse(url, Response.Status.OK,
                 "[\"" + url + "foo/environment/dev/region/us-east/instance/quux\"]");