diff options
Diffstat (limited to 'config-model/src/test/java/com')
3 files changed, 23 insertions, 5 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java index fd25ae2ae48..f7f6c706057 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java @@ -183,7 +183,15 @@ public class IndexedHierarchicDistributionTest { " </group>", ""); } private ContentCluster getIllegalGroupsCluster() throws Exception { - return createCluster(createClusterXml(getOddGroupsClusterXml(), 4, 4)); + return createCluster(createClusterXml(getOddGroupsClusterXml(), Optional.of(getRoundRobinDispatchXml()), 4, 4)); + } + + private String getRoundRobinDispatchXml() { + return joinLines("<tuning>", + " <dispatch>", + " <dispatch-policy>round-robin</dispatch-policy>", + " </dispatch>", + "</tuning>"); } private String getRandomDispatchXml() { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/TuningDispatchTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/TuningDispatchTest.java index 5cfdc8eb6b6..8d618037076 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/TuningDispatchTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/TuningDispatchTest.java @@ -30,7 +30,17 @@ public class TuningDispatchTest { TuningDispatch dispatch = new TuningDispatch.Builder() .setDispatchPolicy("random") .build(); - assertTrue(TuningDispatch.DispatchPolicy.RANDOM == dispatch.getDispatchPolicy()); + assertTrue(TuningDispatch.DispatchPolicy.WEIGHTED == dispatch.getDispatchPolicy()); + assertNull(dispatch.getMinGroupCoverage()); + assertNull(dispatch.getMinActiveDocsCoverage()); + } + + @Test + public void requireThatWeightedDispatchWork() { + TuningDispatch dispatch = new TuningDispatch.Builder() + .setDispatchPolicy("weighted") + .build(); + assertTrue(TuningDispatch.DispatchPolicy.WEIGHTED == dispatch.getDispatchPolicy()); assertNull(dispatch.getMinGroupCoverage()); assertNull(dispatch.getMinActiveDocsCoverage()); } @@ -39,6 +49,6 @@ public class TuningDispatchTest { public void requireThatDefaultsAreNull() { TuningDispatch dispatch = new TuningDispatch.Builder().build(); assertNull(dispatch.getMaxHitsPerPartition()); - assertTrue(TuningDispatch.DispatchPolicy.ROUNDROBIN == dispatch.getDispatchPolicy()); + assertTrue(TuningDispatch.DispatchPolicy.WEIGHTED == dispatch.getDispatchPolicy()); } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilderTest.java index a8d928fe236..3b87aad2f6b 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilderTest.java @@ -45,7 +45,7 @@ public class DomTuningDispatchBuilderTest { assertNull(dispatch.getMaxHitsPerPartition()); assertNull(dispatch.getMinGroupCoverage()); assertNull(dispatch.getMinActiveDocsCoverage()); - assertTrue(TuningDispatch.DispatchPolicy.ROUNDROBIN == dispatch.getDispatchPolicy()); + assertTrue(TuningDispatch.DispatchPolicy.WEIGHTED == dispatch.getDispatchPolicy()); } @Test @@ -86,7 +86,7 @@ public class DomTuningDispatchBuilderTest { " </dispatch>" + " </tuning>" + "</content>"); - assertTrue(TuningDispatch.DispatchPolicy.RANDOM == dispatch.getDispatchPolicy()); + assertTrue(TuningDispatch.DispatchPolicy.WEIGHTED == dispatch.getDispatchPolicy()); } private static TuningDispatch newTuningDispatch(String xml) throws Exception { |