From a179e3e1b552aecde69b717141493252efeeb480 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 27 Nov 2015 14:12:07 +0100
Subject: [PATCH] Polish ReflectionUtils

---
 .../org/junit/gen5/commons/util/ReflectionUtils.java   | 10 +++++-----
 .../junit5/descriptor/SpecificationResolver.java       |  2 +-
 .../gen5/engine/junit5/extension/ForAllExtension.java  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/junit-commons/src/main/java/org/junit/gen5/commons/util/ReflectionUtils.java b/junit-commons/src/main/java/org/junit/gen5/commons/util/ReflectionUtils.java
index 7a45d25dcbf..4e50697d601 100644
--- a/junit-commons/src/main/java/org/junit/gen5/commons/util/ReflectionUtils.java
+++ b/junit-commons/src/main/java/org/junit/gen5/commons/util/ReflectionUtils.java
@@ -11,6 +11,7 @@
 package org.junit.gen5.commons.util;
 
 import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toSet;
 
 import java.io.File;
 import java.lang.reflect.AccessibleObject;
@@ -26,7 +27,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 /**
  * Collection of utilities for working with Java reflection APIs.
@@ -237,7 +237,7 @@ public static Set<File> getAllClasspathRootDirectories() {
 		return Arrays.stream(fullClassPath.split(separator))
 				.filter(part -> !part.endsWith(".jar"))
 				.map(File::new)
-				.collect(Collectors.toSet());
+				.collect(toSet());
 		// @formatter:on
 	}
 
@@ -251,11 +251,11 @@ public static List<Class<?>> findAllClassesInPackage(String basePackageName, Pre
 			ReflectionUtils::loadClass).scanForClassesInPackage(basePackageName, classTester);
 	}
 
-	public static List<Class<?>> findInnerClasses(Class<?> clazz, Predicate<Class<?>> predicate) {
+	public static List<Class<?>> findNestedClasses(Class<?> clazz, Predicate<Class<?>> predicate) {
 		Preconditions.notNull(clazz, "Class must not be null");
 		Preconditions.notNull(predicate, "predicate must not be null");
 
-		return Arrays.stream(clazz.getDeclaredClasses()).filter(predicate).collect(Collectors.toList());
+		return Arrays.stream(clazz.getDeclaredClasses()).filter(predicate).collect(toList());
 	}
 
 	public static Optional<Method> findMethod(Class<?> clazz, String methodName, Class<?>... parameterTypes) {
@@ -327,7 +327,7 @@ private static List<Method> getInterfaceMethods(Class<?> clazz, MethodSortOrder
 		for (Class<?> ifc : clazz.getInterfaces()) {
 
 			List<Method> localMethods = Arrays.stream(ifc.getDeclaredMethods()).filter(Method::isDefault).collect(
-				Collectors.toList());
+				toList());
 
 			// @formatter:off
 			List<Method> subInterfaceMethods = getInterfaceMethods(ifc, sortOrder).stream()
diff --git a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/SpecificationResolver.java b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/SpecificationResolver.java
index 7938a53934b..5fb1a80717b 100644
--- a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/SpecificationResolver.java
+++ b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/SpecificationResolver.java
@@ -164,7 +164,7 @@ private void resolveContainedTestMethods(Class<?> testClass, AbstractTestDescrip
 	}
 
 	private void resolveContainedNestedClasses(Class<?> clazz) {
-		List<Class<?>> nestedClasses = findInnerClasses(clazz, isNestedTestClass);
+		List<Class<?>> nestedClasses = findNestedClasses(clazz, isNestedTestClass);
 		for (Class<?> nestedClass : nestedClasses) {
 			JUnit5Testable nestedClassTestable = JUnit5Testable.fromClass(nestedClass, engineDescriptor.getUniqueId());
 			resolveTestable(nestedClassTestable);
diff --git a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/extension/ForAllExtension.java b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/extension/ForAllExtension.java
index 18e92408342..85b385d084a 100644
--- a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/extension/ForAllExtension.java
+++ b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/extension/ForAllExtension.java
@@ -64,7 +64,7 @@ public void preBeforeAll(TestExecutionContext testExecutionContext) throws Excep
 
 	private List<Object> getObjectsInScope(TestExecutionContext testExecutionContext) {
 		Predicate<Class<?>> forAllFilter = clazz -> AnnotationUtils.isAnnotated(clazz, ForAll.class);
-		List<Class<?>> forAllClasses = ReflectionUtils.findInnerClasses(testExecutionContext.getTestClass().get(),
+		List<Class<?>> forAllClasses = ReflectionUtils.findNestedClasses(testExecutionContext.getTestClass().get(),
 			forAllFilter);
 		return forAllClasses.stream().map(clazz -> forAllObjects.get(testExecutionContext, clazz)).collect(
 			Collectors.toList());