Remove TestExtensionContext and ContainerExtensionContext

Issue: #901

documentation/src/docs/asciidoc/extensions.adoc

@@ -116,9 +116,9 @@ APIs for programmatic, _conditional test execution_.
 
 A `ContainerExecutionCondition` is _evaluated_ to determine if all tests in a given
 container (e.g., a test class) should be executed based on the supplied
-`ContainerExtensionContext`. Similarly, a `TestExecutionCondition` is _evaluated_ to
+`ExtensionContext`. Similarly, a `TestExecutionCondition` is _evaluated_ to
 determine if a given test method should be executed based on the supplied
-`TestExtensionContext`.
+`ExtensionContext`.
 
 When multiple `ContainerExecutionCondition` or `TestExecutionCondition` extensions are registered,
 a container or test, respectively, is disabled as soon as one of the conditions returns _disabled_.
@@ -270,9 +270,9 @@ you keep the state from one invocation of an extension to the next? The
 `ExtensionContext` API provides a `Store` exactly for this purpose.  Extensions may
 put values into a store for later retrieval.  See the
 `<<extensions-lifecycle-callbacks-timing-extension, TimingExtension>>` for an example of using the
-`Store` with a method-level scope. It is important to remember that values stored in a
-`TestExtensionContext` during test execution will not be available in the surrounding
-`ContainerExtensionContext`. Since `ContainerExtensionContexts` may be nested, the scope of inner
+`Store` with a method-level scope. It is important to remember that values stored in an
+`ExtensionContext` during test execution will not be available in the surrounding
+`ExtensionContext`. Since `ExtensionContexts` may be nested, the scope of inner
 contexts may also be limited. Consult the corresponding Javadoc for details on the methods
 available for storing and retrieving values via the `{ExtensionContext_Store}`.
 

documentation/src/docs/asciidoc/release-notes-5.0.0-M5.adoc

@@ -123,6 +123,8 @@ is placed on the Java 9 module path.
   `Object getTestInstance()` to `Optional<Object> getTestInstance()`.
 * The `getTestException()` method in the `TestExtensionContext` API has been moved to the
   `ExtensionContext` API.
+* The `TestExtensionContext` and `ContainerExtensionContext` interfaces have been removed,
+  and all `Extension` interfaces have been changed to use `ExtensionContext` instead.
 
 [[release-notes-5.0.0-m5-migration-extension-api]]
 .Extension API Migration

documentation/src/test/java/example/ParameterizedTestDemo.java

@@ -29,7 +29,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.TestReporter;
-import org.junit.jupiter.api.extension.ContainerExtensionContext;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.converter.ConvertWith;
 import org.junit.jupiter.params.converter.JavaTimeConversionPattern;
