Fix reporting of Enclosed Parameterized tests in Vintage engine

Fixes #3083.

Author: marcphilipp

documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc

@@ -48,7 +48,8 @@ JUnit repository on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Fix reporting of `Parameterized` tests when used in combination with the `Enclosed`
+  runner.
 
 ==== Deprecations and Breaking Changes
 

junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java

@@ -93,7 +93,7 @@ public void testSuiteFinished(Description description) {
 		RunnerTestDescriptor runnerTestDescriptor = testRun.getRunnerTestDescriptor();
 		// runnerTestDescriptor is reported in testRunFinished
 		if (!runnerTestDescriptor.getDescription().equals(description)) {
-			reportContainerFinished(lookupOrRegisterNextTestDescriptor(description));
+			reportContainerFinished(lookupOrRegisterCurrentTestDescriptor(description));
 		}
 	}
 

junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java

@@ -62,6 +62,7 @@
 import org.junit.vintage.engine.samples.junit4.CompletelyDynamicTestCase;
 import org.junit.vintage.engine.samples.junit4.EmptyIgnoredTestCase;
 import org.junit.vintage.engine.samples.junit4.EnclosedJUnit4TestCase;
+import org.junit.vintage.engine.samples.junit4.EnclosedWithParameterizedChildrenJUnit4TestCase;
 import org.junit.vintage.engine.samples.junit4.IgnoredJUnit4TestCase;
 import org.junit.vintage.engine.samples.junit4.IgnoredParameterizedTestCase;
 import org.junit.vintage.engine.samples.junit4.JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase;
@@ -172,6 +173,39 @@ void executesEnclosedJUnit4TestCase() {
 			event(engine(), finishedSuccessfully()));
 	}
 
+	@Test
+	void executesEnclosedWithParameterizedChildrenJUnit4TestCase() {
+		Class<?> testClass = EnclosedWithParameterizedChildrenJUnit4TestCase.class;
+		String commonNestedClassPrefix = EnclosedWithParameterizedChildrenJUnit4TestCase.class.getName()
+				+ "$NestedTestCase";
+
+		execute(testClass).allEvents().debug().assertEventsMatchExactly( //
+			event(engine(), started()), //
+			event(container(testClass), started()), //
+			event(container(commonNestedClassPrefix), started()), //
+			event(container("[0]"), started()), //
+			event(test("test[0]"), started()), //
+			event(test("test[0]"), finishedSuccessfully()), //
+			event(container("[0]"), finishedSuccessfully()), //
+			event(container("[1]"), started()), //
+			event(test("test[1]"), started()), //
+			event(test("test[1]"), finishedSuccessfully()), //
+			event(container("[1]"), finishedSuccessfully()), //
+			event(container(commonNestedClassPrefix), finishedSuccessfully()), //
+			event(container(commonNestedClassPrefix), started()), //
+			event(container("[0]"), started()), //
+			event(test("test[0]"), started()), //
+			event(test("test[0]"), finishedSuccessfully()), //
+			event(container("[0]"), finishedSuccessfully()), //
+			event(container("[1]"), started()), //
+			event(test("test[1]"), started()), //
+			event(test("test[1]"), finishedSuccessfully()), //
+			event(container("[1]"), finishedSuccessfully()), //
+			event(container(commonNestedClassPrefix), finishedSuccessfully()), //
+			event(container(testClass), finishedSuccessfully()), //
+			event(engine(), finishedSuccessfully()));
+	}
+
 	@Test
 	void executesJUnit4SuiteWithJUnit3SuiteWithSingleTestCase() {
 		Class<?> junit4SuiteClass = JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.class;

junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedWithParameterizedChildrenJUnit4TestCase.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.vintage.engine.samples.junit4;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+// Source: https://github.com/junit-team/junit5/issues/3083
+@RunWith(Enclosed.class)
+public class EnclosedWithParameterizedChildrenJUnit4TestCase {
+
+	@RunWith(Parameterized.class)
+	public static class NestedTestCase1 {
+
+		@Parameters
+		public static Collection<Object[]> data() {
+			return Arrays.asList(new Object[] { 1, 2 }, new Object[] { 3, 4 });
+		}
+
+		@SuppressWarnings("unused")
+		public NestedTestCase1(final int a, final int b) {
+		}
+
+		@Test
+		public void test() {
+		}
+	}
+
+	@RunWith(Parameterized.class)
+	public static class NestedTestCase2 {
+
+		@Parameters
+		public static Collection<Object[]> data() {
+			return Arrays.asList(new Object[] { 1, 2 }, new Object[] { 3, 4 });
+		}
+
+		@SuppressWarnings("unused")
+		public NestedTestCase2(final int a, final int b) {
+		}
+
+		@Test
+		public void test() {
+		}
+	}
+}