Method renaming in ElementResolver

junit-team · Apr 29, 2016 · a80cad2 · a80cad2
1 parent 06520b0
commit a80cad2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/discoveryNEW/ElementResolver.java b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/discoveryNEW/ElementResolver.java
@@ -20,12 +20,14 @@
 public interface ElementResolver {
 
 	/**
-	 * Return a set of {@linkplain TestDescriptor testDescriptors} that can be resolved by this resolver
+	 * Return a set of {@linkplain TestDescriptor testDescriptors} that can be resolved by this resolver.
+	 * Returned set must be empty if {@code element} cannot be resolved.
 	 */
-	Set<TestDescriptor> resolve(AnnotatedElement element, TestDescriptor parent);
+	Set<TestDescriptor> resolveElement(AnnotatedElement element, TestDescriptor parent);
 
 	/**
 	 * Return an optional {@linkplain TestDescriptor testDescriptor}.
+	 * Return {@code Optional.empty()} if {@code segment} cannot be resolved.
 	 */
-	Optional<TestDescriptor> resolve(UniqueId.Segment segment, TestDescriptor parent);
+	Optional<TestDescriptor> resolveUniqueId(UniqueId.Segment segment, TestDescriptor parent);
 }
diff --git a/...-engine/src/main/java/org/junit/gen5/engine/junit5/discoveryNEW/JavaElementsResolver.java b/...-engine/src/main/java/org/junit/gen5/engine/junit5/discoveryNEW/JavaElementsResolver.java
@@ -101,7 +101,7 @@ private boolean resolveUniqueId(TestDescriptor parent, List<UniqueId.Segment> re
 
 		UniqueId.Segment head = remainingSegments.remove(0);
 		for (ElementResolver resolver : resolvers) {
-			Optional<TestDescriptor> resolvedDescriptor = resolver.resolve(head, parent);
+			Optional<TestDescriptor> resolvedDescriptor = resolver.resolveUniqueId(head, parent);
 			if (!resolvedDescriptor.isPresent())
 				continue;
 
@@ -163,7 +163,7 @@ private Set<TestDescriptor> resolve(AnnotatedElement element, TestDescriptor par
 	private Set<TestDescriptor> tryToResolveWithResolver(AnnotatedElement element, TestDescriptor parent,
 			ElementResolver resolver) {
 
-		Set<TestDescriptor> resolvedDescriptors = resolver.resolve(element, parent);
+		Set<TestDescriptor> resolvedDescriptors = resolver.resolveElement(element, parent);
 
 		resolvedDescriptors.forEach(testDescriptor -> {
 			Optional<TestDescriptor> existingTestDescriptor = findTestDescriptorByUniqueId(

diff --git a/...engine/src/main/java/org/junit/gen5/engine/junit5/discoveryNEW/TestContainerResolver.java b/...engine/src/main/java/org/junit/gen5/engine/junit5/discoveryNEW/TestContainerResolver.java
@@ -26,7 +26,7 @@ public class TestContainerResolver implements ElementResolver {
 	public static final String SEGMENT_TYPE = "class";
 
 	@Override
-	public Set<TestDescriptor> resolve(AnnotatedElement element, TestDescriptor parent) {
+	public Set<TestDescriptor> resolveElement(AnnotatedElement element, TestDescriptor parent) {
 		if (!(element instanceof Class))
 			return Collections.emptySet();
 
@@ -39,7 +39,7 @@ public Set<TestDescriptor> resolve(AnnotatedElement element, TestDescriptor pare
 	}
 
 	@Override
-	public Optional<TestDescriptor> resolve(UniqueId.Segment segment, TestDescriptor parent) {
+	public Optional<TestDescriptor> resolveUniqueId(UniqueId.Segment segment, TestDescriptor parent) {
 
 		if (!segment.getType().equals(getSegmentType()))
 			return Optional.empty();

diff --git a/...t5-engine/src/main/java/org/junit/gen5/engine/junit5/discoveryNEW/TestMethodResolver.java b/...t5-engine/src/main/java/org/junit/gen5/engine/junit5/discoveryNEW/TestMethodResolver.java
@@ -29,7 +29,7 @@ public class TestMethodResolver implements ElementResolver {
 	public static final String SEGMENT_TYPE = "method";
 
 	@Override
-	public Set<TestDescriptor> resolve(AnnotatedElement element, TestDescriptor parent) {
+	public Set<TestDescriptor> resolveElement(AnnotatedElement element, TestDescriptor parent) {
 		if (!(element instanceof Method))
 			return Collections.emptySet();
 
@@ -45,7 +45,7 @@ public Set<TestDescriptor> resolve(AnnotatedElement element, TestDescriptor pare
 	}
 
 	@Override
-	public Optional<TestDescriptor> resolve(UniqueId.Segment segment, TestDescriptor parent) {
+	public Optional<TestDescriptor> resolveUniqueId(UniqueId.Segment segment, TestDescriptor parent) {
 		if (!segment.getType().equals(SEGMENT_TYPE))
 			return Optional.empty();