You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by br...@apache.org on 2006/05/14 03:42:01 UTC
svn commit: r406181 -
/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
Author: brett
Date: Sat May 13 18:42:01 2006
New Revision: 406181
URL: http://svn.apache.org/viewcvs?rev=406181&view=rev
Log:
[MSUREFIRE-104] fix classloading in forked mode
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java?rev=406181&r1=406180&r2=406181&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java Sat May 13 18:42:01 2006
@@ -43,6 +43,7 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Arrays;
/**
* @author Jason van Zyl
@@ -57,6 +58,8 @@
private List surefireClassPathUrls = new ArrayList();
+ private List surefireBootClassPathUrls = new ArrayList();
+
private List testSuites = new ArrayList();
// ----------------------------------------------------------------------
@@ -368,6 +371,12 @@
properties.setProperty( "surefireClassPathUrl." + i, url );
}
+ for ( int i = 0; i < surefireBootClassPathUrls.size(); i++ )
+ {
+ String url = (String) surefireBootClassPathUrls.get( i );
+ properties.setProperty( "surefireBootClassPathUrl." + i, url );
+ }
+
properties.setProperty( "childDelegation", String.valueOf( childDelegation ) );
}
@@ -446,7 +455,7 @@
throw new SurefireBooterForkException( "Error creating properties files for forking", e );
}
- Commandline cli = forkConfiguration.createCommandLine( surefireClassPathUrls );
+ Commandline cli = forkConfiguration.createCommandLine( surefireBootClassPathUrls );
cli.createArgument().setFile( surefireProperties );
@@ -713,15 +722,17 @@
{
surefireBooter.addSurefireClassPathUrl( p.getProperty( name ) );
}
+ else if ( name.startsWith( "surefireBootClassPathUrl." ) )
+ {
+ surefireBooter.addSurefireBootClassPathUrl( p.getProperty( name ) );
+ }
+ else if ( "childDelegation".equals( name ) )
+ {
+ surefireBooter.childDelegation =
+ Boolean.valueOf( p.getProperty( "childDelegation" ) ).booleanValue();
+ }
}
- // TODO: fix. See also, surefire plugin. Currently, testng is putting all of the test classes into the surefire
- // classpath as the classloaders are not separataed. Here, we need to remove them again to avoid duplication
- List urls = new ArrayList( surefireBooter.classPathUrls );
- urls.removeAll( surefireBooter.surefireClassPathUrls );
- surefireBooter.classPathUrls = urls;
-
- boolean childDelegation = Boolean.valueOf( p.getProperty( "childDelegation" ) ).booleanValue();
String testSet = p.getProperty( "testSet" );
boolean result;
if ( testSet != null )
@@ -751,6 +762,15 @@
public void setChildDelegation( boolean childDelegation )
{
this.childDelegation = childDelegation;
+ }
+
+ public void addSurefireBootClassPathUrl( String path )
+ {
+ if ( !surefireBootClassPathUrls.contains( path ) )
+ {
+ surefireBootClassPathUrls.add( path );
+ }
+ addSurefireClassPathUrl( path );
}
}