[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/utilTests CharacterTranslationTest.java,1.42,1.43 HTMLParserUtilsTest.java,1.16,1.17 NodeListTest.java,1.26,1.27

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

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

Modified Files:
	CharacterTranslationTest.java HTMLParserUtilsTest.java 
	NodeListTest.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: CharacterTranslationTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/CharacterTranslationTest.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** CharacterTranslationTest.java	9 Feb 2004 02:09:44 -0000	1.42
--- CharacterTranslationTest.java	24 May 2004 16:18:34 -0000	1.43
***************
*** 45,50 ****
  import org.htmlparser.Node;
  import org.htmlparser.Parser;
! import org.htmlparser.RemarkNode;
! import org.htmlparser.StringNode;
  import org.htmlparser.tags.LinkTag;
  import org.htmlparser.tags.Tag;
--- 45,50 ----
  import org.htmlparser.Node;
  import org.htmlparser.Parser;
! import org.htmlparser.Remark;
! import org.htmlparser.Text;
  import org.htmlparser.tags.LinkTag;
  import org.htmlparser.tags.Tag;
***************
*** 251,259 ****
              NodeList children;
  
!             if (node instanceof StringNode)
              {
                  // Node is a plain string
!                 // Cast it to an HTMLStringNode
!                 StringNode stringNode = (StringNode)node;
                  // Retrieve the data from the object
                  buffer.append (stringNode.getText ());
--- 251,259 ----
              NodeList children;
  
!             if (node instanceof Text)
              {
                  // Node is a plain string
!                 // Cast it to an HTMLText
!                 Text stringNode = (Text)node;
                  // Retrieve the data from the object
                  buffer.append (stringNode.getText ());
***************
*** 280,284 ****
                  }
              }
!             else if (node instanceof RemarkNode)
              {
              }
--- 280,284 ----
                  }
              }
!             else if (node instanceof Remark)
              {
              }

Index: HTMLParserUtilsTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/HTMLParserUtilsTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** HTMLParserUtilsTest.java	12 May 2004 14:14:32 -0000	1.16
--- HTMLParserUtilsTest.java	24 May 2004 16:18:34 -0000	1.17
***************
*** 220,228 ****
          catch (Exception e)
          {
!             assertStringEquals(
!                 "modified text",
!                 "error msg",
!                 e.getMessage()
!             );
          }
      }
--- 220,227 ----
          catch (Exception e)
          {
!             String msg = e.getMessage ();
!             if (null == msg)
!                 msg = e.getClass ().getName ();
!             fail (msg);
          }
      }
***************
*** 279,287 ****
          catch (Exception e)
          {
!             assertStringEquals(
!                 "modified text",
!                 "error msg",
!                 e.getMessage()
!             );
          }
      }
--- 278,285 ----
          catch (Exception e)
          {
!             String msg = e.getMessage ();
!             if (null == msg)
!                 msg = e.getClass ().getName ();
!             fail (msg);
          }
      }
***************
*** 338,346 ****
          catch (Exception e)
          {
!             assertStringEquals(
!                 "modified text",
!                 "error msg",
!                 e.getMessage()
!             );
          }
      }
--- 336,343 ----
          catch (Exception e)
          {
!             String msg = e.getMessage ();
!             if (null == msg)
!                 msg = e.getClass ().getName ();
!             fail (msg);
          }
      }
***************
*** 392,400 ****
          catch (Exception e)
          {
!             assertStringEquals(
!                 "modified text",
!                 "error msg",
!                 e.getMessage()
!             );
          }
      }
--- 389,396 ----
          catch (Exception e)
          {
!             String msg = e.getMessage ();
!             if (null == msg)
!                 msg = e.getClass ().getName ();
!             fail (msg);
          }
      }

Index: NodeListTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/NodeListTest.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** NodeListTest.java	24 May 2004 00:38:19 -0000	1.26
--- NodeListTest.java	24 May 2004 16:18:34 -0000	1.27
***************
*** 27,32 ****
  package org.htmlparser.tests.utilTests;
  
- import org.htmlparser.AbstractNode;
  import org.htmlparser.Node;
  import org.htmlparser.tests.ParserTestCase;
  import org.htmlparser.util.NodeList;
--- 27,32 ----
  package org.htmlparser.tests.utilTests;
  
  import org.htmlparser.Node;
+ import org.htmlparser.nodes.AbstractNode;
  import org.htmlparser.tests.ParserTestCase;
  import org.htmlparser.util.NodeList;
***************
*** 110,114 ****
      public void testElements() throws Exception {
          createTestDataAndPutInVector(11);
!         Node [] resultNodes = new AbstractNode[11];
          int i = 0;
          for (SimpleNodeIterator e = nodeList.elements();e.hasMoreNodes();) {
--- 110,114 ----
      public void testElements() throws Exception {
          createTestDataAndPutInVector(11);
!         Node [] resultNodes = new Node[11];
          int i = 0;
          for (SimpleNodeIterator e = nodeList.elements();e.hasMoreNodes();) {
***************
*** 141,145 ****
  
      private void createTestDataAndPutInVector(int nodeCount) {
!         testNodes = new AbstractNode[nodeCount];
          for (int i=0;i<nodeCount;i++) {
              testNodes[i]= createHTMLNodeObject();
--- 141,145 ----
  
      private void createTestDataAndPutInVector(int nodeCount) {
!         testNodes = new Node[nodeCount];
          for (int i=0;i<nodeCount;i++) {
              testNodes[i]= createHTMLNodeObject();