Compare commits
No commits in common. 'c9' and 'c8-stream-202201' have entirely different histories.
c9
...
c8-stream-
@ -1 +1 @@
|
|||||||
SOURCES/maven-surefire-3.0.0~M4.tar.gz
|
SOURCES/maven-surefire-3.0.0~M6.tar.gz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
a9e95fafb958c17118687d8d6b088325abb6dc25 SOURCES/maven-surefire-3.0.0~M4.tar.gz
|
9dbfe895fd5dbb4dd337096b6dfb9558021f2fc1 SOURCES/maven-surefire-3.0.0~M6.tar.gz
|
||||||
|
|||||||
@ -1,40 +0,0 @@
|
|||||||
From 85887dc85709e8719db0becc17adacd905dcd579 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
||||||
Date: Mon, 10 Jul 2017 10:37:50 +0200
|
|
||||||
Subject: [PATCH 1/3] Port to TestNG 6.11
|
|
||||||
|
|
||||||
---
|
|
||||||
surefire-providers/surefire-testng/pom.xml | 3 +--
|
|
||||||
.../maven/surefire/testng/conf/AbstractDirectConfigurator.java | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
|
|
||||||
index 1ce2888..bf93114 100644
|
|
||||||
--- a/surefire-providers/surefire-testng/pom.xml
|
|
||||||
+++ b/surefire-providers/surefire-testng/pom.xml
|
|
||||||
@@ -51,8 +51,7 @@
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.testng</groupId>
|
|
||||||
<artifactId>testng</artifactId>
|
|
||||||
- <version>5.10</version>
|
|
||||||
- <classifier>jdk15</classifier>
|
|
||||||
+ <version>6.11</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
|
|
||||||
index e966731..7021ef5 100644
|
|
||||||
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
|
|
||||||
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
|
|
||||||
@@ -63,7 +63,7 @@ public abstract class AbstractDirectConfigurator
|
|
||||||
testng.setUseDefaultListeners( false );
|
|
||||||
configureInstance( testng, options );
|
|
||||||
// TODO: we should have the Profile so that we can decide if this is needed or not
|
|
||||||
- testng.setListenerClasses( loadListenerClasses( listeners ) );
|
|
||||||
+ testng.setListenerClasses( ( List ) loadListenerClasses( listeners ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
--
|
|
||||||
2.30.2
|
|
||||||
|
|
||||||
@ -0,0 +1,54 @@
|
|||||||
|
From 749b5ec6d04904d82747b60f209945a917ec479e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
|
Date: Mon, 10 Jul 2017 10:37:50 +0200
|
||||||
|
Subject: [PATCH 1/4] Port to TestNG 7.4.0
|
||||||
|
|
||||||
|
---
|
||||||
|
surefire-providers/surefire-testng/pom.xml | 3 +--
|
||||||
|
.../maven/surefire/testng/conf/AbstractDirectConfigurator.java | 2 +-
|
||||||
|
.../maven/surefire/testng/conf/TestNGMapConfigurator.java | 2 +-
|
||||||
|
3 files changed, 3 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
|
||||||
|
index ece647d6a..682f296e6 100644
|
||||||
|
--- a/surefire-providers/surefire-testng/pom.xml
|
||||||
|
+++ b/surefire-providers/surefire-testng/pom.xml
|
||||||
|
@@ -51,8 +51,7 @@
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.testng</groupId>
|
||||||
|
<artifactId>testng</artifactId>
|
||||||
|
- <version>5.10</version>
|
||||||
|
- <classifier>jdk15</classifier>
|
||||||
|
+ <version>7.4.0</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
|
||||||
|
index ed918f538..c4a0cd19d 100644
|
||||||
|
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
|
||||||
|
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
|
||||||
|
@@ -63,7 +63,7 @@ public void configure( TestNG testng, Map<String, String> options )
|
||||||
|
testng.setUseDefaultListeners( false );
|
||||||
|
configureInstance( testng, options );
|
||||||
|
// TODO: we should have the Profile so that we can decide if this is needed or not
|
||||||
|
- testng.setListenerClasses( loadListenerClasses( listeners ) );
|
||||||
|
+ testng.setListenerClasses( ( List ) loadListenerClasses( listeners ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
|
||||||
|
index 6caf82459..2d988381f 100755
|
||||||
|
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
|
||||||
|
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
|
||||||
|
@@ -68,7 +68,7 @@ public void configure( XmlSuite suite, Map<String, String> options )
|
||||||
|
String parallel = options.get( PARALLEL_PROP );
|
||||||
|
if ( parallel != null )
|
||||||
|
{
|
||||||
|
- suite.setParallel( parallel );
|
||||||
|
+ suite.setParallel( XmlSuite.ParallelMode.getValidParallel( parallel ) );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
||||||
@ -0,0 +1,70 @@
|
|||||||
|
From 56f22fd719fe464c8a080e710de847983bb65ac1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
|
Date: Fri, 22 Apr 2022 00:28:31 +0200
|
||||||
|
Subject: [PATCH 3/4] Port to JUnit 5.8.1
|
||||||
|
|
||||||
|
---
|
||||||
|
pom.xml | 6 +++---
|
||||||
|
.../maven/surefire/junitplatform/LazyLauncher.java | 14 ++++++++++++++
|
||||||
|
2 files changed, 17 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pom.xml b/pom.xml
|
||||||
|
index c261bf3c2..a75e156ce 100644
|
||||||
|
--- a/pom.xml
|
||||||
|
+++ b/pom.xml
|
||||||
|
@@ -250,17 +250,17 @@
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.junit.platform</groupId>
|
||||||
|
<artifactId>junit-platform-launcher</artifactId>
|
||||||
|
- <version>1.3.2</version>
|
||||||
|
+ <version>1.8.1</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
<artifactId>junit-jupiter-engine</artifactId>
|
||||||
|
- <version>5.3.2</version>
|
||||||
|
+ <version>5.8.1</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
<artifactId>junit-jupiter-params</artifactId>
|
||||||
|
- <version>5.3.2</version>
|
||||||
|
+ <version>5.8.1</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.mockito</groupId>
|
||||||
|
diff --git a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java
|
||||||
|
index 6a1a3b3b3..dee110e3c 100644
|
||||||
|
--- a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java
|
||||||
|
+++ b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java
|
||||||
|
@@ -21,6 +21,7 @@
|
||||||
|
|
||||||
|
import org.apache.maven.surefire.api.util.ReflectionUtils;
|
||||||
|
import org.junit.platform.launcher.Launcher;
|
||||||
|
+import org.junit.platform.launcher.LauncherDiscoveryListener;
|
||||||
|
import org.junit.platform.launcher.LauncherDiscoveryRequest;
|
||||||
|
import org.junit.platform.launcher.TestExecutionListener;
|
||||||
|
import org.junit.platform.launcher.TestPlan;
|
||||||
|
@@ -55,6 +56,19 @@ public void execute( LauncherDiscoveryRequest launcherDiscoveryRequest,
|
||||||
|
launcher().execute( launcherDiscoveryRequest, testExecutionListeners );
|
||||||
|
}
|
||||||
|
|
||||||
|
+ @Override
|
||||||
|
+ public void execute( TestPlan testPlan,
|
||||||
|
+ TestExecutionListener... testExecutionListeners )
|
||||||
|
+ {
|
||||||
|
+ launcher().execute( testPlan, testExecutionListeners );
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public void registerLauncherDiscoveryListeners( LauncherDiscoveryListener... launcherDiscoveryListeners )
|
||||||
|
+ {
|
||||||
|
+ launcher().registerLauncherDiscoveryListeners( launcherDiscoveryListeners );
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
private Launcher launcher()
|
||||||
|
{
|
||||||
|
if ( launcher == null )
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
||||||
@ -1,152 +0,0 @@
|
|||||||
From bc4f6405bb6ca0a5c0313edf878c51d5d5af9ffa Mon Sep 17 00:00:00 2001
|
|
||||||
From: Marian Koncek <mkoncek@redhat.com>
|
|
||||||
Date: Fri, 11 Sep 2020 12:17:15 +0200
|
|
||||||
Subject: [PATCH 3/3] Port to maven-shared-utils 3.3.3
|
|
||||||
|
|
||||||
---
|
|
||||||
.../DefaultForkConfiguration.java | 26 ++++++++++++-------
|
|
||||||
.../surefire/report/StatelessXmlReporter.java | 20 +++++++-------
|
|
||||||
2 files changed, 26 insertions(+), 20 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
|
|
||||||
index 4ab4435..1ce348b 100644
|
|
||||||
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
|
|
||||||
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
|
|
||||||
@@ -42,6 +42,8 @@ import static org.apache.maven.plugin.surefire.util.Relocator.relocate;
|
|
||||||
import static org.apache.maven.plugin.surefire.SurefireHelper.replaceThreadNumberPlaceholders;
|
|
||||||
import static org.apache.maven.surefire.booter.Classpath.join;
|
|
||||||
|
|
||||||
+import org.apache.maven.shared.utils.cli.CommandLineException;
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
* Basic framework which constructs CLI.
|
|
||||||
*
|
|
||||||
@@ -135,17 +137,21 @@ public abstract class DefaultForkConfiguration
|
|
||||||
|
|
||||||
cli.setExecutable( getJdkForTests().getJvmExecutable() );
|
|
||||||
|
|
||||||
- String jvmArgLine = newJvmArgLine( forkNumber );
|
|
||||||
- if ( !jvmArgLine.isEmpty() )
|
|
||||||
- {
|
|
||||||
- cli.createArg()
|
|
||||||
- .setLine( jvmArgLine );
|
|
||||||
- }
|
|
||||||
+ try {
|
|
||||||
+ String jvmArgLine = newJvmArgLine( forkNumber );
|
|
||||||
+ if ( !jvmArgLine.isEmpty() )
|
|
||||||
+ {
|
|
||||||
+ cli.createArg()
|
|
||||||
+ .setLine( jvmArgLine );
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- if ( getDebugLine() != null && !getDebugLine().isEmpty() )
|
|
||||||
- {
|
|
||||||
- cli.createArg()
|
|
||||||
- .setLine( getDebugLine() );
|
|
||||||
+ if ( getDebugLine() != null && !getDebugLine().isEmpty() )
|
|
||||||
+ {
|
|
||||||
+ cli.createArg()
|
|
||||||
+ .setLine( getDebugLine() );
|
|
||||||
+ }
|
|
||||||
+ } catch (CommandLineException ex) {
|
|
||||||
+ throw new SurefireBooterForkException("", ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
resolveClasspath( cli, findStartClass( config ), config, dumpLogDirectory );
|
|
||||||
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
|
|
||||||
index fcb066e..bfe894e 100644
|
|
||||||
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
|
|
||||||
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
|
|
||||||
@@ -200,7 +200,7 @@ public class StatelessXmlReporter
|
|
||||||
}
|
|
||||||
|
|
||||||
private void serializeTestClass( OutputStream outputStream, OutputStreamWriter fw, XMLWriter ppw,
|
|
||||||
- List<WrappedReportEntry> methodEntries )
|
|
||||||
+ List<WrappedReportEntry> methodEntries ) throws IOException
|
|
||||||
{
|
|
||||||
if ( rerunFailingTestsCount > 0 )
|
|
||||||
{
|
|
||||||
@@ -215,7 +215,7 @@ public class StatelessXmlReporter
|
|
||||||
}
|
|
||||||
|
|
||||||
private void serializeTestClassWithoutRerun( OutputStream outputStream, OutputStreamWriter fw, XMLWriter ppw,
|
|
||||||
- List<WrappedReportEntry> methodEntries )
|
|
||||||
+ List<WrappedReportEntry> methodEntries ) throws IOException
|
|
||||||
{
|
|
||||||
for ( WrappedReportEntry methodEntry : methodEntries )
|
|
||||||
{
|
|
||||||
@@ -231,7 +231,7 @@ public class StatelessXmlReporter
|
|
||||||
}
|
|
||||||
|
|
||||||
private void serializeTestClassWithRerun( OutputStream outputStream, OutputStreamWriter fw, XMLWriter ppw,
|
|
||||||
- List<WrappedReportEntry> methodEntries )
|
|
||||||
+ List<WrappedReportEntry> methodEntries ) throws IOException
|
|
||||||
{
|
|
||||||
WrappedReportEntry firstMethodEntry = methodEntries.get( 0 );
|
|
||||||
switch ( getTestResultType( methodEntries ) )
|
|
||||||
@@ -369,7 +369,7 @@ public class StatelessXmlReporter
|
|
||||||
return new File( reportsDirectory, stripIllegalFilenameChars( customizedReportName + ".xml" ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
- private void startTestElement( XMLWriter ppw, WrappedReportEntry report )
|
|
||||||
+ private void startTestElement( XMLWriter ppw, WrappedReportEntry report ) throws IOException
|
|
||||||
{
|
|
||||||
ppw.startElement( "testcase" );
|
|
||||||
String name = phrasedMethodName ? report.getReportName() : report.getName();
|
|
||||||
@@ -390,7 +390,7 @@ public class StatelessXmlReporter
|
|
||||||
ppw.addAttribute( "time", report.elapsedTimeAsString() );
|
|
||||||
}
|
|
||||||
|
|
||||||
- private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats )
|
|
||||||
+ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats ) throws IOException
|
|
||||||
{
|
|
||||||
ppw.startElement( "testsuite" );
|
|
||||||
|
|
||||||
@@ -420,7 +420,7 @@ public class StatelessXmlReporter
|
|
||||||
|
|
||||||
private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLWriter ppw,
|
|
||||||
WrappedReportEntry report, boolean trimStackTrace, OutputStream fw,
|
|
||||||
- String testErrorType, boolean createOutErrElementsInside )
|
|
||||||
+ String testErrorType, boolean createOutErrElementsInside ) throws IOException
|
|
||||||
{
|
|
||||||
ppw.startElement( testErrorType );
|
|
||||||
|
|
||||||
@@ -477,7 +477,7 @@ public class StatelessXmlReporter
|
|
||||||
|
|
||||||
// Create system-out and system-err elements
|
|
||||||
private static void createOutErrElements( OutputStreamWriter outputStreamWriter, XMLWriter ppw,
|
|
||||||
- WrappedReportEntry report, OutputStream fw )
|
|
||||||
+ WrappedReportEntry report, OutputStream fw ) throws IOException
|
|
||||||
{
|
|
||||||
EncodingOutputStream eos = new EncodingOutputStream( fw );
|
|
||||||
addOutputStreamElement( outputStreamWriter, eos, ppw, report.getStdout(), "system-out" );
|
|
||||||
@@ -487,7 +487,7 @@ public class StatelessXmlReporter
|
|
||||||
private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter,
|
|
||||||
EncodingOutputStream eos, XMLWriter xmlWriter,
|
|
||||||
Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream,
|
|
||||||
- String name )
|
|
||||||
+ String name ) throws IOException
|
|
||||||
{
|
|
||||||
if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 )
|
|
||||||
{
|
|
||||||
@@ -517,7 +517,7 @@ public class StatelessXmlReporter
|
|
||||||
*
|
|
||||||
* @param xmlWriter The test suite to report to
|
|
||||||
*/
|
|
||||||
- private static void showProperties( XMLWriter xmlWriter, Map<String, String> systemProperties )
|
|
||||||
+ private static void showProperties( XMLWriter xmlWriter, Map<String, String> systemProperties ) throws IOException
|
|
||||||
{
|
|
||||||
xmlWriter.startElement( "properties" );
|
|
||||||
for ( final Entry<String, String> entry : systemProperties.entrySet() )
|
|
||||||
@@ -559,7 +559,7 @@ public class StatelessXmlReporter
|
|
||||||
* @param message The string
|
|
||||||
*/
|
|
||||||
private static void extraEscapeElementValue( String message, OutputStreamWriter outputStreamWriter,
|
|
||||||
- XMLWriter xmlWriter, OutputStream fw )
|
|
||||||
+ XMLWriter xmlWriter, OutputStream fw ) throws IOException
|
|
||||||
{
|
|
||||||
// Someday convert to xml 1.1 which handles everything but 0 inside string
|
|
||||||
if ( containsEscapesIllegalXml10( message ) )
|
|
||||||
--
|
|
||||||
2.30.2
|
|
||||||
|
|
||||||
Loading…
Reference in new issue