#40: Rename for consistency and readability

------------------------------------------------------------------------ On behalf of the community, the JUnit Lambda Team thanks msg systems ag (http://www.msg-systems.com) for supporting the JUnit crowdfunding campaign! ------------------------------------------------------------------------
junit-team · Jan 6, 2016 · f8514fd · f8514fd
1 parent 319b8d1
commit f8514fd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/junit4-engine/src/main/java/org/junit/gen5/engine/junit4/execution/RunListenerAdapter.java b/junit4-engine/src/main/java/org/junit/gen5/engine/junit4/execution/RunListenerAdapter.java
@@ -43,14 +43,14 @@ public void testRunStarted(Description description) {
 
 	@Override
 	public void testIgnored(Description description) {
-		TestDescriptor testDescriptor = testRun.lookupDescriptor(description);
+		TestDescriptor testDescriptor = testRun.lookupTestDescriptor(description);
 		String reason = determineReasonForIgnoredTest(description);
 		testIgnored(testDescriptor, reason);
 	}
 
 	@Override
 	public void testStarted(Description description) {
-		testStarted(testRun.lookupDescriptor(description));
+		testStarted(testRun.lookupTestDescriptor(description));
 	}
 
 	@Override
@@ -65,7 +65,7 @@ public void testFailure(Failure failure) {
 
 	@Override
 	public void testFinished(Description description) {
-		testFinished(testRun.lookupDescriptor(description));
+		testFinished(testRun.lookupTestDescriptor(description));
 	}
 
 	@Override
@@ -76,7 +76,7 @@ public void testRunFinished(Result result) {
 	}
 
 	private void handleFailure(Failure failure, Function<Throwable, TestExecutionResult> resultCreator) {
-		TestDescriptor testDescriptor = testRun.lookupDescriptor(failure.getDescription());
+		TestDescriptor testDescriptor = testRun.lookupTestDescriptor(failure.getDescription());
 		TestExecutionResult result = resultCreator.apply(failure.getException());
 		testRun.storeResult(testDescriptor, result);
 		if (testDescriptor.isContainer() && testRun.isDescendantOfRunnerTestDescriptor(testDescriptor)) {
@@ -134,7 +134,8 @@ private boolean canStart(TestDescriptor testDescriptor) {
 	}
 
 	private boolean canFinish(TestDescriptor testDescriptor) {
-		return testRun.isNotFinished(testDescriptor) && testRun.isDescendantOfRunnerTestDescriptor(testDescriptor)
+		return testRun.isNotFinished(testDescriptor) //
+				&& testRun.isDescendantOfRunnerTestDescriptor(testDescriptor)
 				&& testRun.areAllFinishedOrSkipped(testDescriptor.getChildren());
 	}
 

diff --git a/junit4-engine/src/main/java/org/junit/gen5/engine/junit4/execution/TestRun.java b/junit4-engine/src/main/java/org/junit/gen5/engine/junit4/execution/TestRun.java
@@ -55,7 +55,7 @@ boolean isDescendantOfRunnerTestDescriptor(TestDescriptor testDescriptor) {
 		return runnerDescendants.contains(testDescriptor);
 	}
 
-	TestDescriptor lookupDescriptor(Description description) {
+	TestDescriptor lookupTestDescriptor(Description description) {
 		return descriptionToDescriptor.get(description);
 	}