maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tibordig...@apache.org
Subject [maven-surefire] 02/02: implemented extension StatelessTestsetInfoReporter
Date Wed, 24 Apr 2019 01:57:53 GMT
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch 1546-1222
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit 767deae5e06b3c97b34d9ec408bf3481e2ead834
Author: tibordigana <tibordigana@apache.org>
AuthorDate: Wed Apr 24 03:57:29 2019 +0200

    implemented extension StatelessTestsetInfoReporter
---
 .../plugin/surefire/AbstractSurefireMojo.java      | 18 +++++++--
 .../maven/plugin/surefire/CommonReflector.java     | 17 ++++++---
 .../surefire/StartupReportConfiguration.java       | 35 ++++++++++++++---
 .../DefaultStatelessTestsetInfoReporter.java       |  4 +-
 .../JUnit5StatelessTestsetInfoReporter.java        | 44 +++++++++++++++++++++-
 .../plugin/surefire/report/ConsoleReporter.java    | 17 ++++++---
 .../surefire/report/DefaultReporterFactory.java    | 20 +++++-----
 .../maven/plugin/surefire/report/FileReporter.java | 14 +++++--
 .../surefire/report/NullConsoleReporter.java       |  2 +-
 .../plugin/surefire/report/NullFileReporter.java   |  2 +-
 .../plugin/surefire/report/TestSetRunListener.java | 11 ++++--
 .../maven/plugin/surefire/report/TestSetStats.java | 37 +++++++++++-------
 .../plugin/surefire/report/WrappedReportEntry.java | 11 ++++--
 .../booterclient/TestSetMockReporterFactory.java   |  4 +-
 .../report/DefaultReporterFactoryTest.java         |  4 +-
 .../maven/surefire/report/FileReporterTest.java    |  4 +-
 .../surefire/report/CategorizedReportEntry.java    | 10 ++++-
 .../apache/maven/surefire/report/ReportEntry.java  |  7 ++++
 .../maven/surefire/report/SimpleReportEntry.java   |  6 +++
 surefire-its/pom.xml                               |  4 +-
 .../apache/maven/surefire/its/JUnitPlatformIT.java | 19 +++++++++-
 .../junit-platform-engine-jupiter/pom.xml          | 13 +++++++
 .../maven/surefire/junitcore/JUnitCoreTester.java  |  4 +-
 23 files changed, 235 insertions(+), 72 deletions(-)

diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 5dc9288..6127e4c 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -28,6 +28,7 @@ import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.surefire.extensions.DefaultConsoleOutputReporter;
 import org.apache.maven.plugin.surefire.extensions.DefaultStatelessReportMojoConfiguration;
 import org.apache.maven.plugin.surefire.extensions.DefaultStatelessReporter;
+import org.apache.maven.plugin.surefire.extensions.DefaultStatelessTestsetInfoReporter;
 import org.apache.maven.plugin.surefire.report.TestSetStats;
 import org.apache.maven.plugin.surefire.report.WrappedReportEntry;
 import org.apache.maven.plugins.annotations.Component;
@@ -76,6 +77,7 @@ import org.apache.maven.surefire.booter.SurefireExecutionException;
 import org.apache.maven.surefire.cli.CommandLineOption;
 import org.apache.maven.surefire.extensions.ConsoleOutputReporter;
 import org.apache.maven.surefire.extensions.StatelessReporter;
+import org.apache.maven.surefire.extensions.StatelessTestsetInfoReporter;
 import org.apache.maven.surefire.providerapi.SurefireProvider;
 import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.suite.RunResult;
@@ -166,10 +168,15 @@ public abstract class AbstractSurefireMojo
     /**
      * Note: use the legacy system property <em>disableXmlReport</em> set to {@code true} to disable the report.
      */
-
     @Parameter private
     StatelessReporter<WrappedReportEntry, TestSetStats, DefaultStatelessReportMojoConfiguration> statelessReporter;
 
