cvs commit: xml-xindice/java/tests/src/org/apache/xindice/core/filer FilerTestCase.java

[kstaken]

kstaken     2002/12/15 11:42:51

  Modified:    java/tests/src/org/apache/xindice UnitTests.java
               java/tests/src/org/apache/xindice/core/filer
                        FilerTestCase.java
  Log:
  Adding code so that BerkeleyBTreeFiler will be tested if it's compiled into
  the server.
  
  Revision  Changes    Path
  1.7       +14 -2     
xml-xindice/java/tests/src/org/apache/xindice/UnitTests.java
  
  Index: UnitTests.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/UnitTests.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- UnitTests.java    28 Nov 2002 08:12:26 -0000      1.6
  +++ UnitTests.java    15 Dec 2002 19:42:51 -0000      1.7
  @@ -76,6 +76,7 @@
   /**
    * @version $Revision$, $Date$
    * @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
  + * @author Kimbro Staken <[EMAIL PROTECTED]>
    */
   public class UnitTests {
   
  @@ -89,6 +90,17 @@
         suite.addTest(new FilerTestSetup(new TestSuite(FilerTestCase.class), 
new FSFiler()));
         // todo see what to do with the HashFiler suite.addTest(new 
FilerTestSetup(new TestSuite(FilerTestCase.class), new HashFiler()));
         suite.addTest(new FilerTestSetup(new TestSuite(FilerTestCase.class), 
new MemFiler()));
  +
  +      // If the Berkeley filer was built in then test it too.
  +      try {
  +         Class filerClass = 
Class.forName("org.apache.xindice.core.filer.BerkeleyBTreeFiler");
  +         BerkeleyBTreeFiler filer = (BerkeleyBTreeFiler) 
filerClass.newInstance();
  +         suite.addTest(new FilerTestSetup(new 
TestSuite(FilerTestCase.class), filer));
  +      }
  +      catch (Exception e) {
  +         // If the class wasn't built just ignore it.
  +      }
  +
   
         suite.addTest(new TestSuite(DatabaseImplTest.class));
         suite.addTest(new TestSuite(ResourceIteratorImplTest.class));
  
  
  
  1.4       +6 -2      
xml-xindice/java/tests/src/org/apache/xindice/core/filer/FilerTestCase.java
  
  Index: FilerTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/core/filer/FilerTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FilerTestCase.java        28 Oct 2002 08:39:20 -0000      1.3
  +++ FilerTestCase.java        15 Dec 2002 19:42:51 -0000      1.4
  @@ -113,6 +113,10 @@
   
         RecordSet set = filer.getRecordSet();
         assertEquals(result.getValue(), set.getNextRecord().getValue());
  +      assertTrue(set.hasMoreRecords() == false);
  +
  +      filer.deleteRecord(TEST_KEY);
  +      assertEquals(0, filer.getRecordCount());
      }
   
      public void testFailReadDeletedRecord() throws Exception {