[Neuclear-develop] neuclear-pay/src/test/org/neuclear/asset/receiver PaymentReceiverTest.java,1.14,1.15

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

Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv28986/src/test/org/neuclear/asset/receiver

Modified Files:
	PaymentReceiverTest.java 
Log Message:
Now builds.
Now need to do unit tests

Index: PaymentReceiverTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver/PaymentReceiverTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PaymentReceiverTest.java	11 Jan 2004 00:39:06 -0000	1.14
--- PaymentReceiverTest.java	13 Jan 2004 15:11:18 -0000	1.15
***************
*** 7,12 ****
--- 7,16 ----
  import org.neuclear.asset.orders.TransferGlobals;
  import org.neuclear.asset.orders.TransferOrder;
+ import org.neuclear.asset.orders.Amount;
+ import org.neuclear.asset.orders.builders.TransferOrderBuilder;
  import org.neuclear.commons.NeuClearException;
+ import org.neuclear.commons.crypto.signers.TestCaseSigner;
  import org.neuclear.commons.sql.DefaultConnectionSource;
+ import org.neuclear.commons.sql.statements.SimpleStatementFactory;
  import org.neuclear.commons.time.TimeTools;
  import org.neuclear.id.Identity;
***************
*** 47,50 ****
--- 51,58 ----
  $Id$
  $Log$
+ Revision 1.15  2004/01/13 15:11:18  pelle
+ Now builds.
+ Now need to do unit tests
+ 
  Revision 1.14  2004/01/11 00:39:06  pelle
  Cleaned up the schemas even more they now all verifiy.
***************
*** 176,185 ****
          proc = new CurrencyController(
                  new SQLLedger(
!                         new DefaultConnectionSource(),
                          assetName
!                 )
!                 , assetName
          );
!         receiver = new AssetControllerReceiver(proc, getSigner());
      }
  
--- 184,194 ----
          proc = new CurrencyController(
                  new SQLLedger(
!                         new SimpleStatementFactory(new DefaultConnectionSource()),
                          assetName
!                 ),
!                 new TestCaseSigner(),
!                 assetName
          );
!         receiver=proc;
      }
  
***************
*** 204,208 ****
      public void performTransaction(SignedNamedObject obj) throws Exception {
          Object pre = getPreTransactionState(obj);
!         org.neuclear.xml.ElementProxy receipt = receiver.receive(obj);
          assertTrue(verifyTransaction(obj, pre));
      }
--- 213,217 ----
      public void performTransaction(SignedNamedObject obj) throws Exception {
          Object pre = getPreTransactionState(obj);
!         SignedNamedObject receipt = receiver.receive(obj);
          assertTrue(verifyTransaction(obj, pre));
      }
***************
*** 212,216 ****
          if (obj instanceof TransferOrder) {
              final TransferOrder transfer = (TransferOrder) obj;
!             final double fromBalance = proc.getBalance(transfer.getFrom(), transfer.getTimeStamp());
              final double toBalance = proc.getBalance(transfer.getRecipient(), transfer.getTimeStamp());
  
--- 221,225 ----
          if (obj instanceof TransferOrder) {
              final TransferOrder transfer = (TransferOrder) obj;
!             final double fromBalance = proc.getBalance(transfer.getSignatory(), transfer.getTimeStamp());
              final double toBalance = proc.getBalance(transfer.getRecipient(), transfer.getTimeStamp());
  
***************
*** 224,233 ****
          if (obj instanceof TransferOrder) {
              final TransferOrder transfer = (TransferOrder) obj;
!             final double fromBalance = proc.getBalance(transfer.getFrom(), transfer.getTimeStamp());
              final double toBalance = proc.getBalance(transfer.getRecipient(), transfer.getTimeStamp());
              final double prebalances[] = (double[]) state;
  
!             return (fromBalance == prebalances[0] - transfer.getAmount()) &&
!                     (toBalance == prebalances[1] + transfer.getAmount());
          }
          return false;
--- 233,242 ----
          if (obj instanceof TransferOrder) {
              final TransferOrder transfer = (TransferOrder) obj;
!             final double fromBalance = proc.getBalance(transfer.getSignatory(), transfer.getTimeStamp());
              final double toBalance = proc.getBalance(transfer.getRecipient(), transfer.getTimeStamp());
              final double prebalances[] = (double[]) state;
  
!             return (fromBalance == prebalances[0] - transfer.getAmount().getAmount()) &&
!                     (toBalance == prebalances[1] + transfer.getAmount().getAmount());
          }
          return false;
***************
*** 235,240 ****
  
      public final SignedNamedObject createPayments(final Identity from, final Identity to, final double amount) throws InvalidTransferException, XMLException, NeuClearException, IOException, UnsupportedEncodingException {
!         final TransferRequestBuilder transfer = new TransferRequestBuilder(asset, from, to, amount, TimeTools.now(), "Test One");
!         return transfer.sign(getSigner());
      }
  
--- 244,249 ----
  
      public final SignedNamedObject createPayments(final Identity from, final Identity to, final double amount) throws InvalidTransferException, XMLException, NeuClearException, IOException, UnsupportedEncodingException {
!         final TransferOrderBuilder transfer = new TransferOrderBuilder(asset, to, new Amount(amount), "Test One");
!         return transfer.convert(from.getName(),getSigner());
      }