[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/scannersTests ImageScannerTest.java,1.19,1.20 F
Brought to you by:
derrickoswald
Menu
▾
▴
[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/scannersTests ImageScannerTest.java,1.19,1.20 FormScannerTest.java,1.22,1.23 HeadScannerTest.java,1.5,1.6 LinkScannerTest.java,1.26,1.27 LabelScannerTest.java,1.24,1.25 SpanScannerTest.java,1.19,1.20
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests
In directory sc8-pr-cvs1:/tmp/cvs-serv17851/src/org/htmlparser/tests/scannersTests
Modified Files:
ImageScannerTest.java FormScannerTest.java
HeadScannerTest.java LinkScannerTest.java
LabelScannerTest.java SpanScannerTest.java
Log Message:
Renamed Node to AbstractNode, extracted the new interface, Node, and moved line separator code from AbstractNode to Parser.
Index: ImageScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/ImageScannerTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ImageScannerTest.java 1 Jun 2003 20:50:16 -0000 1.19
--- ImageScannerTest.java 13 Jun 2003 20:27:04 -0000 1.20
***************
*** 28,31 ****
--- 28,32 ----
package org.htmlparser.tests.scannersTests;
+ import org.htmlparser.AbstractNode;
import org.htmlparser.Node;
import org.htmlparser.Parser;
***************
*** 164,168 ****
createParser("<small><a href=s/5926>Air</a>, <a href=s/5927>Hotel</a>, <a href=s/5928>Vacations</a>, <a href=s/5929>Cruises</a></small></td><td align=center><a href=\"http://rd.yahoo.com/M=218794.2020165.3500581.220161/D=yahoo_top/S=2716149:NP/A=1041273/?http://adfarm.mediaplex.com/ad/ck/990-1736-1039-211\" target=\"_top\"><img width=230 height=33 src=\"http://us.a1.yimg.com/us.yimg.com/a/co/columbiahouse/4for49Freesh_230x33_redx2.gif\" alt=\"\" border=0></a></td><td nowrap align=center width=215>Find your match on<br><a href=s/2734><b>Yahoo! Personals</b></a></td></tr><tr><td colspan=3 align=center><input size=30 name=p>\n"+
"<input type=submit value=Search> <a href=r/so>advanced search</a></td></tr></table><table border=0 cellspacing=0 cellpadding=3 width=640><tr><td nowrap align=center><table border=0 cellspacing=0 cellpadding=0><tr><td><a href=s/5948><img src=\"http://us.i1.yimg.com/us.yimg.com/i/ligans/klgs/eet.gif\" width=20 height=20 border=0></a></td><td> <a href=s/1048><b>Yahooligans!</b></a> - <a href=s/5282>Eet & Ern</a>, <a href=s/5283>Games</a>, <a href=s/5284>Science</a>, <a href=s/5285>Sports</a>, <a href=s/5286>Movies</a>, <a href=s/1048>more</a> </td><td><a href=s/5948><img src=\"http://us.i1.yimg.com/us.yimg.com/i/ligans/klgs/ern.gif\" width=20 height=20 border=0></a></td></tr></table></td></tr><tr><td nowrap align=center><small><b>Shop</b> \n","http://www.yahoo.com");
! Node [] node = new Node[10];
// Register the image scanner
parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
--- 165,169 ----
createParser("<small><a href=s/5926>Air</a>, <a href=s/5927>Hotel</a>, <a href=s/5928>Vacations</a>, <a href=s/5929>Cruises</a></small></td><td align=center><a href=\"http://rd.yahoo.com/M=218794.2020165.3500581.220161/D=yahoo_top/S=2716149:NP/A=1041273/?http://adfarm.mediaplex.com/ad/ck/990-1736-1039-211\" target=\"_top\"><img width=230 height=33 src=\"http://us.a1.yimg.com/us.yimg.com/a/co/columbiahouse/4for49Freesh_230x33_redx2.gif\" alt=\"\" border=0></a></td><td nowrap align=center width=215>Find your match on<br><a href=s/2734><b>Yahoo! Personals</b></a></td></tr><tr><td colspan=3 align=center><input size=30 name=p>\n"+
"<input type=submit value=Search> <a href=r/so>advanced search</a></td></tr></table><table border=0 cellspacing=0 cellpadding=3 width=640><tr><td nowrap align=center><table border=0 cellspacing=0 cellpadding=0><tr><td><a href=s/5948><img src=\"http://us.i1.yimg.com/us.yimg.com/i/ligans/klgs/eet.gif\" width=20 height=20 border=0></a></td><td> <a href=s/1048><b>Yahooligans!</b></a> - <a href=s/5282>Eet & Ern</a>, <a href=s/5283>Games</a>, <a href=s/5284>Science</a>, <a href=s/5285>Sports</a>, <a href=s/5286>Movies</a>, <a href=s/1048>more</a> </td><td><a href=s/5948><img src=\"http://us.i1.yimg.com/us.yimg.com/i/ligans/klgs/ern.gif\" width=20 height=20 border=0></a></td></tr></table></td></tr><tr><td nowrap align=center><small><b>Shop</b> \n","http://www.yahoo.com");
! Node [] node = new AbstractNode[10];
// Register the image scanner
parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
Index: FormScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/FormScannerTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** FormScannerTest.java 1 Jun 2003 20:50:15 -0000 1.22
--- FormScannerTest.java 13 Jun 2003 20:27:04 -0000 1.23
***************
*** 29,32 ****
--- 29,33 ----
package org.htmlparser.tests.scannersTests;
+ import org.htmlparser.AbstractNode;
import org.htmlparser.Node;
import org.htmlparser.Parser;
***************
*** 309,313 ****
parser.registerScanners ();
i = 0;
! nodes = new Node[50];
for (NodeIterator e = parser.elements(); e.hasMoreNodes();)
nodes[i++] = e.nextNode();
--- 310,314 ----
parser.registerScanners ();
i = 0;
! nodes = new AbstractNode[50];
for (NodeIterator e = parser.elements(); e.hasMoreNodes();)
nodes[i++] = e.nextNode();
Index: HeadScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/HeadScannerTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HeadScannerTest.java 1 Jun 2003 20:50:16 -0000 1.5
--- HeadScannerTest.java 13 Jun 2003 20:27:04 -0000 1.6
***************
*** 1,95 ****
! // HTMLParser Library v1_4_20030601 - A java-based parser for HTML
! // Copyright (C) Dec 31, 2000 Somik Raha
! //
! // This library is free software; you can redistribute it and/or
! // modify it under the terms of the GNU Lesser General Public
! // License as published by the Free Software Foundation; either
! // version 2.1 of the License, or (at your option) any later version.
! //
! // This library is distributed in the hope that it will be useful,
! // but WITHOUT ANY WARRANTY; without even the implied warranty of
! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! // Lesser General Public License for more details.
! //
! // You should have received a copy of the GNU Lesser General Public
! // License along with this library; if not, write to the Free Software
! // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! //
! // For any questions or suggestions, you can write to me at :
! // Email :so...@in...
! //
! // Postal Address :
! // Somik Raha
! // Extreme Programmer & Coach
! // Industrial Logic Corporation
! // 2583 Cedar Street, Berkeley,
! // CA 94708, USA
! // Website : http://www.industriallogic.com
! //
! // This class was contributed by Dhaval Udani
! // dha...@or...
!
! package org.htmlparser.tests.scannersTests;
!
! import java.util.*;
! import junit.framework.TestSuite;
! import org.htmlparser.*;
! import org.htmlparser.scanners.*;
! import org.htmlparser.tags.*;
! import org.htmlparser.tests.ParserTestCase;
! import org.htmlparser.util.ParserException;
!
! public class HeadScannerTest extends ParserTestCase {
!
! public HeadScannerTest(String name) {
! super(name);
! }
!
! public void testSimpleHead() throws ParserException {
! createParser("<HTML><HEAD></HEAD></HTML>");
! HeadScanner headScanner = new HeadScanner();
! parser.registerDomScanners();
! parseAndAssertNodeCount(1);
! assertTrue(node[0] instanceof Html);
! Html htmlTag = (Html)node[0];
! assertTrue(htmlTag.getChild(0) instanceof HeadTag);
! }
!
! public void testSimpleHeadWithoutEndTag() throws ParserException {
! createParser("<HTML><HEAD></HTML>");
! HeadScanner headScanner = new HeadScanner();
! parser.registerDomScanners();
! parseAndAssertNodeCount(1);
! assertTrue(node[0] instanceof Html);
! Html htmlTag = (Html)node[0];
! assertTrue(htmlTag.getChild(0) instanceof HeadTag);
! HeadTag headTag = (HeadTag)htmlTag.getChild(0);
! assertEquals("toHtml()","<HEAD></HEAD>",headTag.toHtml());
! assertEquals("toHtml()","<HTML><HEAD></HEAD></HTML>",htmlTag.toHtml());
! }
!
! public void testSimpleHeadWithBody() throws ParserException {
! createParser("<HTML><HEAD><BODY></HTML>");
! HeadScanner headScanner = new HeadScanner();
! parser.registerDomScanners();
! parseAndAssertNodeCount(1);
! assertTrue(node[0] instanceof Html);
! Html htmlTag = (Html)node[0];
! assertTrue(htmlTag.getChild(0) instanceof HeadTag);
! //assertTrue(htmlTag.getChild(1) instanceof BodyTag);
! HeadTag headTag = (HeadTag)htmlTag.getChild(0);
! assertEquals("toHtml()","<HEAD></HEAD>",headTag.toHtml());
! assertEquals("toHtml()","<HTML><HEAD></HEAD><BODY></BODY></HTML>",htmlTag.toHtml());
! }
!
!
! public static TestSuite suite() {
! return new TestSuite(HeadScannerTest.class);
! }
!
! public static void main(String[] args)
! {
! new junit.awtui.TestRunner().start(new String[] {HeadScannerTest.class.getName()});
! }
!
! }
--- 1,93 ----
! // HTMLParser Library v1_4_20030601 - A java-based parser for HTML
! // Copyright (C) Dec 31, 2000 Somik Raha
! //
! // This library is free software; you can redistribute it and/or
! // modify it under the terms of the GNU Lesser General Public
! // License as published by the Free Software Foundation; either
! // version 2.1 of the License, or (at your option) any later version.
! //
! // This library is distributed in the hope that it will be useful,
! // but WITHOUT ANY WARRANTY; without even the implied warranty of
! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! // Lesser General Public License for more details.
! //
! // You should have received a copy of the GNU Lesser General Public
! // License along with this library; if not, write to the Free Software
! // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! //
! // For any questions or suggestions, you can write to me at :
! // Email :so...@in...
! //
! // Postal Address :
! // Somik Raha
! // Extreme Programmer & Coach
! // Industrial Logic Corporation
! // 2583 Cedar Street, Berkeley,
! // CA 94708, USA
! // Website : http://www.industriallogic.com
! //
! // This class was contributed by Dhaval Udani
! // dha...@or...
!
! package org.htmlparser.tests.scannersTests;
!
! import junit.framework.TestSuite;
! import org.htmlparser.scanners.*;
! import org.htmlparser.tags.*;
! import org.htmlparser.tests.ParserTestCase;
! import org.htmlparser.util.ParserException;
!
! public class HeadScannerTest extends ParserTestCase {
!
! public HeadScannerTest(String name) {
! super(name);
! }
!
! public void testSimpleHead() throws ParserException {
! createParser("<HTML><HEAD></HEAD></HTML>");
! HeadScanner headScanner = new HeadScanner();
! parser.registerDomScanners();
! parseAndAssertNodeCount(1);
! assertTrue(node[0] instanceof Html);
! Html htmlTag = (Html)node[0];
! assertTrue(htmlTag.getChild(0) instanceof HeadTag);
! }
!
! public void testSimpleHeadWithoutEndTag() throws ParserException {
! createParser("<HTML><HEAD></HTML>");
! HeadScanner headScanner = new HeadScanner();
! parser.registerDomScanners();
! parseAndAssertNodeCount(1);
! assertTrue(node[0] instanceof Html);
! Html htmlTag = (Html)node[0];
! assertTrue(htmlTag.getChild(0) instanceof HeadTag);
! HeadTag headTag = (HeadTag)htmlTag.getChild(0);
! assertEquals("toHtml()","<HEAD></HEAD>",headTag.toHtml());
! assertEquals("toHtml()","<HTML><HEAD></HEAD></HTML>",htmlTag.toHtml());
! }
!
! public void testSimpleHeadWithBody() throws ParserException {
! createParser("<HTML><HEAD><BODY></HTML>");
! HeadScanner headScanner = new HeadScanner();
! parser.registerDomScanners();
! parseAndAssertNodeCount(1);
! assertTrue(node[0] instanceof Html);
! Html htmlTag = (Html)node[0];
! assertTrue(htmlTag.getChild(0) instanceof HeadTag);
! //assertTrue(htmlTag.getChild(1) instanceof BodyTag);
! HeadTag headTag = (HeadTag)htmlTag.getChild(0);
! assertEquals("toHtml()","<HEAD></HEAD>",headTag.toHtml());
! assertEquals("toHtml()","<HTML><HEAD></HEAD><BODY></BODY></HTML>",htmlTag.toHtml());
! }
!
!
! public static TestSuite suite() {
! return new TestSuite(HeadScannerTest.class);
! }
!
! public static void main(String[] args)
! {
! new junit.awtui.TestRunner().start(new String[] {HeadScannerTest.class.getName()});
! }
!
! }
Index: LinkScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/LinkScannerTest.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** LinkScannerTest.java 1 Jun 2003 20:50:16 -0000 1.26
--- LinkScannerTest.java 13 Jun 2003 20:27:04 -0000 1.27
***************
*** 30,33 ****
--- 30,34 ----
+ import org.htmlparser.AbstractNode;
import org.htmlparser.Node;
import org.htmlparser.Parser;
***************
*** 246,250 ****
LinkTag linkTag = (LinkTag)node[0];
// Get the link data and cross-check
! Node [] dataNode= new Node[10];
int i = 0;
for (SimpleNodeIterator e = linkTag.children();e.hasMoreNodes();)
--- 247,251 ----
LinkTag linkTag = (LinkTag)node[0];
// Get the link data and cross-check
! Node [] dataNode= new AbstractNode[10];
int i = 0;
for (SimpleNodeIterator e = linkTag.children();e.hasMoreNodes();)
***************
*** 332,336 ****
assertEquals("Link URL","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",linkTag.getLink());
assertEquals("Link Text","",linkTag.getLinkText());
! Node [] containedNodes = new Node[10];
int i=0;
for (SimpleNodeIterator e = linkTag.children();e.hasMoreNodes();) {
--- 333,337 ----
assertEquals("Link URL","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",linkTag.getLink());
assertEquals("Link Text","",linkTag.getLinkText());
! Node [] containedNodes = new AbstractNode[10];
int i=0;
for (SimpleNodeIterator e = linkTag.children();e.hasMoreNodes();) {
***************
*** 484,488 ****
// Get the image tag from the link
! Node insideNodes [] = new Node[10];
int j =0 ;
for (SimpleNodeIterator e = linkTag.children();e.hasMoreNodes();) {
--- 485,489 ----
// Get the image tag from the link
! Node insideNodes [] = new AbstractNode[10];
int j =0 ;
for (SimpleNodeIterator e = linkTag.children();e.hasMoreNodes();) {
Index: LabelScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/LabelScannerTest.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** LabelScannerTest.java 1 Jun 2003 20:50:16 -0000 1.24
--- LabelScannerTest.java 13 Jun 2003 20:27:04 -0000 1.25
***************
*** 34,39 ****
import java.util.*;
import junit.framework.TestSuite;
- import org.htmlparser.Node;
- import org.htmlparser.StringNode;
import org.htmlparser.scanners.LabelScanner;
import org.htmlparser.tags.LabelTag;
--- 34,37 ----
Index: SpanScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/SpanScannerTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** SpanScannerTest.java 1 Jun 2003 20:50:16 -0000 1.19
--- SpanScannerTest.java 13 Jun 2003 20:27:04 -0000 1.20
***************
*** 29,33 ****
package org.htmlparser.tests.scannersTests;
-
import org.htmlparser.Node;
import org.htmlparser.scanners.SpanScanner;
--- 29,32 ----
|
