[Neuclear-develop] neuclear-pay/src/test/org/neuclear/exchange/orders/builders AbstractExchangeOrderTest.java,1.1,1.2 CancelExchangeOrderBuilderTest.java,1.1,1.2 ExchangeCompletedReceiptBuilderTest.java,1.1,1.2 ExchangeCompletionOrderBuilderTest.java,1.1,1.2

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

Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/orders/builders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5208/src/test/org/neuclear/exchange/orders/builders

Modified Files:
	AbstractExchangeOrderTest.java 
	CancelExchangeOrderBuilderTest.java 
	ExchangeCompletedReceiptBuilderTest.java 
	ExchangeCompletionOrderBuilderTest.java 
Log Message:
Fixed Exchange tests and Cactus tests working on web app.

Index: ExchangeCompletionOrderBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/orders/builders/ExchangeCompletionOrderBuilderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExchangeCompletionOrderBuilderTest.java	5 Apr 2004 16:31:45 -0000	1.1
--- ExchangeCompletionOrderBuilderTest.java	14 Apr 2004 23:51:13 -0000	1.2
***************
*** 36,39 ****
--- 36,42 ----
  $Id$
  $Log$
+ Revision 1.2  2004/04/14 23:51:13  pelle
+ Fixed Exchange tests and Cactus tests working on web app.
+ 
  Revision 1.1  2004/04/05 16:31:45  pelle
  Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key.
***************
*** 77,92 ****
          assertTrue(obj instanceof ExchangeCompletionOrder);
          ExchangeCompletionOrder complete = (ExchangeCompletionOrder) obj;
!         assertEquals(getSigner().getPublicKey("neu://test").getEncoded(), complete.getSignatory().getPublicKey().getEncoded());
          assertEquals("done", complete.getComment());
          assertEquals(19.0, complete.getAmount().getAmount(), 0);
          assertNotNull(complete.getExchangeTime());
          assertNotNull(complete.getReceipt());
          ExchangeOrderReceipt receipt = complete.getReceipt();
!         assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), receipt.getSignatory().getPublicKey().getEncoded());
          assertNotNull(receipt.getValuetime());
          assertNotNull(receipt.getOrder());
          ExchangeOrder order = receipt.getOrder();
          assertEquals(bux.getDigest(), order.getAsset().getDigest());
!         assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), order.getSignatory().getPublicKey().getEncoded());
  //        assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded());
          assertEquals("Test", order.getComment());
--- 80,99 ----
          assertTrue(obj instanceof ExchangeCompletionOrder);
          ExchangeCompletionOrder complete = (ExchangeCompletionOrder) obj;
!         assertEquals(getPublicKeyName("exchange"), complete.getSignatory().getName());
          assertEquals("done", complete.getComment());
          assertEquals(19.0, complete.getAmount().getAmount(), 0);
          assertNotNull(complete.getExchangeTime());
          assertNotNull(complete.getReceipt());
+ 
          ExchangeOrderReceipt receipt = complete.getReceipt();
!         assertEquals(getPublicKeyName("bux"), receipt.getSignatory().getName());
! //        assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), receipt.getSignatory().getPublicKey().getEncoded());
          assertNotNull(receipt.getValuetime());
          assertNotNull(receipt.getOrder());
+ 
          ExchangeOrder order = receipt.getOrder();
          assertEquals(bux.getDigest(), order.getAsset().getDigest());
!         assertEquals(getPublicKeyName("bob"), order.getSignatory().getName());
! //      assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), order.getSignatory().getPublicKey().getEncoded());
  //        assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded());
          assertEquals("Test", order.getComment());
***************
*** 101,109 ****
          BidItem bids[] = new BidItem[]{new BidItem(shoes, new Amount(5))};
          Builder ob = new ExchangeOrderBuilder(bux, agent, new Amount(20), new Date(System.currentTimeMillis() + 10000), bids, "Test");
!         ExchangeOrderReceiptBuilder rb = new ExchangeOrderReceiptBuilder((ExchangeOrder) ob.convert("neu://test/bux", getSigner()), new Date());
  
!         ExchangeCompletionOrderBuilder builder = new ExchangeCompletionOrderBuilder((ExchangeOrderReceipt) rb.convert("neu://test/bux", getSigner()), new Date(), "neu://alice@test", new Amount(19), "done");
          return builder;
      }
  
  }
