Parametrize AbstractExtensionContext

junit-team · Jun 12, 2016 · 6c418d2 · 6c418d2
1 parent 657df85
commit 6c418d2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/...ngine/src/main/java/org/junit/gen5/engine/junit5/descriptor/AbstractExtensionContext.java b/...ngine/src/main/java/org/junit/gen5/engine/junit5/descriptor/AbstractExtensionContext.java
@@ -28,15 +28,15 @@
 /**
  * @since 5.0
  */
-abstract class AbstractExtensionContext implements ExtensionContext {
+abstract class AbstractExtensionContext<T extends TestDescriptor> implements ExtensionContext {
 
 	private final ExtensionContext parent;
 	private final EngineExecutionListener engineExecutionListener;
-	private final TestDescriptor testDescriptor;
+	private final T testDescriptor;
 	private final ExtensionValuesStore valuesStore;
 
 	AbstractExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
-			TestDescriptor testDescriptor) {
+			T testDescriptor) {
 		this.parent = parent;
 		this.engineExecutionListener = engineExecutionListener;
 		this.testDescriptor = testDescriptor;
@@ -46,7 +46,7 @@ abstract class AbstractExtensionContext implements ExtensionContext {
 	private ExtensionValuesStore createStore(ExtensionContext parent) {
 		ExtensionValuesStore parentStore = null;
 		if (parent != null) {
-			parentStore = ((AbstractExtensionContext) parent).valuesStore;
+			parentStore = ((AbstractExtensionContext<?>) parent).valuesStore;
 		}
 		return new ExtensionValuesStore(parentStore);
 	}
@@ -61,7 +61,7 @@ public Optional<ExtensionContext> getParent() {
 		return Optional.ofNullable(parent);
 	}
 
-	protected TestDescriptor getTestDescriptor() {
+	protected T getTestDescriptor() {
 		return testDescriptor;
 	}
 

diff --git a/...ain/java/org/junit/gen5/engine/junit5/descriptor/ClassBasedContainerExtensionContext.java b/...ain/java/org/junit/gen5/engine/junit5/descriptor/ClassBasedContainerExtensionContext.java
@@ -25,7 +25,7 @@
  * @since 5.0
  */
 @API(Internal)
-public final class ClassBasedContainerExtensionContext extends AbstractExtensionContext
+public final class ClassBasedContainerExtensionContext extends AbstractExtensionContext<ClassTestDescriptor>
 		implements ContainerExtensionContext {
 
 	public ClassBasedContainerExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
@@ -50,7 +50,7 @@ public AnnotatedElement getElement() {
 
 	@Override
 	public Optional<Class<?>> getTestClass() {
-		return Optional.of(((ClassTestDescriptor) getTestDescriptor()).getTestClass());
+		return Optional.of(getTestDescriptor().getTestClass());
 	}
 
 	@Override

diff --git a/...rc/main/java/org/junit/gen5/engine/junit5/descriptor/MethodBasedTestExtensionContext.java b/...rc/main/java/org/junit/gen5/engine/junit5/descriptor/MethodBasedTestExtensionContext.java
@@ -25,7 +25,8 @@
  * @since 5.0
  */
 @API(Internal)
-public final class MethodBasedTestExtensionContext extends AbstractExtensionContext implements TestExtensionContext {
+public final class MethodBasedTestExtensionContext extends AbstractExtensionContext<MethodTestDescriptor>
+		implements TestExtensionContext {
 
 	private final Object testInstance;
 
@@ -36,33 +37,33 @@ public MethodBasedTestExtensionContext(ExtensionContext parent, EngineExecutionL
 	}
 
 	@Override
-	public Optional<Method> getTestMethod() {
+	public String getUniqueId() {
-		return Optional.of(((MethodTestDescriptor) getTestDescriptor()).getTestMethod());
+		return getTestDescriptor().getUniqueId().toString();
 	}
 
 	@Override
-	public Object getTestInstance() {
+	public String getDisplayName() {
-		return this.testInstance;
+		return getTestDescriptor().getDisplayName();
 	}
 
 	@Override
-	public Optional<Class<?>> getTestClass() {
+	public AnnotatedElement getElement() {
-		return Optional.of(((MethodTestDescriptor) getTestDescriptor()).getTestClass());
+		return getTestMethod().get();
 	}
 
 	@Override
-	public String getUniqueId() {
+	public Optional<Class<?>> getTestClass() {
-		return getTestDescriptor().getUniqueId().toString();
+		return Optional.of(getTestDescriptor().getTestClass());
 	}
 
 	@Override
-	public String getDisplayName() {
+	public Optional<Method> getTestMethod() {
-		return getTestDescriptor().getDisplayName();
+		return Optional.of(getTestDescriptor().getTestMethod());
 	}
 
 	@Override
-	public AnnotatedElement getElement() {
+	public Object getTestInstance() {
-		return getTestMethod().get();
+		return this.testInstance;
 	}
 
 }