[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/scannersTests CompositeTagScannerTest.java,1.49
Brought to you by:
derrickoswald
Menu
▾
▴
[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/scannersTests CompositeTagScannerTest.java,1.49,1.50 LabelScannerTest.java,1.40,1.41 ScriptScannerTest.java,1.45,1.46
|
From: <der...@us...> - 2003-11-01 04:03:24
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests
In directory sc8-pr-cvs1:/tmp/cvs-serv2709/scannersTests
Modified Files:
CompositeTagScannerTest.java LabelScannerTest.java
ScriptScannerTest.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: CompositeTagScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/CompositeTagScannerTest.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** CompositeTagScannerTest.java 1 Nov 2003 01:36:57 -0000 1.49
--- CompositeTagScannerTest.java 1 Nov 2003 04:03:21 -0000 1.50
***************
*** 411,420 ****
}
! public void testCompositeTagWithSelfChildren() throws ParserException {
! createParser(
! "<custom>" +
! "<custom>something</custom>" +
! "</custom>"
! );
parser.addScanner(new CustomScanner(false));
parser.addScanner(new AnotherScanner());
--- 411,420 ----
}
! public void testCompositeTagWithSelfChildren() throws ParserException
! {
! String tag1 = "<custom>";
! String tag2 = "<custom>something</custom>";
! String tag3 = "</custom>";
! createParser(tag1 + tag2 + tag3);
parser.addScanner(new CustomScanner(false));
parser.addScanner(new AnotherScanner());
***************
*** 427,431 ****
assertStringEquals(
"first custom tag html",
! "<CUSTOM></CUSTOM>",
customTag.toHtml()
);
--- 427,431 ----
assertStringEquals(
"first custom tag html",
! tag1 + "</custom>",
customTag.toHtml()
);
***************
*** 433,437 ****
assertStringEquals(
"second custom tag html",
! "<CUSTOM>something</CUSTOM>",
customTag.toHtml()
);
--- 433,437 ----
assertStringEquals(
"second custom tag html",
! tag2,
customTag.toHtml()
);
***************
*** 439,443 ****
assertStringEquals(
"third custom tag html",
! "</CUSTOM>",
endTag.toHtml()
);
--- 439,443 ----
assertStringEquals(
"third custom tag html",
! tag3,
endTag.toHtml()
);
***************
*** 445,453 ****
public void testParentConnections() throws ParserException {
! createParser(
! "<custom>" +
! "<custom>something</custom>" +
! "</custom>"
! );
parser.addScanner(new CustomScanner(false));
parser.addScanner(new AnotherScanner());
--- 445,452 ----
public void testParentConnections() throws ParserException {
! String tag1 = "<custom>";
! String tag2 = "<custom>something</custom>";
! String tag3 = "</custom>";
! createParser(tag1 + tag2 + tag3);
parser.addScanner(new CustomScanner(false));
parser.addScanner(new AnotherScanner());
***************
*** 458,462 ****
assertStringEquals(
"first custom tag html",
! "<CUSTOM></CUSTOM>",
customTag.toHtml()
);
--- 457,461 ----
assertStringEquals(
"first custom tag html",
! tag1 + "</custom>",
customTag.toHtml()
);
***************
*** 469,473 ****
assertStringEquals(
"second custom tag html",
! "<CUSTOM>something</CUSTOM>",
customTag.toHtml()
);
--- 468,472 ----
assertStringEquals(
"second custom tag html",
! tag2,
customTag.toHtml()
);
***************
*** 486,490 ****
assertStringEquals(
"third custom tag html",
! "</CUSTOM>",
endTag.toHtml()
);
--- 485,489 ----
assertStringEquals(
"third custom tag html",
! tag3,
endTag.toHtml()
);
Index: LabelScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/LabelScannerTest.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** LabelScannerTest.java 26 Oct 2003 19:46:26 -0000 1.40
--- LabelScannerTest.java 1 Nov 2003 04:03:21 -0000 1.41
***************
*** 49,54 ****
super(name);
}
! public void testSimpleLabels() throws ParserException {
! createParser("<label>This is a label tag</label>");
LabelScanner labelScanner = new LabelScanner("-l");
parser.addScanner(labelScanner);
--- 49,56 ----
super(name);
}
! public void testSimpleLabels() throws ParserException
! {
! String html = "<label>This is a label tag</label>";
! createParser(html);
LabelScanner labelScanner = new LabelScanner("-l");
parser.addScanner(labelScanner);
***************
*** 59,63 ****
assertEquals("Label","This is a label tag",labelTag.getChildrenHTML());
assertEquals("Label","This is a label tag",labelTag.getLabel());
! assertStringEquals("Label","<LABEL>This is a label tag</LABEL>",labelTag.toHtml());
assertEquals("Label Scanner",labelScanner,labelTag.getThisScanner());
}
--- 61,65 ----
assertEquals("Label","This is a label tag",labelTag.getChildrenHTML());
assertEquals("Label","This is a label tag",labelTag.getLabel());
! assertStringEquals("Label", html, labelTag.toHtml());
assertEquals("Label Scanner",labelScanner,labelTag.getThisScanner());
}
***************
*** 77,82 ****
}
! public void testLabelWithOtherTags() throws ParserException {
! createParser("<label><span>Span within label</span></label>");
parser.registerScanners();
LabelScanner labelScanner = new LabelScanner("-l");
--- 79,86 ----
}
! public void testLabelWithOtherTags() throws ParserException
! {
! String html = "<label><span>Span within label</span></label>";
! createParser(html);
parser.registerScanners();
LabelScanner labelScanner = new LabelScanner("-l");
***************
*** 87,91 ****
LabelTag labelTag = (LabelTag) node[0];
assertEquals("Label value","Span within label",labelTag.getLabel());
! assertStringEquals("Label","<LABEL><SPAN>Span within label</SPAN></LABEL>",labelTag.toHtml());
assertEquals("Label Scanner",labelScanner,labelTag.getThisScanner());
}
--- 91,95 ----
LabelTag labelTag = (LabelTag) node[0];
assertEquals("Label value","Span within label",labelTag.getLabel());
! assertStringEquals("Label", html, labelTag.toHtml());
assertEquals("Label Scanner",labelScanner,labelTag.getThisScanner());
}
***************
*** 108,113 ****
! public void testLabelsID() throws ParserException {
! createParser("<label>John Doe</label>");
parser.registerScanners();
LabelScanner labelScanner = new LabelScanner("-l");
--- 112,119 ----
! public void testLabelsID() throws ParserException
! {
! String html = "<label>John Doe</label>";
! createParser(html);
parser.registerScanners();
LabelScanner labelScanner = new LabelScanner("-l");
***************
*** 115,127 ****
parseAndAssertNodeCount(1);
assertTrue(node[0] instanceof LabelTag);
-
LabelTag labelTag = (LabelTag) node[0];
! assertStringEquals("Label","<LABEL>John Doe</LABEL>",labelTag.toHtml());
Hashtable attr = labelTag.getAttributes();
assertNull("ID",attr.get("id"));
}
! public void testNestedLabels() throws ParserException {
! createParser("<label id=\"attr1\"><label>Jane Doe");
parser.registerScanners();
LabelScanner labelScanner = new LabelScanner("-l");
--- 121,135 ----
parseAndAssertNodeCount(1);
assertTrue(node[0] instanceof LabelTag);
LabelTag labelTag = (LabelTag) node[0];
! assertStringEquals("Label", html, labelTag.toHtml());
Hashtable attr = labelTag.getAttributes();
assertNull("ID",attr.get("id"));
}
! public void testNestedLabels() throws ParserException
! {
! String label1 = "<label id=\"attr1\">";
! String label2 = "<label>Jane Doe";
! createParser(label1 + label2);
parser.registerScanners();
LabelScanner labelScanner = new LabelScanner("-l");
***************
*** 130,158 ****
assertTrue(node[0] instanceof LabelTag);
assertTrue(node[1] instanceof LabelTag);
-
LabelTag labelTag = (LabelTag) node[0];
! assertStringEquals("Label","<LABEL ID=\"attr1\"></LABEL>",labelTag.toHtml());
labelTag = (LabelTag) node[1];
! assertStringEquals("Label","<LABEL>Jane Doe</LABEL>",labelTag.toHtml());
Hashtable attr = labelTag.getAttributes();
assertNull("ID",attr.get("id"));
}
! public void testNestedLabels2() throws ParserException {
! String testHTML = new String(
! "<LABEL value=\"Google Search\">Google</LABEL>" +
! "<LABEL value=\"AltaVista Search\">AltaVista" +
! "<LABEL value=\"Lycos Search\"></LABEL>" +
! "<LABEL>Yahoo!</LABEL>" +
! "<LABEL>\nHotmail</LABEL>" +
! "<LABEL value=\"ICQ Messenger\">" +
! "<LABEL>Mailcity\n</LABEL>"+
! "<LABEL>\nIndiatimes\n</LABEL>"+
! "<LABEL>\nRediff\n</LABEL>"+
! "<LABEL>Cricinfo" +
! "<LABEL value=\"Microsoft Passport\">" +
! "<LABEL value=\"AOL\"><SPAN>AOL</SPAN></LABEL>" +
! "<LABEL value=\"Time Warner\">Time <B>Warner <SPAN>AOL </SPAN>Inc.</B>"
! );
createParser(testHTML);
//parser.registerScanners();
--- 138,166 ----
assertTrue(node[0] instanceof LabelTag);
assertTrue(node[1] instanceof LabelTag);
LabelTag labelTag = (LabelTag) node[0];
! assertStringEquals("Label", label1 + "</label>", labelTag.toHtml());
labelTag = (LabelTag) node[1];
! assertStringEquals("Label", label2 + "</label>",labelTag.toHtml());
Hashtable attr = labelTag.getAttributes();
assertNull("ID",attr.get("id"));
}
! public void testNestedLabels2() throws ParserException
! {
! String label1 = "<LABEL value=\"Google Search\">Google</LABEL>";
! String label2 = "<LABEL value=\"AltaVista Search\">AltaVista";
! String label3 = "<LABEL value=\"Lycos Search\"></LABEL>";
! String label4 = "<LABEL>Yahoo!</LABEL>";
! String label5 = "<LABEL>\nHotmail</LABEL>";
! String label6 = "<LABEL value=\"ICQ Messenger\">";
! String label7 = "<LABEL>Mailcity\n</LABEL>";
! String label8 = "<LABEL>\nIndiatimes\n</LABEL>";
! String label9 = "<LABEL>\nRediff\n</LABEL>";
! String label10 = "<LABEL>Cricinfo";
! String label11 = "<LABEL value=\"Microsoft Passport\">";
! String label12 = "<LABEL value=\"AOL\"><SPAN>AOL</SPAN></LABEL>";
! String label13 = "<LABEL value=\"Time Warner\">Time <B>Warner <SPAN>AOL </SPAN>Inc.</B>";
! String testHTML = label1 + label2 + label3 + label4 + label5 + label6
! + label7 + label8 + label9 + label10 + label11 + label12 + label13;
createParser(testHTML);
//parser.registerScanners();
***************
*** 160,198 ****
parser.addScanner(labelScanner);
parseAndAssertNodeCount(13);
-
- // for(int j=0;j<nodeCount;j++)
- // {
- // //assertTrue("Node " + j + " should be Label Tag",node[j] instanceof LabelTag);
- // System.out.println(node[j].getClass().getName());
- // System.out.println(node[j].toHtml());
- // }
-
LabelTag LabelTag;
LabelTag = (LabelTag) node[0];
! assertStringEquals("HTML String","<LABEL VALUE=\"Google Search\">Google</LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[1];
! assertStringEquals("HTML String","<LABEL VALUE=\"AltaVista Search\">AltaVista</LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[2];
! assertStringEquals("HTML String","<LABEL VALUE=\"Lycos Search\"></LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[3];
! assertStringEquals("HTML String","<LABEL>Yahoo!</LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[4];
! assertStringEquals("HTML String","<LABEL>\nHotmail</LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[5];
! assertStringEquals("HTML String","<LABEL VALUE=\"ICQ Messenger\"></LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[6];
! assertStringEquals("HTML String","<LABEL>Mailcity\n</LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[7];
! assertStringEquals("HTML String","<LABEL>\nIndiatimes\n</LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[8];
! assertStringEquals("HTML String","<LABEL>\nRediff\n</LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[9];
! assertStringEquals("HTML String","<LABEL>Cricinfo</LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[10];
! assertStringEquals("HTML String","<LABEL VALUE=\"Microsoft Passport\"></LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[11];
! assertStringEquals("HTML String","<LABEL VALUE=\"AOL\"><SPAN>AOL</SPAN></LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[12];
! assertStringEquals("HTML String","<LABEL VALUE=\"Time Warner\">Time <B>Warner <SPAN>AOL </SPAN>Inc.</B></LABEL>",LabelTag.toHtml());
}
--- 168,198 ----
parser.addScanner(labelScanner);
parseAndAssertNodeCount(13);
LabelTag LabelTag;
LabelTag = (LabelTag) node[0];
! assertStringEquals("HTML String", label1, LabelTag.toHtml());
LabelTag = (LabelTag) node[1];
! assertStringEquals("HTML String", label2 + "</LABEL>", LabelTag.toHtml());
LabelTag = (LabelTag) node[2];
! assertStringEquals("HTML String", label3, LabelTag.toHtml());
LabelTag = (LabelTag) node[3];
! assertStringEquals("HTML String", label4, LabelTag.toHtml());
LabelTag = (LabelTag) node[4];
! assertStringEquals("HTML String", label5, LabelTag.toHtml());
LabelTag = (LabelTag) node[5];
! assertStringEquals("HTML String", label6 + "</LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[6];
! assertStringEquals("HTML String", label7, LabelTag.toHtml());
LabelTag = (LabelTag) node[7];
! assertStringEquals("HTML String", label8, LabelTag.toHtml());
LabelTag = (LabelTag) node[8];
! assertStringEquals("HTML String", label9, LabelTag.toHtml());
LabelTag = (LabelTag) node[9];
! assertStringEquals("HTML String", label10 + "</LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[10];
! assertStringEquals("HTML String", label11 + "</LABEL>",LabelTag.toHtml());
LabelTag = (LabelTag) node[11];
! assertStringEquals("HTML String", label12, LabelTag.toHtml());
LabelTag = (LabelTag) node[12];
! assertStringEquals("HTML String", label13 + "</LABEL>",LabelTag.toHtml());
}
Index: ScriptScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/ScriptScannerTest.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** ScriptScannerTest.java 27 Oct 2003 02:18:05 -0000 1.45
--- ScriptScannerTest.java 1 Nov 2003 04:03:21 -0000 1.46
***************
*** 533,542 ****
* See bug #741769 ScriptScanner doesn't handle quoted </script> tags
*/
! public void testScanQuotedEndTag() throws ParserException {
! createParser("<SCRIPT language=\"JavaScript\">document.write('</SCRIPT>');</SCRIPT>");
parser.addScanner(new ScriptScanner("-s"));
parseAndAssertNodeCount(1);
! String s = node[0].toHtml ();
! assertStringEquals ("Parse error","<SCRIPT LANGUAGE=\"JavaScript\">document.write('</SCRIPT>');</SCRIPT>",s);
}
--- 533,543 ----
* See bug #741769 ScriptScanner doesn't handle quoted </script> tags
*/
! public void testScanQuotedEndTag() throws ParserException
! {
! String html = "<SCRIPT language=\"JavaScript\">document.write('</SCRIPT>');</SCRIPT>";
! createParser(html);
parser.addScanner(new ScriptScanner("-s"));
parseAndAssertNodeCount(1);
! assertStringEquals ("Parse error", html, node[0].toHtml ());
}
|
