[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/visitorsTests HtmlPageTest.java,1.18,1.19 NodeVisitorTest.java,1.15,1.16

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

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

Modified Files:
	HtmlPageTest.java NodeVisitorTest.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: HtmlPageTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/HtmlPageTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** HtmlPageTest.java	2 Jan 2004 16:24:57 -0000	1.18
--- HtmlPageTest.java	24 May 2004 16:18:34 -0000	1.19
***************
*** 28,32 ****
  
  import org.htmlparser.Node;
! import org.htmlparser.StringNode;
  import org.htmlparser.tags.TableColumn;
  import org.htmlparser.tags.TableRow;
--- 28,32 ----
  
  import org.htmlparser.Node;
! import org.htmlparser.Text;
  import org.htmlparser.tags.TableColumn;
  import org.htmlparser.tags.TableRow;
***************
*** 91,95 ****
          Node node = bodyNodes.elementAt(0);
          assertTrue("expected stringNode but was "+node.getClass().getName(),
!             node instanceof StringNode
          );
          assertStringEquals(
--- 91,95 ----
          Node node = bodyNodes.elementAt(0);
          assertTrue("expected stringNode but was "+node.getClass().getName(),
!             node instanceof Text
          );
          assertStringEquals(

Index: NodeVisitorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/NodeVisitorTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** NodeVisitorTest.java	24 May 2004 00:38:19 -0000	1.15
--- NodeVisitorTest.java	24 May 2004 16:18:34 -0000	1.16
***************
*** 30,35 ****
  import java.util.Map;
  
- import org.htmlparser.StringNode;
  import org.htmlparser.Tag;
  import org.htmlparser.tests.ParserTestCase;
  import org.htmlparser.visitors.NodeVisitor;
--- 30,35 ----
  import java.util.Map;
  
  import org.htmlparser.Tag;
+ import org.htmlparser.Text;
  import org.htmlparser.tests.ParserTestCase;
  import org.htmlparser.visitors.NodeVisitor;
***************
*** 67,71 ****
          }
  
!         public void visitStringNode(StringNode stringNode) {
              paramsMap.put(lastKeyVisited,stringNode.getText());
          }
--- 67,71 ----
          }
  
!         public void visitStringNode(Text stringNode) {
              paramsMap.put(lastKeyVisited,stringNode.getText());
          }