diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-10-26 09:17:05 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-10-26 09:17:05 +0200 |
| commit | f99c5ee981cac149023f9ba1c04e947ae2a3ab2a (patch) | |
| tree | 55362a2142020d02b591ba2770d28714a819036e /config-model/src/test/java/com/yahoo | |
| parent | 5c771a79843d6ed595c8d419f7ad4ffc42c0fbf7 (diff) | |
Refactor: Move qrstart config generation from ContainerSearh to ContainerCluster.
Diffstat (limited to 'config-model/src/test/java/com/yahoo')
3 files changed, 3 insertions, 5 deletions
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java index 839ddcecde3..8396cac265c 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java @@ -82,7 +82,6 @@ public class ModelProvisioningTest { " <nodes count=\"3\"/>" + "</jdisc>" + "<jdisc id='mydisc2' version='1.0'>" + - " <search/>" + " <document-processing/>" + " <handler id='myHandler'>" + " <component id='injected' />" + @@ -1666,7 +1665,7 @@ public class ModelProvisioningTest { private int physicalMemoryPercentage(ContainerCluster cluster) { QrStartConfig.Builder b = new QrStartConfig.Builder(); - cluster.getSearch().getConfig(b); + cluster.getConfig(b); return new QrStartConfig(b).jvm().heapSizeAsPercentageOfPhysicalMemory(); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index 7051ffda84a..e4fb19010f5 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -128,7 +128,7 @@ public class ContainerClusterTest { int expectedMemoryPercentage) { ContainerCluster cluster = createContainerCluster(createRoot(isHosted), isCombinedCluster, explicitMemoryPercentage); QrStartConfig.Builder qsB = new QrStartConfig.Builder(); - cluster.getSearch().getConfig(qsB); + cluster.getConfig(qsB); QrStartConfig qsC= new QrStartConfig(qsB); assertEquals(expectedMemoryPercentage, qsC.jvm().heapSizeAsPercentageOfPhysicalMemory()); } @@ -186,7 +186,7 @@ public class ContainerClusterTest { cluster.setGCOpts(override); assertEquals(1, cluster.getContainers().size()); QrStartConfig.Builder qsB = new QrStartConfig.Builder(); - cluster.getSearch().getConfig(qsB); + cluster.getConfig(qsB); QrStartConfig qsC= new QrStartConfig(qsB); assertEquals(expected, qsC.jvm().gcopts()); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index b5c1f7ce26d..a3e24b8a520 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -97,7 +97,6 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { public void ignores_gcopts_on_conflicting_jvargs() { Element clusterElem = DomBuilderTest.parse( "<jdisc version='1.0'>", - " <search/>", " <nodes gcopts='-XX:+UseG1GC' jvmargs='-XX:+UseParNewGC'>", " <node hostalias='mockhost'/>", " </nodes>", |