[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/filterTests FilterTest.java,1.4,1.5

[Derrick O. <der...@us...>]

Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/filterTests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19028/src/org/htmlparser/tests/filterTests

Modified Files:
	FilterTest.java 
Log Message:
Part three of a multiphase refactoring.
The three node types are now fronted by interfaces (program to the interface paradigm)
with concrete implementations in the new htmlparser.nodes package. Classes from the
lexer.nodes package are moved to this package, and obvious references to the concrete
classes that got broken by this have been changed to use the interfaces where possible.



Index: FilterTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/filterTests/FilterTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FilterTest.java	24 May 2004 00:38:18 -0000	1.4
--- FilterTest.java	24 May 2004 16:18:31 -0000	1.5
***************
*** 38,43 ****
  import org.htmlparser.filters.TagNameFilter;
  import org.htmlparser.lexer.Lexer;
! import org.htmlparser.StringNode;
! import org.htmlparser.lexer.nodes.TagNode;
  import org.htmlparser.tags.BodyTag;
  import org.htmlparser.tags.LinkTag;
--- 38,42 ----
  import org.htmlparser.filters.TagNameFilter;
  import org.htmlparser.lexer.Lexer;
! import org.htmlparser.Text;
  import org.htmlparser.tags.BodyTag;
  import org.htmlparser.tags.LinkTag;
***************
*** 80,84 ****
          BodyTag body = (BodyTag)list.elementAt (0);
          assertEquals ("only one child", 1, body.getChildCount ());
!         assertSuperType ("should be StringNode", StringNode.class, body.getChildren ().elementAt (0));
          assertStringEquals("html", guts, body.toHtml ());
      }
--- 79,83 ----
          BodyTag body = (BodyTag)list.elementAt (0);
          assertEquals ("only one child", 1, body.getChildCount ());
!         assertSuperType ("should be Text", Text.class, body.getChildren ().elementAt (0));
          assertStringEquals("html", guts, body.toHtml ());
      }
***************
*** 99,104 ****
          list = parser.extractAllNodesThatMatch (new TagNameFilter ("booty"));
          assertEquals ("only one element", 1, list.size ());
!         assertSuperType ("should be Tag", TagNode.class, list.elementAt (0));
!         assertStringEquals("name", "BOOTY", ((TagNode)list.elementAt (0)).getTagName ());
      }
  
--- 98,103 ----
          list = parser.extractAllNodesThatMatch (new TagNameFilter ("booty"));
          assertEquals ("only one element", 1, list.size ());
!         assertSuperType ("should be Tag", Tag.class, list.elementAt (0));
!         assertStringEquals("name", "BOOTY", ((Tag)(list.elementAt (0))).getTagName ());
      }
  
***************
*** 117,122 ****
          list = parser.extractAllNodesThatMatch (new StringFilter ("Time"));
          assertEquals ("only one element", 1, list.size ());
!         assertSuperType ("should be String", StringNode.class, list.elementAt (0));
!         assertStringEquals("name", "time", ((StringNode)list.elementAt (0)).getText ());
          // test case sensitivity
          list = parser.extractAllNodesThatMatch (new StringFilter ("Time", true));
--- 116,121 ----
          list = parser.extractAllNodesThatMatch (new StringFilter ("Time"));
          assertEquals ("only one element", 1, list.size ());
!         assertSuperType ("should be String", Text.class, list.elementAt (0));
!         assertStringEquals("name", "time", ((Text)list.elementAt (0)).getText ());
          // test case sensitivity
          list = parser.extractAllNodesThatMatch (new StringFilter ("Time", true));
***************
*** 141,146 ****
          LinkTag link = (LinkTag)list.elementAt (0);
          assertEquals ("three children", 3, link.getChildCount ());
!         assertSuperType ("should be TagNode", TagNode.class, link.getChildren ().elementAt (0));
!         TagNode tag = (TagNode)link.getChildren ().elementAt (0);
          assertStringEquals("name", "B", tag.getTagName ());
      }
--- 140,145 ----
          LinkTag link = (LinkTag)list.elementAt (0);
          assertEquals ("three children", 3, link.getChildCount ());
!         assertSuperType ("should be TagNode", Tag.class, link.getChildren ().elementAt (0));
!         Tag tag = (Tag)link.getChildren ().elementAt (0);
          assertStringEquals("name", "B", tag.getTagName ());
      }