[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/tagTests TagTest.java,1.29,1.30 ObjectCollectionTest.java,1.5,1.6 FormTagTest.java,1.21,1.22 BodyTagTest.java,1.5,1.6

[<jke...@us...>]

Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests
In directory sc8-pr-cvs1:/tmp/cvs-serv17851/src/org/htmlparser/tests/tagTests

Modified Files:
	TagTest.java ObjectCollectionTest.java FormTagTest.java 
	BodyTagTest.java 
Log Message:
Renamed Node to AbstractNode, extracted the new interface, Node, and moved line separator code from AbstractNode to Parser.

Index: TagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/TagTest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** TagTest.java	1 Jun 2003 20:50:17 -0000	1.29
--- TagTest.java	13 Jun 2003 20:27:05 -0000	1.30
***************
*** 670,674 ****
          {
              Node newNode = e.nextNode ();  // Get the next HTML Node
!             temp = newNode.toHTML ();
          }
          assertNotNull ("No nodes", temp);
--- 670,674 ----
          {
              Node newNode = e.nextNode ();  // Get the next HTML Node
!             temp = newNode.toHtml();
          }
          assertNotNull ("No nodes", temp);

Index: ObjectCollectionTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/ObjectCollectionTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ObjectCollectionTest.java	13 Apr 2003 06:28:06 -0000	1.5
--- ObjectCollectionTest.java	13 Jun 2003 20:27:05 -0000	1.6
***************
*** 58,62 ****
  		NodeList nodeList = new NodeList();
  		div.collectInto(nodeList,Span.class);
! 		Node [] spans = nodeList.toNodeArray();
  		assertSpanContent(spans);
  	}
--- 58,62 ----
  		NodeList nodeList = new NodeList();
  		div.collectInto(nodeList,Span.class);
! 		Node[] spans = nodeList.toNodeArray();
  		assertSpanContent(spans);
  	}

Index: FormTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/FormTagTest.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FormTagTest.java	1 Jun 2003 20:50:16 -0000	1.21
--- FormTagTest.java	13 Jun 2003 20:27:05 -0000	1.22
***************
*** 81,85 ****
  		assertEquals("Should have found nodes",1,nodeList.size());
  		
! 		Node [] nodes = nodeList.toNodeArray();
  		
  		assertEquals("Number of nodes found",1,nodes.length);
--- 81,85 ----
  		assertEquals("Should have found nodes",1,nodeList.size());
  		
! 		Node[] nodes = nodeList.toNodeArray();
  		
  		assertEquals("Number of nodes found",1,nodes.length);

Index: BodyTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/BodyTagTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BodyTagTest.java	3 May 2003 02:33:33 -0000	1.5
--- BodyTagTest.java	13 Jun 2003 20:27:05 -0000	1.6
***************
*** 29,37 ****
  package org.htmlparser.tests.tagTests;
  
- import java.util.Enumeration;
  import java.util.Hashtable;
  import junit.framework.TestSuite;
  import org.htmlparser.Node;
- import org.htmlparser.Parser;
  
  import org.htmlparser.scanners.BodyScanner;
--- 29,35 ----