[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests FunctionalTests.java,1.44,1.45 LineNumberAssignedByNodeReaderTest.java,1.23,1.24 ParserTestCase.java,1.32,1.33

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

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

Modified Files:
	FunctionalTests.java LineNumberAssignedByNodeReaderTest.java 
	ParserTestCase.java 
Log Message:
Removed lexer level AbstractNode.
Removed data package from parser level tags.
Separated tag creation from recursion in NodeFactory interface.



Index: FunctionalTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/FunctionalTests.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** FunctionalTests.java	22 Sep 2003 02:40:03 -0000	1.44
--- FunctionalTests.java	20 Oct 2003 01:28:03 -0000	1.45
***************
*** 76,80 ****
          int imgTagCount = 0;
          try {
!             URL url = new URL("http://www.yahoo.com");
              InputStream is = url.openStream();
              BufferedReader reader;
--- 76,80 ----
          int imgTagCount = 0;
          try {
!             URL url = new URL("http://education.yahoo.com/");
              InputStream is = url.openStream();
              BufferedReader reader;
***************
*** 93,97 ****
  
      public int countImageTagsWithHTMLParser() throws ParserException {
!         Parser parser = new Parser("http://www.yahoo.com",new DefaultParserFeedback());
          parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
          int parserImgTagCount = 0;
--- 93,97 ----
  
      public int countImageTagsWithHTMLParser() throws ParserException {
!         Parser parser = new Parser("http://education.yahoo.com/",new DefaultParserFeedback());
          parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
          int parserImgTagCount = 0;

Index: LineNumberAssignedByNodeReaderTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/LineNumberAssignedByNodeReaderTest.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** LineNumberAssignedByNodeReaderTest.java	3 Oct 2003 00:20:44 -0000	1.23
--- LineNumberAssignedByNodeReaderTest.java	20 Oct 2003 01:28:03 -0000	1.24
***************
*** 111,117 ****
          assertType("custom node",CustomTag.class,node[useNode]);
          CustomTag tag = (CustomTag)node[useNode];
!         assertEquals("start line", expectedStartLine, tag.tagData.getStartLine());
!         assertEquals("end line", expectedEndLine, tag.tagData.getEndLine());
! 
      }
  
--- 111,116 ----
          assertType("custom node",CustomTag.class,node[useNode]);
          CustomTag tag = (CustomTag)node[useNode];
!         assertEquals("start line", expectedStartLine, tag.getStartingLineNumber ());
!         assertEquals("end line", expectedEndLine, tag.getEndingLineNumber ());
      }
  

Index: ParserTestCase.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/ParserTestCase.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** ParserTestCase.java	5 Oct 2003 13:49:53 -0000	1.32
--- ParserTestCase.java	20 Oct 2003 01:28:03 -0000	1.33
***************
*** 45,49 ****
  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;
--- 45,48 ----
***************
*** 294,300 ****
      }
  
      private void fixIfXmlEndTag (NodeIterator iterator, Node node)
      {
-         TagData data;
          if (node instanceof Tag)
          {
--- 293,300 ----
      }
  
+     // TODO:
+     // Man, this is really screwed up.
      private void fixIfXmlEndTag (NodeIterator iterator, Node node)
      {
          if (node instanceof Tag)
          {
***************
*** 303,309 ****
              {
                  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);
--- 303,310 ----
              {
                  tag.setEmptyXmlTag (false);
! //                data = new TagData
! //                    ("/" + tag.getTagName (), tag.elementEnd (), new Vector (), "", false);
!                 node = new Tag (tag.getPage (), tag.getStartPosition (), tag.getEndPosition (), tag.getAttributesEx ());
!                 //data.getTagBegin (), data.getTagEnd (), data.getAttributes ());
                  // cheat here and poink the new node into the iterator
                  ((IteratorImpl)iterator).push (node);