[Neuclear-cvs] neuclear-pay/src/test/org/neuclear/asset/controllers/receivers IssueOrderReceiverTest.java,1.2,1.3 IssueOrderReceiverWithFeesTest.java,1.1,1.2 TransferOrderReceiverTest.java,1.4,1.5 TransferOrderReceiverWithFeesTest.java,1.1,1.2 TransferReceiptReceiverTest.java,1.2,1.3 TransferReceiptReceiverWithFeesTest.java,1.1,1.2 AbstractExchangeReceiverTest.java,1.3,NONE CancelExchangeOrderReceiverTest.java,1.3,NONE CancelExchangeOrderReceiverWithFeesTest.java,1.1,NONE CancelExchangeReceiptReceiverTest.java,1.2,NONE CancelExchangeReceiptReceiverWithFeesTest.java,1.1,NONE ExchangeCompletedReceiptReceiverTest.java,1.1,NONE ExchangeCompletedReceiptReceiverWithFeesTest.java,1.1,NONE ExchangeCompletionOrderReceiverTest.java,1.1,NONE ExchangeCompletionOrderReceiverWithFeesTest.java,1.1,NONE ExchangeOrderReceiptReceiverTest.java,1.1,NONE ExchangeOrderReceiptReceiverWithFeesTest.java,1.1,NONE ExchangeOrderReceiverTest.java,1.2,NONE ExchangeOrderReceiverWithFeesTest.java,1.1,NONE

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

Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20812/src/test/org/neuclear/asset/controllers/receivers

Modified Files:
	IssueOrderReceiverTest.java 
	IssueOrderReceiverWithFeesTest.java 
	TransferOrderReceiverTest.java 
	TransferOrderReceiverWithFeesTest.java 
	TransferReceiptReceiverTest.java 
	TransferReceiptReceiverWithFeesTest.java 
Removed Files:
	AbstractExchangeReceiverTest.java 
	CancelExchangeOrderReceiverTest.java 
	CancelExchangeOrderReceiverWithFeesTest.java 
	CancelExchangeReceiptReceiverTest.java 
	CancelExchangeReceiptReceiverWithFeesTest.java 
	ExchangeCompletedReceiptReceiverTest.java 
	ExchangeCompletedReceiptReceiverWithFeesTest.java 
	ExchangeCompletionOrderReceiverTest.java 
	ExchangeCompletionOrderReceiverWithFeesTest.java 
	ExchangeOrderReceiptReceiverTest.java 
	ExchangeOrderReceiptReceiverWithFeesTest.java 
	ExchangeOrderReceiverTest.java 
	ExchangeOrderReceiverWithFeesTest.java 
Log Message:
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Index: IssueOrderReceiverTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers/IssueOrderReceiverTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IssueOrderReceiverTest.java	22 Jul 2004 21:48:46 -0000	1.2
--- IssueOrderReceiverTest.java	10 Sep 2004 19:48:02 -0000	1.3
***************
*** 5,8 ****
--- 5,9 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.contracts.builders.AssetBuilder;
+ import org.neuclear.asset.controllers.DelegatingAssetController;
  import org.neuclear.asset.orders.Amount;
  import org.neuclear.asset.orders.TransferGlobals;
***************
*** 24,27 ****
--- 25,32 ----
  $Id$
  $Log$
+ Revision 1.3  2004/09/10 19:48:02  pelle
+ Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
+ Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.
+ 
  Revision 1.2  2004/07/22 21:48:46  pelle
  Further receivers and unit tests for for Exchanges etc.
***************
*** 53,57 ****
          asset = (Asset) new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t").convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new IssueOrderReceiver(signer, ledger);
      }
  
--- 58,62 ----
          asset = (Asset) new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t").convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new DelegatingAssetController(signer, ledger);
      }
  

Index: TransferReceiptReceiverTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers/TransferReceiptReceiverTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TransferReceiptReceiverTest.java	8 Sep 2004 17:41:11 -0000	1.2
--- TransferReceiptReceiverTest.java	10 Sep 2004 19:48:02 -0000	1.3
***************
*** 5,8 ****
--- 5,9 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.contracts.builders.AssetBuilder;
+ import org.neuclear.asset.controllers.DelegatingAssetController;
  import org.neuclear.asset.orders.Amount;
  import org.neuclear.asset.orders.TransferGlobals;
***************
*** 27,30 ****
--- 28,35 ----
  $Id$
  $Log$
+ Revision 1.3  2004/09/10 19:48:02  pelle
+ Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
+ Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.
+ 
  Revision 1.2  2004/09/08 17:41:11  pelle
  Changed these tests to use the SimpleLedgerController from the HibernateLedgerController.
