[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/tagTests BaseHrefTagTest.java,1.29,1.30 LinkTag
Brought to you by:
derrickoswald
Menu
▾
▴
[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/tagTests BaseHrefTagTest.java,1.29,1.30 LinkTagTest.java,1.37,1.38 ScriptTagTest.java,1.33,1.34
|
From: <der...@us...> - 2003-10-20 01:36:51
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests
In directory sc8-pr-cvs1:/tmp/cvs-serv26197/tests/tagTests
Modified Files:
BaseHrefTagTest.java LinkTagTest.java ScriptTagTest.java
Log Message:
Removed lexer level AbstractNode.
Removed data package from parser level tags.
Separated tag creation from recursion in NodeFactory interface.
Index: BaseHrefTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/BaseHrefTagTest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** BaseHrefTagTest.java 6 Oct 2003 01:43:28 -0000 1.29
--- BaseHrefTagTest.java 20 Oct 2003 01:28:04 -0000 1.30
***************
*** 31,35 ****
import java.util.Vector;
import org.htmlparser.tags.BaseHrefTag;
- import org.htmlparser.tags.data.TagData;
import org.htmlparser.tests.ParserTestCase;
import org.htmlparser.util.ParserException;
--- 31,34 ----
***************
*** 42,46 ****
public void testConstruction() {
! BaseHrefTag baseRefTag = new BaseHrefTag(new TagData("BASE", 0, new Vector (), "http://www.abc.com", false),"http://www.abc.com");
assertEquals("Expected Base URL","http://www.abc.com",baseRefTag.getBaseUrl());
}
--- 41,46 ----
public void testConstruction() {
! BaseHrefTag baseRefTag = new BaseHrefTag ();
! baseRefTag.setBaseUrl ("http://www.abc.com");
assertEquals("Expected Base URL","http://www.abc.com",baseRefTag.getBaseUrl());
}
Index: LinkTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/LinkTagTest.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** LinkTagTest.java 6 Oct 2003 01:43:28 -0000 1.37
--- LinkTagTest.java 20 Oct 2003 01:28:04 -0000 1.38
***************
*** 33,39 ****
import org.htmlparser.scanners.LinkScanner;
import org.htmlparser.tags.LinkTag;
- import org.htmlparser.tags.data.CompositeTagData;
- import org.htmlparser.tags.data.LinkData;
- import org.htmlparser.tags.data.TagData;
import org.htmlparser.tests.ParserTestCase;
import org.htmlparser.util.ParserException;
--- 33,36 ----
***************
*** 59,64 ****
parseAndAssertNodeCount(1);
! // The node should be an HTMLLinkTag
! assertTrue("Node should be a HTMLLinkTag",node[0] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[0];
assertEquals("The image locn","http://www.google.com/test.html",linkNode.getLink());
--- 56,61 ----
parseAndAssertNodeCount(1);
! // The node should be an LinkTag
! assertTrue("Node should be a LinkTag",node[0] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[0];
assertEquals("The image locn","http://www.google.com/test.html",linkNode.getLink());
***************
*** 79,84 ****
parseAndAssertNodeCount(1);
! // The node should be an HTMLLinkTag
! assertTrue("Node should be a HTMLLinkTag",node[0] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[0];
assertEquals("The image locn","http://www.google.com/test.html",linkNode.getLink());
--- 76,81 ----
parseAndAssertNodeCount(1);
! // The node should be an LinkTag
! assertTrue("Node should be a LinkTag",node[0] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[0];
assertEquals("The image locn","http://www.google.com/test.html",linkNode.getLink());
***************
*** 98,103 ****
parseAndAssertNodeCount(1);
! // The node should be an HTMLLinkTag
! assertTrue("Node should be a HTMLLinkTag",node[0] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[0];
assertEquals("Link incorrect","http://www.cj.com/mylink.html",linkNode.getLink());
--- 95,100 ----
parseAndAssertNodeCount(1);
! // The node should be an LinkTag
! assertTrue("Node should be a LinkTag",node[0] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[0];
assertEquals("Link incorrect","http://www.cj.com/mylink.html",linkNode.getLink());
***************
*** 117,122 ****
parseAndAssertNodeCount(1);
! // The node should be an HTMLLinkTag
! assertTrue("Node should be a HTMLLinkTag",node[0] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[0];
assertEquals("Link incorrect!!","http://www.cj.com/mylink.html",linkNode.getLink());
--- 114,119 ----
parseAndAssertNodeCount(1);
! // The node should be an LinkTag
! assertTrue("Node should be a LinkTag",node[0] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[0];
assertEquals("Link incorrect!!","http://www.cj.com/mylink.html",linkNode.getLink());
***************
*** 171,175 ****
parseAndAssertNodeCount(1);
! assertTrue("Node should be a HTMLLinkTag",node[0] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[0];
assertStringEquals("Link incorrect","so...@ya...",linkNode.getLink());
--- 168,172 ----
parseAndAssertNodeCount(1);
! assertTrue("Node should be a LinkTag",node[0] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[0];
assertStringEquals("Link incorrect","so...@ya...",linkNode.getLink());
***************
*** 189,193 ****
parseAndAssertNodeCount(1);
! assertTrue("Node should be a HTMLLinkTag",node[0] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[0];
assertEquals("Link incorrect","http://www.cj.com/abcd.html",linkNode.getLink());
--- 186,190 ----
parseAndAssertNodeCount(1);
! assertTrue("Node should be a LinkTag",node[0] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[0];
assertEquals("Link incorrect","http://www.cj.com/abcd.html",linkNode.getLink());
***************
*** 208,213 ****
parseAndAssertNodeCount(1);
! // The node should be an HTMLLinkTag
! assertTrue("Node should be a HTMLLinkTag",node[0] instanceof LinkTag);
LinkTag LinkTag = (LinkTag)node[0];
assertEquals("The image locn","http://www.google.com/test/test.html",LinkTag.getLink());
--- 205,210 ----
parseAndAssertNodeCount(1);
! // The node should be an LinkTag
! assertTrue("Node should be a LinkTag",node[0] instanceof LinkTag);
LinkTag LinkTag = (LinkTag)node[0];
assertEquals("The image locn","http://www.google.com/test/test.html",LinkTag.getLink());
***************
*** 228,233 ****
parseAndAssertNodeCount(1);
! // The node should be an HTMLLinkTag
! assertTrue("Node should be a HTMLLinkTag",node[0] instanceof LinkTag);
LinkTag LinkTag = (LinkTag)node[0];
assertEquals("The image locn","http://www.google.com/test.html",LinkTag.getLink());
--- 225,230 ----
parseAndAssertNodeCount(1);
! // The node should be an LinkTag
! assertTrue("Node should be a LinkTag",node[0] instanceof LinkTag);
LinkTag LinkTag = (LinkTag)node[0];
assertEquals("The image locn","http://www.google.com/test.html",LinkTag.getLink());
***************
*** 248,253 ****
parseAndAssertNodeCount(1);
! // The node should be an HTMLLinkTag
! assertTrue("Node should be a HTMLLinkTag",node[0] instanceof LinkTag);
LinkTag linkTag = (LinkTag)node[0];
assertEquals("The link location","",linkTag.getLink());
--- 245,250 ----
parseAndAssertNodeCount(1);
! // The node should be an LinkTag
! assertTrue("Node should be a LinkTag",node[0] instanceof LinkTag);
LinkTag linkTag = (LinkTag)node[0];
assertEquals("The link location","",linkTag.getLink());
***************
*** 261,265 ****
parseAndAssertNodeCount(1);
! assertTrue("Node should be a HTMLLinkTag",node[0] instanceof LinkTag);
LinkTag linkTag = (LinkTag)node[0];
assertEquals("Link Plain Text","hello",linkTag.toPlainTextString());
--- 258,262 ----
parseAndAssertNodeCount(1);
! assertTrue("Node should be a LinkTag",node[0] instanceof LinkTag);
LinkTag linkTag = (LinkTag)node[0];
assertEquals("Link Plain Text","hello",linkTag.toPlainTextString());
***************
*** 282,359 ****
LinkTag linkTag = (LinkTag)node[0];
assertStringEquals("Link Raw Text",link1,linkTag.toHtml());
! assertTrue("Ninth Node should be a HTMLLinkTag",node[8] instanceof LinkTag);
linkTag = (LinkTag)node[8];
assertStringEquals("Link Raw Text",link2,linkTag.toHtml());
}
! public void testTypeHttps() throws ParserException{
! LinkTag linkTag =
! new LinkTag(
! new TagData("A", 0, new Vector (), "http://www.someurl.com", false),
! new CompositeTagData(null,null,null),
! new LinkData("https://www.someurl.com","","",false,false)
! );
! assertTrue("This is a https link",linkTag.isHTTPSLink());
}
! public void testTypeFtp() throws ParserException{
! LinkTag linkTag =
! new LinkTag(
! new TagData("A", 0, new Vector (), "http://www.someurl.com", false),
! new CompositeTagData(null,null,null),
! new LinkData("ftp://www.someurl.com","","",false,false)
! );
! assertTrue("This is an ftp link",linkTag.isFTPLink());
}
! public void testTypeJavaScript() throws ParserException {
! LinkTag linkTag =
! new LinkTag(
! new TagData("A", 0, new Vector (), "http://www.someurl.com", false),
! new CompositeTagData(null,null,null),
! new LinkData("javascript://www.someurl.com","","",false,true)
! );
! assertTrue("This is a javascript link",linkTag.isJavascriptLink());
}
! public void testTypeHttpLink() throws ParserException {
! LinkTag linkTag =
! new LinkTag(
! new TagData("A", 0, new Vector (), "http://www.someurl.com", false),
! new CompositeTagData(null,null,null),
! new LinkData("http://www.someurl.com","","",false,false)
! );
! assertTrue("This is a http link : "+linkTag.getLink(),linkTag.isHTTPLink());
! linkTag =
! new LinkTag(
! new TagData("A", 0, new Vector (), "http://www.someurl.com", false),
! new CompositeTagData(null,null,null),
! new LinkData("somePage.html","","",false,false)
! );
! assertTrue("This relative link is alsp a http link : "+linkTag.getLink(),linkTag.isHTTPLink());
! linkTag =
! new LinkTag(
! new TagData("A", 0, new Vector (), "http://www.someurl.com", false),
! new CompositeTagData(null,null,null),
! new LinkData("ftp://somePage.html","","",false,false)
! );
! assertTrue("This is not a http link : "+linkTag.getLink(),!linkTag.isHTTPLink());
}
! public void testTypeHttpLikeLink() throws ParserException {
! LinkTag linkTag =
! new LinkTag(
! new TagData("A", 0, new Vector (), "http://www.someurl.com", false),
! new CompositeTagData(null,null,null),
! new LinkData("http://","","",false,false)
! );
! assertTrue("This is a http link",linkTag.isHTTPLikeLink());
! LinkTag linkTag2 =
! new LinkTag(
! new TagData("A", 0, new Vector (), "http://www.someurl.com", false),
! new CompositeTagData(null,null,null),
! new LinkData("https://www.someurl.com","","",false,false)
! );
! assertTrue("This is a https link",linkTag2.isHTTPLikeLink());
}
--- 279,376 ----
LinkTag linkTag = (LinkTag)node[0];
assertStringEquals("Link Raw Text",link1,linkTag.toHtml());
! assertTrue("Ninth Node should be a LinkTag",node[8] instanceof LinkTag);
linkTag = (LinkTag)node[8];
assertStringEquals("Link Raw Text",link2,linkTag.toHtml());
}
! public void testTypeHttps() throws ParserException
! {
! LinkTag link;
!
! createParser ("<A HREF='https://www.someurl.com'>Try https.</A>","http://sourceforge.net");
! parser.addScanner (new LinkScanner ("-l"));
! parseAndAssertNodeCount (1);
! assertTrue ("Node should be a LinkTag", node[0] instanceof LinkTag);
! link = (LinkTag)node[0];
! assertTrue("This is a https link",link.isHTTPSLink());
}
! public void testTypeFtp() throws ParserException
! {
! LinkTag link;
!
! createParser ("<A HREF='ftp://www.someurl.com'>Try ftp.</A>","http://sourceforge.net");
! parser.addScanner (new LinkScanner ("-l"));
! parseAndAssertNodeCount (1);
! assertTrue ("Node should be a LinkTag", node[0] instanceof LinkTag);
! link = (LinkTag)node[0];
! assertTrue("This is an ftp link",link.isFTPLink());
}
! public void testTypeJavaScript() throws ParserException
! {
! LinkTag link;
!
! createParser ("<A HREF='javascript://www.someurl.com'>Try javascript.</A>","http://sourceforge.net");
! parser.addScanner (new LinkScanner ("-l"));
! parseAndAssertNodeCount (1);
! assertTrue ("Node should be a LinkTag", node[0] instanceof LinkTag);
! link = (LinkTag)node[0];
! assertTrue("This is a javascript link",link.isJavascriptLink());
}
! public void testTypeHttpLink() throws ParserException
! {
! LinkTag link;
!
! createParser ("<A HREF='http://www.someurl.com'>Try http.</A>","http://sourceforge.net");
! parser.addScanner (new LinkScanner ("-l"));
! parseAndAssertNodeCount (1);
! assertTrue ("Node should be a LinkTag", node[0] instanceof LinkTag);
! link = (LinkTag)node[0];
! assertTrue("This is a http link : "+link.getLink(),link.isHTTPLink());
}
! public void testRelativeTypeHttpLink() throws ParserException
! {
! LinkTag link;
!
! createParser ("<A HREF='somePage.html'>Try relative http.</A>","http://sourceforge.net");
! parser.addScanner (new LinkScanner ("-l"));
! parseAndAssertNodeCount (1);
! assertTrue ("Node should be a LinkTag", node[0] instanceof LinkTag);
! link = (LinkTag)node[0];
! assertTrue("This relative link is also a http link : "+link.getLink(),link.isHTTPLink());
! }
!
! public void testTypeNonHttp() throws ParserException
! {
! LinkTag link;
!
! createParser ("<A HREF='ftp://www.someurl.com'>Try non-http.</A>","http://sourceforge.net");
! parser.addScanner (new LinkScanner ("-l"));
! parseAndAssertNodeCount (1);
! assertTrue ("Node should be a LinkTag", node[0] instanceof LinkTag);
! link = (LinkTag)node[0];
! assertTrue("This is not a http link : "+link.getLink(),!link.isHTTPLink());
! }
!
! public void testTypeHttpLikeLink() throws ParserException
! {
! LinkTag link;
!
! createParser ("<A HREF='http://'>Try basic http.</A>","http://sourceforge.net");
! parser.addScanner (new LinkScanner ("-l"));
! parseAndAssertNodeCount (1);
! assertTrue ("Node should be a LinkTag", node[0] instanceof LinkTag);
! link = (LinkTag)node[0];
! assertTrue("This is a http link",link.isHTTPLikeLink());
!
! createParser ("<A HREF='https://www.someurl.com'>Try https.</A>","http://sourceforge.net");
! parser.addScanner (new LinkScanner ("-l"));
! parseAndAssertNodeCount (1);
! assertTrue ("Node should be a LinkTag", node[0] instanceof LinkTag);
! link = (LinkTag)node[0];
! assertTrue("This is a https link",link.isHTTPLikeLink());
}
***************
*** 370,374 ****
parseAndAssertNodeCount (1);
! assertTrue ("Node should be a HTMLLinkTag", node[0] instanceof LinkTag);
link = (LinkTag)node[0];
assertTrue ("bug #738504 MailLink != HTTPLink", !link.isHTTPLink ());
--- 387,391 ----
parseAndAssertNodeCount (1);
! assertTrue ("Node should be a LinkTag", node[0] instanceof LinkTag);
link = (LinkTag)node[0];
assertTrue ("bug #738504 MailLink != HTTPLink", !link.isHTTPLink ());
***************
*** 383,391 ****
LinkTag link;
! link = new LinkTag(
! new TagData("A", 0, new Vector (), "http://www.someurl.com", false),
! new CompositeTagData(null,null,null),
! new LinkData("irc://server/channel","","",false,false)
! );
assertTrue("This is not a http link", !link.isHTTPLikeLink ());
}
--- 400,408 ----
LinkTag link;
! createParser ("<A HREF='irc://server/channel'>Try irc.</A>","http://sourceforge.net");
! parser.addScanner (new LinkScanner ("-l"));
! parseAndAssertNodeCount (1);
! assertTrue ("Node should be a LinkTag", node[0] instanceof LinkTag);
! link = (LinkTag)node[0];
assertTrue("This is not a http link", !link.isHTTPLikeLink ());
}
Index: ScriptTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/ScriptTagTest.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ScriptTagTest.java 18 Oct 2003 20:50:37 -0000 1.33
--- ScriptTagTest.java 20 Oct 2003 01:28:04 -0000 1.34
***************
*** 33,38 ****
import org.htmlparser.scanners.ScriptScanner;
import org.htmlparser.tags.ScriptTag;
- import org.htmlparser.tags.data.CompositeTagData;
- import org.htmlparser.tags.data.TagData;
import org.htmlparser.tests.ParserTestCase;
import org.htmlparser.util.NodeList;
--- 33,36 ----
|