--- 108,119 ----
          BidItem bids[] = new BidItem[]{new BidItem(shoes, new Amount(5))};
          Builder ob = new ExchangeOrderBuilder(bux, agent, new Amount(20), new Date(System.currentTimeMillis() + 10000), bids, "Test");
!         ExchangeOrderReceiptBuilder rb = new ExchangeOrderReceiptBuilder((ExchangeOrder) ob.convert("bob", getSigner()), new Date());
  
!         ExchangeCompletionOrderBuilder builder = new ExchangeCompletionOrderBuilder((ExchangeOrderReceipt) rb.convert("bux", getSigner()), new Date(), "neu://alice@test", new Amount(19), "done");
          return builder;
      }
  
+     protected String getSignersAlias() {
+         return "exchange";
+     }
  }

Index: ExchangeCompletedReceiptBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/orders/builders/ExchangeCompletedReceiptBuilderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExchangeCompletedReceiptBuilderTest.java	5 Apr 2004 16:31:45 -0000	1.1
--- ExchangeCompletedReceiptBuilderTest.java	14 Apr 2004 23:51:13 -0000	1.2
***************
*** 33,36 ****
--- 33,39 ----
  $Id$
  $Log$
+ Revision 1.2  2004/04/14 23:51:13  pelle
+ Fixed Exchange tests and Cactus tests working on web app.
+ 
  Revision 1.1  2004/04/05 16:31:45  pelle
  Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key.
***************
*** 74,94 ****
          assertTrue(obj instanceof ExchangeCompletedReceipt);
          ExchangeCompletedReceipt cr = (ExchangeCompletedReceipt) obj;
!         assertEquals(getSigner().getPublicKey("neu://test").getEncoded(), cr.getSignatory().getPublicKey().getEncoded());
          assertNotNull(cr.getOrder());
          assertNotNull(cr.getValueTime());
  
          ExchangeCompletionOrder complete = cr.getOrder();
!         assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), complete.getSignatory().getPublicKey().getEncoded());
          assertEquals("done", complete.getComment());
          assertEquals(19.0, complete.getAmount().getAmount(), 0);
          assertNotNull(complete.getExchangeTime());
          assertNotNull(complete.getReceipt());
          ExchangeOrderReceipt receipt = complete.getReceipt();
!         assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), receipt.getSignatory().getPublicKey().getEncoded());
          assertNotNull(receipt.getValuetime());
          assertNotNull(receipt.getOrder());
          ExchangeOrder order = receipt.getOrder();
          assertEquals(bux.getDigest(), order.getAsset().getDigest());
!         assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), order.getSignatory().getPublicKey().getEncoded());
  //        assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded());
          assertEquals("Test", order.getComment());
--- 77,101 ----
          assertTrue(obj instanceof ExchangeCompletedReceipt);
          ExchangeCompletedReceipt cr = (ExchangeCompletedReceipt) obj;
!         assertEquals(getPublicKeyName("bux"), cr.getSignatory().getName());
          assertNotNull(cr.getOrder());
          assertNotNull(cr.getValueTime());
  
          ExchangeCompletionOrder complete = cr.getOrder();
!         assertEquals(getPublicKeyName("exchange"), complete.getSignatory().getName());
          assertEquals("done", complete.getComment());
          assertEquals(19.0, complete.getAmount().getAmount(), 0);
          assertNotNull(complete.getExchangeTime());
          assertNotNull(complete.getReceipt());
+ 
          ExchangeOrderReceipt receipt = complete.getReceipt();
!         assertEquals(getPublicKeyName("bux"), receipt.getSignatory().getName());
! //        assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), receipt.getSignatory().getPublicKey().getEncoded());
          assertNotNull(receipt.getValuetime());
          assertNotNull(receipt.getOrder());
+ 
          ExchangeOrder order = receipt.getOrder();
          assertEquals(bux.getDigest(), order.getAsset().getDigest());
!         assertEquals(getPublicKeyName("bob"), order.getSignatory().getName());
! //      assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), order.getSignatory().getPublicKey().getEncoded());
  //        assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded());
          assertEquals("Test", order.getComment());
***************
*** 103,112 ****
          BidItem bids[] = new BidItem[]{new BidItem(shoes, new Amount(5))};
          Builder ob = new ExchangeOrderBuilder(bux, agent, new Amount(20), new Date(System.currentTimeMillis() + 10000), bids, "Test");
