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

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

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

Modified Files:
	PaymentReceiverTest.java 
Log Message:
Signers now can generatekeys via the generateKey() method.
Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
SignedNamedObject now contains the full xml which is returned with getEncoded()
This means that it is now possible to further send on or process a SignedNamedObject, leaving
NamedObjectBuilder for its original purposes of purely generating new Contracts.
NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
Updated all major interfaces that used the old model to use the new model.

Index: PaymentReceiverTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver/PaymentReceiverTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PaymentReceiverTest.java	12 Nov 2003 23:47:05 -0000	1.4
--- PaymentReceiverTest.java	19 Nov 2003 23:32:20 -0000	1.5
***************
*** 20,29 ****
  import org.neuclear.tests.AbstractReceiverTest;
  import org.neuclear.xml.XMLException;
- import org.neuclear.xml.XMLTools;
  
! import java.io.File;
! import java.io.FileNotFoundException;
! import java.io.FileOutputStream;
! import java.io.OutputStream;
  import java.security.GeneralSecurityException;
  
--- 20,25 ----
  import org.neuclear.tests.AbstractReceiverTest;
  import org.neuclear.xml.XMLException;
  
! import java.io.*;
  import java.security.GeneralSecurityException;
  
***************
*** 48,51 ****
--- 44,56 ----
  $Id$
  $Log$
+ Revision 1.5  2003/11/19 23:32:20  pelle
+ Signers now can generatekeys via the generateKey() method.
+ Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
+ SignedNamedObject now contains the full xml which is returned with getEncoded()
+ This means that it is now possible to further send on or process a SignedNamedObject, leaving
+ NamedObjectBuilder for its original purposes of purely generating new Contracts.
+ NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
+ Updated all major interfaces that used the old model to use the new model.
+ 
  Revision 1.4  2003/11/12 23:47:05  pelle
  Much work done in creating good test environment.
***************
*** 108,112 ****
   */
  public class PaymentReceiverTest extends AbstractReceiverTest {
!     public PaymentReceiverTest(String string) throws NeuClearException, GeneralSecurityException, UnknownLedgerException, LowlevelLedgerException, BookExistsException, FileNotFoundException, InvalidTransferException, XMLException {
          super(string);
          asset = (Asset) NSResolver.resolveIdentity(assetName);
--- 113,117 ----
   */
  public class PaymentReceiverTest extends AbstractReceiverTest {
!     public PaymentReceiverTest(String string) throws NeuClearException, GeneralSecurityException, UnknownLedgerException, LowlevelLedgerException, BookExistsException, IOException, InvalidTransferException, XMLException {
          super(string);
          asset = (Asset) NSResolver.resolveIdentity(assetName);
***************
*** 168,176 ****
      }
  
!     public void createPayments(Identity from, Identity to, double amount) throws InvalidTransferException, XMLException, NeuClearException, FileNotFoundException {
          TransferRequestBuilder transfer = new TransferRequestBuilder(asset, from, to, 100, TimeTools.now(), "Test One");
!         transfer.sign(getSigner());
!         OutputStream out = new FileOutputStream(directory.getAbsolutePath() + "/" + transfer.getLocalName() + ".xml");
!         XMLTools.writeFile(out, transfer.getElement());
      }
  
--- 173,182 ----
      }
  
!     public void createPayments(Identity from, Identity to, double amount) throws InvalidTransferException, XMLException, NeuClearException, IOException, UnsupportedEncodingException {
          TransferRequestBuilder transfer = new TransferRequestBuilder(asset, from, to, 100, TimeTools.now(), "Test One");
!         SignedNamedObject signed = transfer.sign(getSigner());
!         OutputStream out = new BufferedOutputStream(new FileOutputStream(directory.getAbsolutePath() + "/" + transfer.getLocalName() + ".xml"));
!         out.write(signed.getEncoded().getBytes("UTF-8"));
! 
      }