[Neuclear-develop] neuclear-ledger/src/java/org/neuclear/ledger/tests AbstractLedgerBrowserTest.java,1.2,1.3

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30575/src/java/org/neuclear/ledger/tests

Modified Files:
	AbstractLedgerBrowserTest.java 
Log Message:
AbstractLedgerBrowserTest has been extended to test date ranges
SimpleLedger now passes all tests.
HibernateLedger passes at times, which is mysterious. More research needed.

Index: AbstractLedgerBrowserTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/tests/AbstractLedgerBrowserTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractLedgerBrowserTest.java	26 Mar 2004 23:36:34 -0000	1.2
--- AbstractLedgerBrowserTest.java	29 Mar 2004 16:56:26 -0000	1.3
***************
*** 13,16 ****
--- 13,21 ----
  $Id$
  $Log$
+ Revision 1.3  2004/03/29 16:56:26  pelle
+ AbstractLedgerBrowserTest has been extended to test date ranges
+ SimpleLedger now passes all tests.
+ HibernateLedger passes at times, which is mysterious. More research needed.
+ 
  Revision 1.2  2004/03/26 23:36:34  pelle
  The simple browse(book) now works on hibernate, I have implemented the other two, which currently don not constrain the query correctly.
***************
*** 44,47 ****
--- 49,67 ----
      }
  
+     public static Date getIsolatedTimeStamp() {
+         try {
+             Thread.currentThread().sleep(5);
+         } catch (InterruptedException e) {
+             ;
+         }
+         final Date t = new Date();
+         try {
+             Thread.currentThread().sleep(5);
+         } catch (InterruptedException e) {
+             ;
+         }
+         return t;
+     }
+ 
      public void testAmountOfEntries() throws LowlevelLedgerException, InvalidTransactionException {
          final String bob = getBobBook();
***************
*** 78,82 ****
          final String alice = getAliceBook();
  
!         Date t1 = new Date();
          assertBookBrowserSize(bob, 0, browser.browse(bob));
          assertBookBrowserSize(alice, 0, browser.browse(alice));
--- 98,102 ----
          final String alice = getAliceBook();
  
!         Date t1 = getIsolatedTimeStamp();
          assertBookBrowserSize(bob, 0, browser.browse(bob));
          assertBookBrowserSize(alice, 0, browser.browse(alice));
***************
*** 88,92 ****
          assertBookBrowserSize(alice, i, browser.browse(alice));
  
!         Date t2 = new Date();
          assertTrue(t2.after(t1));
  
--- 108,112 ----
          assertBookBrowserSize(alice, i, browser.browse(alice));
  
!         Date t2 = getIsolatedTimeStamp();
          assertTrue(t2.after(t1));
  
***************
*** 106,113 ****
      }
  
!     public void testEntryContentFromTime() throws LowlevelLedgerException, InvalidTransactionException {
          final String bob = getBobBook();
          final String alice = getAliceBook();
  
          assertBookBrowserSize(bob, 0, browser.browse(bob));
          assertBookBrowserSize(alice, 0, browser.browse(alice));
--- 126,134 ----
      }
  
!     public void testAmountOfEntriesInTimeRange() throws LowlevelLedgerException, InvalidTransactionException {
          final String bob = getBobBook();
          final String alice = getAliceBook();
  
+         Date t1 = getIsolatedTimeStamp();
          assertBookBrowserSize(bob, 0, browser.browse(bob));
          assertBookBrowserSize(alice, 0, browser.browse(alice));
***************
*** 116,125 ****
              ledger.transfer(bob, alice, 10, "test" + i);
          }
!         assertVerifyBrowserContent(bob, alice, -10, i, browser.browse(bob));
!         assertVerifyBrowserContent(alice, bob, 10, i, browser.browse(alice));
  
  
!     }
  
  
      public void assertVerifyBrowserContent(final String book, final String counterparty, final double amount, final int count, final BookBrowser bb) throws LowlevelLedgerException {
--- 137,176 ----
              ledger.transfer(bob, alice, 10, "test" + i);
          }
!         assertBookBrowserSize(bob, i, browser.browse(bob));
!         assertBookBrowserSize(alice, i, browser.browse(alice));
  
+         Date t2 = getIsolatedTimeStamp();
  
!         for (i = 0; i < 10; i++) {
!             ledger.transfer(bob, alice, 10, "test" + i);
!         }
!         assertBookBrowserSize(bob, 20, browser.browse(bob));
!         assertBookBrowserSize(alice, 20, browser.browse(alice));
!         Date t3 = getIsolatedTimeStamp();
! 
!         for (i = 0; i < 10; i++) {
!             ledger.transfer(bob, alice, 10, "test" + i);
!         }
!         Date t4 = getIsolatedTimeStamp();
!         assertBookBrowserSize(bob, 30, browser.browse(bob));
!         assertBookBrowserSize(alice, 30, browser.browse(alice));
  
+         assertBookBrowserSize(bob, 10, browser.browseRange(bob, t3, t4));
+         assertBookBrowserSize(alice, 10, browser.browseRange(alice, t3, t4));
+         assertBookBrowserSize(bob, 10, browser.browseRange(bob, t2, t3));
+         assertBookBrowserSize(alice, 10, browser.browseRange(alice, t2, t3));
+         assertBookBrowserSize(bob, 10, browser.browseRange(bob, t1, t2));
+         assertBookBrowserSize(alice, 10, browser.browseRange(alice, t1, t2));
+ 
+ 
+         assertBookBrowserSize(bob, 20, browser.browseRange(bob, t1, t3));
+         assertBookBrowserSize(alice, 20, browser.browseRange(alice, t1, t3));
+         assertBookBrowserSize(bob, 20, browser.browseRange(bob, t2, t4));
+         assertBookBrowserSize(alice, 20, browser.browseRange(alice, t2, t4));
+ 
+         assertBookBrowserSize(bob, 30, browser.browseRange(bob, t1, t4));
+         assertBookBrowserSize(alice, 30, browser.browseRange(alice, t1, t4));
+ 
+     }
  
      public void assertVerifyBrowserContent(final String book, final String counterparty, final double amount, final int count, final BookBrowser bb) throws LowlevelLedgerException {