[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/scannersTests CompositeTagScannerTest.java,1.45,1.46 OptionTagScannerTest.java,1.32,1.33 SelectTagScannerTest.java,1.31,1.32 TextareaTagScannerTest.java,1.29,1.30

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

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

Modified Files:
	CompositeTagScannerTest.java OptionTagScannerTest.java 
	SelectTagScannerTest.java TextareaTagScannerTest.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: CompositeTagScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/CompositeTagScannerTest.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** CompositeTagScannerTest.java	26 Oct 2003 19:46:26 -0000	1.45
--- CompositeTagScannerTest.java	28 Oct 2003 03:04:19 -0000	1.46
***************
*** 432,436 ****
          customTag = (CustomTag)node[1];
          assertStringEquals(
!             "first custom tag html",
              "<CUSTOM>something</CUSTOM>",
              customTag.toHtml()
--- 432,436 ----
          customTag = (CustomTag)node[1];
          assertStringEquals(
!             "second custom tag html",
              "<CUSTOM>something</CUSTOM>",
              customTag.toHtml()
***************
*** 438,442 ****
          Tag endTag = (Tag)node[2];
          assertStringEquals(
!             "first custom tag html",
              "</CUSTOM>",
              endTag.toHtml()
--- 438,442 ----
          Tag endTag = (Tag)node[2];
          assertStringEquals(
!             "third custom tag html",
              "</CUSTOM>",
              endTag.toHtml()
***************
*** 468,472 ****
          customTag = (CustomTag)node[1];
          assertStringEquals(
!             "first custom tag html",
              "<CUSTOM>something</CUSTOM>",
              customTag.toHtml()
--- 468,472 ----
          customTag = (CustomTag)node[1];
          assertStringEquals(
!             "second custom tag html",
              "<CUSTOM>something</CUSTOM>",
              customTag.toHtml()
***************
*** 485,489 ****
          Tag endTag = (Tag)node[2];
          assertStringEquals(
!             "first custom tag html",
              "</CUSTOM>",
              endTag.toHtml()
--- 485,489 ----
          Tag endTag = (Tag)node[2];
          assertStringEquals(
!             "third custom tag html",
              "</CUSTOM>",
              endTag.toHtml()

Index: OptionTagScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/OptionTagScannerTest.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** OptionTagScannerTest.java	26 Oct 2003 19:46:27 -0000	1.32
--- OptionTagScannerTest.java	28 Oct 2003 03:04:19 -0000	1.33
***************
*** 29,34 ****
  package org.htmlparser.tests.scannersTests;
  
- import java.util.Stack;
- 
  import org.htmlparser.Node;
  import org.htmlparser.StringNode;
--- 29,32 ----
***************
*** 67,71 ****
      public void testScan() throws ParserException
      {
!         scanner = new OptionTagScanner("-i", new Stack ());
          createParser(testHTML,"http://www.google.com/test/index.html");
          parser.addScanner(scanner);
--- 65,69 ----
      public void testScan() throws ParserException
      {
!         scanner = new OptionTagScanner("-i");
          createParser(testHTML,"http://www.google.com/test/index.html");
          parser.addScanner(scanner);

Index: SelectTagScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/SelectTagScannerTest.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** SelectTagScannerTest.java	26 Oct 2003 19:46:27 -0000	1.31
--- SelectTagScannerTest.java	28 Oct 2003 03:04:19 -0000	1.32
***************
*** 29,34 ****
  package org.htmlparser.tests.scannersTests;
  
- import java.util.Stack;
- 
  import org.htmlparser.scanners.OptionTagScanner;
  import org.htmlparser.scanners.SelectTagScanner;
--- 29,32 ----
***************
*** 69,77 ****
      {
  
!         scanner = new SelectTagScanner("-i", new Stack ());
          createParser(testHTML,"http://www.google.com/test/index.html");
!         scanner = new SelectTagScanner("-ta", new Stack ());
          parser.addScanner(scanner);
!         parser.addScanner(new OptionTagScanner("", new Stack ()));
  
  
--- 67,75 ----
      {
  
!         scanner = new SelectTagScanner("-i");
          createParser(testHTML,"http://www.google.com/test/index.html");
!         scanner = new SelectTagScanner("-ta");
          parser.addScanner(scanner);
!         parser.addScanner(new OptionTagScanner(""));
  
  

Index: TextareaTagScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/TextareaTagScannerTest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** TextareaTagScannerTest.java	26 Oct 2003 19:46:27 -0000	1.29
--- TextareaTagScannerTest.java	28 Oct 2003 03:04:19 -0000	1.30
***************
*** 29,34 ****
  package org.htmlparser.tests.scannersTests;
  
- import java.util.Stack;
- 
  import org.htmlparser.scanners.TextareaTagScanner;
  import org.htmlparser.tags.TextareaTag;
--- 29,32 ----
***************
*** 61,67 ****
      public void testScan() throws ParserException
      {
!         scanner = new TextareaTagScanner("-i", new Stack ());
          createParser(testHTML);
!         scanner = new TextareaTagScanner("-ta", new Stack ());
          parser.addScanner(scanner);
          parseAndAssertNodeCount(5);
--- 59,65 ----
      public void testScan() throws ParserException
      {
!         scanner = new TextareaTagScanner("-i");
          createParser(testHTML);
!         scanner = new TextareaTagScanner("-ta");
          parser.addScanner(scanner);
          parseAndAssertNodeCount(5);