Minor clean up in execution nodes

junit-team · Nov 14, 2015 · 08423ef · 08423ef
1 parent 14390ec
commit 08423ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/...-engine/src/main/java/org/junit/gen5/engine/junit5/execution/EngineTestExecutionNode.java b/...-engine/src/main/java/org/junit/gen5/engine/junit5/execution/EngineTestExecutionNode.java
@@ -40,12 +40,11 @@ public void execute(ExecutionRequest request, TestExecutionContext context) {
 	}
 
 	public void executeRequest(ExecutionRequest request) {
-		TestExecutionContext context = createTopLevelContext();
-		execute(request, context);
+		execute(request, createTopLevelContext());
 	}
 
 	private TestExecutionContext createTopLevelContext() {
-		return createContext(getTestDescriptor(), null, null);
+		return new DescriptorBasedTestExecutionContext(getTestDescriptor(), null, null);
 	}
 
 }
diff --git a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/execution/TestExecutionNode.java b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/execution/TestExecutionNode.java
@@ -48,20 +48,13 @@ public final List<TestExecutionNode> getChildren() {
 
 	protected void executeChild(TestExecutionNode child, ExecutionRequest request, TestExecutionContext parentContext,
 			Object testInstance) {
-
-		TestExecutionContext childContext = createChildContext(child.getTestDescriptor(), parentContext, testInstance);
+		TestExecutionContext childContext = createChildContext(child, parentContext, testInstance);
 		child.execute(request, childContext);
-
-	}
-
-	private TestExecutionContext createChildContext(TestDescriptor descriptor, TestExecutionContext parentContext,
-			Object testInstance) {
-		return createContext(descriptor, parentContext, testInstance);
 	}
 
-	protected TestExecutionContext createContext(TestDescriptor descriptor, TestExecutionContext parent,
+	private TestExecutionContext createChildContext(TestExecutionNode child, TestExecutionContext parentContext,
 			Object testInstance) {
-		return new DescriptorBasedTestExecutionContext(descriptor, parent, testInstance);
+		return new DescriptorBasedTestExecutionContext(child.getTestDescriptor(), parentContext, testInstance);
 	}
 
 }