simple refactoring for preparing the after-case

junit-team · Oct 28, 2015 · ad52ad0 · ad52ad0
1 parent cee980a
commit ad52ad0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/JUnit5TestEngine.java b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/JUnit5TestEngine.java
@@ -126,18 +126,18 @@ private void handleBeforeMethods(Class<?> testClass, Object testInstance) throws
   }
 
   private List<Method> findBeforeMethods(Class<?> testClass) {
+    return this.findMethodsForGivenAnnotation(testClass, Before.class);
+  }
 
-    Class<?> desiredAnnotation = Before.class;
 
 
+  private List<Method> findMethodsForGivenAnnotation(Class<?> testClass, Class<? extends Annotation> desiredAnnotation) {
     List<Method> methods = new ArrayList<>();
 
-    //TODO port to streams
+    //TODO port to streams?
     for(Method method: testClass.getDeclaredMethods()) {
-      for(Annotation annotation: method.getDeclaredAnnotations()) {
-        if (annotation.annotationType().equals(desiredAnnotation))
+        if (method.isAnnotationPresent(desiredAnnotation))
           methods.add(method);
-      }
     }
 
     return methods;