Merge pull request #13326 from vespa-engine/hmusum/move-and-remove-tests

Move one test to another class and remove 2 tests that are tested els…

3 files changed, 55 insertions, 61 deletions

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 ae7d5a48955..80b199cb2dd 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
@@ -6,10 +6,13 @@ import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.application.api.ApplicationMetaData;
 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;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.Deployment;
+import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.InstanceName;
+import com.yahoo.config.provision.NetworkPorts;
 import com.yahoo.config.provision.Provisioner;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpResponse;
@@ -45,15 +48,18 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
+import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -105,6 +111,12 @@ public class ApplicationRepositoryTest {
         PrepareResult result = prepareAndActivateApp(testApp);
         assertTrue(result.configChangeActions().getRefeedActions().isEmpty());
         assertTrue(result.configChangeActions().getRestartActions().isEmpty());
+
+        TenantName tenantName = applicationId().tenant();
+        Tenant tenant = tenantRepository.getTenant(tenantName);
+        LocalSession session = tenant.getLocalSessionRepo().getSession(tenant.getApplicationRepo()
+                                                                               .requireActiveSessionOf(applicationId()));
+        AllocatedHosts a = session.getAllocatedHosts();
     }
 
     @Test
@@ -375,6 +387,46 @@ public class ApplicationRepositoryTest {
         assertTrue(approlesStore.readApplicationRoles(applicationId).isEmpty());
     }
 
