You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/05/21 22:05:39 UTC
[maven-surefire] branch 1546-1222 updated: change by request
https://github.com/apache/maven-surefire/pull/226#discussion_r286048530
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
The following commit(s) were added to refs/heads/1546-1222 by this push:
new 1b2e3b4 change by request https://github.com/apache/maven-surefire/pull/226#discussion_r286048530
1b2e3b4 is described below
commit 1b2e3b4597f096533de4b0e75006893d0368c67a
Author: tibordigana <ti...@apache.org>
AuthorDate: Wed May 22 00:05:27 2019 +0200
change by request https://github.com/apache/maven-surefire/pull/226#discussion_r286048530
---
.../org/apache/maven/plugin/surefire/CommonReflector.java | 12 ++++++------
.../maven/plugin/surefire/StartupReportConfiguration.java | 13 +++++++------
2 files changed, 13 insertions(+), 12 deletions(-)
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 fc9ee51..835fb89 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
@@ -19,12 +19,12 @@ package org.apache.maven.plugin.surefire;
* under the License.
*/
+import org.apache.maven.plugin.surefire.extensions.SurefireConsoleOutputReporter;
+import org.apache.maven.plugin.surefire.extensions.SurefireStatelessReporter;
+import org.apache.maven.plugin.surefire.extensions.SurefireStatelessTestsetInfoReporter;
import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
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;
@@ -55,10 +55,10 @@ public class CommonReflector
{
startupReportConfiguration = surefireClassLoader.loadClass( StartupReportConfiguration.class.getName() );
consoleLogger = surefireClassLoader.loadClass( ConsoleLogger.class.getName() );
- statelessTestsetReporter = surefireClassLoader.loadClass( StatelessReporter.class.getName() );
- consoleOutputReporter = surefireClassLoader.loadClass( ConsoleOutputReporter.class.getName() );
+ statelessTestsetReporter = surefireClassLoader.loadClass( SurefireStatelessReporter.class.getName() );
+ consoleOutputReporter = surefireClassLoader.loadClass( SurefireConsoleOutputReporter.class.getName() );
statelessTestsetInfoReporter =
- surefireClassLoader.loadClass( StatelessTestsetInfoReporter.class.getName() );
+ surefireClassLoader.loadClass( SurefireStatelessTestsetInfoReporter.class.getName() );
}
catch ( ClassNotFoundException e )
{
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 2f3f285..2b82afe 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,6 +20,9 @@ package org.apache.maven.plugin.surefire;
*/
import org.apache.maven.plugin.surefire.extensions.DefaultStatelessReportMojoConfiguration;
+import org.apache.maven.plugin.surefire.extensions.SurefireConsoleOutputReporter;
+import org.apache.maven.plugin.surefire.extensions.SurefireStatelessReporter;
+import org.apache.maven.plugin.surefire.extensions.SurefireStatelessTestsetInfoReporter;
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;
@@ -86,12 +89,11 @@ public final class StartupReportConfiguration
private final boolean isForkMode;
- private final
- StatelessReporter<WrappedReportEntry, TestSetStats, DefaultStatelessReportMojoConfiguration> xmlReporter;
+ private final SurefireStatelessReporter xmlReporter;
private final ConsoleOutputReporter consoleOutputReporter;
- private final StatelessTestsetInfoReporter<WrappedReportEntry, TestSetStats> testsetReporter;
+ private final SurefireStatelessTestsetInfoReporter testsetReporter;
private StatisticsReporter statisticsReporter;
@@ -101,9 +103,8 @@ public final class StartupReportConfiguration
@Nonnull File reportsDirectory, boolean trimStackTrace, String reportNameSuffix,
File statisticsFile, boolean requiresRunHistory, int rerunFailingTestsCount,
String xsdSchemaLocation, String encoding, boolean isForkMode,
- StatelessReporter<WrappedReportEntry, TestSetStats, DefaultStatelessReportMojoConfiguration> xmlReporter,
- ConsoleOutputReporter consoleOutputReporter,
- StatelessTestsetInfoReporter<WrappedReportEntry, TestSetStats> testsetReporter )
+ SurefireStatelessReporter xmlReporter, SurefireConsoleOutputReporter consoleOutputReporter,
+ SurefireStatelessTestsetInfoReporter testsetReporter )
{
this.useFile = useFile;
this.printSummary = printSummary;