+    @Parameter
+    private ConsoleOutputReporter consoleOutputReporter;
+
+    @Parameter
+    private StatelessTestsetInfoReporter<WrappedReportEntry, TestSetStats> statelessTestsetInfoReporter;
+
     /**
      * Information about this plugin, mainly used to lookup this plugin's configuration from the currently executing
      * project.
@@ -1957,14 +1964,19 @@ public abstract class AbstractSurefireMojo
 
         xmlReporter.setDisable( isDisableXmlReport() ); // todo change to Boolean in the version 3.0.0-M6
 
-        ConsoleOutputReporter consoleOutputReporter = new DefaultConsoleOutputReporter();
+        ConsoleOutputReporter outReporter =
+                consoleOutputReporter == null ? new DefaultConsoleOutputReporter() : consoleOutputReporter;
+
+        StatelessTestsetInfoReporter<WrappedReportEntry, TestSetStats> testsetReporter =
+                statelessTestsetInfoReporter == null
+                        ? new DefaultStatelessTestsetInfoReporter() : statelessTestsetInfoReporter;
 
         return new StartupReportConfiguration( isUseFile(), isPrintSummary(), getReportFormat(),
                                                isRedirectTestOutputToFile(),
                                                getReportsDirectory(), isTrimStackTrace(), getReportNameSuffix(),
                                                getStatisticsFile( configChecksum ), requiresRunHistory(),
                                                getRerunFailingTestsCount(), getReportSchemaLocation(), getEncoding(),
-                                               isForkMode, xmlReporter, consoleOutputReporter );
+                                               isForkMode, xmlReporter, outReporter, testsetReporter );
     }
 
     private boolean isSpecificTestSpecified()
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
index 8d00125..b49ce4f 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
@@ -24,6 +24,7 @@ import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
 import org.apache.maven.surefire.booter.SurefireReflector;
 import org.apache.maven.surefire.extensions.ConsoleOutputReporter;
 import org.apache.maven.surefire.extensions.StatelessReporter;
+import org.apache.maven.surefire.extensions.StatelessTestsetInfoReporter;
 import org.apache.maven.surefire.util.SurefireReflectionException;
 
 import javax.annotation.Nonnull;
@@ -43,6 +44,7 @@ public class CommonReflector
     private final Class<?> consoleLogger;
     private final Class<?> statelessReporter;
     private final Class<?> consoleOutputReporter;
+    private final Class<?> statelessTestsetInfoReporter;
     private final ClassLoader surefireClassLoader;
 
     public CommonReflector( @Nonnull ClassLoader surefireClassLoader )
@@ -55,6 +57,8 @@ public class CommonReflector
             consoleLogger = surefireClassLoader.loadClass( ConsoleLogger.class.getName() );
             statelessReporter = surefireClassLoader.loadClass( StatelessReporter.class.getName() );
             consoleOutputReporter = surefireClassLoader.loadClass( ConsoleOutputReporter.class.getName() );
+            statelessTestsetInfoReporter =
+                    surefireClassLoader.loadClass( StatelessTestsetInfoReporter.class.getName() );
         }
         catch ( ClassNotFoundException e )
         {
@@ -75,10 +79,11 @@ public class CommonReflector
     private Object createStartupReportConfiguration( @Nonnull StartupReportConfiguration reporterConfiguration )
     {
         Constructor<?> constructor = getConstructor( startupReportConfiguration, boolean.class, boolean.class,
-                                                           String.class, boolean.class, File.class,
-                                                           boolean.class, String.class, File.class, boolean.class,
-                                                           int.class, String.class, String.class, boolean.class,
-                                                           statelessReporter, consoleOutputReporter );
+                                                     String.class, boolean.class, File.class,
+                                                     boolean.class, String.class, File.class, boolean.class,
+                                                     int.class, String.class, String.class, boolean.class,
+                                                     statelessReporter, consoleOutputReporter,
+                                                     statelessTestsetInfoReporter );
         //noinspection BooleanConstructorCall
         Object[] params = { reporterConfiguration.isUseFile(), reporterConfiguration.isPrintSummary(),
             reporterConfiguration.getReportFormat(), reporterConfiguration.isRedirectTestOutputToFile(),
@@ -88,9 +93,9 @@ public class CommonReflector
             reporterConfiguration.getRerunFailingTestsCount(), reporterConfiguration.getXsdSchemaLocation(),
             reporterConfiguration.getEncoding().name(), reporterConfiguration.isForkMode(),
             reporterConfiguration.getXmlReporter().clone( surefireClassLoader ),
-            reporterConfiguration.getConsoleOutputReporter().clone( surefireClassLoader )
+            reporterConfiguration.getConsoleOutputReporter().clone( surefireClassLoader ),
+            reporterConfiguration.getTestsetReporter().clone( surefireClassLoader )
         };
         return newInstance( constructor, params );
     }
-
 }
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
index 9bfbd12..a68a8f5 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
@@ -20,7 +20,7 @@ package org.apache.maven.plugin.surefire;
  */
 
 import org.apache.maven.plugin.surefire.extensions.DefaultStatelessReportMojoConfiguration;
-import org.apache.maven.plugin.surefire.report.FileReporter;
+import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
 import org.apache.maven.plugin.surefire.report.TestSetStats;
 import org.apache.maven.plugin.surefire.report.WrappedReportEntry;
 import org.apache.maven.plugin.surefire.runorder.StatisticsReporter;
@@ -28,6 +28,9 @@ import org.apache.maven.surefire.extensions.ConsoleOutputReportEventListener;
 import org.apache.maven.surefire.extensions.ConsoleOutputReporter;
 import org.apache.maven.surefire.extensions.StatelessReportEventListener;
 import org.apache.maven.surefire.extensions.StatelessReporter;
+import org.apache.maven.surefire.extensions.StatelessTestsetInfoConsoleReportEventListener;
+import org.apache.maven.surefire.extensions.StatelessTestsetInfoFileReportEventListener;
+import org.apache.maven.surefire.extensions.StatelessTestsetInfoReporter;
 
 import javax.annotation.Nonnull;
 import java.io.File;
@@ -88,6 +91,8 @@ public final class StartupReportConfiguration
 
     private final ConsoleOutputReporter consoleOutputReporter;
 
+    private final StatelessTestsetInfoReporter<WrappedReportEntry, TestSetStats> testsetReporter;
+
     private StatisticsReporter statisticsReporter;
 
     @SuppressWarnings( "checkstyle:parameternumber" )
