UnitqueIdParts can split

junit-team · Nov 2, 2015 · 8094382 · 8094382
1 parent 073bbb3
commit 8094382
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/...5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/SpecificationResolver.java b/...5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/SpecificationResolver.java
@@ -40,8 +40,9 @@ public void resolveElement(TestPlanSpecificationElement element) {
 	private void resolveUniqueIdSpecification(UniqueIdSpecification element) {
 		UniqueIdParts uniqueIdParts = new UniqueIdParts(element.getUniqueId());
 		Preconditions.condition(element.getUniqueId().equals(uniqueIdParts.rest()),
-			"Unique ID is: " + uniqueIdParts.rest());
+			"UniqueId is: " + uniqueIdParts.rest());
-		String engingeId = uniqueIdParts.pop();
+		String engineId = uniqueIdParts.pop();
+		Preconditions.condition(root.getUniqueId().equals(engineId), "Engine ID is: " + engineId);
 		TestDescriptor descriptor = new UniqueIdTestDescriptorResolver().resolve(root, element);
 		if (descriptor != null) {
 			testDescriptors.add(descriptor);

diff --git a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/UniqueIdParts.java b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/UniqueIdParts.java
@@ -24,11 +24,19 @@ public UniqueIdParts(String uniqueId) {
 	}
 
 	private void splitIntoParts(String uniqueId) {
-		parts.add(uniqueId);
+		String currentPart = "";
+		for (char c : uniqueId.toCharArray()) {
+			if (SEPARATORS.contains(Character.toString(c))) {
+				parts.add(currentPart);
+				currentPart = "";
+			}
+			currentPart += c;
+		}
+		parts.add(currentPart);
 	}
 
 	public String pop() {
-		return null;
+		return parts.remove(0);
 	}
 
 	public String rest() {