update unit tests

3 files changed, 8 insertions, 8 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
index e7dc86ccfea..eee4d29cc6e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
@@ -28,7 +28,7 @@ import java.util.stream.IntStream;
 
 import static com.yahoo.config.model.api.container.ContainerServiceType.LOGSERVER_CONTAINER;
 import static com.yahoo.config.model.api.container.ContainerServiceType.METRICS_PROXY_CONTAINER;
-import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER;
+import static com.yahoo.config.model.api.container.ContainerServiceType.CONTAINER;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -132,13 +132,13 @@ public class DedicatedAdminV4Test {
 
         // 4 slobroks, 2 per cluster where possible
         assertHostContainsServices(model, "hosts/myhost0", "slobrok", "logd", "logserver",
-                                   METRICS_PROXY_CONTAINER.serviceName, QRSERVER.serviceName);
+                                   METRICS_PROXY_CONTAINER.serviceName, CONTAINER.serviceName);
         assertHostContainsServices(model, "hosts/myhost1", "slobrok", "logd",
-                                   METRICS_PROXY_CONTAINER.serviceName, QRSERVER.serviceName);
+                                   METRICS_PROXY_CONTAINER.serviceName, CONTAINER.serviceName);
         assertHostContainsServices(model, "hosts/myhost2", "slobrok", "logd",
-                                   METRICS_PROXY_CONTAINER.serviceName, QRSERVER.serviceName);
+                                   METRICS_PROXY_CONTAINER.serviceName, CONTAINER.serviceName);
         assertHostContainsServices(model, "hosts/myhost3", "slobrok", "logd",
-                                   METRICS_PROXY_CONTAINER.serviceName, QRSERVER.serviceName);
+                                   METRICS_PROXY_CONTAINER.serviceName, CONTAINER.serviceName);
     }
 
     @Test
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 3468d81b748..a3360278505 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
@@ -166,7 +166,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         assertEquals("clu/storage/0", c.getRootGroup().getNodes().get(0).getConfigId()); // Due to reuse.
         assertEquals(1, c.getRoot().hostSystem().getHosts().size());
         HostResource h = c.getRoot().hostSystem().getHost("mockhost");
-        String [] expectedServices = {"configserver", "logserver", "logd", "container-clustercontroller", "metricsproxy-container", "slobrok", "configproxy","config-sentinel", "qrserver", "storagenode", "searchnode", "distributor", "transactionlogserver"};
+        String [] expectedServices = {"configserver", "logserver", "logd", "container-clustercontroller", "metricsproxy-container", "slobrok", "configproxy","config-sentinel", "container", "storagenode", "searchnode", "distributor", "transactionlogserver"};
         assertServices(h, expectedServices);
         assertEquals("clu/storage/0", h.getService("storagenode").getConfigId());
         assertEquals("clu/search/cluster.clu/0", h.getService("searchnode").getConfigId());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ApplicationBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ApplicationBuilderTest.java
index 3490568770c..ca59e053a89 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ApplicationBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ApplicationBuilderTest.java
@@ -16,7 +16,7 @@ import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 import org.junit.Test;
 import org.w3c.dom.Element;
 
-import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER;
+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;
@@ -120,7 +120,7 @@ public class ApplicationBuilderTest extends ContainerModelBuilderTestBase {
     public void cluster_with_only_search_gets_qrserver_as_service_name() {
         createClusterWithOnlyDefaultChains();
         ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default");
-        assertEquals(QRSERVER.serviceName, cluster.getContainers().get(0).getServiceName());
+        assertEquals(CONTAINER.serviceName, cluster.getContainers().get(0).getServiceName());
     }
 
     @Test