@@ -97,7 +102,8 @@ public final class StartupReportConfiguration
                File statisticsFile, boolean requiresRunHistory, int rerunFailingTestsCount,
                String xsdSchemaLocation, String encoding, boolean isForkMode,
                StatelessReporter<WrappedReportEntry, TestSetStats, DefaultStatelessReportMojoConfiguration> xmlReporter,
-               ConsoleOutputReporter consoleOutputReporter )
+               ConsoleOutputReporter consoleOutputReporter,
+               StatelessTestsetInfoReporter<WrappedReportEntry, TestSetStats> testsetReporter )
     {
         this.useFile = useFile;
         this.printSummary = printSummary;
@@ -117,6 +123,7 @@ public final class StartupReportConfiguration
         this.isForkMode = isForkMode;
         this.xmlReporter = xmlReporter;
         this.consoleOutputReporter = consoleOutputReporter;
+        this.testsetReporter = testsetReporter;
     }
 
     public boolean isUseFile()
@@ -180,13 +187,21 @@ public final class StartupReportConfiguration
         return isDisableXmlReport() ? null : xmlReporter.createListener( xmlReporterConfig );
     }
 
-    public FileReporter instantiateFileReporter( Integer forkNumber )
+    public StatelessTestsetInfoFileReportEventListener<WrappedReportEntry, TestSetStats> instantiateFileReporter(
+            Integer forkNumber )
     {
-        return isUseFile() && isBriefOrPlainFormat()
-            ? new FileReporter( resolveReportsDirectory( forkNumber ), reportNameSuffix, encoding, false )
+        return !testsetReporter.isDisable() && isUseFile() && isBriefOrPlainFormat()
+            ? testsetReporter.createListener( resolveReportsDirectory( forkNumber ), reportNameSuffix, encoding )
             : null;
     }
 
+    public StatelessTestsetInfoConsoleReportEventListener<WrappedReportEntry, TestSetStats> instantiateConsoleReporter(
+            ConsoleLogger consoleLogger )
+    {
+        return !testsetReporter.isDisable() && shouldReportToConsole()
+                ? testsetReporter.createListener( consoleLogger ) : null;
+    }
+
     public boolean isBriefOrPlainFormat()
     {
         String fmt = getReportFormat();
@@ -259,4 +274,14 @@ public final class StartupReportConfiguration
     {
         return consoleOutputReporter;
     }
+
+    public StatelessTestsetInfoReporter<WrappedReportEntry, TestSetStats> getTestsetReporter()
+    {
+        return testsetReporter;
+    }
+
+    private boolean shouldReportToConsole()
+    {
+        return isUseFile() ? isPrintSummary() : isRedirectTestOutputToFile() || isBriefOrPlainFormat();
+    }
 }
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/DefaultStatelessTestsetInfoReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/DefaultStatelessTestsetInfoReporter.java
index 2f57966..499d220 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/DefaultStatelessTestsetInfoReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/DefaultStatelessTestsetInfoReporter.java
@@ -45,14 +45,14 @@ public class DefaultStatelessTestsetInfoReporter
     public StatelessTestsetInfoConsoleReportEventListener<WrappedReportEntry, TestSetStats> createListener(
             ConsoleLogger logger )
     {
-        return new ConsoleReporter( logger );
+        return new ConsoleReporter( logger, false, false );
     }
 
     @Override
     public StatelessTestsetInfoFileReportEventListener<WrappedReportEntry, TestSetStats> createListener(
             File reportsDirectory, String reportNameSuffix, Charset encoding )
     {
-        return new FileReporter( reportsDirectory, reportNameSuffix, encoding, false );
+        return new FileReporter( reportsDirectory, reportNameSuffix, encoding, false, false, false );
     }
 
     @Override
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/JUnit5StatelessTestsetInfoReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/JUnit5StatelessTestsetInfoReporter.java
index 333a8d9..27c4a51 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/JUnit5StatelessTestsetInfoReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/JUnit5StatelessTestsetInfoReporter.java
@@ -48,6 +48,24 @@ public class JUnit5StatelessTestsetInfoReporter
      */
     private boolean usePhrasedFileName;
 
+    /**
+     * Phrased class name of test case in the console log (see xxx)
+     * <em>Running xxx</em> or file report log <em>Test set: xxx</em>.
+     * {@code false} by default.
+     * <br>
+     * This action takes effect only in JUnit5 provider together with a test class annotated <em>DisplayName</em>.
+     */
+    private boolean usePhrasedClassNameInRunning;
+
+    /**
+     * Phrased class name of test case in the log (see xxx)
+     * <em>Tests run: ., Failures: ., Errors: ., Skipped: ., Time elapsed: . s, - in xxx</em>.
+     * {@code false} by default.
+     * <br>
+     * This action takes effect only in JUnit5 provider together with a test class annotated <em>DisplayName</em>.
+     */
+    private boolean usePhrasedClassNameInTestCaseSummary;
+
     public boolean isUsePhrasedFileName()
     {
         return usePhrasedFileName;
@@ -58,18 +76,40 @@ public class JUnit5StatelessTestsetInfoReporter
         this.usePhrasedFileName = usePhrasedFileName;
     }
 
