[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/visitorsTests AllTests.java,1.32,1.33 Composite
Brought to you by:
derrickoswald
Menu
▾
▴
[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/visitorsTests AllTests.java,1.32,1.33 CompositeTagFindingVisitorTest.java,1.5,1.6 HtmlPageTest.java,1.8,1.9 LinkFindingVisitorTest.java,1.5,1.6 NodeVisitorTest.java,1.5,1.6 StringFindingVisitorTest.java,1.7,1.8 TagFindingVisitorTest.java,1.8,1.9 TextExtractingVisitorTest.java,1.5,1.6 UrlModifyingVisitorTest.java,1.5,1.6
|
From: <der...@us...> - 2003-09-03 23:36:26
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests
In directory sc8-pr-cvs1:/tmp/cvs-serv31228/tests/visitorsTests
Modified Files:
AllTests.java CompositeTagFindingVisitorTest.java
HtmlPageTest.java LinkFindingVisitorTest.java
NodeVisitorTest.java StringFindingVisitorTest.java
TagFindingVisitorTest.java TextExtractingVisitorTest.java
UrlModifyingVisitorTest.java
Log Message:
Change tabs to spaces in all source files.
Index: AllTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/AllTests.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** AllTests.java 24 Aug 2003 21:59:44 -0000 1.32
--- AllTests.java 3 Sep 2003 23:36:22 -0000 1.33
***************
*** 33,54 ****
public class AllTests extends junit.framework.TestCase
{
! public AllTests(String name) {
! super(name);
! }
!
! public static TestSuite suite() {
! TestSuite suite = new TestSuite("Visitor Tests");
suite.addTestSuite(CompositeTagFindingVisitorTest.class);
! suite.addTestSuite(HtmlPageTest.class);
! suite.addTestSuite(LinkFindingVisitorTest.class);
! suite.addTestSuite(NodeVisitorTest.class);
! suite.addTestSuite(StringFindingVisitorTest.class);
! suite.addTestSuite(TagFindingVisitorTest.class);
! suite.addTestSuite(TextExtractingVisitorTest.class);
! suite.addTestSuite(UrlModifyingVisitorTest.class);
! return suite;
! }
/**
--- 33,54 ----
public class AllTests extends junit.framework.TestCase
{
! public AllTests(String name) {
! super(name);
! }
!
! public static TestSuite suite() {
! TestSuite suite = new TestSuite("Visitor Tests");
suite.addTestSuite(CompositeTagFindingVisitorTest.class);
! suite.addTestSuite(HtmlPageTest.class);
! suite.addTestSuite(LinkFindingVisitorTest.class);
! suite.addTestSuite(NodeVisitorTest.class);
! suite.addTestSuite(StringFindingVisitorTest.class);
! suite.addTestSuite(TagFindingVisitorTest.class);
! suite.addTestSuite(TextExtractingVisitorTest.class);
! suite.addTestSuite(UrlModifyingVisitorTest.class);
! return suite;
! }
/**
Index: CompositeTagFindingVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/CompositeTagFindingVisitorTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CompositeTagFindingVisitorTest.java 24 Aug 2003 21:59:44 -0000 1.5
--- CompositeTagFindingVisitorTest.java 3 Sep 2003 23:36:22 -0000 1.6
***************
*** 35,44 ****
public class CompositeTagFindingVisitorTest extends ParserTestCase {
! public CompositeTagFindingVisitorTest(String name) {
! super(name);
! }
! public void testFindTagsWithinGivenTag() {
! createParser("<html></html>");
! }
}
--- 35,44 ----
public class CompositeTagFindingVisitorTest extends ParserTestCase {
! public CompositeTagFindingVisitorTest(String name) {
! super(name);
! }
! public void testFindTagsWithinGivenTag() {
! createParser("<html></html>");
! }
}
Index: HtmlPageTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/HtmlPageTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** HtmlPageTest.java 24 Aug 2003 21:59:44 -0000 1.8
--- HtmlPageTest.java 3 Sep 2003 23:36:22 -0000 1.9
***************
*** 40,124 ****
public class HtmlPageTest extends ParserTestCase {
! private static final String SIMPLE_PAGE =
! "<html>" +
! "<head>" +
! "<title>Welcome to the HTMLParser website</title>" +
! "</head>" +
! "<body>" +
! "Welcome to HTMLParser" +
! "</body>" +
! "</html>";
! private static final String PAGE_WITH_TABLE =
! "<html>" +
! "<head>" +
! "<title>Welcome to the HTMLParser website</title>" +
! "</head>" +
! "<body>" +
! "Welcome to HTMLParser" +
! "<table>" +
! "<tr>" +
! "<td>cell 1</td>" +
! "<td>cell 2</td>" +
! "</tr>" +
! "</table>" +
! "</body>" +
! "</html>";
!
! public HtmlPageTest(String name) {
! super(name);
! }
! public void testCreateSimplePage() throws Exception {
! createParser(
! SIMPLE_PAGE
! );
! HtmlPage page = new HtmlPage(parser);
! parser.visitAllNodesWith(page);
! assertStringEquals(
! "title",
! "Welcome to the HTMLParser website",
! page.getTitle()
! );
! NodeList bodyNodes = page.getBody();
! assertEquals("number of nodes in body",1,bodyNodes.size());
! Node node = bodyNodes.elementAt(0);
! assertTrue("expected stringNode but was "+node.getClass().getName(),
! node instanceof StringNode
! );
! assertStringEquals(
! "body contents",
! "Welcome to HTMLParser",
! page.getBody().asString()
! );
! }
!
! public void testCreatePageWithTables() throws Exception {
! createParser(
! PAGE_WITH_TABLE
! );
! HtmlPage page = new HtmlPage(parser);
! parser.visitAllNodesWith(page);
! NodeList bodyNodes = page.getBody();
! assertEquals("number of nodes in body",2,bodyNodes.size());
! assertXmlEquals(
! "body html",
! "Welcome to HTMLParser" +
! "<table>" +
! "<tr>" +
! " <td>cell 1</td>" +
! " <td>cell 2</td>" +
! "</tr>" +
! "</table>",
! bodyNodes.asHtml()
! );
! TableTag tables [] = page.getTables();
! assertEquals("number of tables",1,tables.length);
! assertEquals("number of rows",1,tables[0].getRowCount());
! TableRow row = tables[0].getRow(0);
! assertEquals("number of columns",2,row.getColumnCount());
! TableColumn [] col = row.getColumns();
! assertEquals("column contents","cell 1",col[0].toPlainTextString());
! assertEquals("column contents","cell 2",col[1].toPlainTextString());
! }
}
--- 40,124 ----
public class HtmlPageTest extends ParserTestCase {
! private static final String SIMPLE_PAGE =
! "<html>" +
! "<head>" +
! "<title>Welcome to the HTMLParser website</title>" +
! "</head>" +
! "<body>" +
! "Welcome to HTMLParser" +
! "</body>" +
! "</html>";
! private static final String PAGE_WITH_TABLE =
! "<html>" +
! "<head>" +
! "<title>Welcome to the HTMLParser website</title>" +
! "</head>" +
! "<body>" +
! "Welcome to HTMLParser" +
! "<table>" +
! "<tr>" +
! "<td>cell 1</td>" +
! "<td>cell 2</td>" +
! "</tr>" +
! "</table>" +
! "</body>" +
! "</html>";
!
! public HtmlPageTest(String name) {
! super(name);
! }
! public void testCreateSimplePage() throws Exception {
! createParser(
! SIMPLE_PAGE
! );
! HtmlPage page = new HtmlPage(parser);
! parser.visitAllNodesWith(page);
! assertStringEquals(
! "title",
! "Welcome to the HTMLParser website",
! page.getTitle()
! );
! NodeList bodyNodes = page.getBody();
! assertEquals("number of nodes in body",1,bodyNodes.size());
! Node node = bodyNodes.elementAt(0);
! assertTrue("expected stringNode but was "+node.getClass().getName(),
! node instanceof StringNode
! );
! assertStringEquals(
! "body contents",
! "Welcome to HTMLParser",
! page.getBody().asString()
! );
! }
!
! public void testCreatePageWithTables() throws Exception {
! createParser(
! PAGE_WITH_TABLE
! );
! HtmlPage page = new HtmlPage(parser);
! parser.visitAllNodesWith(page);
! NodeList bodyNodes = page.getBody();
! assertEquals("number of nodes in body",2,bodyNodes.size());
! assertXmlEquals(
! "body html",
! "Welcome to HTMLParser" +
! "<table>" +
! "<tr>" +
! " <td>cell 1</td>" +
! " <td>cell 2</td>" +
! "</tr>" +
! "</table>",
! bodyNodes.asHtml()
! );
! TableTag tables [] = page.getTables();
! assertEquals("number of tables",1,tables.length);
! assertEquals("number of rows",1,tables[0].getRowCount());
! TableRow row = tables[0].getRow(0);
! assertEquals("number of columns",2,row.getColumnCount());
! TableColumn [] col = row.getColumns();
! assertEquals("column contents","cell 1",col[0].toPlainTextString());
! assertEquals("column contents","cell 2",col[1].toPlainTextString());
! }
}
Index: LinkFindingVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/LinkFindingVisitorTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LinkFindingVisitorTest.java 24 Aug 2003 21:59:44 -0000 1.5
--- LinkFindingVisitorTest.java 3 Sep 2003 23:36:22 -0000 1.6
***************
*** 33,51 ****
public class LinkFindingVisitorTest extends ParserTestCase {
! private String html =
! "<HTML><HEAD><TITLE>This is the Title</TITLE></HEAD><BODY>Hello World, <A href=\"http://www.industriallogic.com\">Industrial Logic</a></BODY></HTML>";
! public LinkFindingVisitorTest(String name) {
! super(name);
! }
! public void testLinkFoundCorrectly() throws Exception {
! createParser(html);
! parser.registerScanners();
! LinkFindingVisitor visitor = new LinkFindingVisitor("Industrial Logic");
! parser.visitAllNodesWith(visitor);
! assertTrue("Found Industrial Logic Link",visitor.linkTextFound());
! assertEquals("Link Count",1,visitor.getCount());
! }
!
}
--- 33,51 ----
public class LinkFindingVisitorTest extends ParserTestCase {
! private String html =
! "<HTML><HEAD><TITLE>This is the Title</TITLE></HEAD><BODY>Hello World, <A href=\"http://www.industriallogic.com\">Industrial Logic</a></BODY></HTML>";
! public LinkFindingVisitorTest(String name) {
! super(name);
! }
! public void testLinkFoundCorrectly() throws Exception {
! createParser(html);
! parser.registerScanners();
! LinkFindingVisitor visitor = new LinkFindingVisitor("Industrial Logic");
! parser.visitAllNodesWith(visitor);
! assertTrue("Found Industrial Logic Link",visitor.linkTextFound());
! assertEquals("Link Count",1,visitor.getCount());
! }
!
}
Index: NodeVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/NodeVisitorTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NodeVisitorTest.java 24 Aug 2003 21:59:44 -0000 1.5
--- NodeVisitorTest.java 3 Sep 2003 23:36:22 -0000 1.6
***************
*** 39,76 ****
public class NodeVisitorTest extends ParserTestCase {
! public NodeVisitorTest(String name) {
! super(name);
! }
!
! public void testVisitTag() throws Exception {
! ParameterVisitor visitor = new ParameterVisitor();
! createParser(
! "<input>" +
! "<param name='key1'>value1</param>"+
! "<param name='key2'>value2</param>"+
! "</input>"
! );
! parser.visitAllNodesWith(visitor);
! assertEquals("value of key1","value1",visitor.getValue("key1"));
! assertEquals("value of key2","value2",visitor.getValue("key2"));
! }
!
! class ParameterVisitor extends NodeVisitor {
! Map paramsMap = new HashMap();
! String lastKeyVisited;
!
! public String getValue(String key) {
! return (String)paramsMap.get(key);
! }
!
! public void visitStringNode(StringNode stringNode) {
! paramsMap.put(lastKeyVisited,stringNode.getText());
! }
!
! public void visitTag(Tag tag) {
! if (tag.getTagName().equals("PARAM")) {
! lastKeyVisited = tag.getAttribute("NAME");
! }
! }
! }
}
--- 39,76 ----
public class NodeVisitorTest extends ParserTestCase {
! public NodeVisitorTest(String name) {
! super(name);
! }
!
! public void testVisitTag() throws Exception {
! ParameterVisitor visitor = new ParameterVisitor();
! createParser(
! "<input>" +
! "<param name='key1'>value1</param>"+
! "<param name='key2'>value2</param>"+
! "</input>"
! );
! parser.visitAllNodesWith(visitor);
! assertEquals("value of key1","value1",visitor.getValue("key1"));
! assertEquals("value of key2","value2",visitor.getValue("key2"));
! }
!
! class ParameterVisitor extends NodeVisitor {
! Map paramsMap = new HashMap();
! String lastKeyVisited;
!
! public String getValue(String key) {
! return (String)paramsMap.get(key);
! }
!
! public void visitStringNode(StringNode stringNode) {
! paramsMap.put(lastKeyVisited,stringNode.getText());
! }
!
! public void visitTag(Tag tag) {
! if (tag.getTagName().equals("PARAM")) {
! lastKeyVisited = tag.getAttribute("NAME");
! }
! }
! }
}
Index: StringFindingVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/StringFindingVisitorTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** StringFindingVisitorTest.java 24 Aug 2003 21:59:44 -0000 1.7
--- StringFindingVisitorTest.java 3 Sep 2003 23:36:22 -0000 1.8
***************
*** 33,98 ****
public class StringFindingVisitorTest extends ParserTestCase {
! private static final String HTML =
! "<HTML><HEAD><TITLE>This is the Title</TITLE>" +
! "</HEAD><BODY>Hello World, this is an excellent parser</BODY></HTML>";
!
! private static final String HTML_TO_SEARCH =
! "<HTML><HEAD><TITLE>test</TITLE></HEAD>\n"+
! "<BODY><H1>This is a test page</H1>\n"+
! "Writing tests is good for code. Testing is a good\n"+
! "philosophy. Test driven development is even better.\n";
! public StringFindingVisitorTest(String name) {
! super(name);
! }
! public void testSimpleStringFind() throws Exception {
! createParser(HTML);
! StringFindingVisitor visitor = new StringFindingVisitor("Hello");
! parser.visitAllNodesWith(visitor);
! assertTrue("Hello found", visitor.stringWasFound());
! }
!
! public void testStringNotFound() throws Exception {
! createParser(HTML);
! StringFindingVisitor visitor = new StringFindingVisitor("industrial logic");
! parser.visitAllNodesWith(visitor);
! assertTrue("industrial logic should not have been found", !visitor.stringWasFound());
! }
!
! public void testStringInTagNotFound() throws Exception {
! createParser(HTML);
! StringFindingVisitor visitor = new StringFindingVisitor("HTML");
! parser.visitAllNodesWith(visitor);
! assertTrue("HTML should not have been found", !visitor.stringWasFound());
! }
! public void testStringFoundInSingleStringNode() throws Exception {
! createParser("this is some text!");
! StringFindingVisitor visitor = new StringFindingVisitor("text");
! parser.visitAllNodesWith(visitor);
! assertTrue("text should be found", visitor.stringWasFound());
! }
!
! public void testStringFoundCount() throws Exception {
! createParser(HTML);
! StringFindingVisitor visitor = new StringFindingVisitor("is");
! parser.visitAllNodesWith(visitor);
! assertEquals("# times 'is' was found", 2, visitor.stringFoundCount());
!
! visitor = new StringFindingVisitor("and");
! parser.visitAllNodesWith(visitor);
! assertEquals("# times 'and' was found", 0, visitor.stringFoundCount());
! }
! public void testStringFoundMultipleTimes() throws Exception {
! createParser(HTML_TO_SEARCH);
! StringFindingVisitor visitor = new StringFindingVisitor("TEST");
! visitor.doMultipleSearchesWithinStrings();
! parser.visitAllNodesWith(visitor);
! assertEquals("TEST found", 5, visitor.stringFoundCount());
! }
!
!
}
--- 33,98 ----
public class StringFindingVisitorTest extends ParserTestCase {
! private static final String HTML =
! "<HTML><HEAD><TITLE>This is the Title</TITLE>" +
! "</HEAD><BODY>Hello World, this is an excellent parser</BODY></HTML>";
!
! private static final String HTML_TO_SEARCH =
! "<HTML><HEAD><TITLE>test</TITLE></HEAD>\n"+
! "<BODY><H1>This is a test page</H1>\n"+
! "Writing tests is good for code. Testing is a good\n"+
! "philosophy. Test driven development is even better.\n";
! public StringFindingVisitorTest(String name) {
! super(name);
! }
! public void testSimpleStringFind() throws Exception {
! createParser(HTML);
! StringFindingVisitor visitor = new StringFindingVisitor("Hello");
! parser.visitAllNodesWith(visitor);
! assertTrue("Hello found", visitor.stringWasFound());
! }
!
! public void testStringNotFound() throws Exception {
! createParser(HTML);
! StringFindingVisitor visitor = new StringFindingVisitor("industrial logic");
! parser.visitAllNodesWith(visitor);
! assertTrue("industrial logic should not have been found", !visitor.stringWasFound());
! }
!
! public void testStringInTagNotFound() throws Exception {
! createParser(HTML);
! StringFindingVisitor visitor = new StringFindingVisitor("HTML");
! parser.visitAllNodesWith(visitor);
! assertTrue("HTML should not have been found", !visitor.stringWasFound());
! }
! public void testStringFoundInSingleStringNode() throws Exception {
! createParser("this is some text!");
! StringFindingVisitor visitor = new StringFindingVisitor("text");
! parser.visitAllNodesWith(visitor);
! assertTrue("text should be found", visitor.stringWasFound());
! }
!
! public void testStringFoundCount() throws Exception {
! createParser(HTML);
! StringFindingVisitor visitor = new StringFindingVisitor("is");
! parser.visitAllNodesWith(visitor);
! assertEquals("# times 'is' was found", 2, visitor.stringFoundCount());
!
! visitor = new StringFindingVisitor("and");
! parser.visitAllNodesWith(visitor);
! assertEquals("# times 'and' was found", 0, visitor.stringFoundCount());
! }
! public void testStringFoundMultipleTimes() throws Exception {
! createParser(HTML_TO_SEARCH);
! StringFindingVisitor visitor = new StringFindingVisitor("TEST");
! visitor.doMultipleSearchesWithinStrings();
! parser.visitAllNodesWith(visitor);
! assertEquals("TEST found", 5, visitor.stringFoundCount());
! }
!
!
}
Index: TagFindingVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/TagFindingVisitorTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TagFindingVisitorTest.java 24 Aug 2003 21:59:44 -0000 1.8
--- TagFindingVisitorTest.java 3 Sep 2003 23:36:22 -0000 1.9
***************
*** 35,100 ****
public class TagFindingVisitorTest extends ParserTestCase {
! private String html =
! "<HTML><HEAD><TITLE>This is the Title</TITLE></HEAD>" +
! "<BODY>Hello World, this is an excellent parser</BODY>" +
! "<UL><LI><LI></UL>" +
! "<A href=\"http://www.industriallogic.com\">Industrial Logic</a>" +
! "</HTML>";
! public TagFindingVisitorTest(String name) {
! super(name);
! }
!
! public void setUp() {
! createParser(html);
! }
! public void testTagFound() throws Exception {
! TagFindingVisitor visitor = new TagFindingVisitor(new String[] {"HEAD"});
! parser.visitAllNodesWith(visitor);
! assertEquals("HEAD found", 1, visitor.getTagCount(0));
! }
! public void testTagsFound() throws Exception {
! TagFindingVisitor visitor = new TagFindingVisitor(new String [] {"LI"});
! parser.visitAllNodesWith(visitor);
! assertEquals("LI tags found", 2, visitor.getTagCount(0));
! }
!
! public void testMultipleTags() throws Exception {
! TagFindingVisitor visitor =
! new TagFindingVisitor(
! new String [] {
! "LI","BODY","UL","A"
! }
! );
! parser.visitAllNodesWith(visitor);
! assertEquals("LI tags found", 2, visitor.getTagCount(0));
! assertEquals("BODY tag found", 1, visitor.getTagCount(1));
! assertEquals("UL tag found", 1, visitor.getTagCount(2));
! assertEquals("A tag found", 1, visitor.getTagCount(3));
! }
! public void testEndTags() throws Exception {
! TagFindingVisitor visitor =
! new TagFindingVisitor(
! new String [] {
! "LI","BODY","UL","A"
! },
! true
! );
! parser.visitAllNodesWith(visitor);
! assertEquals("LI tags found", 2, visitor.getTagCount(0));
! assertEquals("BODY tag found", 1, visitor.getTagCount(1));
! assertEquals("UL tag found", 1, visitor.getTagCount(2));
! assertEquals("A tag found", 1, visitor.getTagCount(3));
! assertEquals("BODY end tag found", 1, visitor.getEndTagCount(1));
! }
! public void assertTagNameShouldBe(String message, Node node, String expectedTagName) {
! Tag tag = (Tag)node;
! assertStringEquals(message,expectedTagName,tag.getTagName());
! }
}
--- 35,100 ----
public class TagFindingVisitorTest extends ParserTestCase {
! private String html =
! "<HTML><HEAD><TITLE>This is the Title</TITLE></HEAD>" +
! "<BODY>Hello World, this is an excellent parser</BODY>" +
! "<UL><LI><LI></UL>" +
! "<A href=\"http://www.industriallogic.com\">Industrial Logic</a>" +
! "</HTML>";
! public TagFindingVisitorTest(String name) {
! super(name);
! }
!
! public void setUp() {
! createParser(html);
! }
! public void testTagFound() throws Exception {
! TagFindingVisitor visitor = new TagFindingVisitor(new String[] {"HEAD"});
! parser.visitAllNodesWith(visitor);
! assertEquals("HEAD found", 1, visitor.getTagCount(0));
! }
! public void testTagsFound() throws Exception {
! TagFindingVisitor visitor = new TagFindingVisitor(new String [] {"LI"});
! parser.visitAllNodesWith(visitor);
! assertEquals("LI tags found", 2, visitor.getTagCount(0));
! }
!
! public void testMultipleTags() throws Exception {
! TagFindingVisitor visitor =
! new TagFindingVisitor(
! new String [] {
! "LI","BODY","UL","A"
! }
! );
! parser.visitAllNodesWith(visitor);
! assertEquals("LI tags found", 2, visitor.getTagCount(0));
! assertEquals("BODY tag found", 1, visitor.getTagCount(1));
! assertEquals("UL tag found", 1, visitor.getTagCount(2));
! assertEquals("A tag found", 1, visitor.getTagCount(3));
! }
! public void testEndTags() throws Exception {
! TagFindingVisitor visitor =
! new TagFindingVisitor(
! new String [] {
! "LI","BODY","UL","A"
! },
! true
! );
! parser.visitAllNodesWith(visitor);
! assertEquals("LI tags found", 2, visitor.getTagCount(0));
! assertEquals("BODY tag found", 1, visitor.getTagCount(1));
! assertEquals("UL tag found", 1, visitor.getTagCount(2));
! assertEquals("A tag found", 1, visitor.getTagCount(3));
! assertEquals("BODY end tag found", 1, visitor.getEndTagCount(1));
! }
! public void assertTagNameShouldBe(String message, Node node, String expectedTagName) {
! Tag tag = (Tag)node;
! assertStringEquals(message,expectedTagName,tag.getTagName());
! }
}
Index: TextExtractingVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/TextExtractingVisitorTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TextExtractingVisitorTest.java 24 Aug 2003 21:59:44 -0000 1.5
--- TextExtractingVisitorTest.java 3 Sep 2003 23:36:22 -0000 1.6
***************
*** 34,86 ****
public class TextExtractingVisitorTest extends ParserTestCase {
! public TextExtractingVisitorTest(String name) {
! super(name);
! }
! public void testSimpleVisit() throws Exception {
! createParser("<HTML><HEAD><TITLE>Hello World</TITLE></HEAD></HTML>");
! TextExtractingVisitor visitor = new TextExtractingVisitor();
! parser.visitAllNodesWith(visitor);
! assertStringEquals(
! "extracted text",
! "Hello World",
! visitor.getExtractedText()
! );
! }
!
! public void testSimpleVisitWithRegisteredScanners() throws Exception {
! createParser("<HTML><HEAD><TITLE>Hello World</TITLE></HEAD></HTML>");
! parser.registerScanners();
! TextExtractingVisitor visitor = new TextExtractingVisitor();
! parser.visitAllNodesWith(visitor);
! assertStringEquals(
! "extracted text",
! "Hello World",
! visitor.getExtractedText()
! );
! }
!
! public void testVisitHtmlWithSpecialChars() throws Exception {
! createParser("<BODY>Hello World </BODY>");
! TextExtractingVisitor visitor = new TextExtractingVisitor();
! parser.visitAllNodesWith(visitor);
! assertStringEquals(
! "extracted text",
! "Hello World ",
! visitor.getExtractedText()
! );
! }
!
! public void testVisitHtmlWithPreTags() throws Exception {
! createParser(
! "Some text with <pre>this should be preserved</pre>"
! );
! TextExtractingVisitor visitor = new TextExtractingVisitor();
! parser.visitAllNodesWith(visitor);
! assertStringEquals(
! "extracted text",
! "Some text with this should be preserved",
! visitor.getExtractedText()
! );
! }
}
--- 34,86 ----
public class TextExtractingVisitorTest extends ParserTestCase {
! public TextExtractingVisitorTest(String name) {
! super(name);
! }
! public void testSimpleVisit() throws Exception {
! createParser("<HTML><HEAD><TITLE>Hello World</TITLE></HEAD></HTML>");
! TextExtractingVisitor visitor = new TextExtractingVisitor();
! parser.visitAllNodesWith(visitor);
! assertStringEquals(
! "extracted text",
! "Hello World",
! visitor.getExtractedText()
! );
! }
!
! public void testSimpleVisitWithRegisteredScanners() throws Exception {
! createParser("<HTML><HEAD><TITLE>Hello World</TITLE></HEAD></HTML>");
! parser.registerScanners();
! TextExtractingVisitor visitor = new TextExtractingVisitor();
! parser.visitAllNodesWith(visitor);
! assertStringEquals(
! "extracted text",
! "Hello World",
! visitor.getExtractedText()
! );
! }
!
! public void testVisitHtmlWithSpecialChars() throws Exception {
! createParser("<BODY>Hello World </BODY>");
! TextExtractingVisitor visitor = new TextExtractingVisitor();
! parser.visitAllNodesWith(visitor);
! assertStringEquals(
! "extracted text",
! "Hello World ",
! visitor.getExtractedText()
! );
! }
!
! public void testVisitHtmlWithPreTags() throws Exception {
! createParser(
! "Some text with <pre>this should be preserved</pre>"
! );
! TextExtractingVisitor visitor = new TextExtractingVisitor();
! parser.visitAllNodesWith(visitor);
! assertStringEquals(
! "extracted text",
! "Some text with this should be preserved",
! visitor.getExtractedText()
! );
! }
}
Index: UrlModifyingVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/UrlModifyingVisitorTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** UrlModifyingVisitorTest.java 24 Aug 2003 21:59:44 -0000 1.5
--- UrlModifyingVisitorTest.java 3 Sep 2003 23:36:22 -0000 1.6
***************
*** 34,62 ****
public class UrlModifyingVisitorTest extends ParserTestCase {
! private static final String HTML_WITH_LINK =
! "<HTML><BODY>" +
! "<A HREF=\"mylink.html\"><IMG SRC=\"mypic.jpg\">" +
! "</A><IMG SRC=\"mysecondimage.gif\">" +
! "</BODY></HTML>";
!
! private static final String MODIFIED_HTML =
! "<HTML><BODY>" +
! "<A HREF=\"localhost://mylink.html\">" +
! "<IMG SRC=\"localhost://mypic.jpg\"></A>" +
! "<IMG SRC=\"localhost://mysecondimage.gif\">" +
! "</BODY></HTML>";
!
! public UrlModifyingVisitorTest(String name) {
! super(name);
! }
!
! public void testUrlModificationWithVisitor() throws Exception {
! Parser parser = Parser.createParser(HTML_WITH_LINK);
! UrlModifyingVisitor visitor =
! new UrlModifyingVisitor(parser, "localhost://");
! parser.visitAllNodesWith(visitor);
! assertStringEquals("Expected HTML",
! MODIFIED_HTML,
! visitor.getModifiedResult());
! }
}
--- 34,62 ----
public class UrlModifyingVisitorTest extends ParserTestCase {
! private static final String HTML_WITH_LINK =
! "<HTML><BODY>" +
! "<A HREF=\"mylink.html\"><IMG SRC=\"mypic.jpg\">" +
! "</A><IMG SRC=\"mysecondimage.gif\">" +
! "</BODY></HTML>";
!
! private static final String MODIFIED_HTML =
! "<HTML><BODY>" +
! "<A HREF=\"localhost://mylink.html\">" +
! "<IMG SRC=\"localhost://mypic.jpg\"></A>" +
! "<IMG SRC=\"localhost://mysecondimage.gif\">" +
! "</BODY></HTML>";
!
! public UrlModifyingVisitorTest(String name) {
! super(name);
! }
!
! public void testUrlModificationWithVisitor() throws Exception {
! Parser parser = Parser.createParser(HTML_WITH_LINK);
! UrlModifyingVisitor visitor =
! new UrlModifyingVisitor(parser, "localhost://");
! parser.visitAllNodesWith(visitor);
! assertStringEquals("Expected HTML",
! MODIFIED_HTML,
! visitor.getModifiedResult());
! }
}
|
