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

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

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

Modified Files:
	PaymentReceiverTest.java 
Log Message:
All unit tests in commons, id and xmlsec now work.
AssetController now successfully processes payments in the unit test.
Payment Web App has working form that creates a TransferRequest presents it to the signer
and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust.

Index: PaymentReceiverTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver/PaymentReceiverTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PaymentReceiverTest.java	21 Nov 2003 04:43:04 -0000	1.6
--- PaymentReceiverTest.java	22 Nov 2003 00:22:29 -0000	1.7
***************
*** 1,7 ****
  package org.neuclear.asset.receiver;
  
- import org.dom4j.DocumentException;
  import org.neuclear.asset.InvalidTransferException;
  import org.neuclear.asset.contracts.Asset;
  import org.neuclear.asset.contracts.TransferRequest;
  import org.neuclear.asset.contracts.builders.TransferRequestBuilder;
--- 1,8 ----
  package org.neuclear.asset.receiver;
  
  import org.neuclear.asset.InvalidTransferException;
  import org.neuclear.asset.contracts.Asset;
+ import org.neuclear.asset.contracts.AssetGlobals;
+ import org.neuclear.asset.contracts.TransferGlobals;
  import org.neuclear.asset.contracts.TransferRequest;
  import org.neuclear.asset.contracts.builders.TransferRequestBuilder;
***************
*** 18,25 ****
  import org.neuclear.ledger.implementations.SQLLedger;
  import org.neuclear.receiver.Receiver;
! import org.neuclear.tests.AbstractReceiverTest;
  import org.neuclear.xml.XMLException;
  
! import java.io.*;
  import java.security.GeneralSecurityException;
  
--- 19,27 ----
  import org.neuclear.ledger.implementations.SQLLedger;
  import org.neuclear.receiver.Receiver;
! import org.neuclear.tests.AbstractSigningTest;
  import org.neuclear.xml.XMLException;
  
! import java.io.IOException;
! import java.io.UnsupportedEncodingException;
  import java.security.GeneralSecurityException;
  
***************
*** 44,47 ****
--- 46,55 ----
  $Id$
  $Log$
+ Revision 1.7  2003/11/22 00:22:29  pelle
+ All unit tests in commons, id and xmlsec now work.
+ AssetController now successfully processes payments in the unit test.
+ Payment Web App has working form that creates a TransferRequest presents it to the signer
+ and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust.
+ 
  Revision 1.6  2003/11/21 04:43:04  pelle
  EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 118,124 ****
   * Time: 11:20:31 AM
   */
! public final class PaymentReceiverTest extends AbstractReceiverTest {
      public PaymentReceiverTest(final String string) throws NeuClearException, GeneralSecurityException, UnknownLedgerException, LowlevelLedgerException, BookExistsException, IOException, InvalidTransferException, XMLException {
          super(string);
          asset = (Asset) NSResolver.resolveIdentity(assetName);
  
--- 126,134 ----
   * Time: 11:20:31 AM
   */
! public final class PaymentReceiverTest extends AbstractSigningTest {
      public PaymentReceiverTest(final String string) throws NeuClearException, GeneralSecurityException, UnknownLedgerException, LowlevelLedgerException, BookExistsException, IOException, InvalidTransferException, XMLException {
          super(string);
+         AssetGlobals.registerReaders();
+         TransferGlobals.registerReaders();
          asset = (Asset) NSResolver.resolveIdentity(assetName);
  
***************
*** 131,143 ****
          );
          receiver = new AssetControllerReceiver(proc, getSigner());
-         directory = new File("target/testdata/payments");
-         directory.mkdirs();
-         createPayments(getBob(), getAlice(), 100);
-         createPayments(getAlice(), getBob(), 100);
      }
  
-     public final void testSimple() throws Exception, DocumentException, NeuClearException, XMLException {
-         runDirectoryTest(directory.getAbsolutePath());
-     }
  
      public final Receiver getReceiver() {
--- 141,146 ----
***************
*** 153,156 ****
--- 156,170 ----
      }
  
+     public final void testTransactions() throws Exception, IOException, InvalidTransferException, NeuClearException {
+         performTransaction(createPayments(getAlice(), getBob(), 100));
+         performTransaction(createPayments(getBob(), getAlice(), 100));
+     }
+ 
+     public void performTransaction(SignedNamedObject obj) throws Exception {
+         Object pre = getPreTransactionState(obj);
+         org.neuclear.xml.ElementProxy receipt = receiver.receive(obj);
+         assertTrue(verifyTransaction(obj, pre));
+     }
+ 
      public final Object getPreTransactionState(final SignedNamedObject obj) throws Exception {
  
***************
*** 179,188 ****
      }
  
!     public final void createPayments(final Identity from, final Identity to, final double amount) throws InvalidTransferException, XMLException, NeuClearException, IOException, UnsupportedEncodingException {
!         final TransferRequestBuilder transfer = new TransferRequestBuilder(asset, from, to, 100, TimeTools.now(), "Test One");
!         final SignedNamedObject signed = transfer.sign(getSigner());
!         final OutputStream out = new BufferedOutputStream(new FileOutputStream(directory.getAbsolutePath() + "/" + transfer.getLocalName() + ".xml"));
!         out.write(signed.getEncoded().getBytes("UTF-8"));
! 
      }
  
--- 193,199 ----
      }
  
!     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());
      }
  
***************
*** 190,196 ****
  
      private final Asset asset;
-     private final File directory;
      private final Receiver receiver;
      private final CurrencyController proc;
      private final double balance = 0.0;
  }
--- 201,211 ----
  
      private final Asset asset;
      private final Receiver receiver;
      private final CurrencyController proc;
      private final double balance = 0.0;
+ 
+     static {
+         AssetGlobals.class.getClass();
+         TransferGlobals.class.getClass();
+     }
  }