This commit is contained in:
Fridrich Strba
Git OBS Bridge
parent
f67f478b4e
commit
3e1a380d2f
@ -1,111 +0,0 @@
|
||||
From 03b2d5ad118e287e11f576e7f03f97e05782a043 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/4] Disable JUnit 4.8 test grouping
|
||||
|
||||
---
|
||||
.../surefire/junitcore/JUnitCoreProvider.java | 21 +++------------
|
||||
.../maven/surefire/testng/TestNGExecutor.java | 27 +------------------
|
||||
2 files changed, 4 insertions(+), 44 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 f2f58fe81..c09c51eba 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
|
||||
@@ -39,7 +39,6 @@
|
||||
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.junit.runner.Description;
|
||||
@@ -50,6 +49,7 @@
|
||||
import static org.apache.maven.surefire.api.report.RunMode.RERUN_TEST_AFTER_FAILURE;
|
||||
import static org.apache.maven.surefire.api.testset.TestListResolver.optionallyWildcardFilter;
|
||||
import static org.apache.maven.surefire.api.util.TestsToRun.fromClass;
|
||||
+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;
|
||||
@@ -118,7 +118,7 @@ public RunResult invoke(Object forkTestSet) throws TestSetFailedException {
|
||||
Notifier notifier = new Notifier(listener, getSkipAfterFailureCount());
|
||||
// startCapture() called in createRunListener() in prior to setTestsToRun()
|
||||
|
||||
- Filter filter = jUnit48Reflector.isJUnit48Available() ? createJUnit48Filter() : null;
|
||||
+ Filter filter = null;
|
||||
|
||||
if (testsToRun == null) {
|
||||
setTestsToRun(forkTestSet);
|
||||
@@ -158,8 +158,7 @@ public RunResult invoke(Object forkTestSet) throws TestSetFailedException {
|
||||
i++) {
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -236,20 +235,6 @@ private boolean isParallelTypes() {
|
||||
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);
|
||||
return runOrderCalculator.orderTestClasses(scanned);
|
||||
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 96e7170b9..531fe50a5 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
|
||||
@@ -258,32 +258,7 @@ private static XmlMethodSelector createMethodNameFilteringSelector(TestListResol
|
||||
@SuppressWarnings("checkstyle:magicnumber")
|
||||
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;
|
||||
+ return null;
|
||||
}
|
||||
|
||||
static void run(
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@ -28,7 +28,6 @@ Source0: %{base_name}-%{version}.tar.xz
|
||||
Source1: https://www.apache.org/licenses/LICENSE-2.0.txt
|
||||
Source2: https://www.eclipse.org/legal/cpl-v10.html
|
||||
Patch0: 0001-Port-to-TestNG-7.4.0.patch
|
||||
Patch1: 0002-Disable-JUnit-4.8-test-grouping.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: maven-local
|
||||
|
||||
@ -28,7 +28,6 @@ Source0: %{base_name}-%{version}.tar.xz
|
||||
Source1: https://www.apache.org/licenses/LICENSE-2.0.txt
|
||||
Source2: https://www.eclipse.org/legal/cpl-v10.html
|
||||
Patch0: 0001-Port-to-TestNG-7.4.0.patch
|
||||
Patch1: 0002-Disable-JUnit-4.8-test-grouping.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: maven-local
|
||||
|
||||
@ -28,7 +28,6 @@ Source1: https://www.apache.org/licenses/LICENSE-2.0.txt
|
||||
Source2: https://www.eclipse.org/legal/cpl-v10.html
|
||||
Source10: %{name}-build.tar.xz
|
||||
Patch0: 0001-Port-to-TestNG-7.4.0.patch
|
||||
Patch1: 0002-Disable-JUnit-4.8-test-grouping.patch
|
||||
Patch10: %{name}-bootstrap-resources.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: apache-commons-cli
|
||||
|
||||
Loading…
Reference in New Issue
Block a user