#190 JUnit4UniqueIdBuild now returns UniqueId objects

junit-tests/src/test/java/org/junit/gen5/engine/junit4/JUnit4TestEngineDiscoveryTests.java

@@ -36,6 +36,7 @@
 import org.junit.gen5.api.Test;
 import org.junit.gen5.engine.TestDescriptor;
 import org.junit.gen5.engine.TestTag;
+import org.junit.gen5.engine.UniqueId;
 import org.junit.gen5.engine.discovery.ClassFilter;
 import org.junit.gen5.engine.discovery.MethodSelector;
 import org.junit.gen5.engine.junit4.samples.PlainOldJavaClassWithoutAnyTest;
@@ -90,7 +91,7 @@ void resolvesIgnoredJUnit4TestClass() {
 		assertFalse(runnerDescriptor.isContainer());
 		assertTrue(runnerDescriptor.isTest());
 		assertEquals(testClass.getName(), runnerDescriptor.getDisplayName());
-		assertEquals(uniqueIdForClass(testClass), runnerDescriptor.getUniqueId());
+		assertEquals(uniqueIdForClass(testClass), runnerDescriptor.getUniqueIdObject());
 		assertThat(runnerDescriptor.getChildren()).isEmpty();
 	}
 
@@ -174,12 +175,12 @@ void resolvesJUnit4TestCaseWithOverloadedMethod() {
 
 		TestDescriptor testMethodDescriptor = testMethodDescriptors.get(0);
 		assertEquals("theory", testMethodDescriptor.getDisplayName());
-		assertEquals(uniqueIdForMethod(testClass, "theory", "0"), testMethodDescriptor.getUniqueId());
+		assertEquals(uniqueIdForMethod(testClass, "theory", "0"), testMethodDescriptor.getUniqueIdObject());
 		assertClassSource(testClass, testMethodDescriptor);
 
 		testMethodDescriptor = testMethodDescriptors.get(1);
 		assertEquals("theory", testMethodDescriptor.getDisplayName());
-		assertEquals(uniqueIdForMethod(testClass, "theory", "1"), testMethodDescriptor.getUniqueId());
+		assertEquals(uniqueIdForMethod(testClass, "theory", "1"), testMethodDescriptor.getUniqueIdObject());
 		assertClassSource(testClass, testMethodDescriptor);
 	}
 
@@ -521,7 +522,7 @@ void resolvesClassForMethodSelectorForClassWithNonFilterableRunner() throws Exce
 
 		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertEquals(testClass.getName(), runnerDescriptor.getDisplayName());
-		assertEquals(uniqueIdForClass(testClass), runnerDescriptor.getUniqueId());
+		assertEquals(uniqueIdForClass(testClass), runnerDescriptor.getUniqueIdObject());
 		assertThat(runnerDescriptor.getChildren()).isEmpty();
 	}
 
