Merge branch 'main' into build/improve_build_times_by_removing_grpc_f…

…rom_spotbugsp
open-feature · Jan 3, 2025 · 2ae1594 · 2ae1594
2 parents 0cd8a1e + 15f8e59
commit 2ae1594
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 117 deletions.
diff --git a/providers/flagd/pom.xml b/providers/flagd/pom.xml
@@ -306,100 +306,6 @@
                                     </arguments>
                                 </configuration>
                             </execution>
-                            <execution>
-                                <id>copy-gherkin-evaluation.feature</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <!-- copy the feature spec we want to test into resources so them can be easily loaded -->
-                                    <!-- run: cp test-harness/features/evaluation.feature src/test/resources/features/ -->
-                                    <executable>cp</executable>
-                                    <arguments>
-                                        <argument>spec/specification/assets/gherkin/evaluation.feature</argument>
-                                        <argument>src/test/resources/features/</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>copy-gherkin-flagd-json-evaluator.feature</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <!-- copy the feature spec we want to test into resources so them can be easily loaded -->
-                                    <!-- run: cp test-harness/features/flagd-json-evaluator.feature src/test/resources/features/ -->
-                                    <executable>cp</executable>
-                                    <arguments>
-                                        <argument>test-harness/gherkin/flagd-json-evaluator.feature</argument>
-                                        <argument>src/test/resources/features/</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>copy-gherkin-flagd.feature</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <!-- copy the feature spec we want to test into resources so them can be easily loaded -->
-                                    <!-- run: cp test-harness/features/flagd.feature src/test/resources/features/ -->
-                                    <executable>cp</executable>
-                                    <arguments>
-                                        <argument>test-harness/gherkin/flagd.feature</argument>
-                                        <argument>src/test/resources/features/</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>copy-gherkin-flagd-rpc-caching.feature</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>cp</executable>
-                                    <arguments>
-                                        <argument>test-harness/gherkin/flagd-rpc-caching.feature</argument>
-                                        <argument>src/test/resources/features/</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>copy-gherkin-config.feature</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <!-- copy the feature spec we want to test into resources so them can be easily loaded -->
-                                    <!-- run: cp test-harness/features/flagd.feature src/test/resources/features/ -->
-                                    <executable>cp</executable>
-                                    <arguments>
-                                        <argument>test-harness/gherkin/config.feature</argument>
-                                        <argument>src/test/resources/features/</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>copy-gherkin-flagd-reconnect.feature</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <!-- copy the feature spec we want to test into resources so them can be easily loaded -->
-                                    <!-- run: cp test-harness/features/flagd-reconnect.feature src/test/resources/features/ -->
-                                    <executable>cp</executable>
-                                    <arguments>
-                                        <argument>test-harness/gherkin/flagd-reconnect.feature</argument>
-                                        <argument>src/test/resources/features/</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
                         </executions>
                     </plugin>
                 </plugins>

diff --git a/...lagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunConfigCucumberTest.java b/...lagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunConfigCucumberTest.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Order;
 import org.junit.platform.suite.api.ConfigurationParameter;
 import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
+import org.junit.platform.suite.api.SelectFile;
 import org.junit.platform.suite.api.Suite;
 
 /**
@@ -16,7 +16,7 @@
 @Order(value = Integer.MAX_VALUE)
 @Suite
 @IncludeEngines("cucumber")
-@SelectClasspathResource("features/config.feature")
+@SelectFile("test-harness/gherkin/config.feature")
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
 @ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "dev.openfeature.contrib.providers.flagd.e2e.steps.config")
 public class RunConfigCucumberTest {}
diff --git a/.../test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdInProcessCucumberTest.java b/.../test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdInProcessCucumberTest.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Order;
 import org.junit.platform.suite.api.ConfigurationParameter;
 import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
+import org.junit.platform.suite.api.SelectFile;
 import org.junit.platform.suite.api.Suite;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -17,9 +17,9 @@
 @Order(value = Integer.MAX_VALUE)
 @Suite
 @IncludeEngines("cucumber")
-@SelectClasspathResource("features/evaluation.feature")
-@SelectClasspathResource("features/flagd-json-evaluator.feature")
-@SelectClasspathResource("features/flagd.feature")
+@SelectFile("spec/specification/assets/gherkin/evaluation.feature")
+@SelectFile("test-harness/gherkin/flagd-json-evaluator.feature")
+@SelectFile("test-harness/gherkin/flagd.feature")
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
 @ConfigurationParameter(
         key = GLUE_PROPERTY_NAME,

diff --git a/.../java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdInProcessEnvoyCucumberTest.java b/.../java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdInProcessEnvoyCucumberTest.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Order;
 import org.junit.platform.suite.api.ConfigurationParameter;
 import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
+import org.junit.platform.suite.api.SelectFile;
 import org.junit.platform.suite.api.Suite;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -17,9 +17,9 @@
 @Order(value = Integer.MAX_VALUE)
 @Suite
 @IncludeEngines("cucumber")
-@SelectClasspathResource("features/evaluation.feature")
-@SelectClasspathResource("features/flagd-json-evaluator.feature")
-@SelectClasspathResource("features/flagd.feature")
+@SelectFile("spec/specification/assets/gherkin/evaluation.feature")
+@SelectFile("test-harness/gherkin/flagd-json-evaluator.feature")
+@SelectFile("test-harness/gherkin/flagd.feature")
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
 @ConfigurationParameter(
         key = GLUE_PROPERTY_NAME,

diff --git a/...a/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdInProcessReconnectCucumberTest.java b/...a/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdInProcessReconnectCucumberTest.java
@@ -6,15 +6,15 @@
 import org.junit.jupiter.api.Order;
 import org.junit.platform.suite.api.ConfigurationParameter;
 import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
+import org.junit.platform.suite.api.SelectFile;
 import org.junit.platform.suite.api.Suite;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 /** Class for running the reconnection tests for the in-process provider */
 @Order(value = Integer.MAX_VALUE)
 @Suite
 @IncludeEngines("cucumber")
