[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/tagTests ScriptTagTest.java,1.44,1.45 LinkTagTest.java,1.50,1.51 TagTest.java,1.60,1.61 ImageTagTest.java,1.44,1.45 TableTagTest.java,1.1,1.2 ObjectCollectionTest.java,1.21,1.22 FormTagTest.java,1.45,1.46

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

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

Modified Files:
	ScriptTagTest.java LinkTagTest.java TagTest.java 
	ImageTagTest.java TableTagTest.java ObjectCollectionTest.java 
	FormTagTest.java 
Log Message:
Remove unused variables and other fixes exposed by turning on compiler warnings.

Index: FormTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/FormTagTest.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** FormTagTest.java	2 Jul 2004 00:49:31 -0000	1.45
--- FormTagTest.java	31 Jul 2004 16:42:31 -0000	1.46
***************
*** 244,248 ****
          int i = 0;
          for (NodeIterator e=formTag.children();e.hasMoreNodes();) {
!             Node formNode = (Node)e.nextNode();
              if (formNode instanceof Remark) {
                  remarkNode[i++] = (Remark)formNode;
--- 244,248 ----
          int i = 0;
          for (NodeIterator e=formTag.children();e.hasMoreNodes();) {
!             Node formNode = e.nextNode();
              if (formNode instanceof Remark) {
                  remarkNode[i++] = (Remark)formNode;

Index: LinkTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/LinkTagTest.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** LinkTagTest.java	22 Jul 2004 02:22:31 -0000	1.50
--- LinkTagTest.java	31 Jul 2004 16:42:31 -0000	1.51
***************
*** 559,563 ****
          for (SimpleNodeIterator e = linkTag.children();e.hasMoreNodes();)
          {
!             dataNode[i++] = (Node)e.nextNode();
          }
          assertEquals("Number of data nodes",new Integer(2),new Integer(i));
--- 559,563 ----
          for (SimpleNodeIterator e = linkTag.children();e.hasMoreNodes();)
          {
!             dataNode[i++] = e.nextNode();
          }
          assertEquals("Number of data nodes",new Integer(2),new Integer(i));
***************
*** 778,782 ****
          int j =0 ;
          for (SimpleNodeIterator e = linkTag.children();e.hasMoreNodes();) {
!             insideNodes[j++]= (Node)e.nextNode();
          }
          assertEquals("Number of contained internal nodes",1,j);
--- 778,782 ----
          int j =0 ;
          for (SimpleNodeIterator e = linkTag.children();e.hasMoreNodes();) {
!             insideNodes[j++]= e.nextNode();
          }
          assertEquals("Number of contained internal nodes",1,j);

Index: ObjectCollectionTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/ObjectCollectionTest.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ObjectCollectionTest.java	2 Jul 2004 00:49:31 -0000	1.21
--- ObjectCollectionTest.java	31 Jul 2004 16:42:31 -0000	1.22
***************
*** 34,38 ****
  import org.htmlparser.tags.TableTag;
  import org.htmlparser.tests.ParserTestCase;
- import org.htmlparser.util.NodeList;
  import org.htmlparser.util.ParserException;
  import org.htmlparser.util.ParserUtils;
--- 34,37 ----
***************
*** 113,117 ****
          parseAndAssertNodeCount(1);
          TableTag tableTag = (TableTag)node[0];
-         NodeList nodeList = new NodeList();
          Node[] spans = ParserUtils.findTypeInNode (tableTag, Span.class);
          assertSpanContent(spans);
--- 112,115 ----

Index: ScriptTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/ScriptTagTest.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** ScriptTagTest.java	18 Jul 2004 21:31:21 -0000	1.44
--- ScriptTagTest.java	31 Jul 2004 16:42:31 -0000	1.45
***************
*** 29,33 ****
  import org.htmlparser.Parser;
  import org.htmlparser.PrototypicalNodeFactory;
- import org.htmlparser.scanners.ScriptScanner;
  import org.htmlparser.tags.ScriptTag;
  import org.htmlparser.tests.ParserTestCase;
--- 29,32 ----
***************
*** 41,46 ****
      }
  
-     private ScriptScanner scriptScanner;
- 
      public ScriptTagTest(String name)
      {
--- 40,43 ----
***************
*** 48,57 ****
      }
  
-     protected void setUp() throws Exception
-     {
-         super.setUp();
-         scriptScanner = new ScriptScanner();
-     }
- 
      public void testCreation() throws ParserException
      {
--- 45,48 ----

Index: TableTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/TableTagTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TableTagTest.java	7 Dec 2003 23:41:43 -0000	1.1
--- TableTagTest.java	31 Jul 2004 16:42:31 -0000	1.2
***************
*** 180,186 ****
                  "http://www.sec.gov/Archives/edgar/data/30554/000089322002000287/w57038e10-k.htm"
              );
-         Node node;
          for (NodeIterator e = parser.elements(); e.hasMoreNodes(); )
!             node = e.nextNode();
      }
  }
--- 180,185 ----
                  "http://www.sec.gov/Archives/edgar/data/30554/000089322002000287/w57038e10-k.htm"
              );
          for (NodeIterator e = parser.elements(); e.hasMoreNodes(); )
!             e.nextNode();
      }
  }

Index: ImageTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/ImageTagTest.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** ImageTagTest.java	18 Jul 2004 21:31:21 -0000	1.44
--- ImageTagTest.java	31 Jul 2004 16:42:31 -0000	1.45
***************
*** 293,297 ****
          Node thisNode;
          for (NodeIterator e = parser.elements();e.hasMoreNodes();) {
!             thisNode = (Node)e.nextNode();
              if (thisNode instanceof ImageTag)
                  node[i++] = thisNode;
--- 293,297 ----
          Node thisNode;
          for (NodeIterator e = parser.elements();e.hasMoreNodes();) {
!             thisNode = e.nextNode();
              if (thisNode instanceof ImageTag)
                  node[i++] = thisNode;

Index: TagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/TagTest.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** TagTest.java	17 Jul 2004 13:45:06 -0000	1.60
--- TagTest.java	31 Jul 2004 16:42:31 -0000	1.61
***************
*** 27,31 ****
  package org.htmlparser.tests.tagTests;
  
- import java.util.Hashtable;
  import org.htmlparser.Attribute;
  
--- 27,30 ----
***************
*** 291,295 ****
          createParser(lin1);
          NodeIterator en = parser.elements();
-         Hashtable h;
          String a,nice;
  
--- 290,293 ----