[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit ConditionalTestSuite.java,NONE,1.1 HttpUnitSuite.java,1.27,1.28

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/test/com/meterware/httpunit
In directory sc8-pr-cvs1:/tmp/cvs-serv21694/test/com/meterware/httpunit

Modified Files:
	HttpUnitSuite.java 
Added Files:
	ConditionalTestSuite.java 
Log Message:
Some cleanup to tolerate missing jars

***** Error reading new file[Errno 2] No such file or directory: 'ConditionalTestSuite.java'
Index: HttpUnitSuite.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/HttpUnitSuite.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- HttpUnitSuite.java	22 Nov 2002 17:19:35 -0000	1.27
+++ HttpUnitSuite.java	26 Nov 2002 11:55:57 -0000	1.28
@@ -33,10 +33,7 @@
 /**
  * Tests for the package.
  **/
-public class HttpUnitSuite {
-
-    private static Class[] NO_PARAMETERS = new Class[ 0 ];
-
+public class HttpUnitSuite extends ConditionalTestSuite {
 
     public static void main( String[] args ) {
         junit.textui.TestRunner.run( suite() );
@@ -68,26 +65,6 @@
         addOptionalTestCase( result, "com.meterware.servletunit.ServletUnitSuite" );
         return result;
     }
-
-
-    private static void addOptionalTestCase( TestSuite testSuite, String testCaseName ) {
-        try {
-            final Class testClass = Class.forName( testCaseName );
-            Method suiteMethod = testClass.getMethod( "suite", NO_PARAMETERS );
-            if (suiteMethod != null && Modifier.isStatic( suiteMethod.getModifiers() )) {
-                testSuite.addTest( (TestSuite) suiteMethod.invoke( null, NO_PARAMETERS ) );
-            } else if (TestCase.class.isAssignableFrom( testClass )) {
-                testSuite.addTest( new TestSuite( testClass ) );
-            } else {
-                System.out.println( "Note: test suite " + testCaseName + " not a TestClass and has no suite() method" );
-            }
-        } catch (ClassNotFoundException e) {
-            System.out.println( "Note: skipping optional test suite " + testCaseName + " since it was not build." );
-        } catch (Exception e) {
-            System.out.println( "Note: unable to add " + testCaseName + ": " + e );
-        }
-    }
-
 
 }