[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/scannersTests BaseHREFScannerTest.java,1.30,1.3
Brought to you by:
derrickoswald
Menu
▾
▴
[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/scannersTests BaseHREFScannerTest.java,1.30,1.31 ImageScannerTest.java,1.37,1.38 LinkScannerTest.java,1.46,1.47
|
From: <der...@us...> - 2003-10-29 03:31:30
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests
In directory sc8-pr-cvs1:/tmp/cvs-serv12839/src/org/htmlparser/tests/scannersTests
Modified Files:
BaseHREFScannerTest.java ImageScannerTest.java
LinkScannerTest.java
Log Message:
Move LinkProcess out of scanners and into Page, untangling A, IMG and BASE scanners.
Move form action determination to tag.
The scanners have no special actions on behalf of tags anymore.
Index: BaseHREFScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/BaseHREFScannerTest.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** BaseHREFScannerTest.java 27 Oct 2003 02:18:05 -0000 1.30
--- BaseHREFScannerTest.java 29 Oct 2003 03:31:18 -0000 1.31
***************
*** 65,72 ****
public void testScan() throws ParserException{
createParser("<html><head><TITLE>test page</TITLE><BASE HREF=\"http://www.abc.com/\"><a href=\"home.cfm\">Home</a>...</html>","http://www.google.com/test/index.html");
! LinkScanner linkScanner = new LinkScanner("-l");
! parser.addScanner(linkScanner);
parser.addScanner(new TitleScanner("-t"));
! parser.addScanner(linkScanner.createBaseHREFScanner("-b"));
parseAndAssertNodeCount(7);
//Base href tag should be the 4th tag
--- 65,71 ----
public void testScan() throws ParserException{
createParser("<html><head><TITLE>test page</TITLE><BASE HREF=\"http://www.abc.com/\"><a href=\"home.cfm\">Home</a>...</html>","http://www.google.com/test/index.html");
! parser.addScanner(new LinkScanner("-l"));
parser.addScanner(new TitleScanner("-t"));
! parser.addScanner(new BaseHrefScanner("-b"));
parseAndAssertNodeCount(7);
//Base href tag should be the 4th tag
Index: ImageScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/ImageScannerTest.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** ImageScannerTest.java 27 Oct 2003 02:18:05 -0000 1.37
--- ImageScannerTest.java 29 Oct 2003 03:31:18 -0000 1.38
***************
*** 59,63 ****
createParser("<IMG SRC=\"../abc/def/mypic.jpg\">","http://www.yahoo.com/ghi?abcdefg");
// Register the image scanner
! parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
--- 59,63 ----
createParser("<IMG SRC=\"../abc/def/mypic.jpg\">","http://www.yahoo.com/ghi?abcdefg");
// Register the image scanner
! parser.addScanner(new ImageScanner("-i"));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
***************
*** 68,72 ****
public void testEvaluate()
{
! ImageScanner scanner = new ImageScanner("-i",new LinkProcessor());
Tag tag = new Tag ();
tag.setTagName ("img");
--- 68,72 ----
public void testEvaluate()
{
! ImageScanner scanner = new ImageScanner("-i");
Tag tag = new Tag ();
tag.setTagName ("img");
***************
*** 83,87 ****
createParser ("<img width=638 height=53 border=0 usemap=\"#m\" src=" + locn + " alt=Yahoo>");
// Register the image scanner
! parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
--- 83,87 ----
createParser ("<img width=638 height=53 border=0 usemap=\"#m\" src=" + locn + " alt=Yahoo>");
// Register the image scanner
! parser.addScanner(new ImageScanner("-i"));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
***************
*** 99,103 ****
// Register the image scanner
! parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
--- 99,103 ----
// Register the image scanner
! parser.addScanner(new ImageScanner("-i"));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
***************
*** 113,117 ****
// Register the image scanner
! parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
--- 113,117 ----
// Register the image scanner
! parser.addScanner(new ImageScanner("-i"));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
***************
*** 122,126 ****
public void testRelativeImageScan2() throws ParserException {
createParser("<IMG SRC=\"abc/def/mypic.jpg\">","http://www.yahoo.com"); // Register the image scanner
! parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
--- 122,126 ----
public void testRelativeImageScan2() throws ParserException {
createParser("<IMG SRC=\"abc/def/mypic.jpg\">","http://www.yahoo.com"); // Register the image scanner
! parser.addScanner(new ImageScanner("-i"));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
***************
*** 132,136 ****
createParser("<IMG SRC=\"../abc/def/mypic.jpg\">","http://www.yahoo.com/ghi");
// Register the image scanner
! parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
--- 132,136 ----
createParser("<IMG SRC=\"../abc/def/mypic.jpg\">","http://www.yahoo.com/ghi");
// Register the image scanner
! parser.addScanner(new ImageScanner("-i"));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
***************
*** 147,151 ****
createParser("<IMG SRC=\"../abc/def/Hello World.jpg\">","http://www.yahoo.com/ghi");
// Register the image scanner
! parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
--- 147,151 ----
createParser("<IMG SRC=\"../abc/def/Hello World.jpg\">","http://www.yahoo.com/ghi");
// Register the image scanner
! parser.addScanner(new ImageScanner("-i"));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
***************
*** 159,163 ****
Parser.setLineSeparator("\r\n");
// Register the image scanner
! parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
--- 159,163 ----
Parser.setLineSeparator("\r\n");
// Register the image scanner
! parser.addScanner(new ImageScanner("-i"));
parseAndAssertNodeCount(1);
assertTrue("Node identified should be HTMLImageTag",node[0] instanceof ImageTag);
***************
*** 177,181 ****
Node [] node = new AbstractNode[10];
// Register the image scanner
! parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
int i = 0;
Node thisNode;
--- 177,181 ----
Node [] node = new AbstractNode[10];
// Register the image scanner
! parser.addScanner(new ImageScanner("-i"));
int i = 0;
Node thisNode;
Index: LinkScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/LinkScannerTest.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** LinkScannerTest.java 27 Oct 2003 02:18:05 -0000 1.46
--- LinkScannerTest.java 29 Oct 2003 03:31:18 -0000 1.47
***************
*** 36,39 ****
--- 36,40 ----
import org.htmlparser.StringNode;
import org.htmlparser.lexer.nodes.Attribute;
+ import org.htmlparser.scanners.ImageScanner;
import org.htmlparser.scanners.LinkScanner;
import org.htmlparser.tags.ImageTag;
***************
*** 269,275 ****
createParser("<A HREF=\"mytest.html\"><IMG SRC=\"abcd.jpg\">Hello World</A>","http://www.yahoo.com");
// Register the image scanner
! LinkScanner linkScanner = new LinkScanner("-l");
! parser.addScanner(linkScanner);
! parser.addScanner(linkScanner.createImageScanner("-i"));
parseAndAssertNodeCount(1);
--- 270,275 ----
createParser("<A HREF=\"mytest.html\"><IMG SRC=\"abcd.jpg\">Hello World</A>","http://www.yahoo.com");
// Register the image scanner
! parser.addScanner(new LinkScanner("-l"));
! parser.addScanner(new ImageScanner("-i"));
parseAndAssertNodeCount(1);
***************
*** 346,352 ****
createParser("<a href=\"http://transfer.go.com/cgi/atransfer.pl?goto=http://www.signs.movies.com&name=114332&srvc=nws&context=283&guid=4AD5723D-C802-4310-A388-0B24E1A79689\" target=\"_new\"><img src=\"http://ad.abcnews.com/ad/sponsors/buena_vista_pictures/bvpi-ban0003.gif\" width=468 height=60 border=\"0\" alt=\"See Signs in Theaters 8-2 - Starring Mel Gibson\" align=><font face=\"verdana,arial,helvetica\" SIZE=\"1\"><b></b></font></a>","http://transfer.go.com");
// Register the image scanner
! LinkScanner linkScanner = new LinkScanner("-l");
! parser.addScanner(linkScanner);
! parser.addScanner(linkScanner.createImageScanner("-i"));
parseAndAssertNodeCount(1);
--- 346,351 ----
createParser("<a href=\"http://transfer.go.com/cgi/atransfer.pl?goto=http://www.signs.movies.com&name=114332&srvc=nws&context=283&guid=4AD5723D-C802-4310-A388-0B24E1A79689\" target=\"_new\"><img src=\"http://ad.abcnews.com/ad/sponsors/buena_vista_pictures/bvpi-ban0003.gif\" width=468 height=60 border=\"0\" alt=\"See Signs in Theaters 8-2 - Starring Mel Gibson\" align=><font face=\"verdana,arial,helvetica\" SIZE=\"1\"><b></b></font></a>","http://transfer.go.com");
// Register the image scanner
! parser.addScanner(new LinkScanner("-l"));
! parser.addScanner(new ImageScanner("-i"));
parseAndAssertNodeCount(1);
|
