htmlparser-cvs

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

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

Modified Files:
	NodeListTest.java 
Log Message:
Add remove(Node) method and code suggested by Matthew Buckett.

Index: NodeListTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/NodeListTest.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** NodeListTest.java	24 May 2004 16:18:34 -0000	1.27
--- NodeListTest.java	18 Sep 2005 23:00:27 -0000	1.28
***************
*** 52,55 ****
--- 52,62 ----
      }
  
+     public void testOneItemConstructor() {
+         Node node = createHTMLNodeObject();
+         nodeList = new NodeList(node);
+         assertEquals("Vector Size",1,nodeList.size());
+         assertTrue("First Element",node==nodeList.elementAt(0));
+     }
+ 
      public void testAddOneItem() {
          Node node = createHTMLNodeObject();
***************
*** 82,86 ****
          createTestDataAndPutInVector(30);
          assertTestDataCouldBeExtractedFromVector(30);
-         assertEquals("Number of Adjustments",1,nodeList.getNumberOfAdjustments());
      }
  
--- 89,92 ----
***************
*** 88,92 ****
          createTestDataAndPutInVector(31);
          assertTestDataCouldBeExtractedFromVector(31);
-         assertEquals("Number of Adjustments",2,nodeList.getNumberOfAdjustments());
      }
  
--- 94,97 ----
***************
*** 94,98 ****
          createTestDataAndPutInVector(50);
          assertTestDataCouldBeExtractedFromVector(50);
-         assertEquals("Number of Adjustments",2,nodeList.getNumberOfAdjustments());
      }
  
--- 99,102 ----
***************
*** 100,109 ****
          createTestDataAndPutInVector(51);
          assertTestDataCouldBeExtractedFromVector(51);
-         assertEquals("Number of Adjustments",2,nodeList.getNumberOfAdjustments());
      }
  
      public void testAddTwoHundredItems() {
          createTestDataAndPutInVector(200);
!         assertEquals("Number of Adjustments",4,nodeList.getNumberOfAdjustments());
      }
  
--- 104,112 ----
          createTestDataAndPutInVector(51);
          assertTestDataCouldBeExtractedFromVector(51);
      }
  
      public void testAddTwoHundredItems() {
          createTestDataAndPutInVector(200);
!         assertTestDataCouldBeExtractedFromVector(200);
      }
  
***************
*** 188,190 ****
--- 191,236 ----
          assertTrue("Second Element",null==nodeList.elementAt(1));
      }
+ 
+ 
+     public void testIndexOf() {
+         Node node1 = createHTMLNodeObject();
+         Node node2 = createHTMLNodeObject();
+         Node node3 = createHTMLNodeObject();
+         nodeList.add(node1);
+         nodeList.add(node2);
+         nodeList.add(node3);
+         assertEquals("Vector Size",3,nodeList.size());
+         assertTrue("First Element",node1==nodeList.elementAt(0));
+         assertTrue("Second Element",node2==nodeList.elementAt(1));
+         assertTrue("Third Element",node3==nodeList.elementAt(2));
+         assertTrue("Index wrong",1 == nodeList.indexOf(node2));
+         assertTrue("Index wrong",0 == nodeList.indexOf(node1));
+         assertTrue("Index wrong",2 == nodeList.indexOf(node3));
+     }
+ 
+     public void testRemoveItem() {
+         Node node1 = createHTMLNodeObject();
+         Node node2 = createHTMLNodeObject();
+         nodeList.add(node1);
+         nodeList.add(node2);
+         assertEquals("Vector Size",2,nodeList.size());
+         assertTrue("First Element",node1==nodeList.elementAt(0));
+         assertTrue("Second Element",node2==nodeList.elementAt(1));
+         nodeList.remove(node1);
+         assertEquals("List Size",1,nodeList.size());
+         assertTrue("First Element",node2==nodeList.elementAt(0));
+     }
+ 
+     public void testRemoveLastItem() {
+         Node node1 = createHTMLNodeObject();
+         Node node2 = createHTMLNodeObject();
+         nodeList.add(node1);
+         nodeList.add(node2);
+         assertEquals("Vector Size",2,nodeList.size());
+         assertTrue("First Element",node1==nodeList.elementAt(0));
+         assertTrue("Second Element",node2==nodeList.elementAt(1));
+         nodeList.remove(node2);
+         assertEquals("List Size",1,nodeList.size());
+         assertTrue("First Element",node1==nodeList.elementAt(0));
+     }
  }