Skip to content

Commit

Permalink
Polishing
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbrannen
sbrannen committed Jun 26, 2016
1 parent ac34540 commit da4a05b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
5 changes: 5 additions & 0 deletions ...iter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
View file
Expand Up @@ -48,6 +48,11 @@ public interface TestExecutionExceptionHandler extends Extension {
* the next registered {@code TestExecutionExceptionHandler} (if there is * the next registered {@code TestExecutionExceptionHandler} (if there is
* one) will be invoked with any {@link Throwable} thrown by this handler. * 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>
* contain the {@code Throwable} thrown during invocation of the corresponding
* {@code @Test} method.
*
* @param context the current extension context; never {@code null} * @param context the current extension context; never {@code null}
* @param throwable the {@code Throwable} to handle; never {@code null} * @param throwable the {@code Throwable} to handle; never {@code null}
*/ */
Expand Down
14 changes: 7 additions & 7 deletions ...upiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodTestDescriptor.java
View file
Expand Up @@ -172,7 +172,7 @@ public JupiterEngineExecutionContext execute(JupiterEngineExecutionContext conte


private void invokeBeforeEachCallbacks(JupiterEngineExecutionContext context) { private void invokeBeforeEachCallbacks(JupiterEngineExecutionContext context) {
ExtensionRegistry registry = context.getExtensionRegistry(); ExtensionRegistry registry = context.getExtensionRegistry();
MethodBasedTestExtensionContext testExtensionContext = (MethodBasedTestExtensionContext) context.getExtensionContext(); TestExtensionContext testExtensionContext = (TestExtensionContext) context.getExtensionContext();
ThrowableCollector throwableCollector = context.getThrowableCollector(); ThrowableCollector throwableCollector = context.getThrowableCollector();


for (BeforeEachCallback callback : registry.getExtensions(BeforeEachCallback.class)) { for (BeforeEachCallback callback : registry.getExtensions(BeforeEachCallback.class)) {
Expand All @@ -185,7 +185,7 @@ private void invokeBeforeEachCallbacks(JupiterEngineExecutionContext context) {


private void invokeBeforeEachMethods(JupiterEngineExecutionContext context) { private void invokeBeforeEachMethods(JupiterEngineExecutionContext context) {
ExtensionRegistry registry = context.getExtensionRegistry(); ExtensionRegistry registry = context.getExtensionRegistry();
MethodBasedTestExtensionContext testExtensionContext = (MethodBasedTestExtensionContext) context.getExtensionContext(); TestExtensionContext testExtensionContext = (TestExtensionContext) context.getExtensionContext();
ThrowableCollector throwableCollector = context.getThrowableCollector(); ThrowableCollector throwableCollector = context.getThrowableCollector();


for (BeforeEachMethodAdapter adapter : registry.getExtensions(BeforeEachMethodAdapter.class)) { for (BeforeEachMethodAdapter adapter : registry.getExtensions(BeforeEachMethodAdapter.class)) {
Expand All @@ -198,7 +198,7 @@ private void invokeBeforeEachMethods(JupiterEngineExecutionContext context) {


private void invokeBeforeTestExecutionCallbacks(JupiterEngineExecutionContext context) { private void invokeBeforeTestExecutionCallbacks(JupiterEngineExecutionContext context) {
ExtensionRegistry registry = context.getExtensionRegistry(); ExtensionRegistry registry = context.getExtensionRegistry();
MethodBasedTestExtensionContext testExtensionContext = (MethodBasedTestExtensionContext) context.getExtensionContext(); TestExtensionContext testExtensionContext = (TestExtensionContext) context.getExtensionContext();
ThrowableCollector throwableCollector = context.getThrowableCollector(); ThrowableCollector throwableCollector = context.getThrowableCollector();


for (BeforeTestExecutionCallback callback : registry.getExtensions(BeforeTestExecutionCallback.class)) { for (BeforeTestExecutionCallback callback : registry.getExtensions(BeforeTestExecutionCallback.class)) {
Expand All @@ -210,7 +210,7 @@ private void invokeBeforeTestExecutionCallbacks(JupiterEngineExecutionContext co
} }


protected void invokeTestMethod(JupiterEngineExecutionContext context) { protected void invokeTestMethod(JupiterEngineExecutionContext context) {
MethodBasedTestExtensionContext testExtensionContext = (MethodBasedTestExtensionContext) context.getExtensionContext(); TestExtensionContext testExtensionContext = (TestExtensionContext) context.getExtensionContext();
ThrowableCollector throwableCollector = context.getThrowableCollector(); ThrowableCollector throwableCollector = context.getThrowableCollector();


throwableCollector.execute(() -> { throwableCollector.execute(() -> {
Expand Down Expand Up @@ -250,7 +250,7 @@ private void invokeTestExecutionExceptionHandlers(Throwable ex, List<TestExecuti


private void invokeAfterTestExecutionCallbacks(JupiterEngineExecutionContext context) { private void invokeAfterTestExecutionCallbacks(JupiterEngineExecutionContext context) {
ExtensionRegistry registry = context.getExtensionRegistry(); ExtensionRegistry registry = context.getExtensionRegistry();
MethodBasedTestExtensionContext testExtensionContext = (MethodBasedTestExtensionContext) context.getExtensionContext(); TestExtensionContext testExtensionContext = (TestExtensionContext) context.getExtensionContext();
ThrowableCollector throwableCollector = context.getThrowableCollector(); ThrowableCollector throwableCollector = context.getThrowableCollector();


registry.getReversedExtensions(AfterTestExecutionCallback.class).forEach( registry.getReversedExtensions(AfterTestExecutionCallback.class).forEach(
Expand All @@ -259,7 +259,7 @@ private void invokeAfterTestExecutionCallbacks(JupiterEngineExecutionContext con


private void invokeAfterEachMethods(JupiterEngineExecutionContext context) { private void invokeAfterEachMethods(JupiterEngineExecutionContext context) {
ExtensionRegistry registry = context.getExtensionRegistry(); ExtensionRegistry registry = context.getExtensionRegistry();
MethodBasedTestExtensionContext testExtensionContext = (MethodBasedTestExtensionContext) context.getExtensionContext(); TestExtensionContext testExtensionContext = (TestExtensionContext) context.getExtensionContext();
ThrowableCollector throwableCollector = context.getThrowableCollector(); ThrowableCollector throwableCollector = context.getThrowableCollector();


registry.getReversedExtensions(AfterEachMethodAdapter.class).forEach( registry.getReversedExtensions(AfterEachMethodAdapter.class).forEach(
Expand All @@ -268,7 +268,7 @@ private void invokeAfterEachMethods(JupiterEngineExecutionContext context) {


private void invokeAfterEachCallbacks(JupiterEngineExecutionContext context) { private void invokeAfterEachCallbacks(JupiterEngineExecutionContext context) {
ExtensionRegistry registry = context.getExtensionRegistry(); ExtensionRegistry registry = context.getExtensionRegistry();
MethodBasedTestExtensionContext testExtensionContext = (MethodBasedTestExtensionContext) context.getExtensionContext(); TestExtensionContext testExtensionContext = (TestExtensionContext) context.getExtensionContext();
ThrowableCollector throwableCollector = context.getThrowableCollector(); ThrowableCollector throwableCollector = context.getThrowableCollector();


registry.getReversedExtensions(AfterEachCallback.class).forEach( registry.getReversedExtensions(AfterEachCallback.class).forEach(
Expand Down

0 comments on commit da4a05b

Please sign in to comment.