[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/tagTests BaseHrefTagTest.java,1.32,1.33 BodyTag
Brought to you by:
derrickoswald
Menu
▾
▴
[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/tagTests BaseHrefTagTest.java,1.32,1.33 BodyTagTest.java,1.15,1.16 OptionTagTest.java,1.36,1.37 TitleTagTest.java,1.30,1.31
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests
In directory sc8-pr-cvs1:/tmp/cvs-serv2709/tagTests
Modified Files:
BaseHrefTagTest.java BodyTagTest.java OptionTagTest.java
TitleTagTest.java
Log Message:
Fixed all tests failing if case sensitivity was turned on.
Mostly this involved comparing the output from toHtml() with the string passed to the parser.
Now ParserTestCase does case sensitive comparisons.
Index: BaseHrefTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/BaseHrefTagTest.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** BaseHrefTagTest.java 26 Oct 2003 19:46:27 -0000 1.32
--- BaseHrefTagTest.java 1 Nov 2003 04:03:21 -0000 1.33
***************
*** 51,61 ****
}
! public void testNotHREFBaseTag() throws ParserException {
! createParser("<base target=\"_top\">");
parser.registerScanners();
parseAndAssertNodeCount(1);
assertTrue("Should be a base tag but was "+node[0].getClass().getName(),node[0] instanceof BaseHrefTag);
BaseHrefTag baseTag = (BaseHrefTag)node[0];
! assertStringEquals("Base Tag HTML","<BASE TARGET=\"_top\">",baseTag.toHtml());
}
--- 51,63 ----
}
! public void testNotHREFBaseTag() throws ParserException
! {
! String html = "<base target=\"_top\">";
! createParser(html);
parser.registerScanners();
parseAndAssertNodeCount(1);
assertTrue("Should be a base tag but was "+node[0].getClass().getName(),node[0] instanceof BaseHrefTag);
BaseHrefTag baseTag = (BaseHrefTag)node[0];
! assertStringEquals("Base Tag HTML", html, baseTag.toHtml());
}
Index: BodyTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/BodyTagTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** BodyTagTest.java 26 Oct 2003 19:46:27 -0000 1.15
--- BodyTagTest.java 1 Nov 2003 04:03:21 -0000 1.16
***************
*** 47,50 ****
--- 47,51 ----
private BodyTag bodyTag;
+ private String html = "<body>Yahoo!</body>";
public BodyTagTest(String name) {
***************
*** 54,58 ****
protected void setUp() throws Exception {
super.setUp();
! createParser("<html><head><title>body tag test</title></head><body>Yahoo!</body></html>");
parser.registerScanners();
parser.addScanner(new BodyScanner("-b"));
--- 55,59 ----
protected void setUp() throws Exception {
super.setUp();
! createParser("<html><head><title>body tag test</title></head>" + html + "</html>");
parser.registerScanners();
parser.addScanner(new BodyScanner("-b"));
***************
*** 68,72 ****
public void testToHTML() throws ParserException {
! assertStringEquals("Raw String","<BODY>Yahoo!</BODY>",bodyTag.toHtml());
}
--- 69,73 ----
public void testToHTML() throws ParserException {
! assertStringEquals("Raw String", html, bodyTag.toHtml());
}
Index: OptionTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/OptionTagTest.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** OptionTagTest.java 28 Oct 2003 03:04:19 -0000 1.36
--- OptionTagTest.java 1 Nov 2003 04:03:21 -0000 1.37
***************
*** 44,62 ****
}
! private String testHTML = new String(
! "<OPTION value=\"Google Search\">Google</OPTION>" +
! "<OPTION value=\"AltaVista Search\">AltaVista" +
! "<OPTION value=\"Lycos Search\"></OPTION>" +
! "<OPTION>Yahoo!</OPTION>" +
! "<OPTION>\nHotmail</OPTION>" +
! "<OPTION value=\"ICQ Messenger\">" +
! "<OPTION>Mailcity\n</OPTION>"+
! "<OPTION>\nIndiatimes\n</OPTION>"+
! "<OPTION>\nRediff\n</OPTION>"+
! "<OPTION>Cricinfo" +
! "<OPTION value=\"Microsoft Passport\">"+
! "<OPTION value=\"AOL\"><SPAN>AOL</SPAN></OPTION>" +
! "<OPTION value=\"Time Warner\">Time <LABEL>Warner <SPAN>AOL </SPAN>Inc.</LABEL>"
! );
public OptionTagTest(String name)
--- 44,62 ----
}
! private String option1 = "<OPTION value=\"Google Search\">Google</OPTION>";
! private String option2 = "<OPTION value=\"AltaVista Search\">AltaVista";
! private String option3 = "<OPTION value=\"Lycos Search\"></OPTION>";
! private String option4 = "<OPTION>Yahoo!</OPTION>";
! private String option5 = "<OPTION>\nHotmail</OPTION>";
! private String option6 = "<OPTION value=\"ICQ Messenger\">";
! private String option7 = "<OPTION>Mailcity\n</OPTION>";
! private String option8 = "<OPTION>\nIndiatimes\n</OPTION>";
! private String option9 = "<OPTION>\nRediff\n</OPTION>";
! private String option10 = "<OPTION>Cricinfo";
! private String option11 = "<OPTION value=\"Microsoft Passport\">";
! private String option12 = "<OPTION value=\"AOL\"><SPAN>AOL</SPAN></OPTION>";
! private String option13 = "<OPTION value=\"Time Warner\">Time <LABEL>Warner <SPAN>AOL </SPAN>Inc.</LABEL></OPTION>";
! private String testHTML = option1 + option2 + option3 + option4 + option5 + option6
! + option7 + option8 + option9 + option10 + option11 + option12 + option13;
public OptionTagTest(String name)
***************
*** 82,110 ****
OptionTag OptionTag;
OptionTag = (OptionTag) node[0];
! assertStringEquals("HTML String","<OPTION VALUE=\"Google Search\">Google</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[1];
! assertStringEquals("HTML String","<OPTION VALUE=\"AltaVista Search\">AltaVista</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[2];
! assertStringEquals("HTML String","<OPTION VALUE=\"Lycos Search\"></OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[3];
! 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());
OptionTag = (OptionTag) node[10];
! assertStringEquals("HTML String","<OPTION VALUE=\"Microsoft Passport\"></OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[11];
! assertStringEquals("HTML String","<OPTION VALUE=\"AOL\"><SPAN>AOL</SPAN></OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[12];
! assertStringEquals("HTML String","<OPTION value=\"Time Warner\">Time <LABEL>Warner <SPAN>AOL </SPAN>Inc.</LABEL></OPTION>",OptionTag.toHtml());
}
--- 82,110 ----
OptionTag OptionTag;
OptionTag = (OptionTag) node[0];
! assertStringEquals("HTML String", option1, OptionTag.toHtml());
OptionTag = (OptionTag) node[1];
! assertStringEquals("HTML String", option2 + "</OPTION>", OptionTag.toHtml());
OptionTag = (OptionTag) node[2];
! assertStringEquals("HTML String", option3, OptionTag.toHtml());
OptionTag = (OptionTag) node[3];
! assertStringEquals("HTML String", option4, OptionTag.toHtml());
OptionTag = (OptionTag) node[4];
! assertStringEquals("HTML String", option5, OptionTag.toHtml());
OptionTag = (OptionTag) node[5];
! assertStringEquals("HTML String", option6 + "</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[6];
! assertStringEquals("HTML String", option7, OptionTag.toHtml());
OptionTag = (OptionTag) node[7];
! assertStringEquals("HTML String", option8, OptionTag.toHtml());
OptionTag = (OptionTag) node[8];
! assertStringEquals("HTML String", option9, OptionTag.toHtml());
OptionTag = (OptionTag) node[9];
! assertStringEquals("HTML String", option10 + "</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[10];
! assertStringEquals("HTML String", option11 + "</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[11];
! assertStringEquals("HTML String", option12,OptionTag.toHtml());
OptionTag = (OptionTag) node[12];
! assertStringEquals("HTML String", option13, OptionTag.toHtml());
}
Index: TitleTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/TitleTagTest.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** TitleTagTest.java 26 Oct 2003 19:46:27 -0000 1.30
--- TitleTagTest.java 1 Nov 2003 04:03:21 -0000 1.31
***************
*** 44,47 ****
--- 44,53 ----
private TitleTag titleTag;
+ private String prefix = "<html><head>";
+ private String tag1 = "<title>Yahoo!</title>";
+ private String tag2 = "<base href=http://www.yahoo.com/ target=_top>";
+ private String tag3 = "<meta http-equiv=\"PICS-Label\" content='(PICS-1.1 \"http://www.icra.org/ratingsv02.html\" l r (cz 1 lz 1 nz 1 oz 1 vz 1) gen true for \"http://www.yahoo.com\" r (cz 1 lz 1 nz 1 oz 1 vz 1) \"http://www.rsac.org/ratingsv01.html\" l r (n 0 s 0 v 0 l 0) gen true for \"http://www.yahoo.com\" r (n 0 s 0 v 0 l 0))'>";
+ private String tag4 = "<style>a.h{background-color:#ffee99}</style>";
+ private String suffix = "</head>";
public TitleTagTest(String name) {
***************
*** 50,54 ****
protected void setUp() throws Exception {
super.setUp();
! createParser("<html><head><title>Yahoo!</title><base href=http://www.yahoo.com/ target=_top><meta http-equiv=\"PICS-Label\" content='(PICS-1.1 \"http://www.icra.org/ratingsv02.html\" l r (cz 1 lz 1 nz 1 oz 1 vz 1) gen true for \"http://www.yahoo.com\" r (cz 1 lz 1 nz 1 oz 1 vz 1) \"http://www.rsac.org/ratingsv01.html\" l r (n 0 s 0 v 0 l 0) gen true for \"http://www.yahoo.com\" r (n 0 s 0 v 0 l 0))'><style>a.h{background-color:#ffee99}</style></head>");
parser.addScanner(new TitleScanner("-t"));
parser.addScanner(new StyleScanner("-s"));
--- 56,60 ----
protected void setUp() throws Exception {
super.setUp();
! createParser(prefix + tag1 + tag2 + tag3 + tag4 + suffix);
parser.addScanner(new TitleScanner("-t"));
parser.addScanner(new StyleScanner("-s"));
***************
*** 64,68 ****
public void testToHTML() throws ParserException {
! assertStringEquals("Raw String","<TITLE>Yahoo!</TITLE>",titleTag.toHtml());
}
--- 70,74 ----
public void testToHTML() throws ParserException {
! assertStringEquals("Raw String",tag1,titleTag.toHtml());
}
|
