From 7e160ad01464136d7e4993a43410ad3c05c9f276 Mon Sep 17 00:00:00 2001 From: DBlanchard88 Date: Sun, 1 Oct 2023 14:19:23 -0400 Subject: [PATCH] zero value and events tests fixing formatting deleting unused classes Signed-off-by: DBlanchard88 --- pom.xml | 24 ++++---- providers/flagd/pom.xml | 8 +-- .../flagd/e2e/steps/StepDefinitions.java | 61 +++++++++++-------- 3 files changed, 50 insertions(+), 43 deletions(-) diff --git a/pom.xml b/pom.xml index b271c5900..f556f8d77 100644 --- a/pom.xml +++ b/pom.xml @@ -165,24 +165,24 @@ - io.cucumber - cucumber-java - 7.14.0 - test + io.cucumber + cucumber-java + 7.14.0 + test - io.cucumber - cucumber-junit-platform-engine - 7.14.0 - test + io.cucumber + cucumber-junit-platform-engine + 7.14.0 + test - org.awaitility - awaitility - 4.2.0 - test + org.awaitility + awaitility + 4.2.0 + test diff --git a/providers/flagd/pom.xml b/providers/flagd/pom.xml index 6098d9b67..b9fdc337e 100644 --- a/providers/flagd/pom.xml +++ b/providers/flagd/pom.xml @@ -321,10 +321,10 @@ exec - - - cp - + + + cp + test-harness/gherkin/flagd.feature src/test/resources/features/ diff --git a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/steps/StepDefinitions.java b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/steps/StepDefinitions.java index 5d77e2b4f..ae426db1a 100644 --- a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/steps/StepDefinitions.java +++ b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/steps/StepDefinitions.java @@ -1,8 +1,6 @@ package dev.openfeature.contrib.providers.flagd.e2e.steps; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.atMost; import java.util.HashMap; import java.util.Map; @@ -129,13 +127,13 @@ public void a_string_flag_with_key_is_evaluated_with_default_value(String flagKe this.stringFlagKey = flagKey; this.stringFlagDefaultValue = defaultValue; } - + @Then("the resolved string value should be {string}") public void the_resolved_string_value_should_be(String expected) { String value = client.getStringValue(this.stringFlagKey, this.stringFlagDefaultValue); assertEquals(expected, value); } - + // integer value @When("an integer flag with key {string} is evaluated with default value {int}") public void an_integer_flag_with_key_is_evaluated_with_default_value(String flagKey, Integer defaultValue) { @@ -385,7 +383,8 @@ public void a_context_containing_a_key_with_value(String key, String value) { @Then("the returned value should be {string}") public void the_returned_value_should_be(String expected) { - String value = client.getStringValue(this.stringFlagKey, this.stringFlagDefaultValue, this.customEvaluatorContext); + String value = client.getStringValue(this.stringFlagKey, this.stringFlagDefaultValue, + this.customEvaluatorContext); assertEquals(expected, value); } @@ -393,38 +392,39 @@ public void the_returned_value_should_be(String expected) { * Events */ - // Flag change event + // Flag change event @When("a PROVIDER_CONFIGURATION_CHANGED handler is added") public void a_provider_configuration_changed_handler_is_added() { - this.changeHandler = (EventDetails details) -> { + this.changeHandler = (EventDetails details) -> { this.isChangeHandlerRun = true; }; client.onProviderConfigurationChanged(this.changeHandler); } + @When("a flag with key {string} is modified") public void a_flag_with_key_is_modified(String flagKey) { - //This happens automatically + // This happens automatically } @Then("the PROVIDER_CONFIGURATION_CHANGED handler must run") public void the_provider_configuration_changed_handler_must_run() { Awaitility.await() - .atMost(Duration.ofSeconds(2)) - .until(() -> { - return this.isChangeHandlerRun; - }); + .atMost(Duration.ofSeconds(2)) + .until(() -> { + return this.isChangeHandlerRun; + }); } @Then("the event details must indicate {string} was altered") public void the_event_details_must_indicate_was_altered(String flagKey) { - //TODO: In-process-provider doesnt support flag change list. + // TODO: In-process-provider doesnt support flag change list. } // Provider ready event @When("a PROVIDER_READY handler is added") public void a_provider_ready_handler_is_added() { - this.readyHandler = (EventDetails details) -> { + this.readyHandler = (EventDetails details) -> { this.isReadyHandlerRun = true; }; client.onProviderReady(this.readyHandler); @@ -433,47 +433,53 @@ public void a_provider_ready_handler_is_added() { @Then("the PROVIDER_READY handler must run") public void the_provider_ready_handler_must_run() { Awaitility.await() - .atMost(Duration.ofSeconds(2)) - .until(() -> { - return this.isReadyHandlerRun; - }); + .atMost(Duration.ofSeconds(2)) + .until(() -> { + return this.isReadyHandlerRun; + }); } /* - * Zero Value - */ + * Zero Value + */ // boolean value @When("a zero-value boolean flag with key {string} is evaluated with default value {string}") - public void a_zero_value_boolean_flag_with_key_is_evaluated_with_default_value(String flagKey, String defaultValue) { + public void a_zero_value_boolean_flag_with_key_is_evaluated_with_default_value(String flagKey, + String defaultValue) { this.booleanFlagKey = flagKey; this.booleanFlagDefaultValue = Boolean.valueOf(defaultValue); } + @Then("the resolved boolean zero-value should be {string}") public void the_resolved_boolean_zero_value_should_be(String expected) { boolean value = client.getBooleanValue(this.booleanFlagKey, this.booleanFlagDefaultValue); - assertEquals(Boolean.valueOf(expected),value); + assertEquals(Boolean.valueOf(expected), value); } // float/double value @When("a zero-value float flag with key {string} is evaluated with default value {double}") public void a_zero_value_float_flag_with_key_is_evaluated_with_default_value(String flagKey, Double defaultValue) { - // TODO: There is a bug here with 0 value floats + // TODO: There is a bug here with 0 value floats // this.doubleFlagKey = flagKey; - // this.doubleFlagDefaultValue = defaultValue; + // this.doubleFlagDefaultValue = defaultValue; } + @Then("the resolved float zero-value should be {double}") public void the_resolved_float_zero_value_should_be(Double expected) { - // FlagEvaluationDetails details = client.getDoubleDetails("float-zero-flag", this.doubleFlagDefaultValue); - // assertEquals(expected, details.getValue()); + // FlagEvaluationDetails details = + // client.getDoubleDetails("float-zero-flag", this.doubleFlagDefaultValue); + // assertEquals(expected, details.getValue()); } // integer value @When("a zero-value integer flag with key {string} is evaluated with default value {int}") - public void a_zero_value_integer_flag_with_key_is_evaluated_with_default_value(String flagKey, Integer defaultValue) { + public void a_zero_value_integer_flag_with_key_is_evaluated_with_default_value(String flagKey, + Integer defaultValue) { this.intFlagKey = flagKey; this.intFlagDefaultValue = defaultValue; } + @Then("the resolved integer zero-value should be {int}") public void the_resolved_integer_zero_value_should_be(Integer expected) { int value = client.getIntegerValue(this.intFlagKey, this.intFlagDefaultValue); @@ -486,6 +492,7 @@ public void a_zero_value_string_flag_with_key_is_evaluated_with_default_value(St this.stringFlagKey = flagKey; this.stringFlagDefaultValue = defaultValue; } + @Then("the resolved string zero-value should be {string}") public void the_resolved_string_zero_value_should_be(String expected) { String value = client.getStringValue(this.stringFlagKey, this.stringFlagDefaultValue);