Compare commits
No commits in common. 'c8-stream-201902' and 'c9' have entirely different histories.
c8-stream-
...
c9
@ -1 +1 @@
|
|||||||
SOURCES/maven-surefire-3.0.0-M3.tar.gz
|
SOURCES/maven-surefire-3.0.0~M4.tar.gz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
aa431c17c3667c58c9895ae845aa566f6336c7ba SOURCES/maven-surefire-3.0.0-M3.tar.gz
|
a9e95fafb958c17118687d8d6b088325abb6dc25 SOURCES/maven-surefire-3.0.0~M4.tar.gz
|
||||||
|
|||||||
@ -0,0 +1,118 @@
|
|||||||
|
From 61a123e7dd146933570a252f147fa83666363de3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
|
Date: Mon, 27 Apr 2020 10:45:30 +0200
|
||||||
|
Subject: [PATCH 2/3] Disable JUnit 4.8 test grouping
|
||||||
|
|
||||||
|
---
|
||||||
|
.../surefire/junitcore/JUnitCoreProvider.java | 25 +++--------------
|
||||||
|
.../maven/surefire/testng/TestNGExecutor.java | 27 -------------------
|
||||||
|
2 files changed, 3 insertions(+), 49 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
|
||||||
|
index 7c74e8b..c86bb27 100644
|
||||||
|
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
|
||||||
|
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
|
||||||
|
@@ -25,7 +25,6 @@ import org.apache.maven.surefire.booter.CommandReader;
|
||||||
|
import org.apache.maven.surefire.common.junit4.JUnit4RunListener;
|
||||||
|
import org.apache.maven.surefire.common.junit4.JUnitTestFailureListener;
|
||||||
|
import org.apache.maven.surefire.common.junit4.Notifier;
|
||||||
|
-import org.apache.maven.surefire.common.junit48.FilterFactory;
|
||||||
|
import org.apache.maven.surefire.common.junit48.JUnit48Reflector;
|
||||||
|
import org.apache.maven.surefire.common.junit48.JUnit48TestChecker;
|
||||||
|
import org.apache.maven.surefire.providerapi.AbstractProvider;
|
||||||
|
@@ -47,6 +46,7 @@ import java.util.Set;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
|
import static org.apache.maven.surefire.booter.CommandReader.getReader;
|
||||||
|
+import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.createMatchAnyDescriptionFilter;
|
||||||
|
import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.generateFailingTestDescriptions;
|
||||||
|
import static org.apache.maven.surefire.common.junit4.JUnit4RunListenerFactory.createCustomListeners;
|
||||||
|
import static org.apache.maven.surefire.common.junit4.Notifier.pureNotifier;
|
||||||
|
@@ -126,7 +126,7 @@ public class JUnitCoreProvider
|
||||||
|
new Notifier( createRunListener( reporterFactory, consoleStream ), getSkipAfterFailureCount() );
|
||||||
|
// startCapture() called in createRunListener() in prior to setTestsToRun()
|
||||||
|
|
||||||
|
- Filter filter = jUnit48Reflector.isJUnit48Available() ? createJUnit48Filter() : null;
|
||||||
|
+ Filter filter = null;
|
||||||
|
|
||||||
|
if ( testsToRun == null )
|
||||||
|
{
|
||||||
|
@@ -168,8 +168,7 @@ public class JUnitCoreProvider
|
||||||
|
{
|
||||||
|
Set<Description> failures = generateFailingTestDescriptions( testFailureListener.getAllFailures() );
|
||||||
|
testFailureListener.reset();
|
||||||
|
- FilterFactory filterFactory = new FilterFactory( testClassLoader );
|
||||||
|
- Filter failureDescriptionFilter = filterFactory.createMatchAnyDescriptionFilter( failures );
|
||||||
|
+ Filter failureDescriptionFilter = createMatchAnyDescriptionFilter( failures );
|
||||||
|
rerunCore.execute( testsToRun, failureDescriptionFilter );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -270,24 +269,6 @@ public class JUnitCoreProvider
|
||||||
|
return jUnitCoreParameters.isParallelClasses() || jUnitCoreParameters.isParallelSuites();
|
||||||
|
}
|
||||||
|
|
||||||
|
- private Filter createJUnit48Filter()
|
||||||
|
- {
|
||||||
|
- final FilterFactory factory = new FilterFactory( testClassLoader );
|
||||||
|
- Map<String, String> props = providerParameters.getProviderProperties();
|
||||||
|
- Filter groupFilter = factory.canCreateGroupFilter( props ) ? factory.createGroupFilter( props ) : null;
|
||||||
|
- TestListResolver methodFilter = optionallyWildcardFilter( testResolver );
|
||||||
|
- boolean onlyGroups = methodFilter.isEmpty() || methodFilter.isWildcard();
|
||||||
|
- if ( onlyGroups )
|
||||||
|
- {
|
||||||
|
- return groupFilter;
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
- {
|
||||||
|
- Filter jUnitMethodFilter = factory.createMethodFilter( methodFilter );
|
||||||
|
- return groupFilter == null ? jUnitMethodFilter : factory.and( groupFilter, jUnitMethodFilter );
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
private TestsToRun scanClassPath()
|
||||||
|
{
|
||||||
|
TestsToRun scanned = scanResult.applyFilter( scannerFilter, testClassLoader );
|
||||||
|
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
|
||||||
|
index 6bc30a3..05c55f5 100644
|
||||||
|
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
|
||||||
|
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
|
||||||
|
@@ -237,36 +237,9 @@ final class TestNGExecutor
|
||||||
|
private static XmlMethodSelector createGroupMatchingSelector( Map<String, String> options )
|
||||||
|
throws TestSetFailedException
|
||||||
|
{
|
||||||
|
- final String groups = options.get( ProviderParameterNames.TESTNG_GROUPS_PROP );
|
||||||
|
- final String excludedGroups = options.get( ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP );
|
||||||
|
-
|
||||||
|
- if ( groups == null && excludedGroups == null )
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
- // the class is available in the testClassPath
|
||||||
|
- final String clazzName = "org.apache.maven.surefire.testng.utils.GroupMatcherMethodSelector";
|
||||||
|
- try
|
||||||
|
- {
|
||||||
|
- Class<?> clazz = Class.forName( clazzName );
|
||||||
|
-
|
||||||
|
- // HORRIBLE hack, but TNG doesn't allow us to setup a method selector instance directly.
|
||||||
|
- Method method = clazz.getMethod( "setGroups", String.class, String.class );
|
||||||
|
- method.invoke( null, groups, excludedGroups );
|
||||||
|
- }
|
||||||
|
- catch ( Exception e )
|
||||||
|
- {
|
||||||
|
- throw new TestSetFailedException( e.getMessage(), e );
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- XmlMethodSelector xms = new XmlMethodSelector();
|
||||||
|
-
|
||||||
|
- xms.setName( clazzName );
|
||||||
|
- // looks to need a high value
|
||||||
|
- xms.setPriority( 9999 );
|
||||||
|
-
|
||||||
|
- return xms;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void run( List<String> suiteFiles, String testSourceDirectory,
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
@ -1,70 +0,0 @@
|
|||||||
From a96b8f5dd6d7fc51d9056c93bd08635e06957ea5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Simacek <msimacek@redhat.com>
|
|
||||||
Date: Fri, 16 Mar 2018 13:45:01 +0100
|
|
||||||
Subject: [PATCH 2/2] Port to current maven-shared-utils
|
|
||||||
|
|
||||||
---
|
|
||||||
.../plugin/surefire/report/StatelessXmlReporter.java | 12 ++++++------
|
|
||||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
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 b89c4e9b..8cf0b60c 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
|
|
||||||
@@ -326,7 +326,7 @@ private static File getReportFile( ReportEntry report, File reportsDirectory, St
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, String reportNameSuffix,
|
|
||||||
- String timeAsString )
|
|
||||||
+ String timeAsString ) throws IOException
|
|
||||||
{
|
|
||||||
ppw.startElement( "testcase" );
|
|
||||||
ppw.addAttribute( "name", report.getReportName() );
|
|
||||||
@@ -349,7 +349,7 @@ private static void startTestElement( XMLWriter ppw, WrappedReportEntry report,
|
|
||||||
}
|
|
||||||
|
|
||||||
private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats,
|
|
||||||
- String timeAsString )
|
|
||||||
+ String timeAsString ) throws IOException
|
|
||||||
{
|
|
||||||
ppw.startElement( "testsuite" );
|
|
||||||
|
|
||||||
@@ -377,7 +377,7 @@ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, T
|
|
||||||
|
|
||||||
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 );
|
|
||||||
|
|
||||||
@@ -434,7 +434,7 @@ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLW
|
|
||||||
|
|
||||||
// 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" );
|
|
||||||
@@ -444,7 +444,7 @@ private static void createOutErrElements( OutputStreamWriter outputStreamWriter,
|
|
||||||
private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter,
|
|
||||||
EncodingOutputStream eos, XMLWriter xmlWriter,
|
|
||||||
Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream,
|
|
||||||
- String name )
|
|
||||||
+ String name ) throws IOException
|
|
||||||
{
|
|
||||||
if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 )
|
|
||||||
{
|
|
||||||
@@ -474,7 +474,7 @@ private static void addOutputStreamElement( OutputStreamWriter outputStreamWrite
|
|
||||||
*
|
|
||||||
* @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() )
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
@ -0,0 +1,152 @@
|
|||||||
|
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