[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/tagTests AppletTagTest.java,1.29,1.30 BaseHrefT
Brought to you by:
derrickoswald
Menu
▾
▴
[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/tagTests AppletTagTest.java,1.29,1.30 BaseHrefTagTest.java,1.28,1.29 EndTagTest.java,1.30,1.31 FormTagTest.java,1.32,1.33 FrameSetTagTest.java,1.29,1.30 FrameTagTest.java,1.29,1.30 ImageTagTest.java,1.31,1.32 InputTagTest.java,1.31,1.32 LinkTagTest.java,1.36,1.37 MetaTagTest.java,1.30,1.31 OptionTagTest.java,1.30,1.31 ScriptTagTest.java,1.31,1.32 SelectTagTest.java,1.31,1.32 StyleTagTest.java,1.28,1.29 TagTest.java,1.45,1.46 TextareaTagTest.java,1.29,1.30
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests
In directory sc8-pr-cvs1:/tmp/cvs-serv2828/tests/tagTests
Modified Files:
AppletTagTest.java BaseHrefTagTest.java EndTagTest.java
FormTagTest.java FrameSetTagTest.java FrameTagTest.java
ImageTagTest.java InputTagTest.java LinkTagTest.java
MetaTagTest.java OptionTagTest.java ScriptTagTest.java
SelectTagTest.java StyleTagTest.java TagTest.java
TextareaTagTest.java
Log Message:
Updated tests to correspond to new behaviour.
Mostly due to changes in order and case of tag contents.
Of the forty odd remaining failing tests, the majority comprise altered functionality that needs to be resolved.
Index: AppletTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/AppletTagTest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** AppletTagTest.java 5 Oct 2003 13:49:54 -0000 1.29
--- AppletTagTest.java 6 Oct 2003 01:43:28 -0000 1.30
***************
*** 99,103 ****
String [][]paramsData = {{"Param1","Value1"},{"Name","Somik"},{"Age","23"}};
Hashtable paramsMap = new Hashtable();
! String testHTML = new String("<APPLET CODE=Myclass.class ARCHIVE=test.jar CODEBASE=www.kizna.com>\n");
for (int i = 0;i<paramsData.length;i++)
{
--- 99,103 ----
String [][]paramsData = {{"Param1","Value1"},{"Name","Somik"},{"Age","23"}};
Hashtable paramsMap = new Hashtable();
! String testHTML = "<APPLET CODE=Myclass.class ARCHIVE=test.jar CODEBASE=www.kizna.com>\n";
for (int i = 0;i<paramsData.length;i++)
{
***************
*** 105,112 ****
paramsMap.put(paramsData[i][0],paramsData[i][1]);
}
! testHTML+=
! "</APPLET>\n"+
! "</HTML>";
! createParser(testHTML);
parser.registerScanners();
parseAndAssertNodeCount(3);
--- 105,111 ----
paramsMap.put(paramsData[i][0],paramsData[i][1]);
}
! testHTML +=
! "</APPLET>";
! createParser(testHTML + "\n</HTML>");
parser.registerScanners();
parseAndAssertNodeCount(3);
***************
*** 115,125 ****
appletTag.setArchive ("htmlparser.jar");
// Check the data in the applet tag
! String expectedRawString =
! "<APPLET CODE=Myclass.class ARCHIVE=htmlparser.jar CODEBASE=htmlparser.sourceforge.net>\n"+
! "<PARAM NAME=\"Param1\" VALUE=\"Value1\">\n"+
! "<PARAM NAME=\"Name\" VALUE=\"Somik\">\n"+
! "<PARAM NAME=\"Age\" VALUE=\"23\">\n"+
! "</APPLET>";
! assertStringEquals("toHTML()",expectedRawString,appletTag.toHtml());
}
--- 114,121 ----
appletTag.setArchive ("htmlparser.jar");
// Check the data in the applet tag
! testHTML = testHTML.substring (0, testHTML.indexOf ("test.jar"))
! + "htmlparser.jar"
! + testHTML.substring (testHTML.indexOf ("test.jar") + 8);
! assertStringEquals("toHTML()",testHTML,appletTag.toHtml());
}
***************
*** 134,140 ****
}
testHTML+=
! "</APPLET>\n"+
! "</HTML>";
! createParser(testHTML);
parser.registerScanners();
parseAndAssertNodeCount(3);
--- 130,135 ----
}
testHTML+=
! "</APPLET>";
! createParser(testHTML + "\n</HTML>");
parser.registerScanners();
parseAndAssertNodeCount(3);
***************
*** 143,153 ****
appletTag.setAppletClass ("MyOtherClass.class");
// Check the data in the applet tag
! String expectedRawString =
! "<APPLET CODE=MyOtherClass.class ARCHIVE=htmlparser.jar CODEBASE=htmlparser.sourceforge.net>\n"+
! "<PARAM NAME=\"Param1\" VALUE=\"Value1\">\n"+
! "<PARAM NAME=\"Name\" VALUE=\"Somik\">\n"+
! "<PARAM NAME=\"Age\" VALUE=\"23\">\n"+
! "</APPLET>";
! assertStringEquals("toHTML()",expectedRawString,appletTag.toHtml());
}
--- 138,145 ----
appletTag.setAppletClass ("MyOtherClass.class");
// Check the data in the applet tag
! testHTML = testHTML.substring (0, testHTML.indexOf ("Myclass.class"))
! + "MyOtherClass.class"
! + testHTML.substring (testHTML.indexOf ("Myclass.class") + 13);
! assertStringEquals("toHTML()",testHTML,appletTag.toHtml());
}
Index: BaseHrefTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/BaseHrefTagTest.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** BaseHrefTagTest.java 28 Sep 2003 15:33:59 -0000 1.28
--- BaseHrefTagTest.java 6 Oct 2003 01:43:28 -0000 1.29
***************
*** 29,32 ****
--- 29,33 ----
package org.htmlparser.tests.tagTests;
+ import java.util.Vector;
import org.htmlparser.tags.BaseHrefTag;
import org.htmlparser.tags.data.TagData;
***************
*** 41,47 ****
public void testConstruction() {
! fail ("not implemented");
! // BaseHrefTag baseRefTag = new BaseHrefTag(new TagData(0,0,"",""),"http://www.abc.com");
! // assertEquals("Expected Base URL","http://www.abc.com",baseRefTag.getBaseUrl());
}
--- 42,47 ----
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());
}
Index: EndTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/EndTagTest.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** EndTagTest.java 28 Sep 2003 15:33:59 -0000 1.30
--- EndTagTest.java 6 Oct 2003 01:43:28 -0000 1.31
***************
*** 58,63 ****
int pos = testHtml.indexOf("</SCRIPT>");
parseAndAssertNodeCount(4);
! assertTrue("Node should be a Tag",node[1] instanceof Tag);
! Tag endTag = (Tag)node[1];
assertTrue("Node should be an end Tag",endTag.isEndTag ());
assertEquals("endtag element begin",pos,endTag.elementBegin());
--- 58,63 ----
int pos = testHtml.indexOf("</SCRIPT>");
parseAndAssertNodeCount(4);
! assertTrue("Node should be a Tag",node[2] instanceof Tag);
! Tag endTag = (Tag)node[2];
assertTrue("Node should be an end Tag",endTag.isEndTag ());
assertEquals("endtag element begin",pos,endTag.elementBegin());
Index: FormTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/FormTagTest.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** FormTagTest.java 22 Sep 2003 02:40:12 -0000 1.32
--- FormTagTest.java 6 Oct 2003 01:43:28 -0000 1.33
***************
*** 55,62 ****
formTag.setFormLocation("http://www.yahoo.com/yahoo/do_not_login.jsp");
!
! String expectedHTML = "<FORM ACTION=\"http://www.yahoo.com/yahoo/do_not_login.jsp\" NAME=\"login_form\" ONSUBMIT=\"return CheckData()\" METHOD=\""+FormTag.POST+"\">\r\n"+
! FormScannerTest.EXPECTED_FORM_HTML_REST_OF_FORM;
! assertStringEquals("Raw String",expectedHTML,formTag.toHtml());
}
--- 55,63 ----
formTag.setFormLocation("http://www.yahoo.com/yahoo/do_not_login.jsp");
! String expected =
! FormScannerTest.FORM_HTML.substring (0, FormScannerTest.FORM_HTML.indexOf ("\"do_login.php\""))
! + "http://www.google.com/test/do_login.php"
! + FormScannerTest.FORM_HTML.substring (FormScannerTest.FORM_HTML.indexOf ("\"do_login.php\"") + 14);
! assertStringEquals("Raw String",expected,formTag.toHtml());
}
***************
*** 68,72 ****
assertTrue("Node 0 should be Form Tag",node[0] instanceof FormTag);
FormTag formTag = (FormTag)node[0];
! assertStringEquals("Form Tag string representation"," User NamePassword Contents of TextArea",formTag.toPlainTextString());
}
--- 69,73 ----
assertTrue("Node 0 should be Form Tag",node[0] instanceof FormTag);
FormTag formTag = (FormTag)node[0];
! assertStringEquals("Form Tag string representation","\n \nUser Name\n\nPassword\n\n \n\n \nContents of TextArea\n\n\n", formTag.toPlainTextString());
}
Index: FrameSetTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/FrameSetTagTest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** FrameSetTagTest.java 22 Sep 2003 02:40:12 -0000 1.29
--- FrameSetTagTest.java 6 Oct 2003 01:43:28 -0000 1.30
***************
*** 42,50 ****
public void testToHTML() throws ParserException{
! createParser(
! "<frameset rows=\"115,*\" frameborder=\"NO\" border=\"0\" framespacing=\"0\">\n"+
"<frame name=\"topFrame\" noresize src=\"demo_bc_top.html\" scrolling=\"NO\" frameborder=\"NO\">\n"+
"<frame name=\"mainFrame\" src=\"http://www.kizna.com/web_e/\" scrolling=\"AUTO\">\n"+
! "</frameset>");
parser.addScanner(new FrameSetScanner(""));
--- 42,50 ----
public void testToHTML() throws ParserException{
! String html = "<frameset rows=\"115,*\" frameborder=\"NO\" border=\"0\" framespacing=\"0\">\n"+
"<frame name=\"topFrame\" noresize src=\"demo_bc_top.html\" scrolling=\"NO\" frameborder=\"NO\">\n"+
"<frame name=\"mainFrame\" src=\"http://www.kizna.com/web_e/\" scrolling=\"AUTO\">\n"+
! "</frameset>";
! createParser(html);
parser.addScanner(new FrameSetScanner(""));
***************
*** 52,63 ****
parseAndAssertNodeCount(1);
! assertTrue("Node 0 should be End Tag",node[0] instanceof FrameSetTag);
FrameSetTag frameSetTag = (FrameSetTag)node[0];
! assertStringEquals("HTML Contents",
! "<FRAMESET BORDER=\"0\" ROWS=\"115,*\" FRAMESPACING=\"0\" FRAMEBORDER=\"NO\">\r\n"+
! "<FRAME SCROLLING=\"NO\" FRAMEBORDER=\"NO\" SRC=\"demo_bc_top.html\" NAME=\"topFrame\" NORESIZE>\r\n"+
! "<FRAME SCROLLING=\"AUTO\" SRC=\"http://www.kizna.com/web_e/\" NAME=\"mainFrame\">\r\n"+
! "</FRAMESET>",
! frameSetTag.toHtml());
}
}
--- 52,58 ----
parseAndAssertNodeCount(1);
! assertTrue("Node 0 should be a FrameSetTag",node[0] instanceof FrameSetTag);
FrameSetTag frameSetTag = (FrameSetTag)node[0];
! assertStringEquals("HTML Contents", html, frameSetTag.toHtml());
}
}
Index: FrameTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/FrameTagTest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** FrameTagTest.java 22 Sep 2003 02:40:12 -0000 1.29
--- FrameTagTest.java 6 Oct 2003 01:43:28 -0000 1.30
***************
*** 41,60 ****
public void testToHTML() throws ParserException {
createParser(
"<frameset rows=\"115,*\" frameborder=\"NO\" border=\"0\" framespacing=\"0\">\n"+
! "<frame name=\"topFrame\" noresize src=\"demo_bc_top.html\" scrolling=\"NO\" frameborder=\"NO\">\n"+
! "<frame name=\"mainFrame\" src=\"http://www.kizna.com/web_e/\" scrolling=\"AUTO\">\n"+
"</frameset>");
parser.addScanner(new FrameScanner(""));
! parseAndAssertNodeCount(4);
! assertTrue("Node 1 should be Frame Tag",node[1] instanceof FrameTag);
! assertTrue("Node 2 should be Frame Tag",node[2] instanceof FrameTag);
! FrameTag frameTag1 = (FrameTag)node[1];
! FrameTag frameTag2 = (FrameTag)node[2];
! assertStringEquals("Frame 1 toHTML()","<FRAME SCROLLING=\"NO\" FRAMEBORDER=\"NO\" SRC=\"demo_bc_top.html\" NAME=\"topFrame\" NORESIZE>",frameTag1.toHtml());
! assertStringEquals("Frame 2 toHTML()","<FRAME SCROLLING=\"AUTO\" SRC=\"http://www.kizna.com/web_e/\" NAME=\"mainFrame\">",frameTag2.toHtml());
}
}
--- 41,62 ----
public void testToHTML() throws ParserException {
+ String frame1 = "<frame name=\"topFrame\" noresize src=\"demo_bc_top.html\" scrolling=\"NO\" frameborder=\"NO\">";
+ String frame2 = "<frame name=\"mainFrame\" src=\"http://www.kizna.com/web_e/\" scrolling=\"AUTO\">";
createParser(
"<frameset rows=\"115,*\" frameborder=\"NO\" border=\"0\" framespacing=\"0\">\n"+
! frame1 + "\n"+
! frame2 + "\n"+
"</frameset>");
parser.addScanner(new FrameScanner(""));
! parseAndAssertNodeCount(7);
! assertTrue("Node 3 should be Frame Tag",node[2] instanceof FrameTag);
! assertTrue("Node 5 should be Frame Tag",node[4] instanceof FrameTag);
! FrameTag frameTag1 = (FrameTag)node[2];
! FrameTag frameTag2 = (FrameTag)node[4];
! assertStringEquals("Frame 1 toHTML()",frame1,frameTag1.toHtml());
! assertStringEquals("Frame 2 toHTML()",frame2,frameTag2.toHtml());
}
}
Index: ImageTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/ImageTagTest.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ImageTagTest.java 22 Sep 2003 02:40:12 -0000 1.31
--- ImageTagTest.java 6 Oct 2003 01:43:28 -0000 1.32
***************
*** 142,146 ****
public void testToHTML() throws ParserException {
! createParser("<IMG alt=Google height=115 src=\"../../goo/title_homepage4.gif\" width=305>","http://www.google.com/test/test/index.html");
// Register the image scanner
parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
--- 142,147 ----
public void testToHTML() throws ParserException {
! String img = "<IMG alt=Google height=115 src=\"../../goo/title_homepage4.gif\" width=305>";
! createParser(img,"http://www.google.com/test/test/index.html");
// Register the image scanner
parser.addScanner(new ImageScanner("-i",new LinkProcessor()));
***************
*** 150,154 ****
assertTrue("Node should be a ImageTag",node[0] instanceof ImageTag);
ImageTag imageTag = (ImageTag)node[0];
! assertStringEquals("The image locn","<IMG WIDTH=\"305\" ALT=\"Google\" SRC=\"../../goo/title_homepage4.gif\" HEIGHT=\"115\">",imageTag.toHtml());
assertEquals("Alt","Google",imageTag.getAttribute("alt"));
assertEquals("Height","115",imageTag.getAttribute("height"));
--- 151,155 ----
assertTrue("Node should be a ImageTag",node[0] instanceof ImageTag);
ImageTag imageTag = (ImageTag)node[0];
! assertStringEquals("toHtml",img,imageTag.toHtml());
assertEquals("Alt","Google",imageTag.getAttribute("alt"));
assertEquals("Height","115",imageTag.getAttribute("height"));
Index: InputTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/InputTagTest.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** InputTagTest.java 22 Sep 2003 02:40:12 -0000 1.31
--- InputTagTest.java 6 Oct 2003 01:43:28 -0000 1.32
***************
*** 54,62 ****
public void testToHTML() throws ParserException
{
parseAndAssertNodeCount(1);
assertTrue("Node 1 should be INPUT Tag",node[0] instanceof InputTag);
InputTag InputTag;
InputTag = (InputTag) node[0];
! assertStringEquals ("HTML String","<INPUT NAME=\"Google\" TYPE=\"text\">",InputTag.toHtml());
}
--- 54,63 ----
public void testToHTML() throws ParserException
{
+ String testHTML = "<INPUT type=\"text\" name=\"Google\">";
parseAndAssertNodeCount(1);
assertTrue("Node 1 should be INPUT Tag",node[0] instanceof InputTag);
InputTag InputTag;
InputTag = (InputTag) node[0];
! assertStringEquals ("HTML String",testHTML,InputTag.toHtml());
}
***************
*** 67,71 ****
InputTag InputTag;
InputTag = (InputTag) node[0];
! assertEquals("HTML Raw String","INPUT TAG\n--------\nNAME : Google\nTYPE : text\n",InputTag.toString());
}
--- 68,72 ----
InputTag InputTag;
InputTag = (InputTag) node[0];
! assertEquals("HTML Raw String","INPUT TAG\n--------\nNAME : \"Google\"\nTYPE : \"text\"\n",InputTag.toString());
}
***************
*** 76,81 ****
public void testToHTML2() throws ParserException
{
! String testHTML = new String("<INPUT type=\"checkbox\" "
! +"name=\"cbCheck\" checked>");
createParser(testHTML);
parser.addScanner(new InputTagScanner("-i"));
--- 77,82 ----
public void testToHTML2() throws ParserException
{
! String testHTML ="<INPUT type=\"checkbox\" "
! +"name=\"cbCheck\" checked>";
createParser(testHTML);
parser.addScanner(new InputTagScanner("-i"));
***************
*** 86,92 ****
InputTag InputTag;
InputTag = (InputTag) node[0];
! assertStringEquals("HTML String",
! "<INPUT CHECKED NAME=\"cbCheck\" TYPE=\"checkbox\">",
! InputTag.toHtml());
}
--- 87,91 ----
InputTag InputTag;
InputTag = (InputTag) node[0];
! assertStringEquals("HTML String", testHTML, InputTag.toHtml());
}
Index: LinkTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/LinkTagTest.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** LinkTagTest.java 5 Oct 2003 13:49:54 -0000 1.36
--- LinkTagTest.java 6 Oct 2003 01:43:28 -0000 1.37
***************
*** 29,32 ****
--- 29,33 ----
package org.htmlparser.tests.tagTests;
+ import java.util.Vector;
import org.htmlparser.Parser;
import org.htmlparser.scanners.LinkScanner;
***************
*** 124,130 ****
public void testLinkNodeBug5() throws ParserException
{
! createParser("<a href=http://note.kimo.com.tw/>µ§°O</a> <a \n"+
! "href=http://photo.kimo.com.tw/>¬Ûï</a> <a\n"+
! "href=http://address.kimo.com.tw/>³q°T¿ý</a> ","http://www.cj.com");
Parser.setLineSeparator("\r\n");
// Register the image scanner
--- 125,134 ----
public void testLinkNodeBug5() throws ParserException
{
! String link1 = "http://note.kimo.com.tw/";
! String link2 = "http://photo.kimo.com.tw/";
! String link3 = "http://address.kimo.com.tw/";
! createParser("<a href=" + link1 + ">µ§°O</a> <a \n"+
! "href=" + link2 + ">¬Ûï</a> <a\n"+
! "href=" + link3 + ">³q°T¿ý</a> ","http://www.cj.com");
Parser.setLineSeparator("\r\n");
// Register the image scanner
***************
*** 132,146 ****
parseAndAssertNodeCount(6);
! // The node should be an LinkTag
! assertTrue("Node should be a LinkTag",node[0] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[2];
! assertStringEquals("Link incorrect!!","http://photo.kimo.com.tw",linkNode.getLink());
! assertEquals("Link beginning",new Integer(48),new Integer(linkNode.elementBegin()));
! assertEquals("Link ending",new Integer(38),new Integer(linkNode.elementEnd()));
!
! LinkTag linkNode2 = (LinkTag)node[4];
! assertStringEquals("Link incorrect!!","http://address.kimo.com.tw",linkNode2.getLink());
! assertEquals("Link beginning",new Integer(46),new Integer(linkNode2.elementBegin()));
! assertEquals("Link ending",new Integer(42),new Integer(linkNode2.elementEnd()));
}
--- 136,145 ----
parseAndAssertNodeCount(6);
! assertTrue("Node should be a LinkTag",node[2] instanceof LinkTag);
LinkTag linkNode = (LinkTag)node[2];
! assertStringEquals("Link incorrect!!",link2,linkNode.getLink());
! assertTrue("Node should be a LinkTag",node[4] instanceof LinkTag);
! LinkTag linkNode2 = (LinkTag)node[4];
! assertStringEquals("Link incorrect!!",link3,linkNode2.getLink());
}
***************
*** 268,275 ****
public void testToHTML() throws ParserException {
! createParser("<A HREF='mailto:so...@ya...'>hello</A>\n"+
! "<LI><font color=\"FF0000\" size=-1><b>Tech Samachar:</b></font><a \n"+
"href=\"http://ads.samachar.com/bin/redirect/tech.txt?http://www.samachar.com/tech\n"+
! "nical.html\"> Journalism 3.0</a> by Rajesh Jain","http://www.cj.com/");
Parser.setLineSeparator("\r\n");
// Register the image scanner
--- 267,277 ----
public void testToHTML() throws ParserException {
! String link1 = "<A HREF='mailto:so...@ya...'>hello</A>";
! String link2 = "<a \n"+
"href=\"http://ads.samachar.com/bin/redirect/tech.txt?http://www.samachar.com/tech\n"+
! "nical.html\"> Journalism 3.0</a>";
! createParser(link1 + "\n"+
! "<LI><font color=\"FF0000\" size=-1><b>Tech Samachar:</b></font>" +
! link2 + " by Rajesh Jain","http://www.cj.com/");
Parser.setLineSeparator("\r\n");
// Register the image scanner
***************
*** 279,362 ****
assertTrue("First Node should be a LinkTag",node[0] instanceof LinkTag);
LinkTag linkTag = (LinkTag)node[0];
! assertStringEquals("Link Raw Text","<A HREF=\"mailto:so...@ya...\">hello</A>",linkTag.toHtml());
assertTrue("Ninth Node should be a HTMLLinkTag",node[8] instanceof LinkTag);
linkTag = (LinkTag)node[8];
! assertStringEquals("Link Raw Text","<A HREF=\"http://ads.samachar.com/bin/redirect/tech.txt?http://www.samachar.com/tech\nnical.html\"> Journalism 3.0</A>",linkTag.toHtml());
}
public void testTypeHttps() throws ParserException{
! fail ("not implemented");
! // LinkTag linkTag =
! // new LinkTag(
! // new TagData(0,0,"",""),
! // 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{
! fail ("not implemented");
! // LinkTag linkTag =
! // new LinkTag(
! // new TagData(0,0,"",""),
! // 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 {
! fail ("not implemented");
! // LinkTag linkTag =
! // new LinkTag(
! // new TagData(0,0,"",""),
! // 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 {
! fail ("not implemented");
! // LinkTag linkTag =
! // new LinkTag(
! // new TagData(0,0,"",""),
! // 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(0,0,"",""),
! // 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(0,0,"",""),
! // 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 {
! fail ("not implemented");
! // LinkTag linkTag =
! // new LinkTag(
! // new TagData(0,0,"",""),
! // new CompositeTagData(null,null,null),
! // new LinkData("http://","","",false,false)
! // );
! // assertTrue("This is a http link",linkTag.isHTTPLikeLink());
! // LinkTag linkTag2 =
! // new LinkTag(
! // new TagData(0,0,"",""),
! // new CompositeTagData(null,null,null),
! // new LinkData("https://www.someurl.com","","",false,false)
! // );
! // assertTrue("This is a https link",linkTag2.isHTTPLikeLink());
}
--- 281,359 ----
assertTrue("First Node should be a LinkTag",node[0] instanceof LinkTag);
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());
}
***************
*** 384,396 ****
public void testIrcIsNotAHTTPLink () throws ParserException
{
! fail ("not implemented");
! // LinkTag link;
! //
! // link = new LinkTag(
! // new TagData(0,0,"",""),
! // new CompositeTagData(null,null,null),
! // new LinkData("irc://server/channel","","",false,false)
! // );
! // assertTrue("This is not a http link", !link.isHTTPLikeLink ());
}
}
--- 381,392 ----
public void testIrcIsNotAHTTPLink () throws ParserException
{
! 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 ());
}
}
Index: MetaTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/MetaTagTest.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** MetaTagTest.java 5 Oct 2003 13:49:54 -0000 1.30
--- MetaTagTest.java 6 Oct 2003 01:43:28 -0000 1.31
***************
*** 40,43 ****
--- 40,46 ----
public void testToHTML() throws ParserException {
+ String description = "\"description\"";
+ String content = "\"Protecting the internet community through technology, not legislation. SpamCop eliminates spam. Automatically file spam reports with the network administrators who can stop spam at the source. Subscribe, and filter your email through powerful statistical analysis before it reaches your inbox.\"";
+ String tag = "<META name=" + description + " content=" + content + ">";
createParser(
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\">\n"+
***************
*** 45,49 ****
"<head><title>SpamCop - Welcome to SpamCop\n"+
"</title>\n"+
! "<META name=\"description\" content=\"Protecting the internet community through technology, not legislation. SpamCop eliminates spam. Automatically file spam reports with the network administrators who can stop spam at the source. Subscribe, and filter your email through powerful statistical analysis before it reaches your inbox.\">\n"+
"<META name=\"keywords\" content=\"SpamCop spam cop email filter abuse header headers parse parser utility script net net-abuse filter mail program system trace traceroute dns\">\n"+
"<META name=\"language\" content=\"en\">\n"+
--- 48,52 ----
"<head><title>SpamCop - Welcome to SpamCop\n"+
"</title>\n"+
! tag + "\n"+
"<META name=\"keywords\" content=\"SpamCop spam cop email filter abuse header headers parse parser utility script net net-abuse filter mail program system trace traceroute dns\">\n"+
"<META name=\"language\" content=\"en\">\n"+
***************
*** 57,63 ****
MetaTag metaTag;
metaTag = (MetaTag) node[7];
! assertStringEquals("Meta Tag 7 Name","description",metaTag.getMetaTagName());
! assertStringEquals("Meta Tag 7 Contents","Protecting the internet community through technology, not legislation. SpamCop eliminates spam. Automatically file spam reports with the network administrators who can stop spam at the source. Subscribe, and filter your email through powerful statistical analysis before it reaches your inbox.",metaTag.getMetaContent());
! assertStringEquals("toHTML()","<META name=\"description\" content=\"Protecting the internet community through technology, not legislation. SpamCop eliminates spam. Automatically file spam reports with the network administrators who can stop spam at the source. Subscribe, and filter your email through powerful statistical analysis before it reaches your inbox.\">",metaTag.toHtml());
}
}
--- 60,66 ----
MetaTag metaTag;
metaTag = (MetaTag) node[7];
! assertStringEquals("Meta Tag 7 Name",description,metaTag.getMetaTagName());
! assertStringEquals("Meta Tag 7 Contents",content,metaTag.getMetaContent());
! assertStringEquals("toHTML()",tag,metaTag.toHtml());
}
}
Index: OptionTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/OptionTagTest.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** OptionTagTest.java 22 Sep 2003 02:40:13 -0000 1.30
--- OptionTagTest.java 6 Oct 2003 01:43:28 -0000 1.31
***************
*** 50,54 ****
"<OPTION>Mailcity\n</OPTION>"+
"<OPTION>\nIndiatimes\n</OPTION>"+
! "<OPTION>\nRediff\n</OPTION>\n"+
"<OPTION>Cricinfo" +
"<OPTION value=\"Microsoft Passport\">"
--- 50,54 ----
"<OPTION>Mailcity\n</OPTION>"+
"<OPTION>\nIndiatimes\n</OPTION>"+
! "<OPTION>\nRediff\n</OPTION>"+
"<OPTION>Cricinfo" +
"<OPTION value=\"Microsoft Passport\">"
***************
*** 87,99 ****
assertStringEquals("HTML String","<OPTION>Yahoo!</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[4];
! assertStringEquals("HTML String","<OPTION>\r\nHotmail</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[5];
assertStringEquals("HTML String","<OPTION VALUE=\"ICQ Messenger\"></OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[6];
! assertStringEquals("HTML String","<OPTION>Mailcity\r\n</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[7];
! assertStringEquals("HTML String","<OPTION>\r\nIndiatimes\r\n</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[8];
! assertStringEquals("HTML String","<OPTION>\r\nRediff\r\n</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[9];
assertStringEquals("HTML String","<OPTION>Cricinfo</OPTION>",OptionTag.toHtml());
--- 87,99 ----
assertStringEquals("HTML String","<OPTION>Yahoo!</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[4];
! assertStringEquals("HTML String","<OPTION>\nHotmail</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[5];
assertStringEquals("HTML String","<OPTION VALUE=\"ICQ Messenger\"></OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[6];
! assertStringEquals("HTML String","<OPTION>Mailcity\n</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[7];
! assertStringEquals("HTML String","<OPTION>\nIndiatimes\n</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[8];
! assertStringEquals("HTML String","<OPTION>\nRediff\n</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[9];
assertStringEquals("HTML String","<OPTION>Cricinfo</OPTION>",OptionTag.toHtml());
***************
*** 126,134 ****
assertEquals("HTML Raw String","OPTION VALUE: ICQ Messenger TEXT: \n",OptionTag.toString());
OptionTag = (OptionTag) node[6];
! assertEquals("HTML Raw String","OPTION VALUE: null TEXT: Mailcity\r\n\n",OptionTag.toString());
OptionTag = (OptionTag) node[7];
! assertEquals("HTML Raw String","OPTION VALUE: null TEXT: Indiatimes\r\n\n",OptionTag.toString());
OptionTag = (OptionTag) node[8];
! assertEquals("HTML Raw String","OPTION VALUE: null TEXT: Rediff\r\n\n",OptionTag.toString());
OptionTag = (OptionTag) node[9];
assertEquals("HTML Raw String","OPTION VALUE: null TEXT: Cricinfo\n",OptionTag.toString());
--- 126,134 ----
assertEquals("HTML Raw String","OPTION VALUE: ICQ Messenger TEXT: \n",OptionTag.toString());
OptionTag = (OptionTag) node[6];
! assertEquals("HTML Raw String","OPTION VALUE: null TEXT: Mailcity\n\n",OptionTag.toString());
OptionTag = (OptionTag) node[7];
! assertEquals("HTML Raw String","OPTION VALUE: null TEXT: Indiatimes\n\n",OptionTag.toString());
OptionTag = (OptionTag) node[8];
! assertEquals("HTML Raw String","OPTION VALUE: null TEXT: Rediff\n\n",OptionTag.toString());
OptionTag = (OptionTag) node[9];
assertEquals("HTML Raw String","OPTION VALUE: null TEXT: Cricinfo\n",OptionTag.toString());
Index: ScriptTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/ScriptTagTest.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ScriptTagTest.java 5 Oct 2003 13:49:54 -0000 1.31
--- ScriptTagTest.java 6 Oct 2003 01:43:28 -0000 1.32
***************
*** 139,143 ****
// Register the image scanner
parser.addScanner(new ScriptScanner("-s"));
! parseAndAssertNodeCount(1);
assertTrue("Node should be a script tag",node[0] instanceof ScriptTag);
ScriptTag scriptTag = (ScriptTag)node[0];
--- 139,143 ----
// Register the image scanner
parser.addScanner(new ScriptScanner("-s"));
! parseAndAssertNodeCount(2);
assertTrue("Node should be a script tag",node[0] instanceof ScriptTag);
ScriptTag scriptTag = (ScriptTag)node[0];
***************
*** 163,169 ****
public void testSingleApostropheParsingBug() throws ParserException {
! StringBuffer sb1 = new StringBuffer();
! sb1.append("<script src='<%=sourceFileName%>'></script>");
! createParser(sb1.toString());
// Register the image scanner
--- 163,168 ----
public void testSingleApostropheParsingBug() throws ParserException {
! String script = "<script src='<%=sourceFileName%>'></script>";
! createParser(script);
// Register the image scanner
***************
*** 172,176 ****
assertTrue("Node should be a script tag",node[0] instanceof ScriptTag);
ScriptTag scriptTag = (ScriptTag)node[0];
! assertStringEquals("Script toHTML()","<SCRIPT SRC=\"<%=sourceFileName%>\"></SCRIPT>",scriptTag.toHtml());
}
--- 171,175 ----
assertTrue("Node should be a script tag",node[0] instanceof ScriptTag);
ScriptTag scriptTag = (ScriptTag)node[0];
! assertStringEquals("Script toHTML()",script,scriptTag.toHtml());
}
Index: SelectTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/SelectTagTest.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** SelectTagTest.java 22 Sep 2003 02:40:13 -0000 1.31
--- SelectTagTest.java 6 Oct 2003 01:43:28 -0000 1.32
***************
*** 73,86 ****
public void testToHTML() throws ParserException
{
! assertStringEquals("HTML String","<SELECT NAME=\"Nominees\">\r\n"+
! "<OPTION VALUE=\"Spouse\">Spouse</OPTION>\r\n"+
! "<OPTION VALUE=\"Father\"></OPTION>\r\n"+
! "<OPTION VALUE=\"Mother\">Mother\r\n</OPTION>\r\n" +
! "<OPTION VALUE=\"Son\">\r\nSon\r\n</OPTION>"+
! "<OPTION VALUE=\"Daughter\">\r\nDaughter\r\n</OPTION>\r\n"+
! "<OPTION VALUE=\"Nephew\">\r\nNephew</OPTION>\r\n"+
! "<OPTION VALUE=\"Niece\">Niece\r\n</OPTION>"+
! "</SELECT>",
! selectTag.toHtml());
}
--- 73,77 ----
public void testToHTML() throws ParserException
{
! assertStringEquals("HTML String",testHTML, selectTag.toHtml());
}
***************
*** 94,102 ****
"OPTION VALUE: Spouse TEXT: Spouse\n\n" +
"OPTION VALUE: Father TEXT: \n\n" +
! "OPTION VALUE: Mother TEXT: Mother\r\n\n\n" +
! "OPTION VALUE: Son TEXT: Son\r\n\n\n" +
! "OPTION VALUE: Daughter TEXT: Daughter\r\n\n\n" +
! "OPTION VALUE: Nephew TEXT: Nephew\n\n" +
! "OPTION VALUE: Niece TEXT: Niece\r\n\n\n",
selectTag.toString());
}
--- 85,93 ----
"OPTION VALUE: Spouse TEXT: Spouse\n\n" +
"OPTION VALUE: Father TEXT: \n\n" +
! "OPTION VALUE: Mother TEXT: Mother\n\n\n" +
! "OPTION VALUE: Son TEXT: \nSon\n\n\n" +
! "OPTION VALUE: Daughter TEXT: \nDaughter\n\n\n" +
! "OPTION VALUE: Nephew TEXT: \nNephew\n\n" +
! "OPTION VALUE: Niece TEXT: Niece\n\n\n",
selectTag.toString());
}
Index: StyleTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/StyleTagTest.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** StyleTagTest.java 22 Sep 2003 02:40:13 -0000 1.28
--- StyleTagTest.java 6 Oct 2003 01:43:28 -0000 1.29
***************
*** 41,50 ****
public void testToHTML() throws ParserException {
! createParser("<style>a.h{background-color:#ffee99}</style>");
parser.registerScanners();
parseAndAssertNodeCount(1);
assertTrue(node[0] instanceof StyleTag);
StyleTag styleTag = (StyleTag)node[0];
! assertEquals("Raw String","<STYLE>a.h{background-color:#ffee99}</STYLE>",styleTag.toHtml());
}
--- 41,51 ----
public void testToHTML() throws ParserException {
! String html = "<style>a.h{background-color:#ffee99}</style>";
! createParser(html);
parser.registerScanners();
parseAndAssertNodeCount(1);
assertTrue(node[0] instanceof StyleTag);
StyleTag styleTag = (StyleTag)node[0];
! assertEquals("Raw String",html,styleTag.toHtml());
}
***************
*** 53,62 ****
* style tag attributes being missed
*/
! public void testToHTML_Attriubtes() throws ParserException {
! createParser("<STYLE type=\"text/css\">\n"+
"<!--"+
"{something....something}"+
"-->"+
! "</STYLE>");
Parser.setLineSeparator("\r\n");
--- 54,64 ----
* style tag attributes being missed
*/
! public void testToHtmlAttributes() throws ParserException {
! String style = "<STYLE type=\"text/css\">\n"+
"<!--"+
"{something....something}"+
"-->"+
! "</STYLE>";
! createParser(style);
Parser.setLineSeparator("\r\n");
***************
*** 65,73 ****
assertTrue(node[0] instanceof StyleTag);
StyleTag styleTag = (StyleTag)node[0];
! assertStringEquals("Raw String","<STYLE TYPE=\"text/css\">\r\n"+
! "<!--"+
! "{something....something}"+
! "-->"+
! "</STYLE>",styleTag.toHtml());
}
}
--- 67,71 ----
assertTrue(node[0] instanceof StyleTag);
StyleTag styleTag = (StyleTag)node[0];
! assertStringEquals("toHtml",style,styleTag.toHtml());
}
}
Index: TagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/TagTest.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** TagTest.java 2 Oct 2003 23:48:53 -0000 1.45
--- TagTest.java 6 Oct 2003 01:43:28 -0000 1.46
***************
*** 125,129 ****
h = tag.getAttributes();
String classValue= (String)h.get("CLASS");
! assertEquals ("The class value should be ","userData",classValue);
}
--- 125,129 ----
h = tag.getAttributes();
String classValue= (String)h.get("CLASS");
! assertEquals ("The class value should be ","\"userData\"",classValue);
}
***************
*** 162,168 ****
nice = (String)h.get("YOURPARAMETER");
assertEquals ("Link tag (A)","A",a);
! assertEquals ("href value","http://www.iki.fi/kaila",href);
assertEquals ("myparameter value",null,myValue);
! assertEquals ("yourparameter value","Kaarle Kaaila",nice);
}
if (!(node instanceof LinkTag)) {
--- 162,168 ----
nice = (String)h.get("YOURPARAMETER");
assertEquals ("Link tag (A)","A",a);
! assertEquals ("href value","\"http://www.iki.fi/kaila\"",href);
assertEquals ("myparameter value",null,myValue);
! assertEquals ("yourparameter value","\"Kaarle Kaaila\"",nice);
}
if (!(node instanceof LinkTag)) {
***************
*** 171,175 ****
node = en.nextNode();
snode = (StringNode)node;
! assertEquals("Value of element",snode.getText(),"Kaarle's homepage");
}
--- 171,175 ----
node = en.nextNode();
snode = (StringNode)node;
! assertEquals("Value of element","Kaarle's homepage",snode.getText());
}
***************
*** 177,181 ****
node = en.nextNode();
etag = (Tag)node;
! assertEquals("endtag of link",etag.getText(),"A");
}
}
--- 177,181 ----
node = en.nextNode();
etag = (Tag)node;
! assertEquals("endtag of link","/A", etag.getText());
}
}
***************
*** 190,199 ****
node = en.nextNode();
snode = (StringNode)node;
! assertEquals("paragraph contents",snode.getText(),"Paragraph");
}
if (en.hasMoreNodes()) {
node = en.nextNode();
etag = (Tag)node;
! assertEquals("paragrapg endtag",etag.getText(),"p");
}
--- 190,199 ----
node = en.nextNode();
snode = (StringNode)node;
! assertEquals("paragraph contents","Paragraph",snode.getText());
}
if (en.hasMoreNodes()) {
node = en.nextNode();
etag = (Tag)node;
! assertEquals("paragrapg endtag","/p",etag.getText());
}
***************
*** 232,236 ****
nice = (String)h.get("YOURPARAMETER");
assertEquals ("The tagname should be G",a,"G");
! assertEquals ("Check the http address",href,"http://www.iki.fi/kaila");
assertEquals ("myValue is not null",myValue,null);
assertEquals ("The second parameter value",nice,"Kaila");
--- 232,236 ----
nice = (String)h.get("YOURPARAMETER");
assertEquals ("The tagname should be G",a,"G");
! assertEquals ("Check the http address",href,"\"http://www.iki.fi/kaila\"");
assertEquals ("myValue is not null",myValue,null);
assertEquals ("The second parameter value",nice,"Kaila");
***************
*** 245,249 ****
node = en.nextNode();
etag = (Tag)node;
! assertEquals("Endtag is G",etag.getText(),"G");
}
// testing rest
--- 245,249 ----
node = en.nextNode();
etag = (Tag)node;
! assertEquals("Endtag is G","/G", etag.getText());
}
// testing rest
***************
*** 252,266 ****
tag = (Tag)node;
! assertEquals("Follow up by p-tag",tag.getText(),"p");
}
if (en.hasMoreNodes()) {
node = en.nextNode();
snode = (StringNode)node;
! assertEquals("Verify the paragraph text",snode.getText(),"Paragraph");
}
if (en.hasMoreNodes()) {
node = en.nextNode();
etag = (Tag)node;
! assertEquals("Still patragraph endtag",etag.getText(),"p");
}
--- 252,266 ----
tag = (Tag)node;
! assertEquals("Follow up by p-tag","p", tag.getText());
}
if (en.hasMoreNodes()) {
node = en.nextNode();
snode = (StringNode)node;
! assertEquals("Verify the paragraph text","Paragraph", snode.getText());
}
if (en.hasMoreNodes()) {
node = en.nextNode();
etag = (Tag)node;
! assertEquals("Still patragraph endtag","/p", etag.getText());
}
***************
*** 305,309 ****
node = en.nextNode();
snode = (StringNode)node;
! assertEquals("Value of element",snode.getText(),"Kaarle's homepage");
}
--- 305,309 ----
node = en.nextNode();
snode = (StringNode)node;
! assertEquals("Value of element","Kaarle's homepage",snode.getText());
}
***************
*** 311,315 ****
node = en.nextNode();
etag = (Tag)node;
! assertEquals("Still patragraph endtag",etag.getText(),"A");
}
}
--- 311,315 ----
node = en.nextNode();
etag = (Tag)node;
! assertEquals("Still patragraph endtag","/A",etag.getText());
}
}
***************
*** 388,406 ****
*/
public void testWithoutParseParameter() throws ParserException{
! Node node=null;
String testHTML = "<A href=\"http://www.iki.fi/kaila\" myParameter yourParameter=\"Kaarle\">Kaarle's homepage</A><p>Paragraph</p>";
createParser(testHTML);
NodeIterator en = parser.elements();
String result="";
! try {
! while (en.hasMoreNodes()) {
! node = en.nextNode();
! result += node.toHtml();
! }
! String expected = "<A YOURPARAMETER=\"Kaarle\" MYPARAMETER HREF=\"http://www.iki.fi/kaila\">Kaarle's homepage</A><P>Paragraph</P>";
! assertStringEquals("Check collected contents to original", expected, result);
! } catch (ClassCastException ce) {
! fail("Bad class element = " + node.getClass().getName());
}
}
--- 388,401 ----
*/
public void testWithoutParseParameter() throws ParserException{
! Node node;
String testHTML = "<A href=\"http://www.iki.fi/kaila\" myParameter yourParameter=\"Kaarle\">Kaarle's homepage</A><p>Paragraph</p>";
createParser(testHTML);
NodeIterator en = parser.elements();
String result="";
! while (en.hasMoreNodes()) {
! node = en.nextNode();
! result += node.toHtml();
}
+ assertStringEquals("Check collected contents to original", testHTML, result);
}
***************
*** 411,415 ****
*/
public void testEmptyTagParseParameter() throws ParserException{
! Node node=null;
String testHTML = "<INPUT name=\"foo\" value=\"foobar\" type=\"text\" />";
--- 406,410 ----
*/
public void testEmptyTagParseParameter() throws ParserException{
! Node node;
String testHTML = "<INPUT name=\"foo\" value=\"foobar\" type=\"text\" />";
***************
*** 417,431 ****
NodeIterator en = parser.elements();
String result="";
! try {
! while (en.hasMoreNodes()) {
! node = en.nextNode();
! result = node.toHtml();
! }
! String expected = "<INPUT VALUE=\"foobar\" NAME=\"foo\" TYPE=\"text\"/>";
! assertStringEquals("Check collected contents to original", expected, result);
! } catch (ClassCastException ce) {
!
! fail("Bad class element = " + node.getClass().getName());
}
}
--- 412,420 ----
NodeIterator en = parser.elements();
String result="";
! while (en.hasMoreNodes()) {
! node = en.nextNode();
! result = node.toHtml();
}
+ assertStringEquals("Check collected contents to original", testHTML, result);
}
***************
*** 465,485 ****
public void testIncorrectInvertedCommas() throws ParserException {
! String testHTML = new String("<META NAME=\"Author\" CONTENT = \"DORIER-APPRILL E., GERVAIS-LAMBONY P., MORICONI-EBRARD F., NAVEZ-BOUCHANINE F.\"\">");
createParser(testHTML);
parseAndAssertNodeCount(1);
assertTrue("Node should be a tag",node[0] instanceof Tag);
Tag tag = (Tag)node[0];
! assertStringEquals("Node contents","META NAME=\"Author\" CONTENT=\"DORIER-APPRILL E., GERVAIS-LAMBONY P., MORICONI-EBRARD F., NAVEZ-BOUCHANINE F.\"",tag.getText());
! assertEquals("Meta Content","DORIER-APPRILL E., GERVAIS-LAMBONY P., MORICONI-EBRARD F., NAVEZ-BOUCHANINE F.",tag.getAttribute("CONTENT"));
}
public void testIncorrectInvertedCommas2() throws ParserException {
! String testHTML = new String("<META NAME=\"Keywords\" CONTENT=Moscou, modernisation, politique urbaine, spécificités culturelles, municipalité, Moscou, modernisation, urban politics, cultural specificities, municipality\">");
createParser(testHTML);
parseAndAssertNodeCount(1);
assertTrue("Node should be a tag",node[0] instanceof Tag);
Tag tag = (Tag)node[0];
! assertStringEquals("Node contents","META NAME=\"Keywords\" CONTENT=\"Moscou, modernisation, politique urbaine, spécificités culturelles, municipalité, Moscou, modernisation, urban politics, cultural specificities, municipality\"",tag.getText());
}
--- 454,477 ----
public void testIncorrectInvertedCommas() throws ParserException {
! String content = "\"DORIER-APPRILL E., GERVAIS-LAMBONY P., MORICONI-EBRARD F., NAVEZ-BOUCHANINE F.\"";
! String guts = "META NAME=\"Author\" CONTENT = " + content + " \"";
! String testHTML = "<" + guts + ">";
createParser(testHTML);
parseAndAssertNodeCount(1);
assertTrue("Node should be a tag",node[0] instanceof Tag);
Tag tag = (Tag)node[0];
! assertStringEquals("Node contents",guts,tag.getText());
! assertEquals("Meta Content",content,tag.getAttribute("CONTENT"));
}
public void testIncorrectInvertedCommas2() throws ParserException {
! String guts = "META NAME=\"Keywords\" CONTENT=Moscou, modernisation, politique urbaine, spécificités culturelles, municipalité, Moscou, modernisation, urban politics, cultural specificities, municipality\"";
! String testHTML = "<" + guts + ">";
createParser(testHTML);
parseAndAssertNodeCount(1);
assertTrue("Node should be a tag",node[0] instanceof Tag);
Tag tag = (Tag)node[0];
! assertStringEquals("Node contents",guts,tag.getText());
}
***************
*** 544,548 ****
StringNode stringNode = (StringNode)node[2];
String actual = stringNode.getText();
! assertEquals("Third node has incorrect text","text\r\n<>text",actual);
}
--- 536,540 ----
StringNode stringNode = (StringNode)node[2];
String actual = stringNode.getText();
! assertEquals("Third node has incorrect text","text\n<>text",actual);
}
***************
*** 559,563 ****
StringNode stringNode = (StringNode)node[2];
String actual = stringNode.getText();
! assertEquals("Third node has incorrect text","text<\r\n>text",actual);
}
--- 551,555 ----
StringNode stringNode = (StringNode)node[2];
String actual = stringNode.getText();
! assertEquals("Third node has incorrect text","text<\n>text",actual);
}
***************
*** 574,587 ****
StringNode stringNode = (StringNode)node[2];
String actual = stringNode.getText();
! assertEquals("Third node has incorrect text","text<>\r\ntext",actual);
}
public void testAttributesReconstruction() throws ParserException {
! String testHTML = "<TEXTAREA name=\"JohnDoe\" ></TEXTAREA>";
createParser(testHTML);
parseAndAssertNodeCount(2);
assertTrue("First node should be an HTMLtag",node[0] instanceof Tag);
Tag htmlTag = (Tag)node[0];
- String expectedHTML = "<TEXTAREA NAME=\"JohnDoe\">";
assertStringEquals("Expected HTML",expectedHTML,htmlTag.toHtml());
}
--- 566,579 ----
StringNode stringNode = (StringNode)node[2];
String actual = stringNode.getText();
! assertEquals("Third node has incorrect text","text<>\ntext",actual);
}
public void testAttributesReconstruction() throws ParserException {
! String expectedHTML = "<TEXTAREA name=\"JohnDoe\" >";
! String testHTML = expectedHTML + "</TEXTAREA>";
createParser(testHTML);
parseAndAssertNodeCount(2);
assertTrue("First node should be an HTMLtag",node[0] instanceof Tag);
Tag htmlTag = (Tag)node[0];
assertStringEquals("Expected HTML",expectedHTML,htmlTag.toHtml());
}
***************
*** 653,657 ****
{
// straight out of a real world example
! createParser ("<a href=http://www.google.com/webhp?hl=en>");
// register standard scanners (Very Important)
parser.registerScanners ();
--- 645,650 ----
{
// straight out of a real world example
! String html = "<a href=http://www.google.com/webhp?hl=en>";
! createParser (html);
// register standard scanners (Very Important)
parser.registerScanners ();
***************
*** 663,669 ****
}
assertNotNull ("No nodes", temp);
! assertStringEquals ("Incorrect HTML output: ",
! "<A HREF=\"http://www.google.com/webhp?hl=en\"></A>",
! temp);
}
--- 656,660 --...
[truncated message content] |
