Author: krosenvold
Date: Mon Dec 5 17:59:17 2011
New Revision: 1210545
URL: http://svn.apache.org/viewvc?rev=1210545&view=rev
Log:
[SUREFIRE-804] Testcase fails with forkMode=always and
useSystemClassLoader=false
It turned out existing IT was not being run due to incorrect naming convention.
Doh
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java
(contents, props changed)
- copied, changed from r1210423,
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkMode.java
Removed:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkMode.java
Modified:
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/TypeEncodedValue.java
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=1210545&r1=1210544&r2=1210545&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 Dec 5 17:59:17 2011
@@ -70,7 +70,7 @@ public class ForkedBooter
startupConfiguration.writeSurefireTestClasspathProperty();
- Object testSet = forkedTestSet != null ?
forkedTestSet.getDecodedValue() : null;
+ Object testSet = forkedTestSet != null ?
forkedTestSet.getDecodedValue(testClassLoader) : null;
runSuitesInProcess( testSet, testClassLoader,
startupConfiguration, providerConfiguration );
// noinspection CallToSystemExit
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java?rev=1210545&r1=1210544&r2=1210545&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
Mon Dec 5 17:59:17 2011
@@ -40,11 +40,6 @@ public class TypeEncodedValue
this.value = value;
}
- public String getType()
- {
- return type;
- }
-
public boolean isTypeClass()
{
return Class.class.getName().equals( type );
@@ -52,6 +47,11 @@ public class TypeEncodedValue
public Object getDecodedValue()
{
+ return getDecodedValue( Thread.currentThread().getContextClassLoader()
);
+ }
+
+ public Object getDecodedValue(ClassLoader classLoader)
+ {
if ( type.trim().length() == 0 )
{
return null;
@@ -62,7 +62,7 @@ public class TypeEncodedValue
}
else if ( isTypeClass() )
{
- return ReflectionUtils.loadClass(
Thread.currentThread().getContextClassLoader(), value );
+ return ReflectionUtils.loadClass( classLoader, value );
}
else if ( type.equals( File.class.getName() ) )
{
Copied:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java
(from r1210423,
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkMode.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkMode.java&r1=1210423&r2=1210545&rev=1210545&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkMode.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java
Mon Dec 5 17:59:17 2011
@@ -26,23 +26,23 @@ import org.apache.maven.surefire.its.Sur
*
* @author Kristian Rosenvold
*/
-public class Surefire763EnvironmentForkMode
+public class Surefire763EnvironmentForkModeIT
extends SurefireVerifierTestClass
{
- public Surefire763EnvironmentForkMode()
+ public Surefire763EnvironmentForkModeIT()
{
super( "/environment-variables" );
}
- public void okWhenUseSystemClassLoader()
+ public void testWhenUseSystemClassLoader()
throws Exception
{
addGoal( "-DuseSystemClassLoader=true" );
executeTest();
}
- public void okeWhenDontUseSystemClassLoader()
+ public void testWhenDontUseSystemClassLoader()
throws Exception
{
addGoal( "-DuseSystemClassLoader=false" );
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
