[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests ParserTest.java,1.58,1.59 ParserTestCase.java,1

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	ParserTest.java ParserTestCase.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: ParserTestCase.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/ParserTestCase.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** ParserTestCase.java	28 Feb 2004 15:52:43 -0000	1.45
--- ParserTestCase.java	24 May 2004 16:18:30 -0000	1.46
***************
*** 33,40 ****
  import junit.framework.TestCase;
  
- import org.htmlparser.AbstractNode;
  import org.htmlparser.Node;
  import org.htmlparser.Parser;
! import org.htmlparser.StringNode;
  import org.htmlparser.lexer.Lexer;
  import org.htmlparser.lexer.Page;
--- 33,39 ----
  import junit.framework.TestCase;
  
  import org.htmlparser.Node;
  import org.htmlparser.Parser;
! import org.htmlparser.Text;
  import org.htmlparser.lexer.Lexer;
  import org.htmlparser.lexer.Page;
***************
*** 68,72 ****
          mLexer =  new Lexer (new Page (inputHTML));
          parser = new Parser(mLexer, new DefaultParserFeedback(DefaultParserFeedback.QUIET));
!         node = new AbstractNode[40];
      }
  
--- 67,71 ----
          mLexer =  new Lexer (new Page (inputHTML));
          parser = new Parser(mLexer, new DefaultParserFeedback(DefaultParserFeedback.QUIET));
!         node = new Node[40];
      }
  
***************
*** 75,79 ****
          Lexer lexer = new Lexer (inputHTML);
          parser = new Parser (lexer, new DefaultParserFeedback(DefaultParserFeedback.QUIET));
!         node = new AbstractNode[numNodes];
      }
  
--- 74,78 ----
          Lexer lexer = new Lexer (inputHTML);
          parser = new Parser (lexer, new DefaultParserFeedback(DefaultParserFeedback.QUIET));
!         node = new Node[numNodes];
      }
  
***************
*** 82,86 ****
          lexer.getPage ().setUrl (url);
          parser = new Parser (lexer, new DefaultParserFeedback(DefaultParserFeedback.QUIET));
!         node = new AbstractNode[40];
      }
  
--- 81,85 ----
          lexer.getPage ().setUrl (url);
          parser = new Parser (lexer, new DefaultParserFeedback(DefaultParserFeedback.QUIET));
!         node = new Node[40];
      }
  
***************
*** 89,93 ****
          lexer.getPage ().setUrl (url);
          parser = new Parser (lexer, new DefaultParserFeedback(DefaultParserFeedback.QUIET));
!         node = new AbstractNode[numNodes];
      }
  
--- 88,92 ----
          lexer.getPage ().setUrl (url);
          parser = new Parser (lexer, new DefaultParserFeedback(DefaultParserFeedback.QUIET));
!         node = new Node[numNodes];
      }
  
***************
*** 271,275 ****
          do {
              nextNode = nodeIterator.nextNode();
!             if (nextNode instanceof StringNode) {
                  text = nextNode.toPlainTextString().trim();
              } else text = null;
--- 270,274 ----
          do {
              nextNode = nodeIterator.nextNode();
!             if (nextNode instanceof Text) {
                  text = nextNode.toPlainTextString().trim();
              } else text = null;
***************
*** 426,439 ****
          Object object)
      {
!         
!         String expectedTypeName = expectedType.getName();
!         String actualTypeName   = object.getClass().getName();
!         if (!actualTypeName.equals(expectedTypeName))
!             fail(
!                 message+" should have been of type\n"+
!                 expectedTypeName+
!                 " but was of type \n"+
!                 actualTypeName+"\n and is :"+((Node)object).toHtml()
!             );
      }
  
--- 425,442 ----
          Object object)
      {
!         if (!expectedType.isAssignableFrom (object.getClass ()))
!         {
!             String expectedTypeName = expectedType.getName ();
!             String actualTypeName   = object.getClass ().getName ();
!             if (!actualTypeName.equals (expectedTypeName))
!                 fail(
!                     message + " should have been of type "+
!                     expectedTypeName
!                     + " but was of type "
!                     + actualTypeName
!                     + " and is:"
!                     + ((Node)object).toHtml()
!                 );
!         }
      }
  

Index: ParserTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/ParserTest.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** ParserTest.java	18 Mar 2004 04:04:08 -0000	1.58
--- ParserTest.java	24 May 2004 16:18:30 -0000	1.59
***************
*** 38,47 ****
  import java.util.Locale;
  
- import org.htmlparser.AbstractNode;
  import org.htmlparser.Node;
  import org.htmlparser.Parser;
  import org.htmlparser.PrototypicalNodeFactory;
! import org.htmlparser.RemarkNode;
! import org.htmlparser.StringNode;
  import org.htmlparser.filters.NodeClassFilter;
  import org.htmlparser.filters.TagNameFilter;
--- 38,46 ----
  import java.util.Locale;
  
  import org.htmlparser.Node;
  import org.htmlparser.Parser;
  import org.htmlparser.PrototypicalNodeFactory;
