F!! removed junit5 runtime dependency

Co-Authored-By: Llewellyn Falco <[email protected]>
Co-Authored-By: Johannes Link <[email protected]>

Author: 3 people

approvaltests/src/main/java/org/approvaltests/integrations/junit5/JUnitUtils.java

@@ -0,0 +1,29 @@
+package org.approvaltests.integrations.junit5;
+
+import com.spun.util.tests.TestUtils;
+import org.approvaltests.namer.AttributeStackSelector;
+import org.junit.platform.commons.annotation.Testable;
+import org.junit.platform.commons.util.AnnotationUtils;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+public class JUnitUtils
+{
+  public static boolean isTestableMethodForJunit(StackTraceElement element)
+  {
+    String fullClassName = element.getClassName();
+    Class<?> clazz = AttributeStackSelector.loadClass(fullClassName);
+    String methodName = TestUtils.unrollLambda(element.getMethodName());
+    List<Method> methods = AttributeStackSelector.getMethodsByName(clazz, methodName);
+    if (methods.isEmpty())
+    { return false; }
+    for (Method method : methods)
+    {
+      // TODO: TestFactory might needs special attention
+      if (AnnotationUtils.isAnnotated(method, Testable.class))
+      { return true; }
+    }
+    return false;
+  }
+}

approvaltests/src/main/java/org/approvaltests/integrations/junit5/JUnit5Approvals.java renamed to approvaltests/src/main/java/org/approvaltests/integrations/junit5/JupiterApprovals.java

@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.DynamicTest;
 import org.lambda.actions.Action0;
 
-public class JUnit5Approvals
+public class JupiterApprovals
 {
   @Experimental
   public static DynamicTest dynamicTest(String displayName, Action0 action0)

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

@@ -4,8 +4,7 @@
 import com.spun.util.ObjectUtils;
 import com.spun.util.io.StackElementSelector;
 import com.spun.util.tests.TestUtils;
-import org.junit.platform.commons.annotation.Testable;
-import org.junit.platform.commons.util.AnnotationUtils;
+import org.approvaltests.integrations.junit5.JUnitUtils;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -40,7 +39,7 @@ private List<Class<? extends Annotation>> getAvailableAttributes()
     }
     return attributes;
   }
-  private static Class<? extends Annotation> loadClass(String className)
+  public static Class<? extends Annotation> loadClass(String className)
   {
     Class<? extends Annotation> clazz = null;
     try
@@ -81,21 +80,26 @@ private boolean isTestCase(StackTraceElement element)
     { return true; }
     return isTestAttribute(clazz, TestUtils.unrollLambda(element.getMethodName()));
   }
+  public static Boolean isJunit5Present = null;
   public static boolean isTestableMethod(StackTraceElement element)
   {
-    String fullClassName = element.getClassName();
-    Class<?> clazz = loadClass(fullClassName);
-    String methodName = TestUtils.unrollLambda(element.getMethodName());
-    List<Method> methods = getMethodsByName(clazz, methodName);
-    if (methods.isEmpty())
-    { return false; }
-    for (Method method : methods)
+    if (isJunit5Present == null)
     {
-      if (AnnotationUtils.isAnnotated(method, Testable.class))
-      { return true; }
+      try
+      {
+        Class.forName("org.junit.platform.commons.annotation.Testable");
+        isJunit5Present = true;
+      }
+      catch (ClassNotFoundException e)
+      {
+        isJunit5Present = false;
+      }
     }
-    return false;
+    if (!isJunit5Present)
+    { return false; }
+    return JUnitUtils.isTestableMethodForJunit(element);
   }
+
   private boolean isJunit3Test(Class<?> clazz)
   {
     Class<?> testcase = loadClass("junit.framework.TestCase");

approvaltests/src/test/java/org/approvaltests/namer/JUnit5StackTraceNamerTest.java

@@ -5,7 +5,7 @@
 import com.spun.util.tests.TestUtils;
 import com.spun.util.tests.TestUtils.SourceDirectoryRestorer;
 import org.approvaltests.Approvals;
-import org.approvaltests.integrations.junit5.JUnit5Approvals;
+import org.approvaltests.integrations.junit5.JupiterApprovals;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.DynamicTest;
@@ -93,13 +93,13 @@ void testOverridingDirectoryFinder()
   Collection<DynamicTest> testFactory()
   {
     return Arrays.asList(
-        JUnit5Approvals.dynamicTest("test 1",
+        JupiterApprovals.dynamicTest("test 1",
             () -> StackTraceNamerUtils.assertNamerForFramework(this.getClass().getSimpleName(),
                 "testFactory.test_1")),
-        JUnit5Approvals.dynamicTest("test 3",
+        JupiterApprovals.dynamicTest("test 3",
             () -> StackTraceNamerUtils.assertNamerForFramework(this.getClass().getSimpleName(),
                 "testFactory.test_3")),
-        JUnit5Approvals.dynamicTest("test 2", () -> StackTraceNamerUtils
+        JupiterApprovals.dynamicTest("test 2", () -> StackTraceNamerUtils
             .assertNamerForFramework(this.getClass().getSimpleName(), "testFactory.test_2")));
   }
   @TestFactory