#171 Unresolvable Unique IDs result only in logging

junit-team · Mar 17, 2016 · 0c59d4c · 0c59d4c
1 parent 0e169e5
commit 0c59d4c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/.../src/test/java/org/junit/gen5/engine/junit5/discovery/DiscoverySelectorResolverTests.java b/.../src/test/java/org/junit/gen5/engine/junit5/discovery/DiscoverySelectorResolverTests.java
@@ -19,7 +19,6 @@
 
 import org.junit.gen5.api.Nested;
 import org.junit.gen5.api.Test;
-import org.junit.gen5.commons.util.PreconditionViolationException;
 import org.junit.gen5.engine.EngineDiscoveryRequest;
 import org.junit.gen5.engine.TestDescriptor;
 import org.junit.gen5.engine.UniqueId;
@@ -155,15 +154,12 @@ public void testMethodOfInnerClassByUniqueId() {
 	}
 
 	@Test
-	public void testNonResolvableUniqueId() {
+	public void testNonResolvableUniqueIdResolvesNothing() {
 		UniqueIdSelector selector = UniqueIdSelector.forUniqueId(engineId().append("poops", "machine"));
 		EngineDiscoveryRequest request = request().select(selector).build();
 
-		PreconditionViolationException exception = expectThrows(PreconditionViolationException.class, () -> {
+		resolver.resolveSelectors(request);
-			resolver.resolveSelectors(request);
+		assertTrue(engineDescriptor.allDescendants().isEmpty());
-		});
-		assertTrue(exception.getMessage().contains("Cannot resolve part '[poops:machine]'"),
-			"Exception message wrong: " + exception.getMessage());
 	}
 
 	@Test
@@ -196,7 +192,6 @@ public void testMethodResolutionByUniqueIdFromInheritedClass() {
 		assertEquals(2, engineDescriptor.allDescendants().size());
 		List<UniqueId> uniqueIds = uniqueIds();
 
-		// System.out.println(uniqueIds);
 		assertTrue(uniqueIds.contains(uniqueIdForClass(HerTestClass.class)));
 		assertTrue(uniqueIds.contains(uniqueIdForMethod(HerTestClass.class, "test1()")));
 	}
@@ -215,12 +210,13 @@ public void testMethodResolutionByUniqueIdWithParams() {
 	}
 
 	@Test
-	public void testMethodResolutionByUniqueIdWithWrongParams() {
+	public void testMethodResolutionByUniqueIdWithWrongParamsResolvesNothing() {
 		UniqueIdSelector selector = UniqueIdSelector.forUniqueId(
 			uniqueIdForMethod(HerTestClass.class, "test7(java.math.BigDecimal)"));
 		EngineDiscoveryRequest request = request().select(selector).build();
 
-		assertThrows(PreconditionViolationException.class, () -> resolver.resolveSelectors(request));
+		resolver.resolveSelectors(request);
+		assertTrue(engineDescriptor.allDescendants().isEmpty());
 	}
 
 	@Test

diff --git a/...t5-engine/src/main/java/org/junit/gen5/engine/junit5/discovery/JUnit5TestableFactory.java b/...t5-engine/src/main/java/org/junit/gen5/engine/junit5/discovery/JUnit5TestableFactory.java
@@ -14,11 +14,9 @@
 import static org.junit.gen5.commons.util.ReflectionUtils.loadClass;
 
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.junit.gen5.commons.util.PreconditionViolationException;
 import org.junit.gen5.commons.util.Preconditions;
@@ -106,18 +104,25 @@ private JUnit5Testable createTestable(UniqueId uniqueId, UniqueId engineId, List
 			}
 			case TYPE_METHOD: {
 				Class<?> container = ((JUnit5Class) last).getJavaClass();
-				next = fromMethod(findMethod(head.getValue(), container, uniqueId), container, engineId);
+				Optional<Method> optionalMethod = findMethod(head.getValue(), container);
+				if (!optionalMethod.isPresent()) {
+					LOG.warning(() -> String.format("Cannot resolve part '%s' of unique ID '%s'", head,
+						uniqueId.getUniqueString()));
+					return JUnit5Testable.doNothing();
+				}
+				next = fromMethod(optionalMethod.get(), container, engineId);
 				break;
 			}
 			default:
-				throw createCannotResolveUniqueIdException(uniqueId, head.toString());
+				LOG.warning(() -> String.format("Cannot resolve part '%s' of unique ID '%s'", head,
+					uniqueId.getUniqueString()));
+				return JUnit5Testable.doNothing();
 		}
 		return createTestable(uniqueId, engineId, parts, next);
 	}
 
-	private Method findMethod(String methodSpecPart, Class<?> clazz, UniqueId uniqueId) {
+	private Optional<Method> findMethod(String methodSpecPart, Class<?> clazz) {
-		Optional<Method> optionalMethod = new MethodFinder().findMethod(methodSpecPart, clazz);
+		return new MethodFinder().findMethod(methodSpecPart, clazz);
-		return optionalMethod.orElseThrow(() -> createCannotResolveUniqueIdException(uniqueId, methodSpecPart));
 	}
 
 	private Class<?> findNestedClass(String nameExtension, Class<?> containerClass) {

diff --git a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/discovery/MethodFinder.java b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/discovery/MethodFinder.java
@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+
 import org.junit.gen5.commons.util.ReflectionUtils;
 
 public class MethodFinder {