Removed ConsoleStream interface and used ConsoleLogger instead. Any c…

…ombinations of two interfaces out of three (RunListener, TestOutputReceiver, ConsoleLogger) are avoided and the only TestReportListener is used. Simplified code around logger in JUnitCoreProvider. Renamed method in ReporterFactory.
apache · Feb 14, 2022 · d592f99 · d592f99
1 parent 7f92897
commit d592f99
Show file tree

Hide file tree

Showing 57 changed files with 604 additions and 612 deletions.
diff --git a/...common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java b/...common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
@@ -23,7 +23,7 @@
 import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
 import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
 import org.apache.maven.surefire.api.event.Event;
-import org.apache.maven.surefire.api.report.TestRunListener;
+import org.apache.maven.surefire.api.report.TestReportListener;
 import org.apache.maven.surefire.extensions.EventHandler;
 import org.apache.maven.surefire.api.booter.MasterProcessChannelEncoder;
 import org.apache.maven.surefire.api.report.TestOutputReceiver;
@@ -79,7 +79,7 @@ public class ForkClient
 
     private final int forkNumber;
 
-    private volatile TestRunListener testSetReporter;
+    private volatile TestReportListener testSetReporter;
 
     /**
      * Written by one Thread and read by another: Main Thread and ForkStarter's Thread.
@@ -380,15 +380,15 @@ public final boolean hadTimeout()
     /**
      * Only {@link #getConsoleOutputReceiver()} may call this method in another Thread.
      */
-    private TestRunListener getTestSetReporter()
+    private TestReportListener getTestSetReporter()
     {
         if ( testSetReporter == null )
         {
             synchronized ( this )
             {
                 if ( testSetReporter == null )
                 {
-                    testSetReporter = defaultReporterFactory.createReporter();
+                    testSetReporter = defaultReporterFactory.createTestReportListener();
                 }
             }
         }
@@ -431,7 +431,7 @@ public TestOutputReceiver getConsoleOutputReceiver()
 
     private ConsoleLogger getOrCreateConsoleLogger()
     {
-        return (ConsoleLogger) getTestSetReporter();
+        return getTestSetReporter();
     }
 
     public void close( boolean hadTimeout )

diff --git a/...-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java b/...-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -29,7 +29,7 @@
 import org.apache.maven.surefire.extensions.StatelessTestsetInfoConsoleReportEventListener;
 import org.apache.maven.surefire.extensions.StatelessTestsetInfoFileReportEventListener;
 import org.apache.maven.surefire.api.report.ReporterFactory;
-import org.apache.maven.surefire.api.report.TestRunListener;
+import org.apache.maven.surefire.api.report.TestReportListener;
 import org.apache.maven.surefire.report.RunStatistics;
 import org.apache.maven.surefire.api.report.StackTraceWriter;
 import org.apache.maven.surefire.api.suite.RunResult;
@@ -97,7 +97,7 @@ public DefaultReporterFactory( StartupReportConfiguration reportConfiguration, C
     }
 
     @Override
-    public TestRunListener createReporter()
+    public TestReportListener createTestReportListener()
     {
         TestSetRunListener testSetRunListener =
             new TestSetRunListener( createConsoleReporter(),

diff --git a/...fire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java b/...fire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
@@ -25,15 +25,14 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
 import org.apache.maven.plugin.surefire.runorder.StatisticsReporter;
 import org.apache.maven.surefire.extensions.ConsoleOutputReportEventListener;
 import org.apache.maven.surefire.extensions.StatelessReportEventListener;
 import org.apache.maven.surefire.extensions.StatelessTestsetInfoConsoleReportEventListener;
 import org.apache.maven.surefire.extensions.StatelessTestsetInfoFileReportEventListener;
 import org.apache.maven.surefire.api.report.ReportEntry;
 import org.apache.maven.surefire.api.report.RunMode;
-import org.apache.maven.surefire.api.report.TestRunListener;
+import org.apache.maven.surefire.api.report.TestReportListener;
 import org.apache.maven.surefire.api.report.TestSetReportEntry;
 
 import static org.apache.maven.plugin.surefire.report.ReportEntryType.ERROR;
@@ -50,7 +49,7 @@
  * @author Kristian Rosenvold
  */
 public class TestSetRunListener
-    implements TestRunListener, ConsoleLogger
+    implements TestReportListener
 {
     private final Queue<TestMethodStats> testMethodStats = new ConcurrentLinkedQueue<>();
 

diff --git a/...n/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java b/...n/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
@@ -39,7 +39,7 @@
 import org.apache.maven.surefire.api.report.StackTraceWriter;
 import org.apache.maven.surefire.api.report.TestOutputReceiver;
 import org.apache.maven.surefire.api.report.TestSetReportEntry;
-import org.apache.maven.surefire.api.report.TestRunListener;
+import org.apache.maven.surefire.api.report.TestReportListener;
 import org.apache.maven.surefire.api.util.internal.WritableBufferedByteChannel;
 
 import javax.annotation.Nonnull;
@@ -173,7 +173,7 @@ public void testAssumptionFailure() throws Exception
     public void testConsole() throws Exception
     {
         final StandardTestRun standardTestRun = new StandardTestRun();
-        ConsoleLogger directConsoleReporter = (ConsoleLogger) standardTestRun.run();
+        ConsoleLogger directConsoleReporter = standardTestRun.run();
         directConsoleReporter.info( "HeyYou" );
         standardTestRun.assertExpected( MockReporter.CONSOLE_INFO, "HeyYou" );
     }
@@ -462,7 +462,7 @@ private SimpleReportEntry createReportEntryWithSpecialMessage( String message )
         }
     }
 
-    private TestRunListener createForkingRunListener()
+    private TestReportListener createForkingRunListener()
     {
         WritableBufferedByteChannel channel = (WritableBufferedByteChannel) newChannel( printStream );
         return new ForkingRunListener( new EventChannelEncoder( channel ), false );
@@ -472,7 +472,7 @@ private class StandardTestRun
     {
         private MockReporter reporter;
 
-        public TestRunListener run()
+        public TestReportListener run()
             throws ReporterException
         {
             reset();

diff --git a/...fire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java b/...fire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java
@@ -19,9 +19,8 @@
  * under the License.
  */
 
-import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
 import org.apache.maven.surefire.api.report.ReportEntry;
-import org.apache.maven.surefire.api.report.TestRunListener;
+import org.apache.maven.surefire.api.report.TestReportListener;
 import org.apache.maven.surefire.api.report.TestSetReportEntry;
 import org.apache.maven.surefire.api.report.RunMode;
 
@@ -33,7 +32,7 @@
  * Internal tests use only.
  */
 public class MockReporter
-    implements TestRunListener, ConsoleLogger
+        implements TestReportListener
 {
     private final List<String> events = new ArrayList<>();
 

diff --git a/...c/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java b/...c/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
@@ -25,7 +25,7 @@
 import org.apache.maven.plugin.surefire.extensions.SurefireStatelessTestsetInfoReporter;
 import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
 import org.apache.maven.plugin.surefire.log.api.NullConsoleLogger;
-import org.apache.maven.surefire.api.report.TestRunListener;
+import org.apache.maven.surefire.api.report.TestReportListener;
 
 import java.io.File;
 
@@ -43,7 +43,7 @@ public TestSetMockReporterFactory()
     }
 
     @Override
-    public TestRunListener createReporter()
+    public TestReportListener createTestReportListener()
     {
         return new MockReporter();
     }