-@SelectClasspathResource("features/flagd-reconnect.feature")
+@SelectFile("test-harness/gherkin/flagd-reconnect.feature")
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
 @ConfigurationParameter(
         key = GLUE_PROPERTY_NAME,

diff --git a/...st/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdInProcessSSLCucumberTest.java b/...st/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdInProcessSSLCucumberTest.java
@@ -13,7 +13,7 @@
 @Order(value = Integer.MAX_VALUE)
 @Suite(failIfNoTests = false)
 @IncludeEngines("cucumber")
-// @SelectClasspathResource("features/evaluation.feature")
+// @SelectFile("spec/specification/assets/gherkin/evaluation.feature")
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
 @ConfigurationParameter(
         key = GLUE_PROPERTY_NAME,

diff --git a/...gd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdRpcCucumberTest.java b/...gd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdRpcCucumberTest.java
@@ -6,7 +6,7 @@
 import org.apache.logging.log4j.core.config.Order;
 import org.junit.platform.suite.api.ConfigurationParameter;
 import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
+import org.junit.platform.suite.api.SelectFile;
 import org.junit.platform.suite.api.Suite;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -17,10 +17,10 @@
 @Order(value = Integer.MAX_VALUE)
 @Suite
 @IncludeEngines("cucumber")
-@SelectClasspathResource("features/evaluation.feature")
-@SelectClasspathResource("features/flagd-json-evaluator.feature")
-@SelectClasspathResource("features/flagd.feature")
-@SelectClasspathResource("features/flagd-rpc-caching.feature")
+@SelectFile("spec/specification/assets/gherkin/evaluation.feature")
+@SelectFile("test-harness/gherkin/flagd-json-evaluator.feature")
+@SelectFile("test-harness/gherkin/flagd.feature")
+@SelectFile("test-harness/gherkin/flagd-rpc-caching.feature")
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
 @ConfigurationParameter(
         key = GLUE_PROPERTY_NAME,

diff --git a/...st/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdRpcReconnectCucumberTest.java b/...st/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdRpcReconnectCucumberTest.java
@@ -6,15 +6,15 @@
 import org.apache.logging.log4j.core.config.Order;
 import org.junit.platform.suite.api.ConfigurationParameter;
 import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
+import org.junit.platform.suite.api.SelectFile;
 import org.junit.platform.suite.api.Suite;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 /** Class for running the reconnection tests for the RPC provider */
 @Order(value = Integer.MAX_VALUE)
 @Suite
 @IncludeEngines("cucumber")
-@SelectClasspathResource("features/flagd-reconnect.feature")
+@SelectFile("test-harness/gherkin/flagd-reconnect.feature")
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
 @ConfigurationParameter(
         key = GLUE_PROPERTY_NAME,

diff --git a/...src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdRpcSSLCucumberTest.java b/...src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdRpcSSLCucumberTest.java
@@ -6,15 +6,15 @@
 import org.apache.logging.log4j.core.config.Order;
 import org.junit.platform.suite.api.ConfigurationParameter;
 import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
+import org.junit.platform.suite.api.SelectFile;
 import org.junit.platform.suite.api.Suite;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 /** Class for running the reconnection tests for the RPC provider */
 @Order(value = Integer.MAX_VALUE)
 @Suite
 @IncludeEngines("cucumber")
-@SelectClasspathResource("features/evaluation.feature")
+@SelectFile("spec/specification/assets/gherkin/evaluation.feature")
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
 @ConfigurationParameter(
         key = GLUE_PROPERTY_NAME,

diff --git a/providers/flagd/src/test/resources/features/.gitignore b/providers/flagd/src/test/resources/features/.gitignore
diff --git a/providers/flagd/src/test/resources/features/.gitkeep b/providers/flagd/src/test/resources/features/.gitkeep