cweb-cvs

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

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

Modified Files:
	TestIsolatedBTree.java TestUnisolatedBTree.java 
Log Message:
Continued minor refactoring in line with model updates.

Index: TestUnisolatedBTree.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/isolation/TestUnisolatedBTree.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestUnisolatedBTree.java	17 Feb 2007 21:34:21 -0000	1.5
--- TestUnisolatedBTree.java	11 Mar 2007 11:42:49 -0000	1.6
***************
*** 50,54 ****
  import com.bigdata.objndx.AbstractBTree;
  import com.bigdata.objndx.AbstractBTreeTestCase;
! import com.bigdata.objndx.BTreeMetadata;
  import com.bigdata.objndx.IBatchOp;
  import com.bigdata.objndx.IRangeQuery;
--- 50,54 ----
  import com.bigdata.objndx.AbstractBTree;
  import com.bigdata.objndx.AbstractBTreeTestCase;
! import com.bigdata.objndx.BTree;
  import com.bigdata.objndx.IBatchOp;
  import com.bigdata.objndx.IRangeQuery;
***************
*** 106,110 ****
              final long addr = btree.write();
              
!             btree = (UnisolatedBTree)BTreeMetadata.load(store, addr);
  
              assertTrue(store==btree.getStore());
--- 106,110 ----
              final long addr = btree.write();
              
!             btree = (UnisolatedBTree)BTree.load(store, addr);
  
              assertTrue(store==btree.getStore());
***************
*** 124,128 ****
              final long addr = btree.write();
  
!             btree = (UnisolatedBTree)BTreeMetadata.load(store, addr);
  
              assertTrue(store == btree.getStore());
--- 124,128 ----
              final long addr = btree.write();
  
!             btree = (UnisolatedBTree)BTree.load(store, addr);
  
              assertTrue(store == btree.getStore());
***************
*** 412,416 ****
          final long addr1 = btree.write();
          
!         btree = (UnisolatedBTree)BTreeMetadata.load(store, addr1);
          
          assertSameIterator(new Object[]{v3,v5,v7},btree.entryIterator());
--- 412,416 ----
          final long addr1 = btree.write();
          
!         btree = (UnisolatedBTree)BTree.load(store, addr1);
          
          assertSameIterator(new Object[]{v3,v5,v7},btree.entryIterator());
***************
*** 426,430 ****
          final long addr2 = btree.write();
          
!         btree = (UnisolatedBTree)BTreeMetadata.load(store, addr2);
          
          assertSameIterator(new Object[]{v3,v7},btree.entryIterator());
--- 426,430 ----
          final long addr2 = btree.write();
          
!         btree = (UnisolatedBTree)BTree.load(store, addr2);
          
          assertSameIterator(new Object[]{v3,v7},btree.entryIterator());
***************
*** 440,444 ****
          final long addr3 = btree.write();
          
!         btree = (UnisolatedBTree)BTreeMetadata.load(store, addr3);
          
          assertSameIterator(new Object[]{v3,v7a},btree.entryIterator());
--- 440,444 ----
          final long addr3 = btree.write();
          
!         btree = (UnisolatedBTree)BTree.load(store, addr3);
          
          assertSameIterator(new Object[]{v3,v7a},btree.entryIterator());
***************
*** 455,459 ****
          final long addr4 = btree.write();
          
!         btree = (UnisolatedBTree)BTreeMetadata.load(store, addr4);
          
          assertSameIterator(new Object[]{v3,v5a,v7a},btree.entryIterator());
--- 455,459 ----
          final long addr4 = btree.write();
          
!         btree = (UnisolatedBTree)BTree.load(store, addr4);
          
          assertSameIterator(new Object[]{v3,v5a,v7a},btree.entryIterator());

Index: TestIsolatedBTree.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/isolation/TestIsolatedBTree.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestIsolatedBTree.java	19 Feb 2007 19:00:23 -0000	1.2
--- TestIsolatedBTree.java	11 Mar 2007 11:42:49 -0000	1.3
***************
*** 50,53 ****
--- 50,54 ----
  import com.bigdata.journal.TestTx;
  import com.bigdata.objndx.AbstractBTreeTestCase;
+ import com.bigdata.objndx.BTree;
  import com.bigdata.objndx.BTreeMetadata;
  import com.bigdata.objndx.IBatchOp;
***************
*** 134,138 ****
              final long addr = btree.write();
              
!             btree = new IsolatedBTree(store,BTreeMetadata.read(store, addr), src);
  
              assertTrue(store==btree.getStore());
--- 135,139 ----
              final long addr = btree.write();
              
!             btree = (IsolatedBTree)BTree.load(store,addr);
  
              assertTrue(store==btree.getStore());
***************
*** 154,158 ****
              final long addr = btree.write();
  
!             btree = new IsolatedBTree(store, BTreeMetadata.read(store, addr), src);
  
              assertTrue(store == btree.getStore());
--- 155,159 ----
              final long addr = btree.write();
  
!             btree = (IsolatedBTree)BTree.load(store,addr);
  
              assertTrue(store == btree.getStore());