[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests ParserTest.java,1.43,1.44 ParserTestCase.java,1.31,1.32

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

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

Modified Files:
	ParserTest.java ParserTestCase.java 
Log Message:
Add bean like accessors for positions on Node, AbstractNode and AbstractNodeDecorator.
Handle null page in Cursor.
Add smartquotes mode in Lexer and CompositeTagScannerHelper.
Add simple name constructor in Attribute.
Remove emptyxmltag member, replace with computing accessors in TagNode.
Removed ScriptScannerHelper and moved scanning logic to ScriptScanner.
Reworked extractImageLocn in ImageScanner
Implement extractXMLData in TagScanner.
Made virtual tags zero length in TagData.
Added push() to IteratorImpl.
Added single node constructor to NodeList.
Numerous and various test adjustments. Still 133 failures.



Index: ParserTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/ParserTest.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** ParserTest.java	28 Sep 2003 15:33:58 -0000	1.43
--- ParserTest.java	5 Oct 2003 13:49:53 -0000	1.44
***************
*** 626,631 ****
              node.collectInto(collectionList,LinkTag.class);
          }
!         // NOTE: the link within the script is also found... this may be debatable
!         assertEquals("Size of collection vector should be 12",12,collectionList.size());
          // All items in collection vector should be links
          for (SimpleNodeIterator e = collectionList.elements();e.hasMoreNodes();) {
--- 626,630 ----
              node.collectInto(collectionList,LinkTag.class);
          }
!         assertEquals("Size of collection vector should be 11",11,collectionList.size());
          // All items in collection vector should be links
          for (SimpleNodeIterator e = collectionList.elements();e.hasMoreNodes();) {

Index: ParserTestCase.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/ParserTestCase.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ParserTestCase.java	3 Oct 2003 02:15:20 -0000	1.31
--- ParserTestCase.java	5 Oct 2003 13:49:53 -0000	1.32
***************
*** 32,35 ****
--- 32,36 ----
  import java.io.StringReader;
  import java.util.Iterator;
+ import java.util.Vector;
  
  import junit.framework.TestCase;
***************
*** 44,48 ****
--- 45,51 ----
  import org.htmlparser.tags.InputTag;
  import org.htmlparser.tags.Tag;
+ import org.htmlparser.tags.data.TagData;
  import org.htmlparser.util.DefaultParserFeedback;
+ import org.htmlparser.util.IteratorImpl;
  import org.htmlparser.util.NodeIterator;
  import org.htmlparser.util.ParserException;
***************
*** 151,154 ****
--- 154,158 ----
                          " \n\n**** COMPLETE STRING ACTUAL***\n" + actual
                      );
+                     System.out.println ("string differs, expected \"" + expected + "\", actual \"" + actual + "\"");
                      fail(errorMsg.toString());
              }
***************
*** 171,174 ****
--- 175,180 ----
              msg.append("-->\n").append(node[i].toHtml()).append("\n");
          }
+         if (nodeCountExpected != nodeCount)
+             System.out.println ("node count differs, expected " + nodeCountExpected + ", actual " + nodeCount);
          assertEquals("Number of nodes parsed didn't match, nodes found were :\n"+msg.toString(),nodeCountExpected,nodeCount);
      }
***************
*** 230,235 ****
                  nextActualNode
              );
!             fixIfXmlEndTag(resultParser, nextActualNode);
!             fixIfXmlEndTag(expectedParser, nextExpectedNode);
              assertSameType(displayMessage, nextExpectedNode, nextActualNode);
              assertTagEquals(displayMessage, nextExpectedNode, nextActualNode);
--- 236,241 ----
                  nextActualNode
              );
!             fixIfXmlEndTag(actualIterator, nextActualNode);
!             fixIfXmlEndTag(expectedIterator, nextExpectedNode);
              assertSameType(displayMessage, nextExpectedNode, nextActualNode);
              assertTagEquals(displayMessage, nextExpectedNode, nextActualNode);
***************
*** 288,293 ****
      }
  
!     private void fixIfXmlEndTag (Parser parser, Node node)
      {
          if (node instanceof Tag)
          {
--- 294,300 ----
      }
  
!     private void fixIfXmlEndTag (NodeIterator iterator, Node node)
      {
+         TagData data;
          if (node instanceof Tag)
          {
***************
*** 295,307 ****
              if (tag.isEmptyXmlTag())
              {
!                 System.out.println (tag);
! //                // Add end tag
! //                String currLine = parser.getReader().getCurrentLine();
! //                int pos = parser.getReader().getLastReadPosition();
! //                currLine =
! //                    currLine.substring(0,pos+1)+
! //                    "</"+tag.getTagName()+">"+
! //                    currLine.substring(pos+1,currLine.length());
! //                parser.getReader().changeLine(currLine);
              }
          }
--- 302,311 ----
              if (tag.isEmptyXmlTag())
              {
!                 tag.setEmptyXmlTag (false);
!                 data = new TagData
!                     ("/" + tag.getTagName (), tag.elementEnd (), new Vector (), "", false);
!                 node = new Tag (data);
!                 // cheat here and poink the new node into the iterator
!                 ((IteratorImpl)iterator).push (node);
              }
          }