Author: brett
Date: Wed Oct 6 12:50:57 2010
New Revision: 1005009
URL: http://svn.apache.org/viewvc?rev=1005009&view=rev
Log:
improve the handling of TestNG versions for the multiple checks
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java?rev=1005009&r1=1005008&r2=1005009&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
Wed Oct 6 12:50:57 2010
@@ -45,6 +45,11 @@ public abstract class AbstractSurefireIn
protected ArrayList getInitialGoals()
{
+ return getInitialGoals( testNgVersion );
+ }
+
+ protected ArrayList getInitialGoals( String testNgVersion )
+ {
ArrayList goals = new ArrayList();
goals.add( "-Dsurefire.version=" + surefireVersion );
@@ -55,7 +60,7 @@ public abstract class AbstractSurefireIn
ArtifactVersion v = new DefaultArtifactVersion( testNgVersion );
try
{
- if ( VersionRange.createFromVersionSpec( "(,5.13)"
).containsVersion( v ) )
+ if ( VersionRange.createFromVersionSpec( "(,5.12.1)"
).containsVersion( v ) )
{
goals.add( "-DtestNgClassifier=jdk15" );
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java?rev=1005009&r1=1005008&r2=1005009&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
Wed Oct 6 12:50:57 2010
@@ -39,7 +39,7 @@ public class CheckTestNgVersionsIT
public void test47()
throws Exception
{
- runTestNgTest( "4.7", "jdk15" );
+ runTestNgTest( "4.7" );
}
// DGF SUREFIRE-375 + MAVENUPLOAD-1024
@@ -48,67 +48,67 @@ public class CheckTestNgVersionsIT
public void XXXtest50()
throws Exception
{
- runTestNgTest( "5.0", "jdk15" );
+ runTestNgTest( "5.0" );
}
public void XXXtest501()
throws Exception
{
- runTestNgTest( "5.0.1", "jdk15" );
+ runTestNgTest( "5.0.1" );
}
public void test502()
throws Exception
{
- runTestNgTest( "5.0.2", "jdk15" );
+ runTestNgTest( "5.0.2" );
}
public void test51()
throws Exception
{
- runTestNgTest( "5.1", "jdk15" );
+ runTestNgTest( "5.1" );
}
public void test55()
throws Exception
{
- runTestNgTest( "5.5", "jdk15" );
+ runTestNgTest( "5.5" );
}
public void test56()
throws Exception
{
- runTestNgTest( "5.6", "jdk15" );
+ runTestNgTest( "5.6" );
}
public void test57()
throws Exception
{
- runTestNgTest( "5.7", "jdk15" );
+ runTestNgTest( "5.7" );
}
public void test58()
throws Exception
{
- runTestNgTest( "5.8", "jdk15" );
+ runTestNgTest( "5.8" );
}
public void test59()
throws Exception
{
- runTestNgTest( "5.9", "jdk15" );
+ runTestNgTest( "5.9" );
}
public void test510()
throws Exception
{
- runTestNgTest( "5.10", "jdk15" );
+ runTestNgTest( "5.10" );
}
public void test511()
throws Exception
{
- runTestNgTest( "5.11", "jdk15" );
+ runTestNgTest( "5.11" );
}
public void test512()
@@ -150,25 +150,11 @@ public class CheckTestNgVersionsIT
public void runTestNgTest( String version )
throws Exception
{
- runTestNgTest( version, null );
- }
-
- public void runTestNgTest( String version, String classifier )
- throws Exception
- {
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/testng-simple" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- List arguments = this.getInitialGoals();
+ List arguments = this.getInitialGoals( version );
arguments.add( "test" );
- // DGF we have to pass in the version as a command line argument
- // and NOT as a system property; otherwise our setting will be ignored
- arguments.add( "-DtestNgVersion=" + version );
-
- if ( classifier != null )
- {
- arguments.add( "-DtestNgClassifier=" + classifier );
- }
executeGoals( verifier, arguments );
verifier.verifyErrorFreeLog();
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-simple/pom.xml?rev=1005009&r1=1005008&r2=1005009&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
Wed Oct 6 12:50:57 2010
@@ -74,7 +74,6 @@
<properties>
<testNgVersion>5.7</testNgVersion>
- <testNgClassifier>jdk15</testNgClassifier>
</properties>
<build>
