You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/01/06 14:29:04 UTC
[maven-surefire] 01/01: Remove ConsoleLogger interface from TestSetRunListener
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch test-set-run-listener-cleanup
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit f0b38e45262effd9e1468ac06af48cf2f867512a
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Thu Jan 6 15:28:41 2022 +0100
Remove ConsoleLogger interface from TestSetRunListener
---
.../plugin/surefire/report/TestSetRunListener.java | 63 +---------------------
.../report/DefaultReporterFactoryTest.java | 53 ------------------
2 files changed, 1 insertion(+), 115 deletions(-)
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
index 15b7ed8..0ba71dc 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
@@ -25,7 +25,6 @@ import java.util.List;
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;
@@ -51,7 +50,7 @@ import static java.util.Objects.requireNonNull;
* @author Kristian Rosenvold
*/
public class TestSetRunListener
- implements RunListener, ConsoleOutputReceiver, ConsoleLogger
+ implements RunListener, ConsoleOutputReceiver
{
private final Queue<TestMethodStats> testMethodStats = new ConcurrentLinkedQueue<>();
@@ -95,66 +94,6 @@ public class TestSetRunListener
}
@Override
- public boolean isDebugEnabled()
- {
- return consoleReporter.getConsoleLogger().isDebugEnabled();
- }
-
- @Override
- public void debug( String message )
- {
- consoleReporter.getConsoleLogger().debug( trimTrailingNewLine( message ) );
- }
-
- @Override
- public boolean isInfoEnabled()
- {
- return consoleReporter.getConsoleLogger().isInfoEnabled();
- }
-
- @Override
- public void info( String message )
- {
- consoleReporter.getConsoleLogger().info( trimTrailingNewLine( message ) );
- }
-
- @Override
- public boolean isWarnEnabled()
- {
- return consoleReporter.getConsoleLogger().isWarnEnabled();
- }
-
- @Override
- public void warning( String message )
- {
- consoleReporter.getConsoleLogger().warning( trimTrailingNewLine( message ) );
- }
-
- @Override
- public boolean isErrorEnabled()
- {
- return consoleReporter.getConsoleLogger().isErrorEnabled();
- }
-
- @Override
- public void error( String message )
- {
- consoleReporter.getConsoleLogger().error( trimTrailingNewLine( message ) );
- }
-
- @Override
- public void error( String message, Throwable t )
- {
- consoleReporter.getConsoleLogger().error( trimTrailingNewLine( message ), t );
- }
-
- @Override
- public void error( Throwable t )
- {
- consoleReporter.getConsoleLogger().error( t );
- }
-
- @Override
public void writeTestOutput( String output, boolean newLine, boolean stdout )
{
try
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
index 14e4d82..994c029 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
@@ -271,59 +271,6 @@ public class DefaultReporterFactoryTest
assertEquals( skipped, getTestResultType( skippedList, 1 ) );
}
- public void testLogger()
- {
- MessageUtils.setColorEnabled( false );
- File target = new File( System.getProperty( "user.dir" ), "target" );
- File reportsDirectory = new File( target, "tmp6" );
- StartupReportConfiguration reportConfig =
- new StartupReportConfiguration( true, true, "PLAIN", false, reportsDirectory, false, null,
- new File( reportsDirectory, "TESTHASH" ), false, 1, null, null, false,
- new SurefireStatelessReporter(), new SurefireConsoleOutputReporter(),
- new SurefireStatelessTestsetInfoReporter() );
-
- DummyTestReporter reporter = new DummyTestReporter();
-
- DefaultReporterFactory factory = new DefaultReporterFactory( reportConfig, reporter );
-
- TestSetRunListener runListener = (TestSetRunListener) factory.createReporter();
-
- assertTrue( runListener.isDebugEnabled() );
- assertTrue( runListener.isInfoEnabled() );
- assertTrue( runListener.isWarnEnabled() );
- assertTrue( runListener.isErrorEnabled() );
-
- runListener.debug( "msg" );
- assertEquals( 1, reporter.getMessages().size() );
- assertEquals( "msg", reporter.getMessages().get( 0 ) );
- reporter.reset();
-
- runListener.info( "msg\n" );
- assertEquals( 1, reporter.getMessages().size() );
- assertEquals( "msg", reporter.getMessages().get( 0 ) );
- reporter.reset();
-
- runListener.warning( "msg\r\n" );
- assertEquals( 1, reporter.getMessages().size() );
- assertEquals( "msg", reporter.getMessages().get( 0 ) );
- reporter.reset();
-
- runListener.error( "msg" );
- assertEquals( 1, reporter.getMessages().size() );
- assertEquals( "msg", reporter.getMessages().get( 0 ) );
- reporter.reset();
-
- runListener.error( "msg\n", new Exception( "e" ) );
- assertEquals( 1, reporter.getMessages().size() );
- assertEquals( "msg e", reporter.getMessages().get( 0 ) );
- reporter.reset();
-
- runListener.error( new Exception( "e" ) );
- assertEquals( 1, reporter.getMessages().size() );
- assertEquals( "e", reporter.getMessages().get( 0 ) );
- reporter.reset();
- }
-
public void testCreateReporterWithZeroStatistics()
{
MessageUtils.setColorEnabled( false );