diff options
author | HÃ¥kon Hallingstad <hakon@verizonmedia.com> | 2019-03-04 16:29:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-04 16:29:26 +0100 |
commit | c771a1855dea7c9f78c8001efa6ea317cabd0fde (patch) | |
tree | ef0a04523332fac162c22b3b69d1935a51f9dd5d /flags/src/test/java | |
parent | da7580142fc3440ab5918489c51774846be3d435 (diff) | |
parent | d6cc4191be2990917a1e6cb7b7b7eabb644c1ee0 (diff) |
Merge pull request #8676 from vespa-engine/hakonhall/use-list-instead-of-set-for-flags-rulesconditionsvalues
Use List instead of Set for flags rules.conditions.values
Diffstat (limited to 'flags/src/test/java')
-rw-r--r-- | flags/src/test/java/com/yahoo/vespa/flags/json/ConditionTest.java | 4 | ||||
-rw-r--r-- | flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/flags/src/test/java/com/yahoo/vespa/flags/json/ConditionTest.java b/flags/src/test/java/com/yahoo/vespa/flags/json/ConditionTest.java index 96cbce71fa8..d19442ae0f0 100644 --- a/flags/src/test/java/com/yahoo/vespa/flags/json/ConditionTest.java +++ b/flags/src/test/java/com/yahoo/vespa/flags/json/ConditionTest.java @@ -18,7 +18,7 @@ public class ConditionTest { public void testWhitelist() { String hostname1 = "host1"; Condition condition = new Condition(Condition.Type.WHITELIST, FetchVector.Dimension.HOSTNAME, - Stream.of(hostname1).collect(Collectors.toSet())); + Stream.of(hostname1).collect(Collectors.toList())); assertFalse(condition.test(new FetchVector())); assertFalse(condition.test(new FetchVector().with(FetchVector.Dimension.APPLICATION_ID, "foo"))); assertFalse(condition.test(new FetchVector().with(FetchVector.Dimension.HOSTNAME, "bar"))); @@ -29,7 +29,7 @@ public class ConditionTest { public void testBlacklist() { String hostname1 = "host1"; Condition condition = new Condition(Condition.Type.BLACKLIST, FetchVector.Dimension.HOSTNAME, - Stream.of(hostname1).collect(Collectors.toSet())); + Stream.of(hostname1).collect(Collectors.toList())); assertTrue(condition.test(new FetchVector())); assertTrue(condition.test(new FetchVector().with(FetchVector.Dimension.APPLICATION_ID, "foo"))); assertTrue(condition.test(new FetchVector().with(FetchVector.Dimension.HOSTNAME, "bar"))); diff --git a/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java b/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java index b3ff2a92b07..b0e4cd0f682 100644 --- a/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java +++ b/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java @@ -8,8 +8,7 @@ import com.yahoo.vespa.flags.json.wire.WireFlagData; import org.junit.Test; import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; +import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anEmptyMap; @@ -74,12 +73,12 @@ public class SerializationTest { WireCondition whitelistCondition = wireData.rules.get(0).andConditions.get(0); assertThat(whitelistCondition.type, equalTo("whitelist")); assertThat(whitelistCondition.dimension, equalTo("application")); - assertThat(whitelistCondition.values, equalTo(new HashSet<>(Arrays.asList("a1", "a2")))); + assertThat(whitelistCondition.values, equalTo(List.of("a1", "a2"))); // second condition WireCondition blacklistCondition = wireData.rules.get(0).andConditions.get(1); assertThat(blacklistCondition.type, equalTo("blacklist")); assertThat(blacklistCondition.dimension, equalTo("hostname")); - assertThat(blacklistCondition.values, equalTo(new HashSet<>(Arrays.asList("h1")))); + assertThat(blacklistCondition.values, equalTo(List.of("h1"))); // attributes assertThat(wireData.defaultFetchVector, notNullValue()); |