[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/tagTests OptionTagTest.java,1.35,1.36 SelectTagTest.java,1.35,1.36 TextareaTagTest.java,1.33,1.34

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

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

Modified Files:
	OptionTagTest.java SelectTagTest.java TextareaTagTest.java 
Log Message:
Moved the recursion from the NodeFactory to the CompositeTagScanner where it belongs.
Also needed to kick off the recursion in IteratorImpl.
The scnner is obtained in a kludgy way -- just 'til tags know their own scanners.
Also fixed the other NodeFactory signatures to have a Page rather than a Lexer.



Index: OptionTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/OptionTagTest.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** OptionTagTest.java	26 Oct 2003 19:46:27 -0000	1.35
--- OptionTagTest.java	28 Oct 2003 03:04:19 -0000	1.36
***************
*** 32,37 ****
  package org.htmlparser.tests.tagTests;
  
- import java.util.Stack;
- 
  import org.htmlparser.scanners.OptionTagScanner;
  import org.htmlparser.tags.OptionTag;
--- 32,35 ----
***************
*** 70,74 ****
          super.setUp();
          createParser(testHTML);
!         parser.addScanner(new OptionTagScanner("-option", new Stack ()));
          parseAndAssertNodeCount(13);
      }
--- 68,72 ----
          super.setUp();
          createParser(testHTML);
!         parser.addScanner(new OptionTagScanner("-option"));
          parseAndAssertNodeCount(13);
      }

Index: SelectTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/SelectTagTest.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** SelectTagTest.java	26 Oct 2003 19:46:27 -0000	1.35
--- SelectTagTest.java	28 Oct 2003 03:04:19 -0000	1.36
***************
*** 32,37 ****
  package org.htmlparser.tests.tagTests;
  
- import java.util.Stack;
- 
  import org.htmlparser.scanners.OptionTagScanner;
  import org.htmlparser.scanners.SelectTagScanner;
--- 32,35 ----
***************
*** 80,85 ****
          super.setUp();
          createParser(testHTML);
!         parser.addScanner(new SelectTagScanner("-s", new Stack ()));
!         parser.addScanner(new OptionTagScanner("-o", new Stack ()));
          parseAndAssertNodeCount(1);
          assertTrue("Node 1 should be Select Tag",node[0] instanceof SelectTag);
--- 78,83 ----
          super.setUp();
          createParser(testHTML);
!         parser.addScanner(new SelectTagScanner("-s"));
!         parser.addScanner(new OptionTagScanner("-o"));
          parseAndAssertNodeCount(1);
          assertTrue("Node 1 should be Select Tag",node[0] instanceof SelectTag);

Index: TextareaTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/TextareaTagTest.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** TextareaTagTest.java	26 Oct 2003 19:46:27 -0000	1.33
--- TextareaTagTest.java	28 Oct 2003 03:04:19 -0000	1.34
***************
*** 29,34 ****
  package org.htmlparser.tests.tagTests;
  
- import java.util.Stack;
- 
  import org.htmlparser.scanners.TextareaTagScanner;
  import org.htmlparser.tags.TextareaTag;
--- 29,32 ----
***************
*** 62,66 ****
          super.setUp();
          createParser(testHTML);
!         parser.addScanner(new TextareaTagScanner("-t", new Stack ()));
          parseAndAssertNodeCount(5);
      }
--- 60,64 ----
          super.setUp();
          createParser(testHTML);
!         parser.addScanner(new TextareaTagScanner("-t"));
          parseAndAssertNodeCount(5);
      }