svn commit: r1040704 [2/2] - in /maven/surefire/trunk: maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ maven-surefire-common/src/test/java/org/apac...

[krosenvold]

Modified: 
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java?rev=1040704&r1=1040703&r2=1040704&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java
 (original)
+++ 
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java
 Tue Nov 30 19:08:41 2010
@@ -28,8 +28,8 @@ import org.apache.maven.surefire.report.
 import org.apache.maven.surefire.suite.RunResult;
 import org.apache.maven.surefire.suite.SurefireTestSuite;
 import org.apache.maven.surefire.testset.TestArtifactInfo;
+import org.apache.maven.surefire.testset.TestRequest;
 import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.apache.maven.surefire.testset.TestSuiteDefinition;
 import org.apache.maven.surefire.util.DefaultDirectoryScanner;
 
 import java.util.ArrayList;
@@ -51,14 +51,14 @@ public class TestNGProvider
     private ReporterConfiguration reporterConfiguration;
 
 
-    public RunResult invoke()
+    public RunResult invoke( Object forkTestSet )
         throws TestSetFailedException, ReporterException
     {
         SurefireTestSuite suite = getActiveSuite();
         suite.locateTestSets( getTestsClassLoader() );
-        if ( getTestSuiteDefinition().getTestForFork() != null )
+        if ( forkTestSet != null && getTestSuiteDefinition() == null)
         {
-            suite.execute( getTestSuiteDefinition().getTestForFork(), 
getReporterManagerFactory(),
+            suite.execute( (String) forkTestSet, getReporterManagerFactory(),
                            getTestsClassLoader() );
         }
         else
@@ -68,7 +68,7 @@ public class TestNGProvider
         return RunResult.totalCountOnly( suite.getNumTests() );
     }
 
-    boolean isTestNGXmlTestSuite( TestSuiteDefinition testSuiteDefinition )
+    boolean isTestNGXmlTestSuite( TestRequest testSuiteDefinition )
     {
         return testSuiteDefinition.getSuiteXmlFiles() != null && 
testSuiteDefinition.getSuiteXmlFiles().length > 0 &&
             testSuiteDefinition.getRequestedTest() == null;