Merge pull request #184 from rzabini/pr-base

B Make NamerFactory and TestUtils thread safe

Author: LarsEckart

approvaltests-util/src/main/java/com/spun/util/tests/TestUtils.java

@@ -26,26 +26,27 @@
 
 public class TestUtils
 {
-  private static Random                         random;
-  private static Function2<Class, String, File> getSourceDirectory = ClassUtils::getSourceDirectory;
+  private static Random                                            random;
+  private static final ThreadLocal<Function2<Class, String, File>> getSourceDirectory = ThreadLocal
+      .withInitial(() -> ClassUtils::getSourceDirectory);
   public static SourceDirectoryRestorer registerSourceDirectoryFinder(
       Function2<Class, String, File> sourceDirectoryFinder)
   {
     SourceDirectoryRestorer c = new SourceDirectoryRestorer();
-    TestUtils.getSourceDirectory = sourceDirectoryFinder;
+    TestUtils.getSourceDirectory.set(sourceDirectoryFinder);
     return c;
   }
   public static class SourceDirectoryRestorer implements AutoCloseable
   {
     private final Function2<Class, String, File> original;
     public SourceDirectoryRestorer()
     {
-      this.original = TestUtils.getSourceDirectory;
+      this.original = TestUtils.getSourceDirectory.get();
     }
     @Override
     public void close()
     {
-      TestUtils.getSourceDirectory = original;
+      TestUtils.getSourceDirectory.set(original);
     }
   }
   public static File getFile(String startingDir)
@@ -210,7 +211,7 @@ private static StackTraceReflectionResult getInfo(StackTraceElement element) thr
     String className = fullClassName.substring(fullClassName.lastIndexOf(".") + 1);
     className = handleInnerClasses(className);
     String fileName = element.getFileName();
-    File dir = getSourceDirectory.call(ObjectUtils.loadClass(fullClassName), fileName);
+    File dir = getSourceDirectory.get().call(ObjectUtils.loadClass(fullClassName), fileName);
     String methodName = unrollLambda(element.getMethodName());
     return new StackTraceReflectionResult(dir, className, fullClassName, methodName);
   }

approvaltests/src/main/java/org/approvaltests/namer/NamedEnvironment.java

@@ -8,7 +8,7 @@ public class NamedEnvironment implements AutoCloseable
 {
   public NamedEnvironment(String info)
   {
-    NamerFactory.additionalInformation = info;
+    NamerFactory.setAdditionalInformation(info);
   }
   @Override
   public void close()
@@ -17,14 +17,14 @@ public void close()
   }
   public boolean isCurrentEnvironmentValidFor(String... environment)
   {
-    if (Arrays.asList(environment).contains(NamerFactory.additionalInformation))
+    if (Arrays.asList(environment).contains(NamerFactory.getAdditionalInformation()))
     {
       return true;
     }
     else
     {
-      SimpleLogger
-          .message(String.format("Not valid for current environment: \"%s\"", NamerFactory.additionalInformation));
+      SimpleLogger.message(
+          String.format("Not valid for current environment: \"%s\"", NamerFactory.getAdditionalInformation()));
       return false;
     }
   }

approvaltests/src/main/java/org/approvaltests/namer/NamerFactory.java

@@ -9,18 +9,18 @@
 
 public class NamerFactory
 {
-  public static String additionalInformation;
+  private static final ThreadLocal<String> additionalInformation = new ThreadLocal<>();
   public static String getAndClearAdditionalInformation()
   {
     String result = getAdditionalInformation();
-    additionalInformation = null;
+    additionalInformation.set(null);
     return result;
   }
   public static String getAdditionalInformation()
   {
-    if (additionalInformation == null)
+    if (additionalInformation.get() == null)
     { return ""; }
-    return "." + additionalInformation;
+    return "." + additionalInformation.get();
   }
   public static ApprovalResults ApprovalResults = new ApprovalResults();
   public static NamedEnvironment asMachineSpecificTest(Function0<String> environmentLabeller)
@@ -57,6 +57,10 @@ public static NamedEnvironment withParameters(Object... parameters)
   }
   public static boolean isEmpty()
   {
-    return additionalInformation == null;
+    return additionalInformation.get() == null;
+  }
+  public static void setAdditionalInformation(String info)
+  {
+    additionalInformation.set(info);
   }
 }

approvaltests/src/test/resources/junit-platform.properties

@@ -0,0 +1,2 @@
+junit.jupiter.execution.parallel.enabled=true
+junit.jupiter.execution.parallel.mode.default = concurrent