|
From: Pelle B. <pe...@us...> - 2004-04-02 23:16:49
|
Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/orders/builders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4149/src/test/org/neuclear/asset/orders/builders Modified Files: TransferOrderBuilderTest.java Added Files: TransferReceiptBuilderTest.java Log Message: Got TransferOrder and Builder working with their test cases. Working on TransferReceipt which is the first embedded receipt. This is causing some problems at the moment. --- NEW FILE: TransferReceiptBuilderTest.java --- package org.neuclear.asset.orders.builders; import org.neuclear.asset.InvalidTransferException; import org.neuclear.asset.contracts.Asset; import org.neuclear.asset.contracts.builders.AssetBuilder; import org.neuclear.asset.orders.Amount; import org.neuclear.asset.orders.TransferOrder; import org.neuclear.asset.orders.TransferReceipt; import org.neuclear.commons.NeuClearException; import org.neuclear.commons.crypto.signers.NonExistingSignerException; import org.neuclear.id.SignedNamedObject; import org.neuclear.id.builders.Builder; import org.neuclear.tests.AbstractObjectCreationTest; import org.neuclear.xml.XMLException; import java.security.GeneralSecurityException; import java.util.Date; /* NeuClear Distributed Transaction Clearing Platform (C) 2003 Pelle Braendgaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA $Id: TransferReceiptBuilderTest.java,v 1.1 2004/04/02 23:04:36 pelle Exp $ $Log: TransferReceiptBuilderTest.java,v $ Revision 1.1 2004/04/02 23:04:36 pelle Got TransferOrder and Builder working with their test cases. Working on TransferReceipt which is the first embedded receipt. This is causing some problems at the moment. Revision 1.5 2004/04/02 17:56:16 pelle Added new createTestAsset() method. Revision 1.4 2004/04/01 23:18:33 pelle Split Identity into Signatory and Identity class. Identity remains a signed named object and will in the future just be used for self declared information. Signatory now contains the PublicKey etc and is NOT a signed object. Revision 1.3 2004/03/03 23:28:14 pelle Updated tests to use AbstractObjectCreationTest Revision 1.2 2004/02/18 00:13:31 pelle Many, many clean ups. I've readded Targets in a new method. Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers Revision 1.1 2004/01/21 23:41:02 pelle Started the unit tests for the new payment message format. */ /** * User: pelleb * Date: Jan 21, 2004 * Time: 9:11:44 PM */ public class TransferReceiptBuilderTest extends AbstractObjectCreationTest { public TransferReceiptBuilderTest(String string) throws NeuClearException, GeneralSecurityException { super(string); asset = createTestAsset(); } protected void verifyObject(SignedNamedObject obj) throws NonExistingSignerException { assertNotNull(obj); assertTrue(obj instanceof TransferReceipt); TransferReceipt receipt = (TransferReceipt) obj; assertNotNull(receipt.getValueTime()); assertEquals(asset.getDigest(), receipt.getAsset().getDigest()); assertEquals(getSigner().getPublicKey("neu://test").getEncoded(), receipt.getSignatory().getPublicKey().getEncoded()); TransferOrder order = receipt.getOrder(); assertNotNull(order); assertEquals(asset.getDigest(), order.getAsset().getDigest()); assertEquals(getSigner().getPublicKey("neu://test").getEncoded(), order.getSignatory().getPublicKey().getEncoded()); // assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded()); assertEquals("Test", order.getComment()); assertEquals(20.0, order.getAmount().getAmount(), 0); } protected Class getRequiredClass() { return TransferReceipt.class; } protected Builder createBuilder() throws NeuClearException, InvalidTransferException, XMLException { Builder builder = new TransferOrderBuilder(asset, getAlice(), new Amount(20), "Test"); // System.out.println(builder.asXML()); return new TransferReceiptBuilder((TransferOrder) builder.convert(NAME, getSigner()), new Date()); } 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()); } private Asset asset; } Index: TransferOrderBuilderTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/orders/builders/TransferOrderBuilderTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TransferOrderBuilderTest.java 2 Apr 2004 17:56:16 -0000 1.5 --- TransferOrderBuilderTest.java 2 Apr 2004 23:04:36 -0000 1.6 *************** *** 35,38 **** --- 35,42 ---- $Id$ $Log$ + Revision 1.6 2004/04/02 23:04:36 pelle + Got TransferOrder and Builder working with their test cases. + Working on TransferReceipt which is the first embedded receipt. This is causing some problems at the moment. + Revision 1.5 2004/04/02 17:56:16 pelle Added new createTestAsset() method. *************** *** 72,76 **** assertEquals(asset.getDigest(), order.getAsset().getDigest()); assertEquals(getSigner().getPublicKey("neu://test").getEncoded(), order.getSignatory().getPublicKey().getEncoded()); ! assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded()); assertEquals("Test", order.getComment()); assertEquals(20.0, order.getAmount().getAmount(), 0); --- 76,80 ---- assertEquals(asset.getDigest(), order.getAsset().getDigest()); assertEquals(getSigner().getPublicKey("neu://test").getEncoded(), order.getSignatory().getPublicKey().getEncoded()); ! // assertEquals(getBob().getPublicKey().getEncoded(), order.getRecipient().getSignatory().getPublicKey().getEncoded()); assertEquals("Test", order.getComment()); assertEquals(20.0, order.getAmount().getAmount(), 0); *************** *** 82,86 **** protected Builder createBuilder() throws NeuClearException, InvalidTransferException, XMLException { ! Builder builder = new TransferOrderBuilder(asset, null, new Amount(20), "Test"); // System.out.println(builder.asXML()); return builder; --- 86,90 ---- protected Builder createBuilder() throws NeuClearException, InvalidTransferException, XMLException { ! Builder builder = new TransferOrderBuilder(asset, getAlice(), new Amount(20), "Test"); // System.out.println(builder.asXML()); return builder; |