From 423bc233320d3e8b1d4cd7510e76756b5755aacb Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Tue, 9 Aug 2022 13:14:40 +0200 Subject: qrserver -> container, part 2 --- .../model/provision/HostsXmlProvisionerTest.java | 2 +- .../model/provision/SingleNodeProvisionerTest.java | 2 +- .../model/builder/xml/dom/ContentBuilderTest.java | 6 ------ .../model/builder/xml/dom/VespaDomBuilderTest.java | 2 +- .../vespa/model/container/xml/SearchBuilderTest.java | 18 ++++++------------ .../com/yahoo/vespa/model/content/IndexedTest.java | 4 ++-- 6 files changed, 11 insertions(+), 23 deletions(-) (limited to 'config-model/src/test/java/com') diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java index 9721e85c71d..05b8681b5fa 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java @@ -98,7 +98,7 @@ public class HostsXmlProvisionerTest { return createAliases(new ArrayList<>()); } - // Admin services on node1, qrserver on node2 + additional specs + // Admin services on node1, container on node2 + additional specs private List createAliases(Collection additionalAliases) { ArrayList aliases = new ArrayList<>(); aliases.add("node1"); diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java index 00acc715a39..e5f6235552f 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java @@ -93,7 +93,7 @@ public class SingleNodeProvisionerTest { return createAliases(new ArrayList()); } - // Admin services on node1, qrserver on node2 + additional specs + // Admin services on node1, container on node2 + additional specs private List createAliases(Collection additionalAliases) { List aliases = new ArrayList<>(); aliases.add("node1"); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java index 7f17f5cdd41..0848b8becb9 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java @@ -211,12 +211,6 @@ public class ContentBuilderTest extends DomBuilderTest { assertServices(h, expectedServices); assertEquals(musicClusterId + "/storage/0", h.getService("storagenode").getConfigId()); - - /* Not yet - assertNotNull(h.getService("qrserver")); - assertNotNull(h.getService("docproc")); - */ - } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java index a46fafe30c4..97951ab5a20 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java @@ -45,7 +45,7 @@ public class VespaDomBuilderTest { " " + " " + " " + - " qrservers" + + " foo" + " " + " " + " \n" + diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java index 8e871bb432b..bd067fa3e63 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java @@ -8,7 +8,6 @@ import com.yahoo.container.handler.threadpool.ContainerThreadpoolConfig; import com.yahoo.container.jdisc.JdiscBindingsConfig; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.container.ApplicationContainerCluster; -import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.component.Handler; import com.yahoo.vespa.model.container.search.GUIHandler; @@ -17,12 +16,15 @@ import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg; import org.junit.jupiter.api.Test; import org.w3c.dom.Element; -import static com.yahoo.config.model.api.container.ContainerServiceType.CONTAINER; import static com.yahoo.test.Matchers.hasItemWithMethod; import static com.yahoo.vespa.model.container.search.ContainerSearch.QUERY_PROFILE_REGISTRY_CLASS; import static org.hamcrest.MatcherAssert.assertThat; - -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * @author gjoranv @@ -105,14 +107,6 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase { assertNull(discBindingsConfig.handlers(SearchHandler.HANDLER_CLASS)); } - // TODO: remove test when all containers are named 'container' - @Test - void cluster_with_only_search_gets_qrserver_as_service_name() { - createClusterWithOnlyDefaultChains(); - ApplicationContainerCluster cluster = (ApplicationContainerCluster) root.getChildren().get("default"); - assertEquals(CONTAINER.serviceName, cluster.getContainers().get(0).getServiceName()); - } - @Test void empty_search_element_gives_default_chains() { createClusterWithOnlyDefaultChains(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java index f65a72427de..96aa88303bf 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java @@ -130,7 +130,7 @@ public class IndexedTest extends ContentBaseTest { // HostResource h = model.getHostSystem().getHosts().get(0); // String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok", // "logd", "configproxy","config-sentinel", - // "qrserver", "fleetcontroller", + // "container", "fleetcontroller", // "storagenode", "searchnode", "distributor", "transactionlogserver"}; // DomContentBuilderTest.assertServices(h, expectedServices); Routing routing = model.getRouting(); @@ -159,7 +159,7 @@ public class IndexedTest extends ContentBaseTest { // HostResource h = model.getHostSystem().getHosts().get(0); // String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok", // "logd", "configproxy","config-sentinel", - // "qrserver", "storagenode", "searchnode", "distributor", + // "container", "storagenode", "searchnode", "distributor", // "transactionlogserver"}; // DomContentBuilderTest.assertServices(h, expectedServices); ContentCluster s = model.getContentClusters().get("test"); -- cgit v1.2.3