Polishing

junit-team · Oct 31, 2015 · 0a96c2f · 0a96c2f
1 parent 095d792
commit 0a96c2f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/junit-commons/src/main/java/org/junit/gen5/commons/util/AnnotationUtils.java b/junit-commons/src/main/java/org/junit/gen5/commons/util/AnnotationUtils.java
@@ -64,9 +64,9 @@ private static <A extends Annotation> Optional<A> findAnnotation(AnnotatedElemen
 		}
 
 		// Meta-present on directly present annotations?
-		for (Annotation candiateAnnotation : element.getDeclaredAnnotations()) {
-			if (!isInJavaLangAnnotationPackage(candiateAnnotation) && visited.add(candiateAnnotation)) {
-				Optional<A> metaAnnotation = findAnnotation(candiateAnnotation.annotationType(), annotationType,
+		for (Annotation candidateAnnotation : element.getDeclaredAnnotations()) {
+			if (!isInJavaLangAnnotationPackage(candidateAnnotation) && visited.add(candidateAnnotation)) {
+				Optional<A> metaAnnotation = findAnnotation(candidateAnnotation.annotationType(), annotationType,
 					visited);
 				if (metaAnnotation.isPresent()) {
 					return metaAnnotation;
@@ -108,14 +108,13 @@ public static List<Method> findMethods(Class<?> clazz, Predicate<Method> predica
 
 		// @formatter:off
 		return findAllMethodsInHierarchy(clazz, sortOrder).stream()
-				.filter(predicate::test)
+				.filter(predicate)
 				.collect(toList());
 		// @formatter:on
 	}
 
 	/**
 	 * Return all methods in superclass hierarchy except from Object.
-	 * Superclass methods are first.
 	 */
 	public static List<Method> findAllMethodsInHierarchy(Class<?> clazz, MethodSortOrder sortOrder) {
 		// TODO Support interface default methods.
@@ -157,11 +156,13 @@ private static boolean isMethodShadowedBy(Method upper, Method lower) {
 		if (!lower.getName().equals(upper.getName())) {
 			return false;
 		}
-		if (lower.getParameterTypes().length != upper.getParameterTypes().length) {
+		Class<?>[] lowerParameterTypes = lower.getParameterTypes();
+		Class<?>[] upperParameterTypes = upper.getParameterTypes();
+		if (lowerParameterTypes.length != upperParameterTypes.length) {
 			return false;
 		}
-		for (int i = 0; i < lower.getParameterTypes().length; i++) {
-			if (!lower.getParameterTypes()[i].equals(upper.getParameterTypes()[i])) {
+		for (int i = 0; i < lowerParameterTypes.length; i++) {
+			if (!lowerParameterTypes[i].equals(upperParameterTypes[i])) {
 				return false;
 			}
 		}

diff --git a/sample-project/src/test/java/com/example/SucceedingTestCase.java b/sample-project/src/test/java/com/example/SucceedingTestCase.java
@@ -41,7 +41,7 @@ void after() {
 		System.out.println(getClass().getName() + " after called");
 	}
 
-	@Test(name = "A nice name for test 2")
+	@Test(name = "A nice name for test 1")
 	void test1() {
 		System.out.println("test1");
 	}