+    @Test
+    public void require_that_provision_info_can_be_read() throws Exception {
+        prepareAndActivateApp(testAppJdiscOnly);
+
+        TenantName tenantName = applicationId().tenant();
+        Tenant tenant = tenantRepository.getTenant(tenantName);
+        LocalSession session = tenant.getLocalSessionRepo().getSession(tenant.getApplicationRepo().requireActiveSessionOf(applicationId()));
+
+        List<NetworkPorts.Allocation> list = new ArrayList<>();
+        list.add(new NetworkPorts.Allocation(8080, "container", "container/container.0", "http"));
+        list.add(new NetworkPorts.Allocation(19070, "configserver", "admin/configservers/configserver.0", "rpc"));
+        list.add(new NetworkPorts.Allocation(19071, "configserver", "admin/configservers/configserver.0", "http"));
+        list.add(new NetworkPorts.Allocation(19080, "logserver", "admin/logserver", "rpc"));
+        list.add(new NetworkPorts.Allocation(19081, "logserver", "admin/logserver", "unused/1"));
+        list.add(new NetworkPorts.Allocation(19082, "logserver", "admin/logserver", "unused/2"));
+        list.add(new NetworkPorts.Allocation(19083, "logserver", "admin/logserver", "unused/3"));
+        list.add(new NetworkPorts.Allocation(19089, "logd", "hosts/mytesthost/logd", "http"));
+        list.add(new NetworkPorts.Allocation(19090, "configproxy", "hosts/mytesthost/configproxy", "rpc"));
+        list.add(new NetworkPorts.Allocation(19092, "metricsproxy-container", "admin/metrics/mytesthost", "http"));
+        list.add(new NetworkPorts.Allocation(19093, "metricsproxy-container", "admin/metrics/mytesthost", "http/1"));
+        list.add(new NetworkPorts.Allocation(19094, "metricsproxy-container", "admin/metrics/mytesthost", "rpc/admin"));
+        list.add(new NetworkPorts.Allocation(19095, "metricsproxy-container", "admin/metrics/mytesthost", "rpc/metrics"));
+        list.add(new NetworkPorts.Allocation(19097, "config-sentinel", "hosts/mytesthost/sentinel", "rpc"));
+        list.add(new NetworkPorts.Allocation(19098, "config-sentinel", "hosts/mytesthost/sentinel", "http"));
+        list.add(new NetworkPorts.Allocation(19099, "slobrok", "admin/slobrok.0", "rpc"));
+        list.add(new NetworkPorts.Allocation(19100, "container", "container/container.0", "http/1"));
+        list.add(new NetworkPorts.Allocation(19101, "container", "container/container.0", "messaging"));
+        list.add(new NetworkPorts.Allocation(19102, "container", "container/container.0", "rpc/admin"));
+        list.add(new NetworkPorts.Allocation(19103, "slobrok", "admin/slobrok.0", "http"));
+
+        AllocatedHosts info = session.getAllocatedHosts();
+        assertNotNull(info);
+        assertThat(info.getHosts().size(), is(1));
+        System.out.println(info.getHosts());
+        assertTrue(info.getHosts().contains(new HostSpec("mytesthost", Collections.emptyList())));
+        Optional<NetworkPorts> portsCopy = info.getHosts().iterator().next().networkPorts();
+        assertTrue(portsCopy.isPresent());
+        assertThat(portsCopy.get().allocations(), is(list));
+    }
+
     private ApplicationRepository createApplicationRepository() {
         return new ApplicationRepository(tenantRepository,
                                          provisioner,
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
index b357f712004..7ce1ec47d0e 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
@@ -9,8 +9,6 @@ import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.model.application.provider.MockFileRegistry;
 import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.HostSpec;
-import com.yahoo.config.provision.NetworkPorts;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.path.Path;
 import com.yahoo.slime.Slime;
@@ -23,24 +21,20 @@ import com.yahoo.vespa.config.server.deploy.TenantFileSystemDirs;
 import com.yahoo.vespa.config.server.deploy.ZooKeeperClient;
 import com.yahoo.vespa.config.server.host.HostRegistry;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
+import com.yahoo.vespa.config.server.zookeeper.ConfigCurator;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
-import com.yahoo.vespa.config.server.zookeeper.ConfigCurator;
-
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.io.File;
 import java.time.Instant;
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 import java.util.Optional;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
@@ -49,6 +43,8 @@ import static org.junit.Assert.assertTrue;
  */
 public class LocalSessionTest {
 
+    private static final File testApp = new File("src/test/apps/app");
+
     private final InMemoryFlagSource flagSource = new InMemoryFlagSource();
     private Path tenantPath = Path.createRoot();
     private Curator curator;
@@ -93,26 +89,6 @@ public class LocalSessionTest {
     }
 
     @Test
-    public void require_that_preparer_is_run() throws Exception {
-        SessionTest.MockSessionPreparer preparer = new SessionTest.MockSessionPreparer();
-        LocalSession session = createSession(TenantName.defaultName(), 3, preparer);
-        assertFalse(preparer.isPrepared);
-        doPrepare(session);
-        assertTrue(preparer.isPrepared);
-        assertThat(session.getStatus(), is(Session.Status.PREPARE));
-    }
-
-    @Test
-    public void require_that_session_status_can_be_deactivated() throws Exception {
-        SessionTest.MockSessionPreparer preparer = new SessionTest.MockSessionPreparer();
-        LocalSession session = createSession(TenantName.defaultName(), 3, preparer);
-        session.createDeactivateTransaction().commit();
-        assertThat(session.getStatus(), is(Session.Status.DEACTIVATE));
-    }
-
-    private File testApp = new File("src/test/apps/app");
-
-    @Test
     public void require_that_application_file_can_be_fetched() throws Exception {
         LocalSession session = createSession(TenantName.defaultName(), 3);
         ApplicationFile f1 = session.getApplicationFile(Path.fromString("services.xml"), LocalSession.Mode.READ);
@@ -140,39 +116,6 @@ public class LocalSessionTest {
         createSession(TenantName.defaultName(), 3).getAllocatedHosts();
     }
 
-    @Test
-    public void require_that_provision_info_can_be_read() throws Exception {
-        List<NetworkPorts.Allocation> list = new ArrayList<>();
-        list.add(new NetworkPorts.Allocation(8080, "container", "default/0", "http"));
-        list.add(new NetworkPorts.Allocation(19101, "searchnode", "other/1", "rpc"));
-        NetworkPorts ports = new NetworkPorts(list);
-
-        AllocatedHosts input = AllocatedHosts.withHosts(Collections.singleton(
-                new HostSpec("myhost", Collections.emptyList(),
-                             Optional.empty(), Optional.empty(), Optional.empty(),
-                             Optional.of(ports))));
-
-        LocalSession session = createSession(TenantName.defaultName(), 3, new SessionTest.MockSessionPreparer(), Optional.of(input));
-        ApplicationId origId = new ApplicationId.Builder()
-                               .tenant("tenant")
-                               .applicationName("foo").instanceName("quux").build();
-        doPrepare(session, new PrepareParams.Builder().applicationId(origId).build());
-        AllocatedHosts info = session.getAllocatedHosts();
-        assertNotNull(info);
-        assertThat(info.getHosts().size(), is(1));
-        assertTrue(info.getHosts().contains(new HostSpec("myhost", Collections.emptyList())));
-        Optional<NetworkPorts> portsCopy = info.getHosts().iterator().next().networkPorts();
-        assertTrue(portsCopy.isPresent());
-        assertThat(portsCopy.get().allocations(), is(list));
-    }
-
-    @Test
-    public void require_that_application_metadata_is_correct() throws Exception {
-        LocalSession session = createSession(TenantName.defaultName(), 3);
-        doPrepare(session, new PrepareParams.Builder().build());
-        assertThat(session.getMetaData().toString(), is("n/a, n/a, 0, 0, , 0"));
-    }
-
     private LocalSession createSession(TenantName tenant, long sessionId) throws Exception {
         SessionTest.MockSessionPreparer preparer = new SessionTest.MockSessionPreparer();
         return createSession(tenant, sessionId, preparer);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionTest.java
index b2ad0af8f9a..410127822d0 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionTest.java
@@ -13,7 +13,6 @@ import java.util.Optional;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class SessionTest {