[cweb-CVS] bigdata/src/test/com/bigdata/journal TestDiskJournal.java, 1.8, 1.9 TestTransientJournal.java, 1.7, 1.8 TestMappedJournal.java, 1.9, 1.10 TestDirectJournal.java, 1.8, 1.9

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

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

Modified Files:
	TestDiskJournal.java TestTransientJournal.java 
	TestMappedJournal.java TestDirectJournal.java 
Log Message:
Corrected problem in the interpretation of maximumExtent for an IBufferStrategy vs an IJournal.
Working through use of isolatable indices for the triple store.

Index: TestDirectJournal.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/TestDirectJournal.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestDirectJournal.java	22 Feb 2007 16:59:34 -0000	1.8
--- TestDirectJournal.java	27 Mar 2007 17:11:40 -0000	1.9
***************
*** 143,147 ****
          assertEquals(Options.INITIAL_EXTENT, Options.DEFAULT_INITIAL_EXTENT,
                  bufferStrategy.getInitialExtent());
!         assertEquals(Options.MAXIMUM_EXTENT, Options.DEFAULT_MAXIMUM_EXTENT,
                  bufferStrategy.getMaximumExtent());
          assertNotNull("raf", bufferStrategy.raf);
--- 143,147 ----
          assertEquals(Options.INITIAL_EXTENT, Options.DEFAULT_INITIAL_EXTENT,
                  bufferStrategy.getInitialExtent());
!         assertEquals(Options.MAXIMUM_EXTENT, 0L /*soft limit for Direct buffer*/,
                  bufferStrategy.getMaximumExtent());
          assertNotNull("raf", bufferStrategy.raf);

Index: TestTransientJournal.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/TestTransientJournal.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestTransientJournal.java	21 Feb 2007 20:17:20 -0000	1.7
--- TestTransientJournal.java	27 Mar 2007 17:11:40 -0000	1.8
***************
*** 139,143 ****
          assertEquals(Options.INITIAL_EXTENT, Options.DEFAULT_INITIAL_EXTENT,
                  bufferStrategy.getExtent());
!         assertEquals(Options.MAXIMUM_EXTENT, Options.DEFAULT_MAXIMUM_EXTENT,
                  bufferStrategy.getMaximumExtent());
          assertEquals(Options.BUFFER_MODE, BufferMode.Transient, bufferStrategy
--- 139,143 ----
          assertEquals(Options.INITIAL_EXTENT, Options.DEFAULT_INITIAL_EXTENT,
                  bufferStrategy.getExtent());
!         assertEquals(Options.MAXIMUM_EXTENT, 0L/*soft limit for transient mode*/,
                  bufferStrategy.getMaximumExtent());
          assertEquals(Options.BUFFER_MODE, BufferMode.Transient, bufferStrategy

Index: TestDiskJournal.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/TestDiskJournal.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestDiskJournal.java	22 Feb 2007 16:59:34 -0000	1.8
--- TestDiskJournal.java	27 Mar 2007 17:11:40 -0000	1.9
***************
*** 142,146 ****
          assertEquals(Options.INITIAL_EXTENT, Options.DEFAULT_INITIAL_EXTENT,
                  bufferStrategy.getInitialExtent());
!         assertEquals(Options.MAXIMUM_EXTENT, Options.DEFAULT_MAXIMUM_EXTENT,
                  bufferStrategy.getMaximumExtent());
          assertNotNull("raf", bufferStrategy.raf);
--- 142,146 ----
          assertEquals(Options.INITIAL_EXTENT, Options.DEFAULT_INITIAL_EXTENT,
                  bufferStrategy.getInitialExtent());
!         assertEquals(Options.MAXIMUM_EXTENT, 0L/*soft limit for disk mode*/,
                  bufferStrategy.getMaximumExtent());
          assertNotNull("raf", bufferStrategy.raf);

Index: TestMappedJournal.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/TestMappedJournal.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TestMappedJournal.java	22 Feb 2007 16:59:34 -0000	1.9
--- TestMappedJournal.java	27 Mar 2007 17:11:40 -0000	1.10
***************
*** 143,147 ****
          assertEquals(Options.INITIAL_EXTENT, Options.DEFAULT_INITIAL_EXTENT,
                  bufferStrategy.getInitialExtent());
!         assertEquals(Options.MAXIMUM_EXTENT, Options.DEFAULT_MAXIMUM_EXTENT,
                  bufferStrategy.getMaximumExtent());
          assertNotNull("raf", bufferStrategy.raf);
--- 143,149 ----
          assertEquals(Options.INITIAL_EXTENT, Options.DEFAULT_INITIAL_EXTENT,
                  bufferStrategy.getInitialExtent());
!         assertEquals(
!                 Options.MAXIMUM_EXTENT,
!                 Options.DEFAULT_MAXIMUM_EXTENT /* hard limit for mapped mode. */,
                  bufferStrategy.getMaximumExtent());
          assertNotNull("raf", bufferStrategy.raf);