Author: krosenvold
Date: Mon Nov 21 20:25:19 2011
New Revision: 1204688
URL: http://svn.apache.org/viewvc?rev=1204688&view=rev
Log:
o Moved a lot of code from the api-module into the plugin-side only
Added:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
(contents, props changed)
- copied, changed from r1204687,
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/JdkReflector.java
(with props)
Removed:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/TestConsoleOutputRunListenerTest.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StarterCommon.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java
maven/surefire/trunk/surefire-integration-tests/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java?rev=1204688&r1=1204687&r2=1204688&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
Mon Nov 21 20:25:19 2011
@@ -399,13 +399,17 @@ public abstract class AbstractSurefireMo
{
provider.addProviderProperties();
String providerName = provider.getProviderName();
- final Classpath providerClasspath =
provider.getProviderClasspath();
+ Classpath providerClasspath = provider.getProviderClasspath();
+ Classpath inprocClassPath = new Classpath( providerClasspath );
+ Artifact surefireArtifact = getCommonArtifact();
+ inprocClassPath.addClassPathElementUrl(
surefireArtifact.getFile().getAbsolutePath() );
+
final Classpath testClasspath = generateTestClasspath();
logClasspath( testClasspath, "test classpath" );
logClasspath( providerClasspath, "provider classpath" );
final ClasspathConfiguration classpathConfiguration =
- new ClasspathConfiguration( testClasspath, providerClasspath,
isEnableAssertions(),
+ new ClasspathConfiguration( testClasspath, providerClasspath,
inprocClassPath, isEnableAssertions(),
isChildDelegation() );
return new StartupConfiguration( providerName,
classpathConfiguration, classLoaderConfiguration,
@@ -426,6 +430,11 @@ public abstract class AbstractSurefireMo
}
+ private Artifact getCommonArtifact()
+ {
+ return (Artifact) getPluginArtifactMap().get(
"org.apache.maven.surefire:maven-surefire-common" );
+ }
+
private StartupReportConfiguration getStartupReportConfiguration()
{
return new StartupReportConfiguration( isUseFile(), isPrintSummary(),
getReportFormat(),
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java?rev=1204688&r1=1204687&r2=1204688&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java
Mon Nov 21 20:25:19 2011
@@ -61,7 +61,7 @@ public class InPluginVMSurefireStarter
// separate the TestNG classloader
ClassLoader testsClassLoader =
starterCommon.createInProcessTestClassLoader();
- ClassLoader surefireClassLoader =
starterCommon.createSurefireClassloader( testsClassLoader );
+ ClassLoader surefireClassLoader =
starterCommon.createSurefireInProcClassloader( testsClassLoader );
CommonReflector surefireReflector = new CommonReflector(
surefireClassLoader );
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java?rev=1204688&r1=1204687&r2=1204688&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
Mon Nov 21 20:25:19 2011
@@ -218,7 +218,7 @@ public class ForkStarter
{
final ClasspathConfiguration classpathConfiguration =
startupConfiguration.getClasspathConfiguration();
ClassLoader testsClassLoader =
classpathConfiguration.createTestClassLoader( false );
- ClassLoader surefireClassLoader =
classpathConfiguration.createSurefireClassLoader( testsClassLoader );
+ ClassLoader surefireClassLoader =
classpathConfiguration.createInprocSurefireClassLoader( testsClassLoader );
CommonReflector commonReflector = new CommonReflector(
surefireClassLoader );
Object reporterFactory =
commonReflector.createReportingReporterFactory( startupReportConfiguration );
Copied:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/FileReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java?p2=maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java&p1=maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java?rev=1204688&r1=1204687&r2=1204688&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java
Mon Nov 21 20:25:19 2011
@@ -100,7 +100,7 @@ public class BooterDeserializerStartupCo
{
Classpath testClassPath = new Classpath( Arrays.asList( new String[]{
"CP1", "CP2" } ) );
Classpath providerClasspath = new Classpath( Arrays.asList( new
String[]{ "SP1", "SP2" } ) );
- return new ClasspathConfiguration( testClassPath, providerClasspath,
true, true );
+ return new ClasspathConfiguration( testClassPath, providerClasspath,
new Classpath( ), true, true );
}
public static ClassLoaderConfiguration getSystemClassLoaderConfiguration()
Copied:
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java?p2=maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java&p1=maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
(from r1204687,
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java?p2=maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java&p1=maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java&r1=1204687&r2=1204688&rev=1204688&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/JdkReflector.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/JdkReflector.java?rev=1204688&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/JdkReflector.java
(added)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/JdkReflector.java
Mon Nov 21 20:25:19 2011
@@ -0,0 +1,64 @@
+package org.apache.maven.surefire.booter;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import org.apache.maven.surefire.util.NestedRuntimeException;
+import org.apache.maven.surefire.util.ReflectionUtils;
+
+/**
+ * Does reflection based invocation of misc jdk method
+ * <p/>
+ *
+ * @author Kristian Rosenvold
+ */
+public class JdkReflector
+{
+ private final Method assertionStatusMethod;
+
+
+ public JdkReflector()
+ {
+ assertionStatusMethod = ReflectionUtils.tryGetMethod(
ClassLoader.class, "setDefaultAssertionStatus",
+ new Class[]{
boolean.class } );
+ }
+
+ public void invokeAssertionStatusMethod( ClassLoader classLoader, boolean
enableAssertions )
+ {
+ if ( assertionStatusMethod != null )
+ {
+ try
+ {
+ Object[] args = new Object[]{ enableAssertions ? Boolean.TRUE
: Boolean.FALSE };
+ assertionStatusMethod.invoke( classLoader, args );
+ }
+ catch ( IllegalAccessException e )
+ {
+ throw new NestedRuntimeException( "Unable to access the
assertion enablement method", e );
+ }
+ catch ( InvocationTargetException e )
+ {
+ throw new NestedRuntimeException( "Unable to invoke the
assertion enablement method", e );
+ }
+ }
+ }
+
+}
Propchange:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/JdkReflector.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java?rev=1204688&r1=1204687&r2=1204688&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
Mon Nov 21 20:25:19 2011
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.PrintStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Properties;
@@ -33,6 +34,7 @@ import org.apache.maven.surefire.suite.R
import org.apache.maven.surefire.testset.DirectoryScannerParameters;
import org.apache.maven.surefire.testset.TestArtifactInfo;
import org.apache.maven.surefire.testset.TestRequest;
+import org.apache.maven.surefire.util.NestedRuntimeException;
import org.apache.maven.surefire.util.ReflectionUtils;
import org.apache.maven.surefire.util.SurefireReflectionException;
@@ -73,6 +75,9 @@ public class SurefireReflector
private final Class reporterFactory;
+ private final Method assertionStatusMethod;
+
+
public SurefireReflector( ClassLoader surefireClassLoader )
{
this.surefireClassLoader = surefireClassLoader;
@@ -92,6 +97,8 @@ public class SurefireReflector
reporterFactory = surefireClassLoader.loadClass(
ReporterFactory.class.getName() );
runResult = surefireClassLoader.loadClass(
RunResult.class.getName() );
booterParameters = surefireClassLoader.loadClass(
ProviderParameters.class.getName() );
+ assertionStatusMethod = ReflectionUtils.tryGetMethod(
ClassLoader.class, "setDefaultAssertionStatus",
+ new Class[]{
boolean.class } );
}
catch ( ClassNotFoundException e )
{
@@ -187,10 +194,10 @@ public class SurefireReflector
Object createReporterConfiguration( ReporterConfiguration
reporterConfiguration )
{
- Constructor constructor = ReflectionUtils.getConstructor(
this.reporterConfiguration,
- new Class[]{
File.class, Boolean.class } );
+ Constructor constructor =
+ ReflectionUtils.getConstructor( this.reporterConfiguration, new
Class[]{ File.class, Boolean.class } );
return ReflectionUtils.newInstance( constructor, new Object[]{
reporterConfiguration.getReportsDirectory(),
- reporterConfiguration.isTrimStackTrace()} );
+ reporterConfiguration.isTrimStackTrace() } );
}
public Object createForkingReporterFactory( Boolean trimStackTrace,
PrintStream originalSystemOut )
@@ -305,4 +312,25 @@ public class SurefireReflector
{
return runResult.isAssignableFrom( o.getClass() );
}
+
+ public void invokeAssertionStatusMethod( ClassLoader classLoader, boolean
enableAssertions )
+ {
+ if ( assertionStatusMethod != null )
+ {
+ try
+ {
+ Object[] args = new Object[]{ enableAssertions ? Boolean.TRUE
: Boolean.FALSE };
+ assertionStatusMethod.invoke( classLoader, args );
+ }
+ catch ( IllegalAccessException e )
+ {
+ throw new NestedRuntimeException( "Unable to access the
assertion enablement method", e );
+ }
+ catch ( InvocationTargetException e )
+ {
+ throw new NestedRuntimeException( "Unable to invoke the
assertion enablement method", e );
+ }
+ }
+ }
+
}
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java?rev=1204688&r1=1204687&r2=1204688&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
Mon Nov 21 20:25:19 2011
@@ -19,14 +19,14 @@ package org.apache.maven.surefire.booter
* under the License.
*/
-import org.apache.maven.surefire.util.UrlUtils;
-
import java.io.File;
import java.net.MalformedURLException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.apache.maven.surefire.util.UrlUtils;
/**
* An ordered list of classpath elements with set behaviour
@@ -35,6 +35,8 @@ import java.util.List;
*/
public class Classpath
{
+ private static final JdkReflector jdkReflector = new JdkReflector();
+
public static Classpath join( Classpath firstClasspath, Classpath
secondClasspath )
{
Classpath joinedClasspath = new Classpath();
@@ -43,10 +45,16 @@ public class Classpath
return joinedClasspath;
}
- private final List elements = new ArrayList();
+ private final List elements;
public Classpath()
{
+ this.elements = new ArrayList();
+ }
+
+ public Classpath( Classpath other )
+ {
+ this.elements = new ArrayList( other.elements );
}
public Classpath( List elements )
@@ -129,6 +137,31 @@ public class Classpath
}
+ public ClassLoader createClassLoader( ClassLoader parent, boolean
childDelegation, boolean enableAssertions )
+ throws SurefireExecutionException
+ {
+ try
+ {
+ List urls = getAsUrlList();
+ IsolatedClassLoader classLoader = new IsolatedClassLoader( parent,
childDelegation );
+ for ( Iterator iter = urls.iterator(); iter.hasNext(); )
+ {
+ URL url = (URL) iter.next();
+ classLoader.addURL( url );
+ }
+ if (parent != null){
+ jdkReflector.invokeAssertionStatusMethod( parent,
enableAssertions );
+ }
+ jdkReflector.invokeAssertionStatusMethod( classLoader,
enableAssertions );
+ return classLoader;
+ }
+ catch ( MalformedURLException e )
+ {
+ throw new SurefireExecutionException( "When creating classloader",
e );
+ }
+ }
+
+
public int hashCode()
{
return elements != null ? elements.hashCode() : 0;
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java?rev=1204688&r1=1204687&r2=1204688&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
Mon Nov 21 20:25:19 2011
@@ -19,14 +19,6 @@ package org.apache.maven.surefire.booter
* under the License.
*/
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.maven.surefire.util.NestedRuntimeException;
-
/**
* Represents the classpaths for the BooterConfiguration.
* <p/>
@@ -50,6 +42,9 @@ public class ClasspathConfiguration
private final Classpath surefireClasspathUrls;
+ /** The surefire classpath to use when invoking in-process with the plugin
*/
+ private final Classpath inprocClasspath;
+
/**
* Whether to enable assertions or not (can be affected by the fork
arguments, and the ability to do so based on the
* JVM).
@@ -59,24 +54,27 @@ public class ClasspathConfiguration
// todo: @deprecated because the IsolatedClassLoader is really isolated -
no parent.
private final boolean childDelegation;
+ private final JdkReflector jdkReflector = new JdkReflector();
+
public ClasspathConfiguration( boolean enableAssertions, boolean
childDelegation )
{
- this( new Classpath(), new Classpath(), enableAssertions,
childDelegation );
+ this( new Classpath(), new Classpath(),new Classpath(),
enableAssertions, childDelegation );
}
-
ClasspathConfiguration( PropertiesWrapper properties )
{
this( properties.getClasspath( CLASSPATH ),
properties.getClasspath( SUREFIRE_CLASSPATH ),
+ new Classpath( ),
properties.getBooleanProperty( ENABLE_ASSERTIONS ),
properties.getBooleanProperty( CHILD_DELEGATION ) );
}
- public ClasspathConfiguration( Classpath testClasspath, Classpath
surefireClassPathUrls, boolean enableAssertions,
+ public ClasspathConfiguration( Classpath testClasspath, Classpath
surefireClassPathUrls, Classpath inprocClasspath, boolean enableAssertions,
boolean childDelegation )
{
this.enableAssertions = enableAssertions;
this.childDelegation = childDelegation;
+ this.inprocClasspath = inprocClasspath;
this.classpathUrls = testClasspath;
this.surefireClasspathUrls = surefireClassPathUrls;
}
@@ -89,21 +87,6 @@ public class ClasspathConfiguration
properties.setProperty( CHILD_DELEGATION, String.valueOf(
childDelegation ) );
}
- private static Method assertionStatusMethod;
-
- static
- {
- try
- {
- assertionStatusMethod =
- ClassLoader.class.getMethod( "setDefaultAssertionStatus", new
Class[]{ boolean.class } );
- }
- catch ( NoSuchMethodException e )
- {
- assertionStatusMethod = null;
- }
- }
-
public ClassLoader createTestClassLoaderConditionallySystem( boolean
useSystemClassLoader )
throws SurefireExecutionException
{
@@ -115,66 +98,24 @@ public class ClasspathConfiguration
public ClassLoader createTestClassLoader( boolean childDelegation )
throws SurefireExecutionException
{
- return createClassLoaderSEE( classpathUrls, null, childDelegation );
+ return classpathUrls.createClassLoader( null, childDelegation,
enableAssertions );
}
public ClassLoader createTestClassLoader()
throws SurefireExecutionException
{
- return createClassLoaderSEE( classpathUrls, null, this.childDelegation
);
+ return classpathUrls.createClassLoader( null, this.childDelegation,
enableAssertions );
}
public ClassLoader createSurefireClassLoader( ClassLoader parent )
throws SurefireExecutionException
{
- return createClassLoaderSEE( surefireClasspathUrls, parent, false );
+ return surefireClasspathUrls.createClassLoader( parent, false,
enableAssertions );
}
-
- private ClassLoader createClassLoaderSEE( Classpath classPathUrls,
ClassLoader parent, boolean childDelegation )
+ public ClassLoader createInprocSurefireClassLoader( ClassLoader parent )
throws SurefireExecutionException
{
- try
- {
- return createClassLoader( classPathUrls, parent, childDelegation );
- }
- catch ( MalformedURLException e )
- {
- throw new SurefireExecutionException( "When creating classloader",
e );
- }
-
- }
-
- private ClassLoader createClassLoader( Classpath classPathUrls,
ClassLoader parent, boolean childDelegation )
- throws MalformedURLException
- {
- List urls = classPathUrls.getAsUrlList();
- IsolatedClassLoader classLoader = new IsolatedClassLoader( parent,
childDelegation );
- if ( assertionStatusMethod != null )
- {
- try
- {
- Object[] args = new Object[]{ enableAssertions ? Boolean.TRUE
: Boolean.FALSE };
- if ( parent != null )
- {
- assertionStatusMethod.invoke( parent, args );
- }
- assertionStatusMethod.invoke( classLoader, args );
- }
- catch ( IllegalAccessException e )
- {
- throw new NestedRuntimeException( "Unable to access the
assertion enablement method", e );
- }
- catch ( InvocationTargetException e )
- {
- throw new NestedRuntimeException( "Unable to invoke the
assertion enablement method", e );
- }
- }
- for ( Iterator iter = urls.iterator(); iter.hasNext(); )
- {
- URL url = (URL) iter.next();
- classLoader.addURL( url );
- }
- return classLoader;
+ return inprocClasspath.createClassLoader( parent, false,
enableAssertions );
}
public Classpath getTestClasspath()
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java?rev=1204688&r1=1204687&r2=1204688&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
Mon Nov 21 20:25:19 2011
@@ -62,7 +62,7 @@ public class ForkedBooter
ProviderConfiguration booterConfiguration =
booterDeserializer.deserialize();
final StartupConfiguration providerConfiguration =
booterDeserializer.getProviderConfiguration();
- SurefireStarter starter = new SurefireStarter(
providerConfiguration, booterConfiguration, null );
+ SurefireStarter starter = new SurefireStarter(
providerConfiguration, booterConfiguration );
TypeEncodedValue forkedTestSet =
booterConfiguration.getTestForFork();
final RunResult result = forkedTestSet != null
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StarterCommon.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StarterCommon.java?rev=1204688&r1=1204687&r2=1204688&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StarterCommon.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StarterCommon.java
Mon Nov 21 20:25:19 2011
@@ -61,6 +61,15 @@ public class StarterCommon
return classpathConfiguration.createSurefireClassLoader(
testsClassLoader );
}
+
+ public ClassLoader createSurefireInProcClassloader( ClassLoader
testsClassLoader )
+ throws SurefireExecutionException
+ {
+ final ClasspathConfiguration classpathConfiguration =
startupConfiguration.getClasspathConfiguration();
+
+ return classpathConfiguration.createInprocSurefireClassLoader(
testsClassLoader );
+ }
+
public ClassLoader createInProcessTestClassLoader()
throws SurefireExecutionException
{
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java?rev=1204688&r1=1204687&r2=1204688&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java
Mon Nov 21 20:25:19 2011
@@ -43,8 +43,7 @@ public class SurefireStarter
private final StarterCommon starterCommon;
- public SurefireStarter( StartupConfiguration startupConfiguration,
ProviderConfiguration providerConfiguration,
- StartupReportConfiguration
startupReportConfiguration )
+ public SurefireStarter( StartupConfiguration startupConfiguration,
ProviderConfiguration providerConfiguration )
{
this.providerConfiguration = providerConfiguration;
this.startupConfiguration = startupConfiguration;
Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=1204688&r1=1204687&r2=1204688&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Mon Nov 21 20:25:19
2011
@@ -37,7 +37,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<it.settings.showPasswords>false</it.settings.showPasswords>
<testng.version>5.7</testng.version>
- <surefire.threadcount>2</surefire.threadcount>
+ <surefire.threadcount>1s</surefire.threadcount>
<surefire.build.version>2.8</surefire.build.version>
</properties>
@@ -190,8 +190,7 @@
</dependency>
</dependencies>
<properties>
- <surefire.build.version>${project.version}</surefire.build.version>
- <!-- Until we release 2.7.3 -->
+ <surefire.build.version>2.8</surefire.build.version>
</properties>
</profile>
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml?rev=1204688&r1=1204687&r2=1204688&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml Mon Nov 21
20:25:19 2011
@@ -55,6 +55,12 @@
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
+ <artifactId>maven-surefire-common</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
<artifactId>common-junit48</artifactId>
<version>${project.version}</version>
</dependency>
