svn commit: r407362 - in /maven/surefire/trunk/surefire-providers: surefire-junit/src/main/java/org/apache/maven/surefire/junit/ surefire-testng/src/main/java/org/apache/maven/surefire/testng/

[mperham]

Author: mperham
Date: Wed May 17 13:11:45 2006
New Revision: 407362

URL: http://svn.apache.org/viewvc?rev=407362&view=rev
Log: (empty)

Modified:
    
maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java
    
maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
    
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java

Modified: 
maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java?rev=407362&r1=407361&r2=407362&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java
 (original)
+++ 
maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java
 Wed May 17 13:11:45 2006
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import junit.framework.TestCase;
+import junit.framework.Test;
 import org.apache.maven.surefire.suite.AbstractDirectoryTestSuite;
 import org.apache.maven.surefire.testset.PojoTestSet;
 import org.apache.maven.surefire.testset.SurefireTestSet;
@@ -44,7 +44,7 @@
         Class junitClass = null;
         try
         {
-            junitClass = classLoader.loadClass( TestCase.class.getName() );
+            junitClass = classLoader.loadClass( Test.class.getName() );
         }
         catch ( ClassNotFoundException e )
         {

Modified: 
maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java?rev=407362&r1=407361&r2=407362&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
 (original)
+++ 
maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
 Wed May 17 13:11:45 2006
@@ -29,7 +29,7 @@
 public final class JUnitTestSet
     extends AbstractTestSet
 {
-    public static final String TEST_CASE = "junit.framework.TestCase";
+    public static final String TEST_CASE = "junit.framework.Test";
 
     public static final String TEST_RESULT = "junit.framework.TestResult";
 

Modified: 
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java?rev=407362&r1=407361&r2=407362&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
 (original)
+++ 
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
 Wed May 17 13:11:45 2006
@@ -161,9 +161,13 @@
 
 //        if ( !TestNGClassFinder.isTestNGClass( testSet.getTestClass(), 
annotationFinder ) )
         // TODO: this is a bit dodgy, but isTestNGClass wasn't working
-        if ( "junit.framework.TestCase".equals( 
testSet.getTestClass().getSuperclass().getName() ) )
+        try
+        {
+            Class junitClass = Class.forName( "junit.framework.Test" );
+            xmlTest.setJUnit( testSet.getTestClass().isAssignableFrom( 
junitClass ) );
+        }
+        catch ( ClassNotFoundException e )
         {
-            xmlTest.setJUnit( true );
         }
     }