+    public boolean isUsePhrasedClassNameInRunning()
+    {
+        return usePhrasedClassNameInRunning;
+    }
+
+    public void setUsePhrasedClassNameInRunning( boolean usePhrasedClassNameInRunning )
+    {
+        this.usePhrasedClassNameInRunning = usePhrasedClassNameInRunning;
+    }
+
+    public boolean isUsePhrasedClassNameInTestCaseSummary()
+    {
+        return usePhrasedClassNameInTestCaseSummary;
+    }
+
+    public void setUsePhrasedClassNameInTestCaseSummary( boolean usePhrasedClassNameInTestCaseSummary )
+    {
+        this.usePhrasedClassNameInTestCaseSummary = usePhrasedClassNameInTestCaseSummary;
+    }
+
     @Override
     public StatelessTestsetInfoConsoleReportEventListener<WrappedReportEntry, TestSetStats> createListener(
             ConsoleLogger logger )
     {
-        return new ConsoleReporter( logger );
+        return new ConsoleReporter( logger, isUsePhrasedClassNameInRunning(),
+                                    isUsePhrasedClassNameInTestCaseSummary() );
     }
 
     @Override
     public StatelessTestsetInfoFileReportEventListener<WrappedReportEntry, TestSetStats> createListener(
             File reportsDirectory, String reportNameSuffix, Charset encoding )
     {
-        return new FileReporter( reportsDirectory, reportNameSuffix, encoding, isUsePhrasedFileName() );
+        return new FileReporter( reportsDirectory, reportNameSuffix, encoding, isUsePhrasedFileName(),
+                                 isUsePhrasedClassNameInRunning(), isUsePhrasedClassNameInTestCaseSummary() );
     }
 
     @Override
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java
index 91a3fe0..0bee687 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java
@@ -41,22 +41,27 @@ public class ConsoleReporter
         extends StatelessTestsetInfoConsoleReportEventListener<WrappedReportEntry, TestSetStats>
 {
     public static final String BRIEF = "brief";
-
     public static final String PLAIN = "plain";
-
     private static final String TEST_SET_STARTING_PREFIX = "Running ";
 
-    public ConsoleReporter( ConsoleLogger logger )
+    private final boolean usePhrasedClassNameInRunning;
+    private final boolean usePhrasedClassNameInTestCaseSummary;
+
+    public ConsoleReporter( ConsoleLogger logger,
+                            boolean usePhrasedClassNameInRunning, boolean usePhrasedClassNameInTestCaseSummary )
     {
         super( logger );
+        this.usePhrasedClassNameInRunning = usePhrasedClassNameInRunning;
+        this.usePhrasedClassNameInTestCaseSummary = usePhrasedClassNameInTestCaseSummary;
     }
 
     @Override
     public void testSetStarting( TestSetReportEntry report )
     {
-        MessageBuilder builder = buffer();
+        MessageBuilder builder = buffer().a( TEST_SET_STARTING_PREFIX );
+        String runningTestCase = concatenateWithTestGroup( builder, report, usePhrasedClassNameInRunning );
         getConsoleLogger()
-                .info( concatenateWithTestGroup( builder.a( TEST_SET_STARTING_PREFIX ), report ) );
+                .info( runningTestCase );
     }
 
     @Override
@@ -69,7 +74,7 @@ public class ConsoleReporter
         boolean flakes = testSetStats.getSkipped() > 0;
         Level level = resolveLevel( success, failures, errors, skipped, flakes );
 
-        println( testSetStats.getColoredTestSetSummary( report ), level );
+        println( testSetStats.getColoredTestSetSummary( report, usePhrasedClassNameInTestCaseSummary ), level );
         for ( String testResult : testResults )
         {
             println( testResult, level );
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index 2309f31..0d5a9a5 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -26,6 +26,8 @@ import org.apache.maven.plugin.surefire.runorder.StatisticsReporter;
 import org.apache.maven.shared.utils.logging.MessageBuilder;
 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.report.ReporterFactory;
 import org.apache.maven.surefire.report.RunListener;
 import org.apache.maven.surefire.report.RunStatistics;
@@ -115,14 +117,17 @@ public class DefaultReporterFactory
         return reportConfiguration.getReportsDirectory();
     }
 
-    private ConsoleReporter createConsoleReporter()
+    private StatelessTestsetInfoConsoleReportEventListener<WrappedReportEntry, TestSetStats> createConsoleReporter()
     {
-        return shouldReportToConsole() ? new ConsoleReporter( consoleLogger ) : NullConsoleReporter.INSTANCE;
+        StatelessTestsetInfoConsoleReportEventListener<WrappedReportEntry, TestSetStats> consoleReporter =
+                reportConfiguration.instantiateConsoleReporter( consoleLogger );
+        return useNonNull( consoleReporter, NullConsoleReporter.INSTANCE );
     }
 
-    private FileReporter createFileReporter()
+    private StatelessTestsetInfoFileReportEventListener<WrappedReportEntry, TestSetStats> createFileReporter()
     {
-        FileReporter fileReporter = reportConfiguration.instantiateFileReporter( forkNumber );
+        StatelessTestsetInfoFileReportEventListener<WrappedReportEntry, TestSetStats> fileReporter =
+                reportConfiguration.instantiateFileReporter( forkNumber );
         return useNonNull( fileReporter, NullFileReporter.INSTANCE );
     }
 
@@ -146,13 +151,6 @@ public class DefaultReporterFactory
         return useNonNull( statisticsReporter, NullStatisticsReporter.INSTANCE );
     }
 
