[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/tagTests SelectTagTest.java,1.13,1.14 OptionTag
Brought to you by:
derrickoswald
Menu
▾
▴
[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/tagTests SelectTagTest.java,1.13,1.14 OptionTagTest.java,1.13,1.14
|
From: <der...@us...> - 2003-05-10 01:47:15
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests
In directory sc8-pr-cvs1:/tmp/cvs-serv21759/org/htmlparser/tests/tagTests
Modified Files:
SelectTagTest.java OptionTagTest.java
Log Message:
For Dhaval:
I have converted the OptionTag to a composite tag. The problem that is present
with Label tag exists here a well so my guess is that it is with CompositeTag
itself. Once solved, all related problems will also get solved. In any
case I have commented some test conditions in the OptionTagTest class. You can
uncomment it and see it for yourself.
Some SelectTag test cases are also changed as a result.
Index: SelectTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/SelectTagTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SelectTagTest.java 5 May 2003 03:12:25 -0000 1.13
--- SelectTagTest.java 10 May 2003 01:47:11 -0000 1.14
***************
*** 103,109 ****
OptionTag [] optionTags = selectTag.getOptionTags();
assertEquals("option tag array length",7,optionTags.length);
! assertEquals("option tag 1","Spouse",optionTags[0].getValue());
! assertEquals("option tag 7","Niece\r\n",optionTags[6].getValue());
}
}
--- 103,114 ----
OptionTag [] optionTags = selectTag.getOptionTags();
assertEquals("option tag array length",7,optionTags.length);
! assertEquals("option tag 1","Spouse",optionTags[0].getOptionText());
! assertEquals("option tag 7","Niece\r\n",optionTags[6].getOptionText());
}
+ public static void main(String[] args)
+ {
+ new junit.awtui.TestRunner().start(new String[] {SelectTagTest.class.getName()});
+ }
+
}
Index: OptionTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/OptionTagTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** OptionTagTest.java 5 May 2003 03:12:25 -0000 1.13
--- OptionTagTest.java 10 May 2003 01:47:12 -0000 1.14
***************
*** 51,54 ****
--- 51,56 ----
"<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>"
);
***************
*** 61,65 ****
super.setUp();
createParser(testHTML);
! parser.addScanner(new OptionTagScanner("-i"));
parseAndAssertNodeCount(11);
}
--- 63,67 ----
super.setUp();
createParser(testHTML);
! parser.addScanner(new OptionTagScanner("-option"));
parseAndAssertNodeCount(11);
}
***************
*** 69,73 ****
for(int j=0;j<nodeCount;j++)
{
! assertTrue("Node " + j + " should be Option Tag",node[j] instanceof OptionTag);
}
OptionTag OptionTag;
--- 71,77 ----
for(int j=0;j<nodeCount;j++)
{
! //assertTrue("Node " + j + " should be Option Tag",node[j] instanceof OptionTag);
! System.out.println(node[j].getClass().getName());
! System.out.println(node[j].toHtml());
}
OptionTag OptionTag;
***************
*** 81,85 ****
assertStringEquals("HTML String","<OPTION>Yahoo!</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[4];
! assertStringEquals("HTML String","<OPTION>Hotmail</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[5];
assertStringEquals("HTML String","<OPTION VALUE=\"ICQ Messenger\"></OPTION>",OptionTag.toHtml());
--- 85,89 ----
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());
***************
*** 87,102 ****
assertStringEquals("HTML String","<OPTION>Mailcity\r\n</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[7];
! assertStringEquals("HTML String","<OPTION>Indiatimes\r\n</OPTION>",OptionTag.toHtml());
OptionTag = (OptionTag) node[8];
! assertStringEquals("HTML String","<OPTION>Rediff\r\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());
! }
public void testToString() throws ParserException
{
! for(int j=0;j<nodeCount;j++)
{
assertTrue("Node " + j + " should be Option Tag",node[j] instanceof OptionTag);
--- 91,110 ----
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());
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());
! */ }
public void testToString() throws ParserException
{
! for(int j=0;j<11;j++)
{
assertTrue("Node " + j + " should be Option Tag",node[j] instanceof OptionTag);
***************
*** 104,128 ****
OptionTag OptionTag;
OptionTag = (OptionTag) node[0];
! assertEquals("HTML Raw String","OPTION TAG\n--------\nVALUE : Google Search\nTEXT : Google\n",OptionTag.toString());
OptionTag = (OptionTag) node[1];
! assertEquals("HTML Raw String","OPTION TAG\n--------\nVALUE : AltaVista Search\nTEXT : AltaVista\n",OptionTag.toString());
OptionTag = (OptionTag) node[2];
! assertEquals("HTML Raw String","OPTION TAG\n--------\nVALUE : Lycos Search\nTEXT : \n",OptionTag.toString());
OptionTag = (OptionTag) node[3];
! assertEquals("HTML Raw String","OPTION TAG\n--------\nTEXT : Yahoo!\n",OptionTag.toString());
OptionTag = (OptionTag) node[4];
! assertEquals("HTML Raw String","OPTION TAG\n--------\nTEXT : Hotmail\n",OptionTag.toString());
OptionTag = (OptionTag) node[5];
! assertEquals("HTML Raw String","OPTION TAG\n--------\nVALUE : ICQ Messenger\nTEXT : \n",OptionTag.toString());
OptionTag = (OptionTag) node[6];
! assertEquals("HTML Raw String","OPTION TAG\n--------\nTEXT : Mailcity\r\n\n",OptionTag.toString());
OptionTag = (OptionTag) node[7];
! assertEquals("HTML Raw String","OPTION TAG\n--------\nTEXT : Indiatimes\r\n\n",OptionTag.toString());
OptionTag = (OptionTag) node[8];
! assertEquals("HTML Raw String","OPTION TAG\n--------\nTEXT : Rediff\r\n\n",OptionTag.toString());
OptionTag = (OptionTag) node[9];
! assertEquals("HTML Raw String","OPTION TAG\n--------\nTEXT : Cricinfo\n",OptionTag.toString());
OptionTag = (OptionTag) node[10];
! assertEquals("HTML Raw String","OPTION TAG\n--------\nVALUE : Microsoft Passport\nTEXT : \n",OptionTag.toString());
}
--- 112,145 ----
OptionTag OptionTag;
OptionTag = (OptionTag) node[0];
! assertEquals("HTML Raw String","OPTION VALUE: Google Search TEXT: Google\n",OptionTag.toString());
OptionTag = (OptionTag) node[1];
! assertEquals("HTML Raw String","OPTION VALUE: AltaVista Search TEXT: AltaVista\n",OptionTag.toString());
OptionTag = (OptionTag) node[2];
! assertEquals("HTML Raw String","OPTION VALUE: Lycos Search TEXT: \n",OptionTag.toString());
OptionTag = (OptionTag) node[3];
! assertEquals("HTML Raw String","OPTION VALUE: null TEXT: Yahoo!\n",OptionTag.toString());
OptionTag = (OptionTag) node[4];
! assertEquals("HTML Raw String","OPTION VALUE: null TEXT: Hotmail\n",OptionTag.toString());
OptionTag = (OptionTag) node[5];
! 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());
OptionTag = (OptionTag) node[10];
! assertEquals("HTML Raw String","OPTION VALUE: Microsoft Passport TEXT: \n",OptionTag.toString());
! /* OptionTag = (OptionTag) node[11];
! assertEquals("HTML Raw String","OPTION VALUE: AOL TEXT: AOL\n",OptionTag.toString());
! OptionTag = (OptionTag) node[12];
! assertEquals("HTML Raw String","OPTION VALUE: Time Warner TEXT: Time Warner AOL Inc.\n",OptionTag.toString());
! */ }
!
! public static void main(String[] args)
! {
! new junit.awtui.TestRunner().start(new String[] {OptionTagTest.class.getName()});
}
|
