Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23128/tests/tagTests
Modified Files:
BulletListTagTest.java DivTagTest.java SpanTagTest.java
Log Message:
Fix bug #882940 empty applet tag contents causes NullPointerException
Also found and fixed other similar problems where getChildren() could
return null.
Then changed table row and column handling to handle rows and
columns embedded within other tags.
Index: BulletListTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/BulletListTagTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BulletListTagTest.java 7 Dec 2003 23:41:43 -0000 1.1
--- BulletListTagTest.java 24 Jan 2004 23:58:06 -0000 1.2
***************
*** 64,68 ****
NodeList nestedBulletLists =
((CompositeTag)node[0]).searchFor(
! BulletList.class
);
assertEquals(
--- 64,69 ----
NodeList nestedBulletLists =
((CompositeTag)node[0]).searchFor(
! BulletList.class,
! true
);
assertEquals(
Index: DivTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/DivTagTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DivTagTest.java 7 Dec 2003 23:41:43 -0000 1.1
--- DivTagTest.java 24 Jan 2004 23:58:07 -0000 1.2
***************
*** 52,56 ****
assertType("node should be table",TableTag.class,node[0]);
TableTag tableTag = (TableTag)node[0];
! Div div = (Div)tableTag.searchFor(Div.class).toNodeArray()[0];
assertEquals("div contents","some text",div.toPlainTextString());
}
--- 52,56 ----
assertType("node should be table",TableTag.class,node[0]);
TableTag tableTag = (TableTag)node[0];
! Div div = (Div)tableTag.searchFor(Div.class, true).toNodeArray()[0];
assertEquals("div contents","some text",div.toPlainTextString());
}
Index: SpanTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/SpanTagTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SpanTagTest.java 7 Dec 2003 23:41:43 -0000 1.1
--- SpanTagTest.java 24 Jan 2004 23:58:07 -0000 1.2
***************
*** 67,71 ****
assertType("node",TableColumn.class,node[0]);
TableColumn col = (TableColumn)node[0];
! Node spans [] = col.searchFor(Span.class).toNodeArray();
assertEquals("number of spans found",2,spans.length);
assertStringEquals(
--- 67,71 ----
assertType("node",TableColumn.class,node[0]);
TableColumn col = (TableColumn)node[0];
! Node spans [] = col.searchFor(Span.class, true).toNodeArray();
assertEquals("number of spans found",2,spans.length);
assertStringEquals(
|
