Polishing

Author: sbrannen

junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java

@@ -58,6 +58,7 @@
  * of {@code @TestInstance}.
  *
  * @since 5.0
+ * @see Nested @Nested
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
@@ -82,8 +83,8 @@ enum Lifecycle {
 		PER_CLASS,
 
 		/**
-		 * When using this mode, a new test instance will be created for each test method
-		 * or test factory method.
+		 * When using this mode, a new test instance will be created for each test method,
+		 * test factory method, or test template method.
 		 *
 		 * <p>This mode is analogous to the behavior found in JUnit versions 1 through 4.
 		 *

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

@@ -163,10 +163,11 @@ public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext conte
 
 		ThrowableCollector throwableCollector = new OpenTest4JAwareThrowableCollector();
 		ClassExtensionContext extensionContext = new ClassExtensionContext(context.getExtensionContext(),
-			context.getExecutionListener(), this, lifecycle, context.getConfigurationParameters(), throwableCollector);
+			context.getExecutionListener(), this, this.lifecycle, context.getConfigurationParameters(),
+			throwableCollector);
 
-		this.beforeAllMethods = findBeforeAllMethods(this.testClass, lifecycle == Lifecycle.PER_METHOD);
-		this.afterAllMethods = findAfterAllMethods(this.testClass, lifecycle == Lifecycle.PER_METHOD);
+		this.beforeAllMethods = findBeforeAllMethods(this.testClass, this.lifecycle == Lifecycle.PER_METHOD);
+		this.afterAllMethods = findAfterAllMethods(this.testClass, this.lifecycle == Lifecycle.PER_METHOD);
 
 		// @formatter:off
 		return context.extend()

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java

@@ -961,6 +961,7 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
 		}
 
 		private static void trackLifecycle(ExtensionContext context) {
+			assertThat(context.getRoot().getTestInstanceLifecycle()).isEmpty();
 			lifecyclesMap.computeIfAbsent(context.getRequiredTestClass(), clazz -> new ArrayList<>()).add(
 				context.getTestInstanceLifecycle().orElse(null));
 		}