[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/parserHelperTests AllTests.java,1.28,1.29 CompositeTagScannerHelperTest.java,1.23,1.24 RemarkNodeParserTest.java,1.37,1.38 StringParserTest.java,1.39,1.40

[<der...@us...>]

Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests
In directory sc8-pr-cvs1:/tmp/cvs-serv21682/parserHelperTests

Modified Files:
	AllTests.java CompositeTagScannerHelperTest.java 
	RemarkNodeParserTest.java StringParserTest.java 
Log Message:
Consolidated the various testing main() methods into ParserTestCase.
All unit test classes in the org.htmlparser.tests heirarchy should now be executable. 



Index: AllTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests/AllTests.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** AllTests.java	22 Sep 2003 02:40:07 -0000	1.28
--- AllTests.java	21 Oct 2003 02:24:00 -0000	1.29
***************
*** 28,35 ****
  
  package org.htmlparser.tests.parserHelperTests;
- import junit.framework.*;
  
! public class AllTests extends junit.framework.TestCase
  {
  
      public AllTests(String name) {
--- 28,42 ----
  
  package org.htmlparser.tests.parserHelperTests;
  
! import junit.framework.TestSuite;
! 
! import org.htmlparser.tests.ParserTestCase;
! 
! public class AllTests extends ParserTestCase
  {
+     static
+     {
+         System.setProperty ("org.htmlparser.tests.parserHelperTests.AllTests", "AllTests");
+     }
  
      public AllTests(String name) {
***************
*** 37,114 ****
      }
  
!       public static TestSuite suite() {
          TestSuite suite = new TestSuite("Parser Helper Tests");
-         // To-do: Test below should be enabled after it passes
- //      suite.addTestSuite(AttributeParserTest.class);
          suite.addTestSuite(CompositeTagScannerHelperTest.class);
          suite.addTestSuite(RemarkNodeParserTest.class);
          suite.addTestSuite(StringParserTest.class);
-         // To-do: Test below should be enabled after it passes
- //      suite.addTestSuite(TagParserTest.class);
- 
          return suite;
-     }
- 
-     /**
-      * Mainline for all suites of tests.
-      * @param args Command line arguments. The following options
-      * are understood:
-      * <pre>
-      * -text  -- use junit.textui.TestRunner
-      * -awt   -- use junit.awtui.TestRunner
-      * -swing -- use junit.swingui.TestRunner (default)
-      * </pre>
-      * All other options are passed on to the junit framework.
-      */
-     public static void main(String[] args)
-     {
-         String runner;
-         int i;
-         String arguments[];
-         Class cls;
- 
-         runner = null;
-         for (i = 0; (i < args.length) && (null == runner); i++)
-         {
-             if (args[i].equalsIgnoreCase ("-text"))
-                 runner = "junit.textui.TestRunner";
-             else if (args[i].equalsIgnoreCase ("-awt"))
-                 runner = "junit.awtui.TestRunner";
-             else if (args[i].equalsIgnoreCase ("-swing"))
-                 runner = "junit.swingui.TestRunner";
-         }
-         if (null != runner)
-         {
-             // remove it from the arguments
-             arguments = new String[args.length - 1];
-             System.arraycopy (args, 0, arguments, 0, i - 1);
-             System.arraycopy (args, i, arguments, i - 1, args.length - i);
-             args = arguments;
-         }
-         else
-             runner = "junit.swingui.TestRunner";
- 
-         // append the test class
-         arguments = new String[args.length + 1];
-         System.arraycopy (args, 0, arguments, 0, args.length);
-         arguments[args.length] = "org.htmlparser.tests.parserHelperTests.AllTests";
- 
-         // invoke main() of the test runner
-         try
-         {
-             cls = Class.forName (runner);
-             java.lang.reflect.Method method = cls.getDeclaredMethod (
-                 "main", new Class[] { String[].class });
-             method.invoke (
-                 null,
-                 new Object[] { arguments });
-         }
-         catch (Throwable t)
-         {
-             System.err.println (
-                 "cannot run unit test ("
-                 + t.getMessage ()
-                 + ")");
-         }
      }
  }
--- 44,53 ----
      }
  
!     public static TestSuite suite() {
          TestSuite suite = new TestSuite("Parser Helper Tests");
          suite.addTestSuite(CompositeTagScannerHelperTest.class);
          suite.addTestSuite(RemarkNodeParserTest.class);
          suite.addTestSuite(StringParserTest.class);
          return suite;
      }
  }

Index: CompositeTagScannerHelperTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests/CompositeTagScannerHelperTest.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** CompositeTagScannerHelperTest.java	20 Oct 2003 01:28:04 -0000	1.23
--- CompositeTagScannerHelperTest.java	21 Oct 2003 02:24:00 -0000	1.24
***************
*** 40,43 ****
--- 40,49 ----
   */
  public class CompositeTagScannerHelperTest extends ParserTestCase {
+ 
+     static
+     {
+         System.setProperty ("org.htmlparser.tests.parserHelperTests.CompositeTagScannerHelperTest", "CompositeTagScannerHelperTest");
+     }
+ 
      private CompositeTagScannerHelper helper;
      public CompositeTagScannerHelperTest(String name) {

Index: RemarkNodeParserTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests/RemarkNodeParserTest.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** RemarkNodeParserTest.java	6 Oct 2003 01:43:28 -0000	1.37
--- RemarkNodeParserTest.java	21 Oct 2003 02:24:00 -0000	1.38
***************
*** 39,42 ****
--- 39,47 ----
  public class RemarkNodeParserTest extends ParserTestCase
  {
+     static
+     {
+         System.setProperty ("org.htmlparser.tests.parserHelperTests.RemarkNodeParserTest", "RemarkNodeParserTest");
+     }
+ 
      public RemarkNodeParserTest(String name) {
          super(name);

Index: StringParserTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests/StringParserTest.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** StringParserTest.java	6 Oct 2003 01:43:28 -0000	1.39
--- StringParserTest.java	21 Oct 2003 02:24:00 -0000	1.40
***************
*** 40,43 ****
--- 40,48 ----
  public class StringParserTest extends ParserTestCase {
  
+     static
+     {
+         System.setProperty ("org.htmlparser.tests.parserHelperTests.StringParserTest", "StringParserTest");
+     }
+ 
      public StringParserTest(String name) {
          super(name);