!         ExchangeOrderReceiptBuilder rb = new ExchangeOrderReceiptBuilder((ExchangeOrder) ob.convert("neu://test/bux", getSigner()), new Date());
  
!         ExchangeCompletionOrderBuilder cb = new ExchangeCompletionOrderBuilder((ExchangeOrderReceipt) rb.convert("neu://test/bux", getSigner()), new Date(), "neu://alice@test", new Amount(19), "done");
!         ExchangeCompletedReceiptBuilder builder = new ExchangeCompletedReceiptBuilder((ExchangeCompletionOrder) cb.convert("neu://test/bux", getSigner()), new Date());
          return builder;
      }
  
  }
--- 110,123 ----
          BidItem bids[] = new BidItem[]{new BidItem(shoes, new Amount(5))};
          Builder ob = new ExchangeOrderBuilder(bux, agent, new Amount(20), new Date(System.currentTimeMillis() + 10000), bids, "Test");
!         ExchangeOrderReceiptBuilder rb = new ExchangeOrderReceiptBuilder((ExchangeOrder) ob.convert("bob", getSigner()), new Date());
  
!         ExchangeCompletionOrderBuilder cb = new ExchangeCompletionOrderBuilder((ExchangeOrderReceipt) rb.convert("bux", getSigner()), new Date(), "neu://alice@test", new Amount(19), "done");
!         ExchangeCompletedReceiptBuilder builder = new ExchangeCompletedReceiptBuilder((ExchangeCompletionOrder) cb.convert("exchange", getSigner()), new Date());
          return builder;
      }
  
+     protected String getSignersAlias() {
+         return "bux";
+     }
+ 
  }

Index: AbstractExchangeOrderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/orders/builders/AbstractExchangeOrderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractExchangeOrderTest.java	5 Apr 2004 16:31:44 -0000	1.1
--- AbstractExchangeOrderTest.java	14 Apr 2004 23:51:12 -0000	1.2
***************
*** 13,16 ****
--- 13,19 ----
  $Id$
  $Log$
+ Revision 1.2  2004/04/14 23:51:12  pelle
+ Fixed Exchange tests and Cactus tests working on web app.
+ 
  Revision 1.1  2004/04/05 16:31:44  pelle
  Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key.
***************
*** 33,40 ****
      public Asset createTestAsset() throws NeuClearException {
          AssetBuilder builder = new AssetBuilder("http://bux.neuclear.org",
!                 getSigner().getPublicKey("neu://test/bux"),
!                 getAlice().getPublicKey(),
                  2, 0);
!         return (Asset) builder.convert(NAME, getSigner());
  
      }
--- 36,43 ----
      public Asset createTestAsset() throws NeuClearException {
          AssetBuilder builder = new AssetBuilder("http://bux.neuclear.org",
!                 getSigner().getPublicKey("bux"),
!                 getSigner().getPublicKey("buxissuer"),
                  2, 0);
!         return (Asset) builder.convert(PROMOTER, getSigner());
  
      }
***************
*** 42,49 ****
      public Asset createShoeAsset() throws NeuClearException {
          AssetBuilder builder = new AssetBuilder("http://shoes.neuclear.org",
!                 getSigner().getPublicKey("neu://test"),
!                 getAlice().getPublicKey(),
                  2, 0);
!         return (Asset) builder.convert(NAME, getSigner());
  
      }
--- 45,52 ----
      public Asset createShoeAsset() throws NeuClearException {
          AssetBuilder builder = new AssetBuilder("http://shoes.neuclear.org",
!                 getSigner().getPublicKey("shoes"),
!                 getSigner().getPublicKey("shoesissuer"),
                  2, 0);
!         return (Asset) builder.convert(PROMOTER, getSigner());
  
      }
***************
*** 51,56 ****
      public ExchangeAgent createTestExchangeAgent() throws NeuClearException {
          ExchangeAgentBuilder builder = new ExchangeAgentBuilder("http://tradex.neuclear.org",
!                 getSigner().getPublicKey("neu://bob@test"));
!         return (ExchangeAgent) builder.convert(NAME, getSigner());
  
      }