-    private boolean shouldReportToConsole()
-    {
-        return reportConfiguration.isUseFile()
-                       ? reportConfiguration.isPrintSummary()
-                       : reportConfiguration.isRedirectTestOutputToFile() || reportConfiguration.isBriefOrPlainFormat();
-    }
-
     public void mergeFromOtherFactories( Collection<DefaultReporterFactory> factories )
     {
         for ( DefaultReporterFactory factory : factories )
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
index 8dc34a0..2301e34 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
@@ -44,11 +44,16 @@ public class FileReporter
         extends StatelessTestsetInfoFileReportEventListener<WrappedReportEntry, TestSetStats>
 {
     private final boolean usePhrasedFileName;
+    private final boolean usePhrasedClassNameInRunning;
+    private final boolean usePhrasedClassNameInTestCaseSummary;
 
-    public FileReporter( File reportsDirectory, String reportNameSuffix, Charset encoding, boolean usePhrasedFileName )
+    public FileReporter( File reportsDirectory, String reportNameSuffix, Charset encoding, boolean usePhrasedFileName,
+                         boolean usePhrasedClassNameInRunning, boolean usePhrasedClassNameInTestCaseSummary )
     {
         super( reportsDirectory, reportNameSuffix, encoding );
         this.usePhrasedFileName = usePhrasedFileName;
+        this.usePhrasedClassNameInRunning = usePhrasedClassNameInRunning;
+        this.usePhrasedClassNameInTestCaseSummary = usePhrasedClassNameInTestCaseSummary;
     }
 
     static File getReportFile( File reportsDirectory, String reportEntryName, String reportNameSuffix,
@@ -65,7 +70,7 @@ public class FileReporter
         File reportFile = getReportFile( getReportsDirectory(),
                                          usePhrasedFileName ? report.getReportSourceName() : report.getSourceName(),
                                          getReportNameSuffix(),
-                              ".txt" );
+                                         ".txt" );
 
         File reportDir = reportFile.getParentFile();
 
@@ -77,13 +82,14 @@ public class FileReporter
             writer.write( "-------------------------------------------------------------------------------" );
             writer.newLine();
 
-            writer.write( "Test set: " + report.getSourceName() );
+            String tesSet = usePhrasedClassNameInRunning ? report.getReportSourceName() : report.getSourceName();
+            writer.write( "Test set: " + tesSet );
             writer.newLine();
 
             writer.write( "-------------------------------------------------------------------------------" );
             writer.newLine();
 
-            writer.write( testSetStats.getTestSetSummary( report ) );
+            writer.write( testSetStats.getTestSetSummary( report, usePhrasedClassNameInTestCaseSummary ) );
             writer.newLine();
             for ( String testResult : testResults )
             {
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleReporter.java
index 76f9563..f33fca1 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleReporter.java
@@ -38,7 +38,7 @@ class NullConsoleReporter
 
     private NullConsoleReporter()
     {
-        super( new NullConsoleLogger() );
+        super( new NullConsoleLogger(), false, false );
     }
 
     @Override
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullFileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullFileReporter.java
index c0e546f..be217eb 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullFileReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullFileReporter.java
@@ -35,7 +35,7 @@ class NullFileReporter
 
     private NullFileReporter()
     {
-        super( null, null, null, false );
+        super( null, null, null, false, false, false );
     }
 
     @Override
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 f97140c..5205a34 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
@@ -29,6 +29,8 @@ 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.report.ConsoleOutputReceiver;
 import org.apache.maven.surefire.report.ReportEntry;
 import org.apache.maven.surefire.report.RunListener;
@@ -61,9 +63,9 @@ public class TestSetRunListener
 
     private final StatelessReportEventListener<WrappedReportEntry, TestSetStats> simpleXMLReporter;
 
-    private final ConsoleReporter consoleReporter;
+    private final StatelessTestsetInfoConsoleReportEventListener<WrappedReportEntry, TestSetStats> consoleReporter;
 
-    private final FileReporter fileReporter;
+    private final StatelessTestsetInfoFileReportEventListener<WrappedReportEntry, TestSetStats> fileReporter;
 
     private final StatisticsReporter statisticsReporter;
 
@@ -74,7 +76,10 @@ public class TestSetRunListener
     private volatile RunMode runMode = NORMAL_RUN;
 
     @SuppressWarnings( "checkstyle:parameternumber" )
-    public TestSetRunListener( ConsoleReporter consoleReporter, FileReporter fileReporter,
+    public TestSetRunListener( StatelessTestsetInfoConsoleReportEventListener<WrappedReportEntry, TestSetStats>
+                                           consoleReporter,
+                               StatelessTestsetInfoFileReportEventListener<WrappedReportEntry, TestSetStats>
+                                       fileReporter,
                                StatelessReportEventListener<WrappedReportEntry, TestSetStats> simpleXMLReporter,
                                ConsoleOutputReportEventListener consoleOutputReceiver,
                                StatisticsReporter statisticsReporter, boolean trimStackTrace,
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
index 2d9dfbb..3e360c1 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
@@ -170,7 +170,7 @@ public class TestSetStats
         completedCount += 1;
     }
 
-    public String getTestSetSummary( WrappedReportEntry reportEntry )
+    public String getTestSetSummary( WrappedReportEntry reportEntry, boolean phrasedClassName )
     {
         String summary = TESTS_RUN + completedCount
                                  + COMMA
@@ -187,12 +187,13 @@ public class TestSetStats
             summary += FAILURE_MARKER;
         }
 
-        summary += IN_MARKER + reportEntry.getNameWithGroup();
+        summary += IN_MARKER;
+        summary += phrasedClassName ? reportEntry.getReportNameWithGroup() : reportEntry.getNameWithGroup();
 
         return summary;
     }
 
-    public String getColoredTestSetSummary( WrappedReportEntry reportEntry )
+    public String getColoredTestSetSummary( WrappedReportEntry reportEntry, boolean phrasedClassName )
     {
         final boolean isSuccessful = failures == 0 && errors == 0 && skipped == 0;
         final boolean isFailure = failures > 0;
@@ -256,7 +257,7 @@ public class TestSetStats
             builder.failure( FAILURE_MARKER );
         }
         builder.a( IN_MARKER );
-        return concatenateWithTestGroup( builder, reportEntry );
+        return concatenateWithTestGroup( builder, reportEntry, phrasedClassName );
     }
 
     public List<String> getTestResults()
@@ -288,21 +289,29 @@ public class TestSetStats
 
     /**
      * Append the test set message for a report.
-     * e.g. "org.foo.BarTest ( of group )"
+     * e.g. "org.foo.BarTest ( of group )" or phrased text "test class description ( of group )".
      *
      * @param builder    MessageBuilder with preceded text inside
      * @param report     report whose test set is starting
      * @return the message
      */
-    static String concatenateWithTestGroup( MessageBuilder builder, ReportEntry report )
+    static String concatenateWithTestGroup( MessageBuilder builder, ReportEntry report, boolean phrasedClassName )
     {
-        final String testClass = report.getNameWithGroup();
-        int indexOfGroup = testClass.indexOf( GROUP_PREFIX );
-        int delimiter = testClass.lastIndexOf( '.', indexOfGroup == -1 ? testClass.length() : indexOfGroup );
-        String pkg = testClass.substring( 0, 1 + delimiter );
-        String cls = testClass.substring( 1 + delimiter );
-        return builder.a( pkg )
-                       .strong( cls )
-                       .toString();
+        if ( phrasedClassName )
+        {
+            return builder.strong( report.getReportNameWithGroup() )
+                    .toString();
+        }
+        else
+        {
+            String testClass = report.getNameWithGroup();
+            int indexOfGroup = testClass.indexOf( GROUP_PREFIX );
+            int delimiter = testClass.lastIndexOf( '.', indexOfGroup == -1 ? testClass.length() : indexOfGroup );
+            String pkg = testClass.substring( 0, 1 + delimiter );
+            String cls = testClass.substring( 1 + delimiter );
+            return builder.a( pkg )
+                    .strong( cls )
+                    .toString();
+        }
     }
 }
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
index fd4bba3..102eea4 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
@@ -25,7 +25,6 @@ import org.apache.maven.surefire.report.TestSetReportEntry;
 
 import java.util.Collections;
 import java.util.Map;
-import java.util.Objects;
 
 import static java.util.Collections.unmodifiableMap;
 import static org.apache.maven.plugin.surefire.report.ReporterUtils.formatElapsedTime;
@@ -159,7 +158,7 @@ public class WrappedReportEntry
     {
         String sourceName = getSourceName();
         String sourceText = getSourceText();
-        return isBlank( sourceText ) || Objects.equals( sourceName, sourceText ) ? sourceName : sourceText;
+        return isBlank( sourceText ) ? sourceName : sourceText;
     }
 
     String getReportSourceName( String suffix )
@@ -176,7 +175,7 @@ public class WrappedReportEntry
     {
         String name = getName();
         String nameText = getNameText();
-        return isBlank( nameText ) || Objects.equals( name, nameText ) ? name : nameText;
+        return isBlank( nameText ) ? name : nameText;
     }
 
     public String getOutput( boolean trimStackTrace )
@@ -220,6 +219,12 @@ public class WrappedReportEntry
     }
 
     @Override
