htmlparser-cvs

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

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

Modified Files:
	AllTests.java CompositeTagFindingVisitorTest.java 
	HtmlPageTest.java LinkFindingVisitorTest.java 
	NodeVisitorTest.java StringFindingVisitorTest.java 
	TagFindingVisitorTest.java TextExtractingVisitorTest.java 
	UrlModifyingVisitorTest.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/visitorsTests/AllTests.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** AllTests.java	22 Sep 2003 02:40:14 -0000	1.36
--- AllTests.java	21 Oct 2003 02:24:01 -0000	1.37
***************
*** 30,36 ****
  
  import junit.framework.TestSuite;
  
! public class AllTests extends junit.framework.TestCase
  {
      public AllTests(String name) {
          super(name);
--- 30,42 ----
  
  import junit.framework.TestSuite;
+ import org.htmlparser.tests.ParserTestCase;
  
! public class AllTests extends ParserTestCase
  {
+     static
+     {
+         System.setProperty ("org.htmlparser.tests.visitorsTests.AllTests", "AllTests");
+     }
+ 
      public AllTests(String name) {
          super(name);
***************
*** 50,129 ****
  
          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";
- 
-         /*
-          * from http://www.mail-archive.com/commons-user%40jakarta.apache.org/msg02958.html
-          *
-          * The problem is within the UI test runners of JUnit. They bring
-          * with them a custom classloader, which causes the
-          * LogConfigurationException. Unfortunately Log4j doesn't work
-          * either.
-          *
-          * Solution: Disable "Reload classes every run" or start JUnit with
-          * command line option -noloading before the name of the Testsuite.
-          */
- 
-         // append the test class
-         arguments = new String[args.length + 2];
-         System.arraycopy (args, 0, arguments, 0, args.length);
-         arguments[arguments.length - 2] = "-noloading";
-         arguments[arguments.length - 1] = "org.htmlparser.tests.visitorsTests.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 ()
-                 + ")");
-         }
      }
  }
--- 56,59 ----

Index: CompositeTagFindingVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/CompositeTagFindingVisitorTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CompositeTagFindingVisitorTest.java	22 Sep 2003 02:40:14 -0000	1.9
--- CompositeTagFindingVisitorTest.java	21 Oct 2003 02:24:01 -0000	1.10
***************
*** 31,37 ****
  import org.htmlparser.tests.ParserTestCase;
  
- 
- 
  public class CompositeTagFindingVisitorTest extends ParserTestCase {
  
      public CompositeTagFindingVisitorTest(String name) {
--- 31,40 ----
  import org.htmlparser.tests.ParserTestCase;
  
  public class CompositeTagFindingVisitorTest extends ParserTestCase {
+ 
+     static
+     {
+         System.setProperty ("org.htmlparser.tests.visitorsTests.CompositeTagFindingVisitorTest", "CompositeTagFindingVisitorTest");
+     }
  
      public CompositeTagFindingVisitorTest(String name) {

Index: HtmlPageTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/HtmlPageTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** HtmlPageTest.java	22 Sep 2003 02:40:14 -0000	1.12
--- HtmlPageTest.java	21 Oct 2003 02:24:01 -0000	1.13
***************
*** 40,43 ****
--- 40,48 ----
  public class HtmlPageTest extends ParserTestCase {
  
+     static
+     {
+         System.setProperty ("org.htmlparser.tests.visitorsTests.HtmlPageTest", "HtmlPageTest");
+     }
+ 
      private static final String SIMPLE_PAGE =
          "<html>" +

Index: LinkFindingVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/LinkFindingVisitorTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** LinkFindingVisitorTest.java	22 Sep 2003 02:40:14 -0000	1.9
--- LinkFindingVisitorTest.java	21 Oct 2003 02:24:01 -0000	1.10
***************
*** 33,36 ****
--- 33,42 ----
  
  public class LinkFindingVisitorTest extends ParserTestCase {
+ 
+     static
+     {
+         System.setProperty ("org.htmlparser.tests.visitorsTests.LinkFindingVisitorTest", "LinkFindingVisitorTest");
+     }
+ 
      private String html =
          "<HTML><HEAD><TITLE>This is the Title</TITLE></HEAD><BODY>Hello World, <A href=\"http://www.industriallogic.com\">Industrial Logic</a></BODY></HTML>";

Index: NodeVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/NodeVisitorTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NodeVisitorTest.java	22 Sep 2003 02:40:14 -0000	1.9
--- NodeVisitorTest.java	21 Oct 2003 02:24:01 -0000	1.10
***************
*** 39,42 ****
--- 39,47 ----
  public class NodeVisitorTest extends ParserTestCase {
  
+     static
+     {
+         System.setProperty ("org.htmlparser.tests.visitorsTests.NodeVisitorTest", "NodeVisitorTest");
+     }
+ 
      public NodeVisitorTest(String name) {
          super(name);

Index: StringFindingVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/StringFindingVisitorTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** StringFindingVisitorTest.java	22 Sep 2003 02:40:15 -0000	1.11
--- StringFindingVisitorTest.java	21 Oct 2003 02:24:01 -0000	1.12
***************
*** 33,36 ****
--- 33,42 ----
  
  public class StringFindingVisitorTest extends ParserTestCase {
+ 
+     static
+     {
+         System.setProperty ("org.htmlparser.tests.visitorsTests.StringFindingVisitorTest", "StringFindingVisitorTest");
+     }
+ 
      private static final String HTML =
          "<HTML><HEAD><TITLE>This is the Title</TITLE>" +

Index: TagFindingVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/TagFindingVisitorTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TagFindingVisitorTest.java	22 Sep 2003 02:40:15 -0000	1.12
--- TagFindingVisitorTest.java	21 Oct 2003 02:24:01 -0000	1.13
***************
*** 35,38 ****
--- 35,44 ----
  
  public class TagFindingVisitorTest extends ParserTestCase {
+ 
+     static
+     {
+         System.setProperty ("org.htmlparser.tests.visitorsTests.TagFindingVisitorTest", "TagFindingVisitorTest");
+     }
+ 
      private String html =
          "<HTML><HEAD><TITLE>This is the Title</TITLE></HEAD>" +

Index: TextExtractingVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/TextExtractingVisitorTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TextExtractingVisitorTest.java	22 Sep 2003 02:40:15 -0000	1.9
--- TextExtractingVisitorTest.java	21 Oct 2003 02:24:01 -0000	1.10
***************
*** 34,37 ****
--- 34,42 ----
  public class TextExtractingVisitorTest extends ParserTestCase {
  
+     static
+     {
+         System.setProperty ("org.htmlparser.tests.visitorsTests.TextExtractingVisitorTest", "TextExtractingVisitorTest");
+     }
+ 
      public TextExtractingVisitorTest(String name) {
          super(name);

Index: UrlModifyingVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/UrlModifyingVisitorTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** UrlModifyingVisitorTest.java	20 Oct 2003 01:28:04 -0000	1.11
--- UrlModifyingVisitorTest.java	21 Oct 2003 02:24:01 -0000	1.12
***************
*** 34,37 ****
--- 34,43 ----
  
  public class UrlModifyingVisitorTest extends ParserTestCase {
+ 
+     static
+     {
+         System.setProperty ("org.htmlparser.tests.visitorsTests.UrlModifyingVisitorTest", "UrlModifyingVisitorTest");
+     }
+ 
      private static final String HTML_WITH_LINK =
      "<HTML><BODY>" +