Fix bug in org.eclipse.tycho.surefire.junit4 provider.
This commit is contained in:
Roland Grunberg
parent
1b6f195d75
commit
0549b7a7cf
|
|
@ -1,4 +1,4 @@
|
|||
From f72d45fb261a3910885a3073c33cc0f98f14392f Mon Sep 17 00:00:00 2001
|
||||
From d4d161e7ccfb21503e906229a37000eb9a821284 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Sievers <jan.sievers@sap.com>
|
||||
Date: Tue, 4 Sep 2012 16:02:52 +0200
|
||||
Subject: [PATCH] Resolve all necessary dependencies for Tycho Surefire.
|
||||
|
|
@ -18,16 +18,16 @@ Change-Id: I9ef0239eed887fa47c380efcdce968934c788c9f
|
|||
pom.xml | 2 +-
|
||||
.../META-INF/MANIFEST.MF | 5 ++--
|
||||
.../org.eclipse.tycho.surefire.junit/pom.xml | 5 ++++
|
||||
.../META-INF/MANIFEST.MF | 4 +++-
|
||||
.../META-INF/MANIFEST.MF | 5 +++-
|
||||
.../org.eclipse.tycho.surefire.junit4/pom.xml | 10 ++++++++
|
||||
.../META-INF/MANIFEST.MF | 8 ++++---
|
||||
.../org.eclipse.tycho.surefire.junit47/pom.xml | 10 ++++++++
|
||||
.../META-INF/MANIFEST.MF | 7 +++---
|
||||
.../org.eclipse.tycho.surefire.osgibooter/pom.xml | 5 ++++
|
||||
.../surefire/osgibooter/OsgiSurefireBooter.java | 17 +++++++++-----
|
||||
.../surefire/osgibooter/OsgiSurefireBooter.java | 20 ++++++++++------
|
||||
tycho-surefire/pom.xml | 2 +-
|
||||
.../java/org/eclipse/tycho/surefire/TestMojo.java | 27 +++++++++++++++++++---
|
||||
12 files changed, 82 insertions(+), 20 deletions(-)
|
||||
12 files changed, 85 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index c43cc8d..6e5fde4 100644
|
||||
|
|
@ -73,10 +73,10 @@ index f99c319..0224cc6 100644
|
|||
</configuration>
|
||||
</execution>
|
||||
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
|
||||
index 50be5ea..0d8e8d8 100644
|
||||
index 50be5ea..97760e2 100644
|
||||
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
|
||||
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
|
||||
@@ -6,7 +6,9 @@ Bundle-Version: 0.23.0
|
||||
@@ -6,9 +6,12 @@ Bundle-Version: 0.23.0
|
||||
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
|
||||
JavaSE-1.6
|
||||
|
|
@ -87,6 +87,9 @@ index 50be5ea..0d8e8d8 100644
|
|||
Import-Package: junit.framework;version="3.0.0",
|
||||
org.junit;version="4.0.0",
|
||||
org.junit.runner;version="4.0.0",
|
||||
+ org.junit.runner.manipulation;version="4.0.0",
|
||||
org.junit.runner.notification;version="4.0.0"
|
||||
Bundle-Vendor: %providerName
|
||||
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
|
||||
index 9628b06..2a09e91 100644
|
||||
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
|
||||
|
|
@ -183,7 +186,7 @@ index 82700eb..3fbc3a3 100644
|
|||
</configuration>
|
||||
</execution>
|
||||
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
|
||||
index 19eeab9..7accf71 100644
|
||||
index 19eeab9..31e9d3e 100644
|
||||
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
|
||||
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
|
||||
@@ -21,7 +21,9 @@ import java.io.IOException;
|
||||
|
|
@ -196,7 +199,7 @@ index 19eeab9..7accf71 100644
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
@@ -34,7 +36,9 @@ import org.apache.maven.surefire.booter.ClasspathConfiguration;
|
||||
@@ -34,12 +36,15 @@ import org.apache.maven.surefire.booter.ClasspathConfiguration;
|
||||
import org.apache.maven.surefire.booter.ForkedBooter;
|
||||
import org.apache.maven.surefire.booter.ProviderConfiguration;
|
||||
import org.apache.maven.surefire.booter.ProviderFactory;
|
||||
|
|
@ -206,7 +209,13 @@ index 19eeab9..7accf71 100644
|
|||
import org.apache.maven.surefire.report.ReporterConfiguration;
|
||||
import org.apache.maven.surefire.report.ReporterFactory;
|
||||
import org.apache.maven.surefire.suite.RunResult;
|
||||
@@ -75,13 +79,14 @@ public class OsgiSurefireBooter {
|
||||
import org.apache.maven.surefire.testset.DirectoryScannerParameters;
|
||||
import org.apache.maven.surefire.testset.RunOrderParameters;
|
||||
+import org.apache.maven.surefire.testset.TestListResolver;
|
||||
import org.apache.maven.surefire.testset.TestRequest;
|
||||
import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.core.runtime.IStatus;
|
||||
@@ -75,13 +80,14 @@ public class OsgiSurefireBooter {
|
||||
new ClassLoaderConfiguration(useSystemClassloader, useManifestOnlyJar), forkRequested, inForkedVM);
|
||||
// TODO dir scanning with no includes done here (done in TestMojo already)
|
||||
// but without dirScannerParams we get an NPE accessing runOrder
|
||||
|
|
@ -215,7 +224,8 @@ index 19eeab9..7accf71 100644
|
|||
+ DirectoryScannerParameters dirScannerParams = new DirectoryScannerParameters(testClassesDir, Collections.<String>emptyList(),
|
||||
+ Collections.<String>emptyList(), Collections.<String>emptyList(), failIfNoTests, runOrder);
|
||||
ReporterConfiguration reporterConfig = new ReporterConfiguration(reportsDir, trimStacktrace);
|
||||
TestRequest testRequest = new TestRequest(null, testClassesDir, null);
|
||||
- TestRequest testRequest = new TestRequest(null, testClassesDir, null);
|
||||
+ TestRequest testRequest = new TestRequest(null, testClassesDir, new TestListResolver(Collections.<String> emptyList()));
|
||||
ProviderConfiguration providerConfiguration = new ProviderConfiguration(dirScannerParams,
|
||||
new RunOrderParameters(runOrder, null), failIfNoTests, reporterConfig, null, testRequest,
|
||||
- extractProviderProperties(testProps), null, false);
|
||||
|
|
@ -224,7 +234,7 @@ index 19eeab9..7accf71 100644
|
|||
StartupReportConfiguration startupReportConfig = new StartupReportConfiguration(useFile, printSummary,
|
||||
StartupReportConfiguration.PLAIN_REPORT_FORMAT, redirectTestOutputToFile, disableXmlReport, reportsDir,
|
||||
trimStacktrace, null, "TESTHASH", false, 0);
|
||||
@@ -103,12 +108,12 @@ public class OsgiSurefireBooter {
|
||||
@@ -103,12 +109,12 @@ public class OsgiSurefireBooter {
|
||||
/*
|
||||
* See TestMojo#mergeProviderProperties
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
Name: %{?scl_prefix}tycho
|
||||
Version: 0.23.0
|
||||
Release: 10%{?dist}
|
||||
Release: 11%{?dist}
|
||||
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
|
||||
|
||||
# license file is missing but all files having some licensing information are ASL 2.0
|
||||
|
|
@ -422,6 +422,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
|
|||
%{_javadocdir}/tycho
|
||||
|
||||
%changelog
|
||||
* Mon Oct 26 2015 Roland Grunberg <rgrunber@redhat.com> - 0.23.0-11
|
||||
- Fix bug in org.eclipse.tycho.surefire.junit4 provider.
|
||||
|
||||
* Tue Oct 20 2015 Roland Grunberg <rgrunber@redhat.com> - 0.23.0-10
|
||||
- Update to work with maven-surefire 2.19.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue