diff options
author | HÃ¥kon Hallingstad <hakon@verizonmedia.com> | 2019-10-23 09:03:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-23 09:03:36 +0200 |
commit | cf22860022aecafc6c9751d4db866d281a530103 (patch) | |
tree | b293cc3a21eeab918ccd33279fdbcff3e91272fc /configserver-flags/src | |
parent | 5129c936bd24bf2123372c4b2245ed836101cde1 (diff) | |
parent | b65dce02245de0341ce576c97d7f526d745e02f8 (diff) |
Merge pull request #11037 from vespa-engine/hakonhall/support-flag-conditions-based-on-vespa-release
Support flag conditions based on Vespa release
Diffstat (limited to 'configserver-flags/src')
-rw-r--r-- | configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImplTest.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImplTest.java b/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImplTest.java index 7460e42c866..4f2d5ae13d4 100644 --- a/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImplTest.java +++ b/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/db/FlagsDbImplTest.java @@ -8,12 +8,15 @@ import com.yahoo.vespa.flags.JsonNodeRawFlag; import com.yahoo.vespa.flags.json.Condition; import com.yahoo.vespa.flags.json.FlagData; import com.yahoo.vespa.flags.json.Rule; +import com.yahoo.vespa.flags.json.WhitelistCondition; import org.junit.Test; +import java.util.List; import java.util.Map; import java.util.Optional; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertEquals; @@ -29,7 +32,8 @@ public class FlagsDbImplTest { MockCurator curator = new MockCurator(); FlagsDbImpl db = new FlagsDbImpl(curator); - Condition condition1 = new Condition(Condition.Type.WHITELIST, FetchVector.Dimension.HOSTNAME, "host1"); + var params = new Condition.CreateParams(FetchVector.Dimension.HOSTNAME, List.of("host1"), Optional.empty()); + Condition condition1 = WhitelistCondition.create(params); Rule rule1 = new Rule(Optional.of(JsonNodeRawFlag.fromJson("13")), condition1); FlagId flagId = new FlagId("id"); FlagData data = new FlagData(flagId, new FetchVector().with(FetchVector.Dimension.ZONE_ID, "zone-a"), rule1); |