+    public String getReportNameWithGroup()
+    {
+        return original.getReportNameWithGroup();
+    }
+
+    @Override
     public Map<String, String> getSystemProperties()
     {
         return systemProperties;
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
index b646800..9435bda 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
@@ -22,6 +22,7 @@ package org.apache.maven.plugin.surefire.booterclient;
 import org.apache.maven.plugin.surefire.StartupReportConfiguration;
 import org.apache.maven.plugin.surefire.extensions.DefaultConsoleOutputReporter;
 import org.apache.maven.plugin.surefire.extensions.DefaultStatelessReporter;
+import org.apache.maven.plugin.surefire.extensions.DefaultStatelessTestsetInfoReporter;
 import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
 import org.apache.maven.plugin.surefire.log.api.NullConsoleLogger;
 import org.apache.maven.surefire.report.RunListener;
@@ -58,6 +59,7 @@ public class TestSetMockReporterFactory
         File target = new File( "./target" );
         File statisticsFile = new File( target, "TESTHASH" );
         return new StartupReportConfiguration( true, true, "PLAIN", false, target, false, null, statisticsFile,
-                false, 0, null, null, true, new DefaultStatelessReporter(), new DefaultConsoleOutputReporter() );
+                false, 0, null, null, true, new DefaultStatelessReporter(), new DefaultConsoleOutputReporter(),
+                new DefaultStatelessTestsetInfoReporter() );
     }
 }
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 37d9cbb..7476acd 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
@@ -30,6 +30,7 @@ import junit.framework.TestCase;
 import org.apache.maven.plugin.surefire.StartupReportConfiguration;
 import org.apache.maven.plugin.surefire.extensions.DefaultConsoleOutputReporter;
 import org.apache.maven.plugin.surefire.extensions.DefaultStatelessReporter;
