Fixes SwitcherTest when using with concurrent testing strategy

Author: petruki

pom.xml

@@ -8,7 +8,7 @@
 	<groupId>com.github.switcherapi</groupId>
 	<artifactId>switcher-client</artifactId>
 	<packaging>jar</packaging>
-	<version>2.2.3</version>
+	<version>2.2.4-SNAPSHOT</version>
 
 	<name>Switcher Client</name>
 	<description>Switcher Client SDK for working with Switcher API</description>

src/main/java/com/github/switcherapi/client/test/SwitcherTest.java

@@ -2,14 +2,17 @@
 
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Annotate test cases with the Switcher Key and the expected result.
+ * Annotate test cases with the Switcher Key and the expected result.<p>
+ * It uses "@Execution(ExecutionMode.SAME_THREAD)" to prevent Switcher race condition when setting up the mock.
  * 
  * <p>
  * <b>Requires JUnit 5 Jupiter</b>
@@ -18,6 +21,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Execution(ExecutionMode.SAME_THREAD)
 @ExtendWith(SwitcherTestExtension.class)
 @TestTemplate
 public @interface SwitcherTest {

src/test/java/com/github/switcherapi/playground/ClientPlayground.java

@@ -8,7 +8,7 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import static com.github.switcherapi.playground.Features.MY_SWITCHER;
+import static com.github.switcherapi.playground.Features.CLIENT_JAVA_FEATURE;
 import static com.github.switcherapi.playground.Features.getSwitcher;
 
 public class ClientPlayground {
@@ -19,14 +19,18 @@ public class ClientPlayground {
 
 	public static void test() {
 		new Features().configureClient();
-		Switcher switcher = getSwitcher(MY_SWITCHER)
+		Switcher switcher = getSwitcher(CLIENT_JAVA_FEATURE)
 				.bypassMetrics()
 				.build();
 
 		scheduler.scheduleAtFixedRate(() -> {
-			long time = System.currentTimeMillis();
-            logger.info("Switcher is on: {}", switcher.isItOn());
-            logger.info("Time elapsed: {}", System.currentTimeMillis() - time);
+			try {
+				long time = System.currentTimeMillis();
+				logger.info("Switcher is on: {}", switcher.isItOn());
+				logger.info("Time elapsed: {}", System.currentTimeMillis() - time);
+			} catch (Exception e) {
+				logger.error(e.getMessage(), e);
+			}
 		}, 0, 5, TimeUnit.SECONDS);
 	}
 

src/test/java/com/github/switcherapi/playground/Features.java

@@ -7,18 +7,18 @@
 public class Features extends SwitcherContextBase {
 
 	@SwitcherKey
-	public static final String MY_SWITCHER = "MY_SWITCHER";
+	public static final String CLIENT_JAVA_FEATURE = "CLIENT_JAVA_FEATURE";
 
 	@Override
 	protected void configureClient() {
 		configure(ContextBuilder.builder()
 				.context(Features.class.getCanonicalName())
 				.url("https://api.switcherapi.com")
-				.apiKey("[API_KEY]")
-				.component("switcher-playground")
-				.domain("Playground")
+				.apiKey(System.getenv("switcher.api.key"))
+				.component(System.getenv("switcher.component"))
+				.domain(System.getenv("switcher.domain"))
 				.local(true)
-				.snapshotLocation("/snapshot/playground"));
+				.snapshotLocation("./src/test/resources/snapshot/playground"));
 
 		initializeClient();
 	}

src/test/resources/snapshot/playground/default.json

@@ -1,29 +1,32 @@
 {
   "data": {
     "domain": {
-      "name": "Playground",
+      "name": "Switcher API",
       "version": 0,
-      "description": "My playground",
+      "description": "Feature Flag - Toggle - Cloud-based",
       "activated": true,
       "group": [
         {
-          "name": "Experimental",
-          "description": "Open feature flags for experimentation",
+          "name": "Test Project",
+          "description": "Test",
           "activated": true,
           "config": [
             {
-              "key": "MY_SWITCHER",
-              "description": "My first switcher",
+              "key": "CLIENT_JAVA_FEATURE",
+              "description": "Used for Integration test for the Switcher Client Java",
               "activated": true,
               "strategies": [
                 {
                   "strategy": "VALUE_VALIDATION",
                   "operation": "EXIST",
-                  "activated": false,
+                  "activated": true,
                   "values": [
                     "user_1"
                   ]
                 }
+              ],
+              "components": [
+                "switcher-client-java"
               ]
             }
           ]