kward       2002/06/11 19:12:00

  Modified:    java/scratchpad/tests/src CollectionTest.java
  Log:
  cleaned up tests
  
  Revision  Changes    Path
  1.3       +65 -57    xml-xindice/java/scratchpad/tests/src/CollectionTest.java
  
  Index: CollectionTest.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/scratchpad/tests/src/CollectionTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CollectionTest.java       10 Jun 2002 02:11:40 -0000      1.2
  +++ CollectionTest.java       12 Jun 2002 02:12:00 -0000      1.3
  @@ -59,6 +59,8 @@
   
   import java.util.*;
   
  +import junit.framework.*;
  +
   public class CollectionTest extends XMLRPCAPITestCase {
   
      private boolean exceptioncaught = false ;
  @@ -74,92 +76,98 @@
   
      public void testListCollections() throws Exception {
   
  -   exceptioncaught = true;
  -   assertTrue( exceptioncaught );
  +      createCollection("child1");
   
  -   }
  +      // see if our collection is there
  +      Hashtable message = new Hashtable();
  +      message.put("message", "ListCollections");
  +      message.put("collection", "/" + INSTANCE_NAME + "/" + 
TEST_COLLECTION_NAME);
   
  -   public void testGetCollection() {
  +      Vector params = new Vector();
  +      params.addElement(message);
   
  -   exceptioncaught = true ;
  -   assertTrue( exceptioncaught );
  +      Hashtable result = (Hashtable) client.execute("run", params);
   
  -   }
  +      Vector list = (Vector) result.get("result");
  +      Enumeration enum = list.elements();
  +      while ( enum.hasMoreElements() ) {
  +         assertTrue(((String) enum.nextElement()).equals("child1"));
  +      }
   
  -   public void testInsertDocument() {
  +      dropCollection("child1");
   
  -   exceptioncaught = true ;
  -   assertTrue( exceptioncaught );
  -
  -   }
  +      // see if no collection returns a result
  +      message = new Hashtable();
  +      message.put("message", "ListCollections");
  +      message.put("collection", "/" + INSTANCE_NAME);
   
  -   public void testRemoveDocument() {
  +      params = new Vector();
  +      params.addElement(message);
   
  -   exceptioncaught = true ;
  -   assertTrue( exceptioncaught );
  +      result = new Hashtable();
  +      result = (Hashtable) client.execute("run", params);
   
  -   }
  +      list = new Vector();
  +      list = (Vector) result.get("result");
   
  -   public void testGetDocument() {
  +      assertTrue(list.size() > 0);
   
  -   exceptioncaught = true ;
  -   assertTrue( exceptioncaught );
   
      }
   
  -   public void testSetDocument() {
  -
  -   exceptioncaught = true ;
  -   assertTrue( exceptioncaught );
  +   public void testInsertDocument() throws Exception {
   
  -   }
  +      String result = null;
   
  -   public void testQueryDocument() {
  +      // insert a test document
  +      try {
  +         result = insertDocument("testdoc", "<test>test data</test>");
  +      } catch(Exception e) {
  +         fail( e.getMessage() );
  +      }
   
  -   exceptioncaught = true ;
  -   assertTrue( exceptioncaught );
  -
  -   }
  +      assertTrue(result.equals("testdoc"));
   
  -   public void testQueryCollection() {
  +      removeDocument("testdoc");
   
  -   exceptioncaught = true ;
  -   assertTrue( exceptioncaught );
  +      // try inserting a bad document
  +      try {
  +         insertDocument("baddoc", "<test>test data</tes");
  +      } catch(Exception e) {
  +         assertTrue(e.getMessage().lastIndexOf("Error parsing Document") > 
0);
  +      }
   
      }
   
  -   public void testGetDocuments() {
  +   public void testRemoveDocument() throws Exception {
   
  -   exceptioncaught = true ;
  -   assertTrue( exceptioncaught );
  +      insertDocument("doctodrop", "<data>\n<test>\ntest 
data</test>\n</data>");
   
  -   }
  -
  -   public void testListDocuments() {
  +      // try removing our document
  +      try {
  +         removeDocument("doctodrop");
  +      } catch( Exception e ) {
  +         fail( e.getMessage() );
  +      }
   
  -   exceptioncaught = true ;
  -   assertTrue( exceptioncaught );
  +      assertTrue(true);
   
  -   }
  +      // try removing a document that doesn't exist
  +      Hashtable message = new Hashtable();
   
  -   public void testListIndexers() {
  +      message.put("message", "RemoveDocument");
  +      message.put("collection", "/" + INSTANCE_NAME + "/" + 
TEST_COLLECTION_NAME );
  +      message.put("name", "invalidname");
   
  -   exceptioncaught = true ;
  -   assertTrue( exceptioncaught );
  -
  -   }
  -
  -   public void testGetDocumentCount() {
  -
  -   exceptioncaught = true ;
  -   assertTrue( exceptioncaught );
  -
  -   }
  +      Vector params = new Vector();
   
  -   public void testCreateNewOID() {
  +      params.addElement(message);
   
  -   exceptioncaught = true ;
  -   assertTrue( exceptioncaught );
  +      try {
  +         client.execute("run", params);
  +      } catch(Exception e) {
  +         assertTrue(e.getMessage().lastIndexOf("Document Does Not Exist") > 
0);
  +      }
   
      }
   
  
  
  

Reply via email to