[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests AllTests.java,1.51,1.52 ParserTestCase.java,1.30,1.31

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

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

Modified Files:
	AllTests.java ParserTestCase.java 
Log Message:
Fix all testcases generating exceptions. Still 160 failures.



Index: AllTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/AllTests.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** AllTests.java	22 Sep 2003 02:40:03 -0000	1.51
--- AllTests.java	3 Oct 2003 02:15:20 -0000	1.52
***************
*** 101,118 ****
      }
  
!     public static TestSuite suite() {
!         TestSuite suite = new TestSuite("HTMLParser Tests");
!         TestSuite basic = new TestSuite("Basic Tests");
!         basic.addTestSuite(ParserTest.class);
!         suite.addTest(basic);
!         suite.addTest(org.htmlparser.tests.scannersTests.AllTests.suite());
!         suite.addTest(org.htmlparser.tests.utilTests.AllTests.suite());
!         suite.addTest(org.htmlparser.tests.tagTests.AllTests.suite());
!         suite.addTest(org.htmlparser.tests.visitorsTests.AllTests.suite());
!         suite.addTest(org.htmlparser.tests.parserHelperTests.AllTests.suite());
!         suite.addTest(org.htmlparser.tests.nodeDecoratorTests.AllTests.suite());
!         suite.addTest(AssertXmlEqualsTest.suite());
!         suite.addTest(LineNumberAssignedByNodeReaderTest.suite());
!         return suite;
      }
  }
--- 101,124 ----
      }
  
!     public static TestSuite suite()
!     {
!         TestSuite suite;
!         TestSuite sub;
!         
!         suite = new TestSuite ("HTMLParser Tests");
!         sub = new TestSuite ("Basic Tests");
!         sub.addTestSuite (ParserTest.class);
!         sub.addTestSuite (AssertXmlEqualsTest.class);
!         sub.addTestSuite (FunctionalTests.class);
!         sub.addTestSuite (LineNumberAssignedByNodeReaderTest.class);
!         suite.addTest (sub);
!         suite.addTest (org.htmlparser.tests.scannersTests.AllTests.suite ());
!         suite.addTest (org.htmlparser.tests.utilTests.AllTests.suite ());
!         suite.addTest (org.htmlparser.tests.tagTests.AllTests.suite ());
!         suite.addTest (org.htmlparser.tests.visitorsTests.AllTests.suite ());
!         suite.addTest (org.htmlparser.tests.parserHelperTests.AllTests.suite ());
!         suite.addTest (org.htmlparser.tests.nodeDecoratorTests.AllTests.suite ());
! 
!         return (suite);
      }
  }

Index: ParserTestCase.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/ParserTestCase.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ParserTestCase.java	2 Oct 2003 23:48:53 -0000	1.30
--- ParserTestCase.java	3 Oct 2003 02:15:20 -0000	1.31
***************
*** 224,228 ****
              nextExpectedNode = getNextNodeUsing(expectedIterator);
              nextActualNode = getNextNodeUsing(actualIterator);
! 
              assertStringValueMatches(
                  displayMessage,
--- 224,228 ----
              nextExpectedNode = getNextNodeUsing(expectedIterator);
              nextActualNode = getNextNodeUsing(actualIterator);
!             assertNotNull (nextActualNode);
              assertStringValueMatches(
                  displayMessage,
***************
*** 288,297 ****
      }
  
!     private void fixIfXmlEndTag(Parser parser, Node node) {
!         if (node instanceof Tag) {
              Tag tag = (Tag)node;
!             if (tag.isEmptyXmlTag()) {
! // oh crap...
!                 // Add end tag
  //                String currLine = parser.getReader().getCurrentLine();
  //                int pos = parser.getReader().getLastReadPosition();
--- 288,300 ----
      }
  
!     private void fixIfXmlEndTag (Parser parser, Node node)
!     {
!         if (node instanceof Tag)
!         {
              Tag tag = (Tag)node;
!             if (tag.isEmptyXmlTag())
!             {
!                 System.out.println (tag);
! //                // Add end tag
  //                String currLine = parser.getReader().getCurrentLine();
  //                int pos = parser.getReader().getLastReadPosition();
***************
*** 347,351 ****
          while (i.hasNext()) {
              String key = (String)i.next();
!             if (key=="/") continue;
              String expectedValue =
                  expectedTag.getAttribute(key);
--- 350,354 ----
          while (i.hasNext()) {
              String key = (String)i.next();
!             if (key.trim().equals ("/")) continue;
              String expectedValue =
                  expectedTag.getAttribute(key);