diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-10-23 11:44:13 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-10-23 11:44:13 +0200 |
commit | ff250e41e38e7bb8ac91b3bcc72d605fc2ec483c (patch) | |
tree | d57496eb08db3a0714c6b0f2e37b97748ed5c6cd /flags/src/test/java/com/yahoo | |
parent | 64d27e4723082ab8e2d7c61a6b61abd3081ea79a (diff) |
Make fluent-style params
Diffstat (limited to 'flags/src/test/java/com/yahoo')
-rw-r--r-- | flags/src/test/java/com/yahoo/vespa/flags/json/ConditionTest.java | 11 |
1 files changed, 4 insertions, 7 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 618bc86baaf..b46828b6691 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 @@ -4,9 +4,6 @@ package com.yahoo.vespa.flags.json; import com.yahoo.vespa.flags.FetchVector; import org.junit.Test; -import java.util.List; -import java.util.Optional; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -18,7 +15,7 @@ public class ConditionTest { @Test public void testWhitelist() { String hostname1 = "host1"; - var params = new Condition.CreateParams(FetchVector.Dimension.HOSTNAME, List.of(hostname1), Optional.empty()); + var params = new Condition.CreateParams(FetchVector.Dimension.HOSTNAME).setValues(hostname1); Condition condition = WhitelistCondition.create(params); assertFalse(condition.test(new FetchVector())); assertFalse(condition.test(new FetchVector().with(FetchVector.Dimension.APPLICATION_ID, "foo"))); @@ -29,7 +26,7 @@ public class ConditionTest { @Test public void testBlacklist() { String hostname1 = "host1"; - var params = new Condition.CreateParams(FetchVector.Dimension.HOSTNAME, List.of(hostname1), Optional.empty()); + var params = new Condition.CreateParams(FetchVector.Dimension.HOSTNAME).setValues(hostname1); Condition condition = BlacklistCondition.create(params); assertTrue(condition.test(new FetchVector())); assertTrue(condition.test(new FetchVector().with(FetchVector.Dimension.APPLICATION_ID, "foo"))); @@ -47,7 +44,7 @@ public class ConditionTest { // Test with empty fetch vector along vespa version dimension (this should never happen as the // version is always available through Vtag, although Vtag has a dummy version number for e.g. // locally run unit tests that hasn't set the release Vespa version). - var params = new Condition.CreateParams(FetchVector.Dimension.VESPA_VERSION, List.of(), Optional.of(">=7.1.2")); + var params = new Condition.CreateParams(FetchVector.Dimension.VESPA_VERSION).setPredicate(">=7.1.2"); Condition condition = RelationalCondition.create(params); assertFalse(condition.test(new FetchVector())); } @@ -59,7 +56,7 @@ public class ConditionTest { } private boolean vespaVersionCondition(String vespaVersion, String predicate) { - var params = new Condition.CreateParams(FetchVector.Dimension.VESPA_VERSION, List.of(), Optional.of(predicate)); + var params = new Condition.CreateParams(FetchVector.Dimension.VESPA_VERSION).setPredicate(predicate); Condition condition = RelationalCondition.create(params); return condition.test(new FetchVector().with(FetchVector.Dimension.VESPA_VERSION, vespaVersion)); } |