From dad6de37bcab9fdfce4dedb6c53c76054e583dbe Mon Sep 17 00:00:00 2001 From: Alexander Soong Date: Thu, 5 Jul 2018 14:21:57 -0700 Subject: [PATCH 1/2] Test abstraction of testing parameters --- .../core/extensions/coreIssuanceOrder.spec.ts | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/test/core/extensions/coreIssuanceOrder.spec.ts b/test/core/extensions/coreIssuanceOrder.spec.ts index 477726095..7eec88fbe 100644 --- a/test/core/extensions/coreIssuanceOrder.spec.ts +++ b/test/core/extensions/coreIssuanceOrder.spec.ts @@ -328,43 +328,47 @@ contract("CoreIssuanceOrder", (accounts) => { }); }); - describe("#cancelOrder", async () => { + describe.only("#cancelOrder", async () => { let subjectCaller: Address; let subjectQuantityToCancel: BigNumber; let subjectExchangeOrdersData: Bytes32; - const naturalUnit: BigNumber = ether(2); - let components: StandardTokenMockContract[] = []; - let componentUnits: BigNumber[]; - let setToken: SetTokenContract; - let signerAddress: Address; - let relayerAddress: Address; - let componentAddresses: Address[]; - + let quantity: BigNumber = ether(4); + let makerTokenAmount: BigNumber = ether(10); + let expirationTime: number = 10; let issuanceOrderParams: any; beforeEach(async () => { - signerAddress = signerAccount; - relayerAddress = relayerAccount; + const signerAddress = signerAccount; + const relayerAddress = relayerAccount; - components = await erc20Wrapper.deployTokensAsync(2, signerAddress); //For current purposes issue to maker/signer + const components = await erc20Wrapper.deployTokensAsync(2, signerAddress); //For current purposes issue to maker/signer await erc20Wrapper.approveTransfersAsync(components, transferProxy.address, signerAddress); - componentAddresses = _.map(components, (token) => token.address); - componentUnits = _.map(components, () => ether(4)); // Multiple of naturalUnit - setToken = await coreWrapper.createSetTokenAsync( + const componentAddresses = _.map(components, (token) => token.address); + const componentUnits = _.map(components, () => ether(4)); // Multiple of naturalUnit + const setToken = await coreWrapper.createSetTokenAsync( core, setTokenFactory.address, componentAddresses, componentUnits, - naturalUnit, + ether(2), ); await coreWrapper.registerDefaultExchanges(core); subjectCaller = signerAccount; subjectQuantityToCancel = ether(2); - issuanceOrderParams = await generateFillOrderParameters(setToken.address, signerAddress, signerAddress, componentAddresses[0], relayerAddress); + issuanceOrderParams = await generateFillOrderParameters( + setToken.address, + signerAddress, + signerAddress, + componentAddresses[0], + relayerAddress, + quantity, + makerTokenAmount, + expirationTime, + ); }); async function subject(): Promise { @@ -425,7 +429,9 @@ contract("CoreIssuanceOrder", (accounts) => { describe("when the order has expired", async () => { beforeEach(async () => { - issuanceOrderParams = await generateFillOrderParameters(setToken.address, signerAddress, signerAddress, componentAddresses[0], relayerAddress, undefined, undefined, -1) + quantity = undefined; + makerTokenAmount = undefined; + expirationTime = -1; }); it("should revert", async () => { @@ -445,7 +451,7 @@ contract("CoreIssuanceOrder", (accounts) => { describe("when the Set Token quantity in Issuance Order is not a multiple of the natural unit of the set", async () => { beforeEach(async () => { - issuanceOrderParams = await generateFillOrderParameters(setToken.address, signerAddress, signerAddress, componentAddresses[0], relayerAddress, ether(5)); + quantity = ether(5); }); it("should revert", async () => { @@ -455,7 +461,7 @@ contract("CoreIssuanceOrder", (accounts) => { describe("when Set Token quantity in Issuance Order equals 0", async () => { beforeEach(async () => { - issuanceOrderParams = await generateFillOrderParameters(setToken.address, signerAddress, signerAddress, componentAddresses[0], relayerAddress, ZERO); + quantity = ZERO; }); it("should revert", async () => { @@ -465,7 +471,8 @@ contract("CoreIssuanceOrder", (accounts) => { describe("when makerTokenAmount in Issuance Order equals 0", async () => { beforeEach(async () => { - issuanceOrderParams = await generateFillOrderParameters(setToken.address, signerAddress, signerAddress, componentAddresses[0], relayerAddress, undefined, ZERO); + quantity = undefined; + makerTokenAmount = ZERO; }); it("should revert", async () => { From bddc4492a68f8d7686e30dd909dc2d2bbeede0ef Mon Sep 17 00:00:00 2001 From: Alexander Soong Date: Thu, 5 Jul 2018 14:37:29 -0700 Subject: [PATCH 2/2] Sample default values --- .../core/extensions/coreIssuanceOrder.spec.ts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/core/extensions/coreIssuanceOrder.spec.ts b/test/core/extensions/coreIssuanceOrder.spec.ts index 7eec88fbe..6b544700b 100644 --- a/test/core/extensions/coreIssuanceOrder.spec.ts +++ b/test/core/extensions/coreIssuanceOrder.spec.ts @@ -333,9 +333,9 @@ contract("CoreIssuanceOrder", (accounts) => { let subjectQuantityToCancel: BigNumber; let subjectExchangeOrdersData: Bytes32; - let quantity: BigNumber = ether(4); - let makerTokenAmount: BigNumber = ether(10); - let expirationTime: number = 10; + let quantity: BigNumber; + let makerTokenAmount: BigNumber; + let expirationTime: number; let issuanceOrderParams: any; beforeEach(async () => { @@ -365,9 +365,9 @@ contract("CoreIssuanceOrder", (accounts) => { signerAddress, componentAddresses[0], relayerAddress, - quantity, - makerTokenAmount, - expirationTime, + quantity || ether(4), + makerTokenAmount || ether(10), + expirationTime || 10, ); }); @@ -428,7 +428,7 @@ contract("CoreIssuanceOrder", (accounts) => { }); describe("when the order has expired", async () => { - beforeEach(async () => { + before(async () => { quantity = undefined; makerTokenAmount = undefined; expirationTime = -1; @@ -450,7 +450,7 @@ contract("CoreIssuanceOrder", (accounts) => { }); describe("when the Set Token quantity in Issuance Order is not a multiple of the natural unit of the set", async () => { - beforeEach(async () => { + before(async () => { quantity = ether(5); }); @@ -460,7 +460,7 @@ contract("CoreIssuanceOrder", (accounts) => { }); describe("when Set Token quantity in Issuance Order equals 0", async () => { - beforeEach(async () => { + before(async () => { quantity = ZERO; }); @@ -470,7 +470,7 @@ contract("CoreIssuanceOrder", (accounts) => { }); describe("when makerTokenAmount in Issuance Order equals 0", async () => { - beforeEach(async () => { + before(async () => { quantity = undefined; makerTokenAmount = ZERO; });