--- 54,59 ----
      public ExchangeAgent createTestExchangeAgent() throws NeuClearException {
          ExchangeAgentBuilder builder = new ExchangeAgentBuilder("http://tradex.neuclear.org",
!                 getSigner().getPublicKey("exchange"));
!         return (ExchangeAgent) builder.convert("carol", getSigner());
  
      }
***************
*** 59,61 ****
--- 62,65 ----
      protected Asset shoes;
      protected ExchangeAgent agent;
+     public static String PROMOTER = "ivan";
  }

Index: CancelExchangeOrderBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/orders/builders/CancelExchangeOrderBuilderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CancelExchangeOrderBuilderTest.java	5 Apr 2004 16:31:45 -0000	1.1
--- CancelExchangeOrderBuilderTest.java	14 Apr 2004 23:51:13 -0000	1.2
***************
*** 36,39 ****
--- 36,42 ----
  $Id$
  $Log$
+ Revision 1.2  2004/04/14 23:51:13  pelle
+ Fixed Exchange tests and Cactus tests working on web app.
+ 
  Revision 1.1  2004/04/05 16:31:45  pelle
  Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key.
***************
*** 77,89 ****
          assertTrue(obj instanceof CancelExchangeOrder);
          CancelExchangeOrder cancel = (CancelExchangeOrder) obj;
!         assertEquals(getSigner().getPublicKey("neu://test").getEncoded(), cancel.getSignatory().getPublicKey().getEncoded());
          assertNotNull(cancel.getReceipt());
          ExchangeOrderReceipt receipt = cancel.getReceipt();
!         assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), receipt.getSignatory().getPublicKey().getEncoded());
          assertNotNull(receipt.getValuetime());
          assertNotNull(receipt.getOrder());
          ExchangeOrder order = receipt.getOrder();
          assertEquals(bux.getDigest(), order.getAsset().getDigest());
!         assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), order.getSignatory().getPublicKey().getEncoded());
  //        assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded());
          assertEquals("Test", order.getComment());
--- 80,95 ----
          assertTrue(obj instanceof CancelExchangeOrder);
          CancelExchangeOrder cancel = (CancelExchangeOrder) obj;
!         assertEquals(getPublicKeyName("bob"), cancel.getSignatory().getName());
          assertNotNull(cancel.getReceipt());
          ExchangeOrderReceipt receipt = cancel.getReceipt();
!         assertEquals(getPublicKeyName("bux"), receipt.getSignatory().getName());
! //        assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), receipt.getSignatory().getPublicKey().getEncoded());
          assertNotNull(receipt.getValuetime());
          assertNotNull(receipt.getOrder());
+ 
          ExchangeOrder order = receipt.getOrder();
          assertEquals(bux.getDigest(), order.getAsset().getDigest());
!         assertEquals(getPublicKeyName("bob"), order.getSignatory().getName());
! //      assertEquals(getSigner().getPublicKey("neu://test/bux").getEncoded(), order.getSignatory().getPublicKey().getEncoded());
  //        assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded());
          assertEquals("Test", order.getComment());
***************
*** 98,106 ****
          BidItem bids[] = new BidItem[]{new BidItem(shoes, new Amount(5))};
          Builder ob = new ExchangeOrderBuilder(bux, agent, new Amount(20), new Date(System.currentTimeMillis() + 10000), bids, "Test");
!         ExchangeOrderReceiptBuilder rb = new ExchangeOrderReceiptBuilder((ExchangeOrder) ob.convert("neu://test/bux", getSigner()), new Date());
  
!         CancelExchangeOrderBuilder builder = new CancelExchangeOrderBuilder((ExchangeOrderReceipt) rb.convert("neu://test/bux", getSigner()));
          return builder;
      }
  
  }
--- 104,116 ----
          BidItem bids[] = new BidItem[]{new BidItem(shoes, new Amount(5))};
          Builder ob = new ExchangeOrderBuilder(bux, agent, new Amount(20), new Date(System.currentTimeMillis() + 10000), bids, "Test");
!         ExchangeOrderReceiptBuilder rb = new ExchangeOrderReceiptBuilder((ExchangeOrder) ob.convert("bob", getSigner()), new Date());
  
!         CancelExchangeOrderBuilder builder = new CancelExchangeOrderBuilder((ExchangeOrderReceipt) rb.convert("bux", getSigner()));
          return builder;
      }
  
+     protected String getSignersAlias() {
+         return "bob";
+     }
+ 
  }