cweb-cvs

[Bryan T. <tho...@us...>]

Update of /cvsroot/cweb/bigdata/src/test/com/bigdata/journal
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5433/src/test/com/bigdata/journal

Modified Files:
	TestCommitRecordIndex.java TestTx.java TestNamedIndices.java 
Log Message:
Continued minor refactoring in line with model updates.

Index: TestCommitRecordIndex.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/TestCommitRecordIndex.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestCommitRecordIndex.java	17 Feb 2007 21:34:12 -0000	1.1
--- TestCommitRecordIndex.java	11 Mar 2007 11:42:34 -0000	1.2
***************
*** 50,54 ****
  import java.nio.ByteBuffer;
  
! import com.bigdata.objndx.BTreeMetadata;
  import com.bigdata.rawstore.IRawStore;
  import com.bigdata.rawstore.SimpleMemoryRawStore;
--- 50,54 ----
  import java.nio.ByteBuffer;
  
! import com.bigdata.objndx.BTree;
  import com.bigdata.rawstore.IRawStore;
  import com.bigdata.rawstore.SimpleMemoryRawStore;
***************
*** 136,140 ****
              
              // reload the index from the store.
!             ndx = (CommitRecordIndex)BTreeMetadata.load(store, ndx_addr);
  
              // verify existence test.
--- 136,140 ----
              
              // reload the index from the store.
!             ndx = (CommitRecordIndex)BTree.load(store, ndx_addr);
  
              // verify existence test.

Index: TestTx.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/TestTx.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** TestTx.java	22 Feb 2007 16:59:34 -0000	1.19
--- TestTx.java	11 Mar 2007 11:42:34 -0000	1.20
***************
*** 733,737 ****
  //
  //            // Transaction begins before the write.
! //            IStore tx0 = new Tx(journal,0);
  //
  //            // Write a random data version for id 0.
--- 733,737 ----
  //
  //            // Transaction begins before the write.
! //            IIndexStore tx0 = new Tx(journal,0);
  //
  //            // Write a random data version for id 0.
***************
*** 752,756 ****
  //
  //            // Transaction begins after the write.
! //            IStore tx1 = new Tx(journal,1);
  //
  //            /*
--- 752,756 ----
  //
  //            // Transaction begins after the write.
! //            IIndexStore tx1 = new Tx(journal,1);
  //
  //            /*

Index: TestNamedIndices.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/TestNamedIndices.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestNamedIndices.java	22 Feb 2007 16:59:34 -0000	1.2
--- TestNamedIndices.java	11 Mar 2007 11:42:34 -0000	1.3
***************
*** 50,54 ****
  import com.bigdata.objndx.BTree;
  import com.bigdata.objndx.SimpleEntry;
! import com.bigdata.scaleup.PartitionedJournal;
  
  /**
--- 50,54 ----
  import com.bigdata.objndx.BTree;
  import com.bigdata.objndx.SimpleEntry;
! import com.bigdata.scaleup.MasterJournal;
  
  /**
***************
*** 68,72 ****
   * 
   * @todo reuse this test suite to test the basic features of a
!  *       {@link PartitionedJournal}.
   * 
   * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
--- 68,72 ----
   * 
   * @todo reuse this test suite to test the basic features of a
!  *       {@link MasterJournal}.
   * 
   * @author <a href="mailto:tho...@us...">Bryan Thompson</a>