F!! allow multi level @testable detection

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

Author: 3 people

approvaltests-tests/src/test/java/org/approvaltests/namer/AttributeStackSelectorTest.java

@@ -19,6 +19,12 @@ void testDetectionOfAnnotationsThatAreMarkedTestable()
     StackTraceElement element = ThreadUtils.getStackTrace()[2];
     assertTrue(AttributeStackSelector.isTestableMethod(element));
   }
+  @Example()
+  void testDetectionOfAnnotationsThatAreIndirectlyMarkedTestable()
+  {
+    StackTraceElement element = ThreadUtils.getStackTrace()[2];
+    assertTrue(AttributeStackSelector.isTestableMethod(element));
+  }
   @Test
   void unrollLambda()
   {

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

@@ -5,6 +5,7 @@
 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 java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -90,20 +91,11 @@ public static boolean isTestableMethod(StackTraceElement element)
     { return false; }
     for (Method method : methods)
     {
-      Annotation[] annotations = method.getAnnotations();
-      for (Annotation annotation : annotations)
-      {
-        if (isTestableAnnotation(annotation))
-        { return true; }
-      }
+      if (AnnotationUtils.isAnnotated(method, Testable.class))
+      { return true; }
     }
     return false;
   }
-  public static boolean isTestableAnnotation(Annotation annotation)
-  {
-    Class<? extends Annotation> annotationType = annotation.annotationType();
-    return annotationType.isAnnotationPresent(Testable.class);
-  }
   private boolean isJunit3Test(Class<?> clazz)
   {
     Class<?> testcase = loadClass("junit.framework.TestCase");