Fix Node traversal and cleanup during printing phase (#70)

* fix logic to traverse the nodes

* change to snapshot

* small refactor

Author: fabriciorby

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.fabriciorby</groupId>
     <artifactId>maven-surefire-junit5-tree-reporter</artifactId>
-    <version>1.5.0</version>
+    <version>1.5.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>maven-surefire-junit5-tree-reporter</name>

src/main/java/org/apache/maven/plugin/surefire/report/ActualTreePrinter.java

@@ -25,10 +25,18 @@ public ActualTreePrinter(Node node, ConsoleLogger consoleLogger, ReporterOptions
         this.theme = options.getTheme();
     }
 
-    public void print() {
+    public void printAndRemoveChild() {
         if (options.isPrintBlankLineBetweenTests()) println("");
-        print(tree.branches.get(0));
-        Node.clearTree();
+        print();
+        removeChild();
+    }
+
+    public void print() {
+        print(tree);
+    }
+
+    public void removeChild() {
+        tree.getParent().branches.remove(tree);
     }
 
     private void print(Node node) {
@@ -68,7 +76,7 @@ private void println(String message) {
     }
 
     private boolean isLastMissingBranch(Node node) {
-        Node rootChild = tree.branches.get(0); // first after ROOT
+        Node rootChild = Node.getRoot().branches.get(0); // first after ROOT
         if (rootChild.hasBranches()) {
             Node rootChildLastChild = getLastItem(rootChild.branches); // last branch in root child
             return node.getParent(rootChildLastChild.getName()).isPresent() || node == rootChildLastChild;

src/main/java/org/apache/maven/plugin/surefire/report/TestReportHandler.java

@@ -43,16 +43,17 @@ public void print(TreePrinter treePrinter) {
             testSetStats.getReportEntries()
                     .forEach(entry -> Node.getBranchNode(node, getTestClassPath(entry.getSourceName())).get().wrappedReportEntries.add(entry));
         }
-        if (report != null) {
-            Node.getBranchNode(node, getTestClassPath(report.getSourceName())).get().setClassReportEntry((WrappedReportEntry) report);
-        }
+
+        Node classToBeTested = Node.getBranchNode(node, getTestClassPath(report.getSourceName())).get();
+        classToBeTested.setClassReportEntry((WrappedReportEntry) report);
+
         if (isMarkedAsNestedTest()) {
             prepareEntriesForNestedTests();
             if (isNestedTestReadyToPrint()) {
-                printNestedTests(treePrinter);
+                printNestedTests(treePrinter, classToBeTested);
             }
         } else {
-            printTests(treePrinter);
+            printTests(treePrinter, classToBeTested);
         }
     }
 
@@ -106,13 +107,13 @@ private boolean isNestedTestReadyToPrint() {
         return getClassEntryList().size() == getClassNameList().size();
     }
 
-    private void printNestedTests(TreePrinter treePrinter) {
-        treePrinter.printTests();
+    private void printNestedTests(TreePrinter treePrinter, Node classToBeTested) {
+        treePrinter.printTests(classToBeTested);
         cleanEntries();
     }
 
-    private void printTests(TreePrinter treePrinter) {
-        treePrinter.printTests();
+    private void printTests(TreePrinter treePrinter, Node classToBeTested) {
+        treePrinter.printTests(classToBeTested);
     }
 
     private <J, K, V extends Collection<K>> BiFunction<J, V, V> addToCollection(K obj) {

src/main/java/org/apache/maven/plugin/surefire/report/TreePrinter.java

@@ -20,22 +20,7 @@
 package org.apache.maven.plugin.surefire.report;
 
 import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
-import org.apache.maven.surefire.shared.lang3.ArrayUtils;
-import org.apache.maven.surefire.shared.lang3.StringUtils;
-import org.apache.maven.surefire.shared.utils.logging.MessageBuilder;
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.LongStream;
-
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toSet;
-import static org.apache.maven.plugin.surefire.report.TestSetStats.concatenateWithTestGroup;
-import static org.apache.maven.plugin.surefire.report.TextFormatter.abbreviateName;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
 import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer;
 
 /**
@@ -54,7 +39,7 @@ public TreePrinter(ConsoleLogger consoleLogger, ReporterOptions options) {
         this.options = options;
     }
 
-    public void printTests() {
-        new ActualTreePrinter(Node.getRoot(), consoleLogger, options).print();
+    public void printTests(Node node) {
+        new ActualTreePrinter(node, consoleLogger, options).printAndRemoveChild();
     }
 }