[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/lexerTests AllTests.java,1.12,1.13 AttributeTes
Brought to you by:
derrickoswald
Menu
▾
▴
[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/lexerTests AllTests.java,1.12,1.13 AttributeTests.java,1.3,1.4 LexerTests.java,1.8,1.9 PageIndexTests.java,1.8,1.9 PageTests.java,1.10,1.11 SourceTests.java,1.9,1.10 StreamTests.java,1.8,1.9 TagTests.java,1.1,1.2
|
From: <der...@us...> - 2003-10-21 02:48:30
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests
In directory sc8-pr-cvs1:/tmp/cvs-serv21682/lexerTests
Modified Files:
AllTests.java AttributeTests.java LexerTests.java
PageIndexTests.java PageTests.java SourceTests.java
StreamTests.java TagTests.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/lexerTests/AllTests.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AllTests.java 13 Oct 2003 21:48:13 -0000 1.12
--- AllTests.java 21 Oct 2003 02:24:00 -0000 1.13
***************
*** 29,37 ****
package org.htmlparser.tests.lexerTests;
- import junit.framework.TestCase;
import junit.framework.TestSuite;
! public class AllTests extends TestCase
{
public AllTests (String name)
{
--- 29,43 ----
package org.htmlparser.tests.lexerTests;
import junit.framework.TestSuite;
! import org.htmlparser.tests.ParserTestCase;
!
! public class AllTests extends ParserTestCase
{
+ static
+ {
+ System.setProperty ("org.htmlparser.tests.lexerTests.AllTests", "AllTests");
+ }
+
public AllTests (String name)
{
***************
*** 50,129 ****
suite.addTestSuite (TagTests.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";
-
- /*
- * 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.lexerTests.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: AttributeTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/AttributeTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AttributeTests.java 20 Oct 2003 01:28:03 -0000 1.3
--- AttributeTests.java 21 Oct 2003 02:24:00 -0000 1.4
***************
*** 45,48 ****
--- 45,53 ----
public class AttributeTests extends ParserTestCase
{
+ static
+ {
+ System.setProperty ("org.htmlparser.tests.lexerTests.AttributeTests", "AttributeTests");
+ }
+
private static final boolean JSP_TESTS_ENABLED = false;
private Tag tag;
***************
*** 512,578 ****
assertTrue ("Attribute missing", table.containsKey ("OTHER"));
assertEquals ("Attribute has wrong value", "fred", (String)table.get ("OTHER"));
- }
-
- /**
- * 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.lexerTests.AttributeTests";
-
- // 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 ()
- + ")");
- }
}
}
--- 517,520 ----
Index: LexerTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/LexerTests.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LexerTests.java 28 Sep 2003 15:33:58 -0000 1.8
--- LexerTests.java 21 Oct 2003 02:24:00 -0000 1.9
***************
*** 39,44 ****
import java.net.URLConnection;
- import junit.framework.TestCase;
-
import org.htmlparser.Node;
import org.htmlparser.Parser;
--- 39,42 ----
***************
*** 52,59 ****
import org.htmlparser.lexer.nodes.TagNode;
import org.htmlparser.tags.Tag;
import org.htmlparser.util.ParserException;
! public class LexerTests extends TestCase
{
/**
--- 50,63 ----
import org.htmlparser.lexer.nodes.TagNode;
import org.htmlparser.tags.Tag;
+ import org.htmlparser.tests.ParserTestCase;
import org.htmlparser.util.ParserException;
! public class LexerTests extends ParserTestCase
{
+
+ static
+ {
+ System.setProperty ("org.htmlparser.tests.lexerTests.LexerTests", "LexerTests");
+ }
/**
Index: PageIndexTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/PageIndexTests.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PageIndexTests.java 22 Sep 2003 02:40:05 -0000 1.8
--- PageIndexTests.java 21 Oct 2003 02:24:00 -0000 1.9
***************
*** 29,38 ****
package org.htmlparser.tests.lexerTests;
- import junit.framework.TestCase;
-
import org.htmlparser.lexer.PageIndex;
! public class PageIndexTests extends TestCase
{
/**
--- 29,42 ----
package org.htmlparser.tests.lexerTests;
import org.htmlparser.lexer.PageIndex;
+ import org.htmlparser.tests.ParserTestCase;
! public class PageIndexTests extends ParserTestCase
{
+
+ static
+ {
+ System.setProperty ("org.htmlparser.tests.lexerTests.PageIndexTests", "PageIndexTests");
+ }
/**
Index: PageTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/PageTests.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PageTests.java 22 Sep 2003 02:40:06 -0000 1.10
--- PageTests.java 21 Oct 2003 02:24:00 -0000 1.11
***************
*** 34,44 ****
import java.net.URLConnection;
- import junit.framework.TestCase;
-
import org.htmlparser.lexer.Page;
import org.htmlparser.util.ParserException;
! public class PageTests extends TestCase
{
/**
* The default charset.
--- 34,48 ----
import java.net.URLConnection;
import org.htmlparser.lexer.Page;
+ import org.htmlparser.tests.ParserTestCase;
import org.htmlparser.util.ParserException;
! public class PageTests extends ParserTestCase
{
+ static
+ {
+ System.setProperty ("org.htmlparser.tests.lexerTests.PageTests", "PageTests");
+ }
+
/**
* The default charset.
Index: SourceTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/SourceTests.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SourceTests.java 22 Sep 2003 02:40:06 -0000 1.9
--- SourceTests.java 21 Oct 2003 02:24:00 -0000 1.10
***************
*** 40,50 ****
import java.util.Random;
- import junit.framework.TestCase;
-
import org.htmlparser.lexer.Stream;
import org.htmlparser.lexer.Source;
! public class SourceTests extends TestCase
{
/**
* The default charset.
--- 40,54 ----
import java.util.Random;
import org.htmlparser.lexer.Stream;
import org.htmlparser.lexer.Source;
+ import org.htmlparser.tests.ParserTestCase;
! public class SourceTests extends ParserTestCase
{
+ static
+ {
+ System.setProperty ("org.htmlparser.tests.lexerTests.SourceTests", "SourceTests");
+ }
+
/**
* The default charset.
Index: StreamTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/StreamTests.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** StreamTests.java 22 Sep 2003 02:40:06 -0000 1.8
--- StreamTests.java 21 Oct 2003 02:24:00 -0000 1.9
***************
*** 39,48 ****
import java.util.Random;
- import junit.framework.TestCase;
-
import org.htmlparser.lexer.Stream;
! public class StreamTests extends TestCase
{
/**
* Test the first level stream class.
--- 39,52 ----
import java.util.Random;
import org.htmlparser.lexer.Stream;
+ import org.htmlparser.tests.ParserTestCase;
! public class StreamTests extends ParserTestCase
{
+ static
+ {
+ System.setProperty ("org.htmlparser.tests.lexerTests.StreamTests", "StreamTests");
+ }
+
/**
* Test the first level stream class.
Index: TagTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/TagTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TagTests.java 13 Oct 2003 21:48:13 -0000 1.1
--- TagTests.java 21 Oct 2003 02:24:00 -0000 1.2
***************
*** 27,36 ****
// Website : http://www.industriallogic.com
- // ---- IMPORTANT: This class has failing tests ----
- // Original Location: org.htmlparser.tests.parserHelperTests;
- // Pls rememeber to add test back to org.htmlparser.tests.parserHelperTests.AllTests.suite()
- // and delete these comments when you're done.
- // ---- NEEDS FIXING ----
-
package org.htmlparser.tests.lexerTests;
import java.util.HashMap;
--- 27,30 ----
***************
*** 46,49 ****
--- 40,48 ----
public class TagTests extends ParserTestCase {
+ static
+ {
+ System.setProperty ("org.htmlparser.tests.lexerTests.TagTests", "TagTests");
+ }
+
private static final String TEST_HTML = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">" +
"<!-- Server: sf-web2 -->" +
***************
*** 420,487 ****
String html = tag.toHtml ();
assertStringEquals ("html","<INPUT DISABLED=>", html);
- }
-
- /**
- * 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;
-
- System.out.println (System.getProperty ("testclass"));
- 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.lexerTests.TagTests";
-
- // 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 ()
- + ")");
- }
}
}
--- 419,422 ----
|