***************
*** 60,64 ****
          asset = (Asset) new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t").convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new TransferReceiptReceiver(ledger);
      }
  
--- 65,69 ----
          asset = (Asset) new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t").convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new DelegatingAssetController(signer, ledger);
      }
  

--- ExchangeOrderReceiptReceiverTest.java DELETED ---

--- ExchangeCompletedReceiptReceiverWithFeesTest.java DELETED ---

--- CancelExchangeOrderReceiverWithFeesTest.java DELETED ---

--- CancelExchangeReceiptReceiverWithFeesTest.java DELETED ---

--- ExchangeCompletionOrderReceiverTest.java DELETED ---

--- ExchangeCompletedReceiptReceiverTest.java DELETED ---

Index: IssueOrderReceiverWithFeesTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers/IssueOrderReceiverWithFeesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IssueOrderReceiverWithFeesTest.java	8 Sep 2004 23:17:40 -0000	1.1
--- IssueOrderReceiverWithFeesTest.java	10 Sep 2004 19:48:02 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.contracts.builders.AssetBuilder;
+ import org.neuclear.asset.controllers.DelegatingAssetController;
  import org.neuclear.asset.fees.FeeStructureBuilder;
  import org.neuclear.asset.orders.Amount;
***************
*** 62,66 ****
          asset = (Asset) assetBuilder.convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new IssueOrderReceiver(signer, ledger);
      }
  
--- 63,67 ----
          asset = (Asset) assetBuilder.convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new DelegatingAssetController(signer, ledger);
      }
  

--- CancelExchangeOrderReceiverTest.java DELETED ---

Index: TransferOrderReceiverWithFeesTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers/TransferOrderReceiverWithFeesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TransferOrderReceiverWithFeesTest.java	8 Sep 2004 20:08:00 -0000	1.1
--- TransferOrderReceiverWithFeesTest.java	10 Sep 2004 19:48:02 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.contracts.builders.AssetBuilder;
+ import org.neuclear.asset.controllers.DelegatingAssetController;
  import org.neuclear.asset.fees.FeeStructureBuilder;
  import org.neuclear.asset.orders.Amount;
***************
*** 62,66 ****
          asset = (Asset) assetBuilder.convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new TransferOrderReceiver(signer, ledger);
      }
  
--- 63,67 ----
          asset = (Asset) assetBuilder.convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new DelegatingAssetController(signer, ledger);
      }
  

--- ExchangeOrderReceiverWithFeesTest.java DELETED ---

--- ExchangeCompletionOrderReceiverWithFeesTest.java DELETED ---

--- CancelExchangeReceiptReceiverTest.java DELETED ---

--- ExchangeOrderReceiverTest.java DELETED ---

Index: TransferOrderReceiverTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers/TransferOrderReceiverTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TransferOrderReceiverTest.java	8 Sep 2004 20:08:00 -0000	1.4
--- TransferOrderReceiverTest.java	10 Sep 2004 19:48:02 -0000	1.5
***************
*** 5,8 ****
--- 5,9 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.contracts.builders.AssetBuilder;
+ import org.neuclear.asset.controllers.DelegatingAssetController;
  import org.neuclear.asset.orders.Amount;
  import org.neuclear.asset.orders.TransferGlobals;
***************
*** 24,27 ****
--- 25,32 ----
  $Id$
  $Log$
+ Revision 1.5  2004/09/10 19:48:02  pelle
+ Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
+ Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.
+ 
  Revision 1.4  2004/09/08 20:08:00  pelle
  Added support for fees to TransferOrderReceiver
***************
*** 56,60 ****
          asset = (Asset) new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t").convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new TransferOrderReceiver(signer, ledger);
      }
  
--- 61,65 ----
          asset = (Asset) new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t").convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new DelegatingAssetController(signer, ledger);
      }
  

--- AbstractExchangeReceiverTest.java DELETED ---

--- ExchangeOrderReceiptReceiverWithFeesTest.java DELETED ---

Index: TransferReceiptReceiverWithFeesTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers/TransferReceiptReceiverWithFeesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TransferReceiptReceiverWithFeesTest.java	8 Sep 2004 23:17:40 -0000	1.1
--- TransferReceiptReceiverWithFeesTest.java	10 Sep 2004 19:48:02 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.contracts.builders.AssetBuilder;
+ import org.neuclear.asset.controllers.DelegatingAssetController;
  import org.neuclear.asset.fees.FeeStructureBuilder;
  import org.neuclear.asset.orders.Amount;
***************
*** 66,70 ****
          asset = (Asset) assetBuilder.convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new TransferReceiptReceiver(ledger);
      }
  
--- 67,71 ----
          asset = (Asset) assetBuilder.convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new DelegatingAssetController(signer, ledger);
      }