! import org.htmlparser.Remark;
! import org.htmlparser.Text;
  import org.htmlparser.filters.NodeClassFilter;
  import org.htmlparser.filters.TagNameFilter;
***************
*** 103,107 ****
          }
  
!         Node [] node = new AbstractNode[500];
          int i = 0;
          for (NodeIterator e = parser.elements();e.hasMoreNodes();)
--- 102,106 ----
          }
  
!         Node[] node = new Node[500];
          int i = 0;
          for (NodeIterator e = parser.elements();e.hasMoreNodes();)
***************
*** 230,234 ****
          NodeIterator enumeration;
          Node node;
!         StringNode string;
  
          try
--- 229,233 ----
          NodeIterator enumeration;
          Node node;
!         Text string;
  
          try
***************
*** 313,319 ****
          {
              node = enumeration.nextNode ();
!             if (node instanceof StringNode)
              {
!                 string = (StringNode)node;
                  if (-1 != string.getText ().indexOf (postal_code))
                      pass = true;
--- 312,318 ----
          {
              node = enumeration.nextNode ();
!             if (node instanceof Text)
              {
!                 string = (Text)node;
                  if (-1 != string.getText ().indexOf (postal_code))
                      pass = true;
***************
*** 356,360 ****
              parser = new Parser (file.getAbsolutePath (), new DefaultParserFeedback(DefaultParserFeedback.QUIET));
              parser.setNodeFactory (new PrototypicalNodeFactory (true));
!             nodes = new AbstractNode[30];
              i = 0;
              for (enumeration = parser.elements (); enumeration.hasMoreNodes ();)
--- 355,359 ----
              parser = new Parser (file.getAbsolutePath (), new DefaultParserFeedback(DefaultParserFeedback.QUIET));
              parser.setNodeFactory (new PrototypicalNodeFactory (true));
!             nodes = new Node[30];
              i = 0;
              for (enumeration = parser.elements (); enumeration.hasMoreNodes ();)
***************
*** 437,441 ****
          parser.setNodeFactory (new PrototypicalNodeFactory (new MetaTag ()));
          i = 0;
!         nodes = new AbstractNode[30];
          for (NodeIterator e = parser.elements(); e.hasMoreNodes();)
              nodes[i++] = e.nextNode();
--- 436,440 ----
          parser.setNodeFactory (new PrototypicalNodeFactory (new MetaTag ()));
          i = 0;
!         nodes = new Node[30];
          for (NodeIterator e = parser.elements(); e.hasMoreNodes();)
              nodes[i++] = e.nextNode();
***************
*** 577,581 ****
          parser = new Parser(url);
          parser.setNodeFactory (new PrototypicalNodeFactory (true));
!         Node node [] = new AbstractNode[30];
          int i = 0;
          for (NodeIterator e = parser.elements();e.hasMoreNodes();) {
--- 576,580 ----
          parser = new Parser(url);
          parser.setNodeFactory (new PrototypicalNodeFactory (true));
!         Node node [] = new Node[30];
          int i = 0;
          for (NodeIterator e = parser.elements();e.hasMoreNodes();) {
***************
*** 905,909 ****
          assertStringEquals ("html wrong", html, node[0].toHtml ());
          assertTrue ("wrong number of children", 1 == node[0].getChildren ().size ());
!         assertTrue ("string node expected", node[0].getChildren ().elementAt (0) instanceof StringNode);
          txt = node[0].getChildren ().elementAt (0);
          assertStringEquals ("string html wrong", text, txt.toHtml ());
--- 904,908 ----
          assertStringEquals ("html wrong", html, node[0].toHtml ());
          assertTrue ("wrong number of children", 1 == node[0].getChildren ().size ());
!         assertTrue ("string node expected", node[0].getChildren ().elementAt (0) instanceof Text);
          txt = node[0].getChildren ().elementAt (0);
          assertStringEquals ("string html wrong", text, txt.toHtml ());
***************
*** 940,944 ****
          assertStringEquals ("html wrong", html, node[0].toHtml ());
          assertTrue ("wrong number of children", 1 == node[0].getChildren ().size ());
!         assertTrue ("remark node expected", node[0].getChildren ().elementAt (0) instanceof RemarkNode);
          rem = node[0].getChildren ().elementAt (0);
          assertStringEquals ("remark html wrong", remark, rem.toHtml ());
--- 939,943 ----
          assertStringEquals ("html wrong", html, node[0].toHtml ());
          assertTrue ("wrong number of children", 1 == node[0].getChildren ().size ());
!         assertTrue ("remark node expected", node[0].getChildren ().elementAt (0) instanceof Remark);
          rem = node[0].getChildren ().elementAt (0);
          assertStringEquals ("remark html wrong", remark, rem.toHtml ());

[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests ParserTest.java,1.58,1.59 ParserTestCase.java,1

[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests ParserTest.java,1.58,1.59 ParserTestCase.java,1.45,1.46