From da154c8926facc022abee11cd97f380f3328d6fd Mon Sep 17 00:00:00 2001
From: Morten Tokle <mortent@verizonmedia.com>
Date: Mon, 30 Aug 2021 12:55:36 +0200
Subject: Fix tests

---
 .../config/server/ApplicationRepositoryTest.java   | 22 ---------------------
 .../config/server/session/PrepareParamsTest.java   | 23 ----------------------
 2 files changed, 45 deletions(-)

(limited to 'configserver')

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 665b603acfc..07a514f60b5 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -7,7 +7,6 @@ import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.SimpletypesConfig;
 import com.yahoo.config.application.api.ApplicationMetaData;
 import com.yahoo.config.model.NullConfigModelRegistry;
-import com.yahoo.config.model.api.ApplicationRoles;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.ApplicationId;
@@ -515,27 +514,6 @@ public class ApplicationRepositoryTest {
         assertEquals(expected.values, actual.values);
     }
 
-    @Test
-    public void deletesApplicationRoles() {
-        var tenant = applicationRepository.getTenant(applicationId());
-        var applicationId = applicationId(tenant1);
-        var prepareParams = new PrepareParams.Builder().applicationId(applicationId)
-                .applicationRoles(ApplicationRoles.fromString("hostRole","containerRole")).build();
-        deployApp(testApp, prepareParams);
-        var approlesStore = new ApplicationRolesStore(tenantRepository.getCurator(), tenant.getPath());
-        var appRoles = approlesStore.readApplicationRoles(applicationId);
-
-        // App roles present after deploy
-        assertTrue(appRoles.isPresent());
-        assertEquals("hostRole", appRoles.get().applicationHostRole());
-        assertEquals("containerRole", appRoles.get().applicationContainerRole());
-
-        assertTrue(applicationRepository.delete(applicationId));
-
-        // App roles deleted on application delete
-        assertTrue(approlesStore.readApplicationRoles(applicationId).isEmpty());
-    }
-
     @Test
     public void require_that_provision_info_can_be_read() {
         prepareAndActivate(testAppJdiscOnly);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
index f68e79ae266..19f665689a2 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
@@ -116,28 +116,6 @@ public class PrepareParamsTest {
         assertPrepareParamsEqual(prepareParams, prepareParamsJson);
     }
 
-    @Test
-    public void testCorrectParsingWithApplicationRoles() throws IOException {
-        String req = request + "&" +
-                     PrepareParams.APPLICATION_HOST_ROLE + "=hostRole&" +
-                     PrepareParams.APPLICATION_CONTAINER_ROLE + "=containerRole";
-        var prepareParams = createParams(req, TenantName.from("foo"));
-
-        Optional<ApplicationRoles> applicationRoles = prepareParams.applicationRoles();
-        assertTrue(applicationRoles.isPresent());
-        assertEquals("hostRole", applicationRoles.get().applicationHostRole());
-        assertEquals("containerRole", applicationRoles.get().applicationContainerRole());
-
-        // Verify using json object
-        var slime = SlimeUtils.jsonToSlime(json);
-        var cursor = slime.get();
-        cursor.setString(PrepareParams.APPLICATION_HOST_ROLE, "hostRole");
-        cursor.setString(PrepareParams.APPLICATION_CONTAINER_ROLE, "containerRole");
-
-        PrepareParams prepareParamsJson = PrepareParams.fromJson(SlimeUtils.toJsonBytes(slime), TenantName.from("foo"), Duration.ofSeconds(60));
-        assertPrepareParamsEqual(prepareParams, prepareParamsJson);
-    }
-
     @Test
     public void testQuotaParsing() throws IOException {
         var quotaParam = "{\"clusterSize\": 23, \"budget\": 23232323}";
@@ -239,7 +217,6 @@ public class PrepareParamsTest {
         assertEquals(urlParams.endpointCertificateMetadata(), jsonParams.endpointCertificateMetadata());
         assertEquals(urlParams.dockerImageRepository(), jsonParams.dockerImageRepository());
         assertEquals(urlParams.athenzDomain(), jsonParams.athenzDomain());
-        assertEquals(urlParams.applicationRoles(), jsonParams.applicationRoles());
         assertEquals(urlParams.quota(), jsonParams.quota());
         assertEquals(urlParams.tenantSecretStores(), jsonParams.tenantSecretStores());
     }
-- 
cgit v1.2.3