@@ -161,7 +161,7 @@ void testWithArgumentsSource(String argument) {
 	static class MyArgumentsProvider implements ArgumentsProvider {
 
 		@Override
-		public Stream<? extends Arguments> provideArguments(ContainerExtensionContext context) {
+		public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 			return Stream.of("foo", "bar").map(Arguments::of);
 		}
 	}

documentation/src/test/java/example/exception/IgnoreIOExceptionExtension.java

@@ -12,15 +12,15 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestExecutionExceptionHandler;
-import org.junit.jupiter.api.extension.TestExtensionContext;
 
 // @formatter:off
 // tag::user_guide[]
 public class IgnoreIOExceptionExtension implements TestExecutionExceptionHandler {
 
 	@Override
-	public void handleTestExecutionException(TestExtensionContext context, Throwable throwable)
+	public void handleTestExecutionException(ExtensionContext context, Throwable throwable)
 			throws Throwable {
 
 		if (throwable instanceof IOException) {

documentation/src/test/java/example/timing/TimingExtension.java

@@ -16,9 +16,9 @@
 
 import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
 import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
-import org.junit.jupiter.api.extension.TestExtensionContext;
 
 // end::user_guide[]
 /**
@@ -33,20 +33,20 @@ public class TimingExtension implements BeforeTestExecutionCallback, AfterTestEx
 	private static final Logger LOG = Logger.getLogger(TimingExtension.class.getName());
 
 	@Override
-	public void beforeTestExecution(TestExtensionContext context) throws Exception {
+	public void beforeTestExecution(ExtensionContext context) throws Exception {
 		getStore(context).put(context.getTestMethod().get(), System.currentTimeMillis());
 	}
 
 	@Override
-	public void afterTestExecution(TestExtensionContext context) throws Exception {
+	public void afterTestExecution(ExtensionContext context) throws Exception {
 		Method testMethod = context.getTestMethod().get();
 		long start = getStore(context).remove(testMethod, long.class);
 		long duration = System.currentTimeMillis() - start;
 
 		LOG.info(() -> String.format("Method [%s] took %s ms.", testMethod.getName(), duration));
 	}
 
-	private Store getStore(TestExtensionContext context) {
+	private Store getStore(ExtensionContext context) {
 		return context.getStore(Namespace.create(getClass(), context));
 	}
 

documentation/src/test/java/extensions/ExpectToFail.java

@@ -19,10 +19,10 @@
 
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
 import org.junit.jupiter.api.extension.TestExecutionExceptionHandler;
-import org.junit.jupiter.api.extension.TestExtensionContext;
 
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
@@ -32,16 +32,16 @@
 	static class Extension implements TestExecutionExceptionHandler, AfterEachCallback {
 
 		@Override
-		public void handleTestExecutionException(TestExtensionContext context, Throwable throwable) throws Throwable {
+		public void handleTestExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
 			getExceptionStore(context).put("exception", throwable);
 		}
 
 		@Override
-		public void afterEach(TestExtensionContext context) throws Exception {
+		public void afterEach(ExtensionContext context) throws Exception {
 			assertNotNull(getExceptionStore(context).get("exception"), "Test should have failed");
 		}
 
-		private Store getExceptionStore(TestExtensionContext context) {
+		private Store getExceptionStore(ExtensionContext context) {
 			return context.getStore(Namespace.create(context));
 		}
 	}

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java

@@ -41,6 +41,6 @@ public interface AfterAllCallback extends Extension {
 	 *
 	 * @param context the current extension context; never {@code null}
 	 */
-	void afterAll(ContainerExtensionContext context) throws Exception;
+	void afterAll(ExtensionContext context) throws Exception;
 
 }

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java

@@ -45,6 +45,6 @@ public interface AfterEachCallback extends Extension {
 	 *
 	 * @param context the current extension context; never {@code null}
 	 */
-	void afterEach(TestExtensionContext context) throws Exception;
+	void afterEach(ExtensionContext context) throws Exception;
 
 }

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java

@@ -44,6 +44,6 @@ public interface AfterTestExecutionCallback extends Extension {
 	 *
 	 * @param context the current extension context; never {@code null}
 	 */
-	void afterTestExecution(TestExtensionContext context) throws Exception;
+	void afterTestExecution(ExtensionContext context) throws Exception;
 
 }

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java

@@ -41,6 +41,6 @@ public interface BeforeAllCallback extends Extension {
 	 *
 	 * @param context the current extension context; never {@code null}
 	 */
-	void beforeAll(ContainerExtensionContext context) throws Exception;
+	void beforeAll(ExtensionContext context) throws Exception;
 
 }

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java

@@ -43,6 +43,6 @@ public interface BeforeEachCallback extends Extension {
 	 *
 	 * @param context the current extension context; never {@code null}
 	 */
-	void beforeEach(TestExtensionContext context) throws Exception;
+	void beforeEach(ExtensionContext context) throws Exception;
 
 }

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java

@@ -44,6 +44,6 @@ public interface BeforeTestExecutionCallback extends Extension {
 	 *
 	 * @param context the current extension context; never {@code null}
 	 */
-	void beforeTestExecution(TestExtensionContext context) throws Exception;
+	void beforeTestExecution(ExtensionContext context) throws Exception;
 
 }

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ContainerExecutionCondition.java

@@ -19,9 +19,9 @@
  * programmatic, <em>conditional container execution</em>.
  *
  * <p>A {@code ContainerExecutionCondition} is
- * {@linkplain #evaluateContainerExecutionCondition(ContainerExtensionContext) evaluated}
+ * {@linkplain #evaluateContainerExecutionCondition(ExtensionContext) evaluated}
  * to determine if all tests in a given container should be executed based
- * on the supplied {@link ContainerExtensionContext}.
+ * on the supplied {@link ExtensionContext}.
  *
  * <p>Implementations must provide a no-args constructor.
  *
@@ -34,7 +34,7 @@
 public interface ContainerExecutionCondition extends Extension {
 
 	/**
-	 * Evaluate this condition for the supplied {@link ContainerExtensionContext}.
+	 * Evaluate this condition for the supplied {@link ExtensionContext}.
 	 *
 	 * <p>An {@linkplain ConditionEvaluationResult#enabled enabled} result
 	 * indicates that the container should be executed; whereas, a
@@ -44,6 +44,6 @@ public interface ContainerExecutionCondition extends Extension {
 	 * @param context the current extension context; never {@code null}
 	 * @return the result of evaluating this condition; never {@code null}
 	 */
-	ConditionEvaluationResult evaluateContainerExecutionCondition(ContainerExtensionContext context);
+	ConditionEvaluationResult evaluateContainerExecutionCondition(ExtensionContext context);
 
 }

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java

@@ -130,7 +130,7 @@ public interface ExtensionContext {
 
 	/**
 	 * Get the exception that was thrown during execution of the test associated
-	 * with this {@code TestExtensionContext}, if available.
+	 * with this {@code ExtensionContext}, if available.
 	 *
 	 * <p>This method is typically used for logging and tracing purposes. If you
 	 * wish to actually <em>handle</em> an exception thrown during test execution,

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionCondition.java

@@ -19,9 +19,9 @@
  * programmatic, <em>conditional test execution</em>.
  *
  * <p>A {@code TestExecutionCondition} is
- * {@linkplain #evaluateTestExecutionCondition(TestExtensionContext) evaluated}
+ * {@linkplain #evaluateTestExecutionCondition(ExtensionContext) evaluated}
  * to determine if a given test should be executed based on the supplied
- * {@link TestExtensionContext}.
+ * {@link ExtensionContext}.
  *
  * <p>Implementations must provide a no-args constructor.
  *
@@ -34,7 +34,7 @@
 public interface TestExecutionCondition extends Extension {
 
 	/**
-	 * Evaluate this condition for the supplied {@link TestExtensionContext}.
+	 * Evaluate this condition for the supplied {@link ExtensionContext}.
 	 *
 	 * <p>An {@linkplain ConditionEvaluationResult#enabled enabled} result
 	 * indicates that the test should be executed; whereas, a
@@ -44,6 +44,6 @@ public interface TestExecutionCondition extends Extension {
 	 * @param context the current extension context; never {@code null}
 	 * @return the result of evaluating this condition; never {@code null}
 	 */
-	ConditionEvaluationResult evaluateTestExecutionCondition(TestExtensionContext context);
+	ConditionEvaluationResult evaluateTestExecutionCondition(ExtensionContext context);
 
 }

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java

@@ -48,14 +48,14 @@ public interface TestExecutionExceptionHandler extends Extension {
 	 * the next registered {@code TestExecutionExceptionHandler} (if there is
 	 * one) will be invoked with any {@link Throwable} thrown by this handler.
 	 *
-	 * <p>Note that the {@link TestExtensionContext#getTestException() test
-	 * exception} in the supplied {@code TestExtensionContext} will <em>not</em>
+	 * <p>Note that the {@link ExtensionContext#getTestException() test
+	 * exception} in the supplied {@code ExtensionContext} will <em>not</em>
 	 * contain the {@code Throwable} thrown during invocation of the corresponding
 	 * {@code @Test} method.
 	 *
 	 * @param context the current extension context; never {@code null}
 	 * @param throwable the {@code Throwable} to handle; never {@code null}
 	 */
-	void handleTestExecutionException(TestExtensionContext context, Throwable throwable) throws Throwable;
+	void handleTestExecutionException(ExtensionContext context, Throwable throwable) throws Throwable;
 
 }

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java

@@ -54,34 +54,34 @@ public interface TestTemplateInvocationContextProvider extends Extension {
 	 * Determine if this provider supports providing invocation contexts for the
 	 * test template method represented by the supplied {@code context}.
 	 *
-	 * @param context the container extension context for the test template
-	 * method about to be invoked; never {@code null}
+	 * @param context the extension context for the test template method about
+	 * to be invoked; never {@code null}
 	 * @return {@code true} if this provider can provide invocation contexts
 	 * @see #provideTestTemplateInvocationContexts
-	 * @see ContainerExtensionContext
+	 * @see ExtensionContext
 	 */
-	boolean supportsTestTemplate(ContainerExtensionContext context);
+	boolean supportsTestTemplate(ExtensionContext context);
 
 	/**
 	 * Provide {@linkplain TestTemplateInvocationContext invocation contexts}
 	 * for the test template method represented by the supplied {@code context}.
 	 *
 	 * <p>This method is only called by the framework if {@link #supportsTestTemplate}
-	 * previously returned {@code true} for the same {@link ContainerExtensionContext}.
+	 * previously returned {@code true} for the same {@link ExtensionContext}.
 	 * Thus, this method must not return an empty {@code Stream}.
 	 *
 	 * <p>The returned {@code Stream} will be properly closed by calling
 	 * {@link Stream#close()}, making it safe to use a resource such as
 	 * {@link java.nio.file.Files#lines(java.nio.file.Path) Files.lines()}.
 	 *
-	 * @param context the container extension context for the test template
-	 * method about to be invoked; never {@code null}
+	 * @param context the extension context for the test template method about
+	 * to be invoked; never {@code null}
 	 * @return a {@code Stream} of {@code TestTemplateInvocationContext}
 	 * instances for the invocation of the test template method; never {@code null}
 	 * or empty
 	 * @see #supportsTestTemplate
-	 * @see ContainerExtensionContext
+	 * @see ExtensionContext
 	 */
-	Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(ContainerExtensionContext context);
+	Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(ExtensionContext context);
 
 }

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java

@@ -87,8 +87,4 @@ public Set<String> getTags() {
 		return testDescriptor.getTags().stream().map(TestTag::getName).collect(toCollection(LinkedHashSet::new));
 	}
 
-	@Override
-	public Optional<Throwable> getTestException() {
-		return Optional.empty();
-	}
 }