+import org.apache.maven.plugin.surefire.extensions.DefaultStatelessTestsetInfoReporter;
 import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
 import org.apache.maven.shared.utils.logging.MessageUtils;
 import org.apache.maven.surefire.report.RunStatistics;
@@ -71,7 +72,8 @@ public class DefaultReporterFactoryTest
         StartupReportConfiguration reportConfig =
                 new StartupReportConfiguration( true, true, "PLAIN", false, reportsDirectory, false, null,
                         new File( reportsDirectory, "TESTHASH" ), false, 1, null, null, false,
-                        new DefaultStatelessReporter(), new DefaultConsoleOutputReporter() );
+                        new DefaultStatelessReporter(), new DefaultConsoleOutputReporter(),
+                        new DefaultStatelessTestsetInfoReporter() );
 
         DummyTestReporter reporter = new DummyTestReporter();
 
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
index ee63fc1..0b9d84b 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
@@ -45,7 +45,7 @@ public class FileReporterTest
         reportEntry = new SimpleReportEntry( getClass().getName(), null, testName, null );
         WrappedReportEntry wrappedReportEntry =
             new WrappedReportEntry( reportEntry, ReportEntryType.SUCCESS, 12, null, null );
-        reporter = new FileReporter( reportDir, null, Charset.defaultCharset(), false );
+        reporter = new FileReporter( reportDir, null, Charset.defaultCharset(), false, false, false );
         reporter.testSetCompleted( wrappedReportEntry, createTestSetStats(), new ArrayList<String>() );
 
         File expectedReportFile = new File( reportDir, testName + ".txt" );
@@ -67,7 +67,7 @@ public class FileReporterTest
         reportEntry = new SimpleReportEntry( getClass().getName(), null, testName, null );
         WrappedReportEntry wrappedReportEntry =
             new WrappedReportEntry( reportEntry, ReportEntryType.SUCCESS, 12, null, null );
-        reporter = new FileReporter( reportDir, suffixText, Charset.defaultCharset(), false );
+        reporter = new FileReporter( reportDir, suffixText, Charset.defaultCharset(), false, false, false );
         reporter.testSetCompleted( wrappedReportEntry, createTestSetStats(), new ArrayList<String>() );
 
         File expectedReportFile = new File( reportDir, testName + "-" + suffixText + ".txt" );
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
index 7d7a54b..c35d6d5 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
@@ -21,6 +21,7 @@ package org.apache.maven.surefire.report;
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author Kristian Rosenvold
@@ -86,6 +87,12 @@ public class CategorizedReportEntry
     }
 
     @Override
+    public String getReportNameWithGroup()
+    {
+        return isNameWithGroup() ? getSourceText() + GROUP_PREFIX + getGroup() + GROUP_SUFIX : getSourceText();
+    }
+
+    @Override
     public boolean equals( Object o )
     {
         if ( this == o )
@@ -103,8 +110,7 @@ public class CategorizedReportEntry
 
         CategorizedReportEntry that = (CategorizedReportEntry) o;
 
-        return !( group != null ? !group.equals( that.group ) : that.group != null );
-
+        return Objects.equals( group, that.group );
     }
 
     @Override
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
index 9d93b6c..6bc9618 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
@@ -98,4 +98,11 @@ public interface ReportEntry
      * @return A string with the test case name and group/category, or just the name.
      */
     String getNameWithGroup();
+
+    /**
+     * A source text of the test case together with the group or category (if any exists).
+     *
+     * @return A string with the test case text and group/category, or just the source text.
+     */
+    String getReportNameWithGroup();
 }
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
index 8e8367e..df7b4c4 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
@@ -236,6 +236,12 @@ public class SimpleReportEntry
     }
 
     @Override
