#190 TestDescriptor.findByUniqueId now takes UniqueID object as param

junit-team · Mar 15, 2016 · 7bf7bdd · 7bf7bdd
1 parent a1a2097
commit 7bf7bdd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/junit-engine-api/src/main/java/org/junit/gen5/engine/TestDescriptor.java b/junit-engine-api/src/main/java/org/junit/gen5/engine/TestDescriptor.java
@@ -89,13 +89,13 @@ default boolean hasTests() {
 		return (isTest() || getChildren().stream().anyMatch(TestDescriptor::hasTests));
 	}
 
-	default Optional<? extends TestDescriptor> findByUniqueId(String uniqueId) {
-		if (getUniqueId().equals(uniqueId)) {
+	default Optional<? extends TestDescriptor> findByUniqueId(UniqueId uniqueId) {
+		if (getUniqueIdObject().equals(uniqueId)) {
 			return Optional.of(this);
 		}
 		// else
 		return getChildren().stream().filter(
-			testDescriptor -> testDescriptor.getUniqueId().equals(uniqueId)).findFirst();
+			testDescriptor -> testDescriptor.getUniqueIdObject().equals(uniqueId)).findFirst();
 	}
 
 	interface Visitor {

diff --git a/...ne-api/src/main/java/org/junit/gen5/engine/support/descriptor/AbstractTestDescriptor.java b/...ne-api/src/main/java/org/junit/gen5/engine/support/descriptor/AbstractTestDescriptor.java
@@ -82,8 +82,8 @@ protected void removeFromHierarchy() {
 	}
 
 	@Override
-	public Optional<? extends TestDescriptor> findByUniqueId(String uniqueId) {
-		if (getUniqueId().equals(uniqueId)) {
+	public Optional<? extends TestDescriptor> findByUniqueId(UniqueId uniqueId) {
+		if (getUniqueIdObject().equals(uniqueId)) {
 			return Optional.of(this);
 		}
 		for (TestDescriptor child : this.children) {

diff --git a/junit4-engine/src/main/java/org/junit/gen5/engine/junit4/discovery/UniqueIdFilter.java b/junit4-engine/src/main/java/org/junit/gen5/engine/junit4/discovery/UniqueIdFilter.java
@@ -19,18 +19,19 @@
 import java.util.Set;
 
 import org.junit.gen5.engine.TestDescriptor;
+import org.junit.gen5.engine.UniqueId;
 import org.junit.gen5.engine.junit4.descriptor.JUnit4TestDescriptor;
 import org.junit.gen5.engine.junit4.descriptor.RunnerTestDescriptor;
 import org.junit.runner.Description;
 
 class UniqueIdFilter extends RunnerTestDescriptorAwareFilter {
 
-	private final String uniqueId;
+	private final UniqueId uniqueId;
 
 	private Deque<Description> path;
 	private Set<Description> descendants;
 
-	public UniqueIdFilter(String uniqueId) {
+	public UniqueIdFilter(UniqueId uniqueId) {
 		this.uniqueId = uniqueId;
 	}
 

diff --git a/...engine/src/main/java/org/junit/gen5/engine/junit4/discovery/UniqueIdSelectorResolver.java b/...engine/src/main/java/org/junit/gen5/engine/junit4/discovery/UniqueIdSelectorResolver.java
@@ -51,7 +51,7 @@ void resolve(UniqueIdSelector selector, TestClassCollector collector) {
 	private void resolveIntoFilteredTestClass(String testClassName, UniqueId uniqueId, TestClassCollector collector) {
 		Optional<Class<?>> testClass = ReflectionUtils.loadClass(testClassName);
 		if (testClass.isPresent()) {
-			collector.addFiltered(testClass.get(), new UniqueIdFilter(uniqueId.getUniqueString()));
+			collector.addFiltered(testClass.get(), new UniqueIdFilter(uniqueId));
 		}
 		else {
 			logger.warning(() -> format("Unresolvable Unique ID (%s): Unknown class %s", uniqueId, testClassName));

diff --git a/...ngine/src/main/java/org/junit/gen5/engine/junit5/discovery/DiscoverySelectorResolver.java b/...ngine/src/main/java/org/junit/gen5/engine/junit5/discovery/DiscoverySelectorResolver.java
@@ -186,7 +186,7 @@ private JUnit5TestDescriptor getOrCreateClassDescriptor(Class<?> clazz, UniqueId
 
 	@SuppressWarnings("unchecked")
 	private Optional<TestDescriptor> descriptorByUniqueId(UniqueId uniqueId) {
-		return (Optional<TestDescriptor>) engineDescriptor.findByUniqueId(uniqueId.getUniqueString());
+		return (Optional<TestDescriptor>) engineDescriptor.findByUniqueId(uniqueId);
 	}
 
 }