TestFactoryTestDescriptors can be discovered by their unique IDs (#58)

junit-team · May 24, 2016 · 509f287 · 509f287
1 parent 77f7820
commit 509f287
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 13 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
@@ -43,6 +43,7 @@
 import org.junit.gen5.engine.discovery.MethodSelector;
 import org.junit.gen5.engine.discovery.PackageSelector;
 import org.junit.gen5.engine.discovery.UniqueIdSelector;
+import org.junit.gen5.engine.junit5.descriptor.TestFactoryTestDescriptor;
 
 /**
  * @since 5.0
@@ -322,6 +323,33 @@ public void twoMethodResolutionsByUniqueId() {
 		assertSame(classFromMethod1, classFromMethod2);
 	}
 
+	@Test
+	public void resolvingDynamicTestByUniqueIdResolvesOnlyUpToParentTestFactory() {
+		UniqueIdSelector selector = UniqueIdSelector.forUniqueId(
+			uniqueIdForTestFactoryMethod(MyTestClass.class, "dynamicTest()").append(
+				TestFactoryTestDescriptor.DYNAMIC_TEST_SEGMENT_TYPE, "%1"));
+
+		resolver.resolveSelectors(request().select(selector).build(), engineDescriptor);
+
+		assertThat(engineDescriptor.allDescendants()).hasSize(2);
+
+		assertThat(uniqueIds()).containsSequence(uniqueIdForClass(MyTestClass.class),
+			uniqueIdForTestFactoryMethod(MyTestClass.class, "dynamicTest()"));
+	}
+
+	@Test
+	public void resolvingTestFactoryMethodByUniqueId() {
+		UniqueIdSelector selector = UniqueIdSelector.forUniqueId(
+			uniqueIdForTestFactoryMethod(MyTestClass.class, "dynamicTest()"));
+
+		resolver.resolveSelectors(request().select(selector).build(), engineDescriptor);
+
+		assertThat(engineDescriptor.allDescendants()).hasSize(2);
+
+		assertThat(uniqueIds()).containsSequence(uniqueIdForClass(MyTestClass.class),
+			uniqueIdForTestFactoryMethod(MyTestClass.class, "dynamicTest()"));
+	}
+
 	@Test
 	public void packageResolution() {
 		PackageSelector selector = PackageSelector.forPackageName("org.junit.gen5.engine.junit5.descriptor.subpackage");

diff --git a/...gine/src/main/java/org/junit/gen5/engine/junit5/descriptor/TestFactoryTestDescriptor.java b/...gine/src/main/java/org/junit/gen5/engine/junit5/descriptor/TestFactoryTestDescriptor.java
@@ -39,6 +39,8 @@
 @API(Internal)
 public class TestFactoryTestDescriptor extends MethodTestDescriptor implements Leaf<JUnit5EngineExecutionContext> {
 
+	public static final String DYNAMIC_TEST_SEGMENT_TYPE = "dynamic-test";
+
 	public TestFactoryTestDescriptor(UniqueId uniqueId, Class<?> testClass, Method testMethod) {
 		super(uniqueId, testClass, testMethod);
 	}
@@ -106,7 +108,7 @@ private Stream<? extends DynamicTest> toDynamicTestStream(Object testFactoryMeth
 	}
 
 	private void registerAndExecute(DynamicTest dynamicTest, int index, EngineExecutionListener listener) {
-		UniqueId uniqueId = getUniqueId().append("dynamic-test", "%" + index);
+		UniqueId uniqueId = getUniqueId().append(DYNAMIC_TEST_SEGMENT_TYPE, "%" + index);
 		DynamicTestTestDescriptor dynamicTestTestDescriptor = new DynamicTestTestDescriptor(uniqueId, dynamicTest,
 			getSource().get());
 		addChild(dynamicTestTestDescriptor);

diff --git a/...ngine/src/main/java/org/junit/gen5/engine/junit5/discovery/TestFactoryMethodResolver.java b/...ngine/src/main/java/org/junit/gen5/engine/junit5/discovery/TestFactoryMethodResolver.java
@@ -12,7 +12,6 @@
 
 import java.lang.reflect.Method;
 
-import org.junit.gen5.commons.util.StringUtils;
 import org.junit.gen5.engine.TestDescriptor;
 import org.junit.gen5.engine.UniqueId;
 import org.junit.gen5.engine.junit5.descriptor.ClassTestDescriptor;
@@ -22,14 +21,14 @@ public class TestFactoryMethodResolver extends TestMethodResolver {
 
 	public static final String SEGMENT_TYPE = "test-factory";
 
-	protected boolean isTestMethod(Method candidate) {
-		return new IsTestFactoryMethod().test(candidate);
+	private final IsTestFactoryMethod isTestFactoryMethod = new IsTestFactoryMethod();
+
+	public TestFactoryMethodResolver() {
+		super(SEGMENT_TYPE);
 	}
 
-	protected UniqueId createUniqueId(Method testMethod, TestDescriptor parent) {
-		String methodId = String.format("%s(%s)", testMethod.getName(),
-			StringUtils.nullSafeToString(testMethod.getParameterTypes()));
-		return parent.getUniqueId().append(SEGMENT_TYPE, methodId);
+	protected boolean isTestMethod(Method candidate) {
+		return isTestFactoryMethod.test(candidate);
 	}
 
 	protected TestDescriptor resolveMethod(Method testMethod, ClassTestDescriptor parentClassDescriptor,

diff --git a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/discovery/TestMethodResolver.java b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/discovery/TestMethodResolver.java
@@ -33,6 +33,16 @@ public class TestMethodResolver implements ElementResolver {
 
 	public static final String SEGMENT_TYPE = "method";
 
+	private final String segmentType;
+
+	public TestMethodResolver() {
+		this(SEGMENT_TYPE);
+	}
+
+	protected TestMethodResolver(String segmentType) {
+		this.segmentType = segmentType;
+	}
+
 	@Override
 	public Set<TestDescriptor> resolveElement(AnnotatedElement element, TestDescriptor parent) {
 		if (!(element instanceof Method))
@@ -51,7 +61,7 @@ public Set<TestDescriptor> resolveElement(AnnotatedElement element, TestDescript
 
 	@Override
 	public Optional<TestDescriptor> resolveUniqueId(UniqueId.Segment segment, TestDescriptor parent) {
-		if (!segment.getType().equals(SEGMENT_TYPE))
+		if (!segment.getType().equals(segmentType))
 			return Optional.empty();
 
 		if (!(parent instanceof ClassTestDescriptor))
@@ -73,10 +83,10 @@ protected boolean isTestMethod(Method candidate) {
 		return new IsTestMethod().test(candidate);
 	}
 
-	protected UniqueId createUniqueId(Method testMethod, TestDescriptor parent) {
-		String methodId = String.format("%s(%s)", testMethod.getName(),
-			StringUtils.nullSafeToString(testMethod.getParameterTypes()));
-		return parent.getUniqueId().append(SEGMENT_TYPE, methodId);
+	private UniqueId createUniqueId(Method testMethod, TestDescriptor parent) {
+		Class<?>[] parameterTypes = testMethod.getParameterTypes();
+		String methodId = String.format("%s(%s)", testMethod.getName(), StringUtils.nullSafeToString(parameterTypes));
+		return parent.getUniqueId().append(segmentType, methodId);
 	}
 
 	private Optional<Method> findMethod(UniqueId.Segment segment, ClassTestDescriptor parent) {