+    public String getReportNameWithGroup()
+    {
+        return getSourceText();
+    }
+
+    @Override
     public Map<String, String> getSystemProperties()
     {
         return systemProperties;
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index 9bc0b85..c6523cd 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -170,9 +170,7 @@
                     <forkMode>once</forkMode>
                     <argLine>-server -Xmx64m -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.awt.headless=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
                     <includes>
-                        <include>org/apache/**/Surefire1396CustomProviderClassPathIT.java</include>
-                        <include>org/apache/**/JUnitPlatformIT.java</include>
-                        <include>org/apache/**/JUnitPlatformEnginesIT.java</include>
+                        <include>org/apache/**/*IT*.java</include>
                     </includes>
                     <!-- Pass current surefire version to the main suite so that it -->
                     <!-- can forward to all integration test projects. SUREFIRE-513 -->
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
index 73f3748..161938f 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
@@ -54,7 +54,24 @@ public class JUnitPlatformIT
                 .verifyErrorFree( 7 );
 
         validator.getSurefireReportsFile( "junitplatformenginejupiter.DisplayNameTest.txt", UTF_8 )
-                 .assertContainsText( convertUnicodeToUTF8( "<< ✨ >>" ) );
+                 .assertContainsText( "<< ✨ >>" );
+
+        validator.getSurefireReportsFile( "junitplatformenginejupiter.DisplayNameTest.txt", UTF_8 )
+                .assertContainsText( "Test set: << ✨ >>" );
+
+        validator.getSurefireReportsFile( "junitplatformenginejupiter.DisplayNameTest.txt", UTF_8 )
+                .assertContainsText( " - in << ✨ >>" );
+
+
+        validator.getSurefireReportsFile( "junitplatformenginejupiter.DisplayNameTest-output.txt", UTF_8 )
+                .assertContainsText( "<< ✨ >>" );
+
+        validator.getSurefireReportsFile( "junitplatformenginejupiter.DisplayNameTest-output.txt", UTF_8 )
+                .assertContainsText( "73$71 ✔" );
+
+        validator.getSurefireReportsFile( "junitplatformenginejupiter.DisplayNameTest-output.txt", UTF_8 )
+                .assertContainsText( "73$72 ✔" );
+
 
         validator.getSurefireReportsFile( "TEST-junitplatformenginejupiter.DisplayNameTest.xml", UTF_8 )
         .assertContainsText( "testcase name=\"73$71 ✔\" classname=\"&lt;&lt; ✨ &gt;&gt;\"" )
diff --git a/surefire-its/src/test/resources/junit-platform-engine-jupiter/pom.xml b/surefire-its/src/test/resources/junit-platform-engine-jupiter/pom.xml
index ea04ce2..4acb16a 100644
--- a/surefire-its/src/test/resources/junit-platform-engine-jupiter/pom.xml
+++ b/surefire-its/src/test/resources/junit-platform-engine-jupiter/pom.xml
@@ -73,11 +73,24 @@
                     <forkCount>1.0C</forkCount>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     <statelessReporter implementation="org.apache.maven.plugin.surefire.extensions.JUnit5Xml30StatelessReporter">
+                        <disable>false</disable>
+                        <version>3.0</version>
                         <usePhrasedFileName>false</usePhrasedFileName>
                         <usePhrasedTestSuiteClassName>false</usePhrasedTestSuiteClassName>
                         <usePhrasedTestCaseClassName>true</usePhrasedTestCaseClassName>
                         <usePhrasedTestCaseMethodName>true</usePhrasedTestCaseMethodName>
                     </statelessReporter>
+                    <consoleOutputReporter implementation="org.apache.maven.plugin.surefire.extensions.JUnit5ConsoleOutputReporter">
+                        <disable>false</disable>
+                        <encoding>UTF-8</encoding>
+                        <usePhrasedFileName>false</usePhrasedFileName>
+                    </consoleOutputReporter>
+                    <statelessTestsetInfoReporter implementation="org.apache.maven.plugin.surefire.extensions.JUnit5StatelessTestsetInfoReporter">
+                        <disable>false</disable>
+                        <usePhrasedFileName>false</usePhrasedFileName>
+                        <usePhrasedClassNameInRunning>true</usePhrasedClassNameInRunning>
+                        <usePhrasedClassNameInTestCaseSummary>true</usePhrasedClassNameInTestCaseSummary>
+                    </statelessTestsetInfoReporter>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreTester.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreTester.java
index 3eda924..5114482 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreTester.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreTester.java
@@ -22,6 +22,7 @@ package org.apache.maven.surefire.junitcore;
 import org.apache.maven.plugin.surefire.StartupReportConfiguration;
 import org.apache.maven.plugin.surefire.extensions.DefaultConsoleOutputReporter;
 import org.apache.maven.plugin.surefire.extensions.DefaultStatelessReporter;
+import org.apache.maven.plugin.surefire.extensions.DefaultStatelessTestsetInfoReporter;
 import org.apache.maven.plugin.surefire.log.api.NullConsoleLogger;
 import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
 import org.apache.maven.surefire.report.ConsoleOutputReceiver;
@@ -107,6 +108,7 @@ public class JUnitCoreTester
         File target = new File( "./target" );
         File statisticsFile = new File( target, "TESTHASHxXML" );
         return new StartupReportConfiguration( true, true, "PLAIN", false, target, false, null, statisticsFile,
-                false, 0, null, null, false, new DefaultStatelessReporter(), new DefaultConsoleOutputReporter() );
+                false, 0, null, null, false, new DefaultStatelessReporter(), new DefaultConsoleOutputReporter(),
+                new DefaultStatelessTestsetInfoReporter() );
     }
 }


Mime
View raw message