Fix nested tests where only the last nested test was printed #26 (#40)

* Fix nested tests where only the last nested test was printed * Add another nested test to the tests --------- Co-authored-by: Andre Wachsmuth <awa@xima.de>
fabriciorby · May 13, 2023 · 34f8af5 · 34f8af5
1 parent f46b2ac
commit 34f8af5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/main/java/org/apache/maven/plugin/surefire/report/TestReportHandler.java b/src/main/java/org/apache/maven/plugin/surefire/report/TestReportHandler.java
@@ -68,7 +68,7 @@ private Set<String> getClassNameList() {
     }
 
     private void prepareTestEntriesForNestedTest() {
-        testEntries.putIfAbsent(sourceRootName, new ArrayList<>(testSetStats.getReportEntries()));
+        testEntries.computeIfAbsent(sourceRootName, $ -> new ArrayList<>()).addAll(testSetStats.getReportEntries());
     }
 
     private List<WrappedReportEntry> getTestEntryList() {

diff --git a/src/test/java/NestedExampleTest.java b/src/test/java/NestedExampleTest.java
@@ -11,6 +11,16 @@ void test() throws InterruptedException {
         Thread.sleep(100);
     }
 
+    @Nested
+    @DisplayName("First Inner Test")
+    class FirstInnerTest {
+        @Test
+        @DisplayName("FirstInnerTest should show up")
+        void test() throws InterruptedException {
+            Thread.sleep(100);
+        }
+    }
+
     @Nested
     @DisplayName("Inner Test")
     class InnerTest {

diff --git a/src/test/java/org/apache/maven/plugin/surefire/report/ConsoleTreeReporterTest.java b/src/test/java/org/apache/maven/plugin/surefire/report/ConsoleTreeReporterTest.java
@@ -58,19 +58,22 @@ void testSetCompleted() {
         SimpleReportEntry thirdTest = new SimpleReportEntry(RunMode.NORMAL_RUN, 123L, "NestedExampleTest$InnerTest", "Inner Test", "test", "Inner test should pass");
         SimpleReportEntry fourthTest = new SimpleReportEntry(RunMode.NORMAL_RUN, 123L, "NestedExampleTest$InnerTest$InnerInnerTest", "Inner Inner Test", "test", "Inner Inner Test should pass");
         SimpleReportEntry fifthTest = new SimpleReportEntry(RunMode.NORMAL_RUN, 123L, "NestedExampleTest$InnerTest$InnerInnerTest$InnerInnerInnerTest", "Inner Inner Inner Test", "test", "Inner Inner Inner Test should pass");
+        SimpleReportEntry sixthTest = new SimpleReportEntry(RunMode.NORMAL_RUN, 123L, "NestedExampleTest$FirstInnerTest", "First Inner Test", "test", "FirstInnerTest should show up");
 
         WrappedReportEntry wrappedReportEntry1 = new WrappedReportEntry(firstTest, ReportEntryType.SUCCESS, 1, stdout, stderr);
         WrappedReportEntry wrappedReportEntry2 = new WrappedReportEntry(secondTest, ReportEntryType.SUCCESS, 1, stdout, stderr);
         WrappedReportEntry wrappedReportEntry3 = new WrappedReportEntry(thirdTest, ReportEntryType.SUCCESS, 1, stdout, stderr);
         WrappedReportEntry wrappedReportEntry4 = new WrappedReportEntry(fourthTest, ReportEntryType.SUCCESS, 1, stdout, stderr);
         WrappedReportEntry wrappedReportEntry5 = new WrappedReportEntry(fifthTest, ReportEntryType.SUCCESS, 1, stdout, stderr);
+        WrappedReportEntry wrappedReportEntry6 = new WrappedReportEntry(sixthTest, ReportEntryType.SUCCESS, 1, stdout, stderr);
 
         TestSetStats testSetStats = new TestSetStats(false, true);
         testSetStats.testSucceeded(wrappedReportEntry1);
         testSetStats.testSucceeded(wrappedReportEntry2);
         testSetStats.testSucceeded(wrappedReportEntry3);
         testSetStats.testSucceeded(wrappedReportEntry4);
         testSetStats.testSucceeded(wrappedReportEntry5);
+        testSetStats.testSucceeded(wrappedReportEntry6);
 
         TestSetStats testSetStatsForClass = new TestSetStats(false, true);
 
@@ -87,4 +90,4 @@ void testSetCompleted() {
         //TODO see how to unit test this
     }
 
-}
+}