@@ -537,8 +538,8 @@ void usesCustomUniqueIdsWhenPresent() throws Exception {
 
 		TestDescriptor childDescriptor = getOnlyElement(runnerDescriptor.getChildren());
 
-		String prefix = uniqueIdForClass(testClass);
-		assertThat(childDescriptor.getUniqueIdObject().getUniqueString()).startsWith(prefix);
+		UniqueId prefix = uniqueIdForClass(testClass);
+		assertThat(childDescriptor.getUniqueIdObject().getUniqueString()).startsWith(prefix.getUniqueString());
 
 		String customUniqueIdValue = childDescriptor.getUniqueIdObject().getSegments().get(2).getType();
 		assertNotNull(Base64.getDecoder().decode(customUniqueIdValue.getBytes(StandardCharsets.UTF_8)),
@@ -579,17 +580,18 @@ private static void assertRunnerTestDescriptor(TestDescriptor runnerDescriptor,
 		assertFalse(runnerDescriptor.isTest());
 		assertEquals(testClass.getName(), runnerDescriptor.getDisplayName());
 		assertEquals(testClass.getName(), runnerDescriptor.getName());
-		assertEquals(uniqueIdForClass(testClass), runnerDescriptor.getUniqueId());
+		assertEquals(uniqueIdForClass(testClass), runnerDescriptor.getUniqueIdObject());
 		assertClassSource(testClass, runnerDescriptor);
 	}
 
 	private static void assertTestMethodDescriptor(TestDescriptor testMethodDescriptor, Class<?> testClass,
-			String methodName, String uniqueContainerId) throws Exception {
+			String methodName, UniqueId uniqueContainerId) throws Exception {
 		assertTrue(testMethodDescriptor.isTest());
 		assertFalse(testMethodDescriptor.isContainer());
 		assertEquals(methodName, testMethodDescriptor.getDisplayName());
 		assertEquals(methodName + "(" + testClass.getName() + ")", testMethodDescriptor.getName());
-		assertEquals(uniqueIdForMethod(uniqueContainerId, testClass, methodName), testMethodDescriptor.getUniqueId());
+		assertEquals(uniqueIdForMethod(uniqueContainerId, testClass, methodName),
+			testMethodDescriptor.getUniqueIdObject());
 		assertThat(testMethodDescriptor.getChildren()).isEmpty();
 		assertMethodSource(testClass.getMethod(methodName), testMethodDescriptor);
 	}
@@ -600,7 +602,7 @@ private static void assertContainerTestDescriptor(TestDescriptor containerDescri
 		assertFalse(containerDescriptor.isTest());
 		assertEquals(testClass.getName(), containerDescriptor.getDisplayName());
 		assertEquals(testClass.getName(), containerDescriptor.getName());
-		assertEquals(uniqueIdForClasses(suiteClass, testClass), containerDescriptor.getUniqueId());
+		assertEquals(uniqueIdForClasses(suiteClass, testClass), containerDescriptor.getUniqueIdObject());
 		assertClassSource(testClass, containerDescriptor);
 	}
 
@@ -609,7 +611,7 @@ private static void assertInitializationError(TestDescriptor testDescriptor, Cla
 		assertTrue(testDescriptor.isTest());
 		assertFalse(testDescriptor.isContainer());
 		assertEquals("initializationError", testDescriptor.getDisplayName());
-		assertEquals(uniqueIdForErrorInClass(testClass, failingClass), testDescriptor.getUniqueId());
+		assertEquals(uniqueIdForErrorInClass(testClass, failingClass), testDescriptor.getUniqueIdObject());
 		assertThat(testDescriptor.getChildren()).isEmpty();
 		assertClassSource(failingClass, testDescriptor);
 	}

junit-tests/src/test/java/org/junit/gen5/engine/junit4/JUnit4UniqueIdBuilder.java

@@ -20,37 +20,44 @@
  */
 public class JUnit4UniqueIdBuilder {
 
-	public static String uniqueIdForErrorInClass(Class<?> clazz, Class<?> failingClass) {
-		return uniqueIdForClasses(clazz) + "/[test:initializationError(" + failingClass.getName() + ")]";
+	public static UniqueId uniqueIdForErrorInClass(Class<?> clazz, Class<?> failingClass) {
+		return uniqueIdForClasses(clazz).append(JUnit4TestDescriptor.SEGMENT_TYPE_TEST,
+			"initializationError(" + failingClass.getName() + ")");
 	}
 
-	public static String uniqueIdForClass(Class<?> clazz) {
+	public static UniqueId uniqueIdForClass(Class<?> clazz) {
 		return uniqueIdForClasses(clazz);
 	}
 
-	public static String uniqueIdForClasses(Class<?> clazz, Class<?>... clazzes) {
-		String uniqueId = uniqueIdForClass(clazz.getName());
+	public static UniqueId uniqueIdForClasses(Class<?> clazz, Class<?>... clazzes) {
+		UniqueId uniqueId = uniqueIdForClass(clazz.getName());
 		for (Class<?> each : clazzes) {
-			uniqueId += "/[test:" + each.getName() + "]";
+			uniqueId = uniqueId.append(JUnit4TestDescriptor.SEGMENT_TYPE_TEST, each.getName());
 		}
 		return uniqueId;
 	}
 
-	public static String uniqueIdForClass(String fullyQualifiedClassName) {
+	public static UniqueId uniqueIdForClass(String fullyQualifiedClassName) {
 		UniqueId containerId = engineId();
-		return containerId.append(JUnit4TestDescriptor.SEGMENT_TYPE_RUNNER, fullyQualifiedClassName).getUniqueString();
+		return containerId.append(JUnit4TestDescriptor.SEGMENT_TYPE_RUNNER, fullyQualifiedClassName);
 	}
 
-	public static String uniqueIdForMethod(Class<?> testClass, String methodName) {
-		return uniqueIdForClass(testClass) + "/[test:" + methodName + "(" + testClass.getName() + ")]";
+	public static UniqueId uniqueIdForMethod(Class<?> testClass, String methodName) {
+		return uniqueIdForClass(testClass).append(JUnit4TestDescriptor.SEGMENT_TYPE_TEST,
+			methodValue(testClass, methodName));
 	}
 
-	public static String uniqueIdForMethod(Class<?> testClass, String methodName, String index) {
-		return uniqueIdForClass(testClass) + "/[test:" + methodName + "(" + testClass.getName() + ")[" + index + "]]";
+	private static String methodValue(Class<?> testClass, String methodName) {
+		return methodName + "(" + testClass.getName() + ")";
 	}
 
-	public static String uniqueIdForMethod(String containerId, Class<?> testClass, String methodName) {
-		return containerId + "/[test:" + methodName + "(" + testClass.getName() + ")]";
+	public static UniqueId uniqueIdForMethod(Class<?> testClass, String methodName, String index) {
+		return uniqueIdForClass(testClass).append(JUnit4TestDescriptor.SEGMENT_TYPE_TEST,
+			methodValue(testClass, methodName) + "[" + index + "]");
+	}
+
+	public static UniqueId uniqueIdForMethod(UniqueId containerId, Class<?> testClass, String methodName) {
+		return containerId.append(JUnit4TestDescriptor.SEGMENT_TYPE_TEST, methodValue(testClass, methodName));
 	}
 
 	public static UniqueId engineId() {

junit-tests/src/test/java/org/junit/gen5/engine/junit4/discovery/UniqueIdSelectorResolverTests.java

@@ -29,7 +29,7 @@ class UniqueIdSelectorResolverTests {
 
 	@Test
 	void logsWarningOnUnloadableTestClass() {
-		String uniqueId = JUnit4UniqueIdBuilder.uniqueIdForClass("foo.bar.UnknownClass");
+		UniqueId uniqueId = JUnit4UniqueIdBuilder.uniqueIdForClass("foo.bar.UnknownClass");
 		RecordCollectingLogger logger = new RecordCollectingLogger();
 		UniqueIdSelector selector = UniqueIdSelector.forUniqueId(uniqueId);
 		TestClassCollector collector = new TestClassCollector();