4 files changed, 58 insertions, 29 deletions
diff --git a/test/0x.js_test.ts b/test/0x.js_test.ts
index 5d23d7094..a84785f4b 100644
--- a/test/0x.js_test.ts
+++ b/test/0x.js_test.ts
@@ -7,6 +7,7 @@ import * as Sinon from 'sinon';
 import {ZeroEx} from '../src/0x.js';
 import {constants} from './utils/constants';
 import {web3Factory} from './utils/web3_factory';
+import {Order} from '../src/types';
 
 // Use BigNumber chai add-on
 chai.use(ChaiBigNumber());
@@ -43,38 +44,28 @@ describe('ZeroEx library', () => {
     });
     describe('#getOrderHash', () => {
         const expectedOrderHash = '0x103a5e97dab5dbeb8f385636f86a7d1e458a7ccbe1bd194727f0b2f85ab116c7';
+        const order: Order = {
+            maker: constants.NULL_ADDRESS,
+            feeRecipient: constants.NULL_ADDRESS,
+            makerTokenAddress: constants.NULL_ADDRESS,
+            takerTokenAddress: constants.NULL_ADDRESS,
+            salt: new BigNumber(0),
+            makerFee: new BigNumber(0),
+            takerFee: new BigNumber(0),
+            makerTokenAmount: new BigNumber(0),
+            takerTokenAmount: new BigNumber(0),
+            expirationUnixTimestampSec: new BigNumber(0),
+        };
+        const exchangeAddress = constants.NULL_ADDRESS;
         it('defaults takerAddress to NULL address', () => {
-            const orderHash = ZeroEx.getOrderHashHex(
-                constants.NULL_ADDRESS,
-                constants.NULL_ADDRESS,
-                '',
-                constants.NULL_ADDRESS,
-                constants.NULL_ADDRESS,
-                constants.NULL_ADDRESS,
-                new BigNumber(0),
-                new BigNumber(0),
-                new BigNumber(0),
-                new BigNumber(0),
-                new BigNumber(0),
-                new BigNumber(0),
-            );
+            const orderHash = ZeroEx.getOrderHashHex(exchangeAddress, order);
             expect(orderHash).to.be.equal(expectedOrderHash);
         });
         it('calculates the order hash', () => {
-            const orderHash = ZeroEx.getOrderHashHex(
-                constants.NULL_ADDRESS,
-                constants.NULL_ADDRESS,
-                constants.NULL_ADDRESS,
-                constants.NULL_ADDRESS,
-                constants.NULL_ADDRESS,
-                constants.NULL_ADDRESS,
-                new BigNumber(0),
-                new BigNumber(0),
-                new BigNumber(0),
-                new BigNumber(0),
-                new BigNumber(0),
-                new BigNumber(0),
-            );
+            const orderWithZeroTaker = _.assign(order, {
+                taker: constants.NULL_ADDRESS,
+            });
+            const orderHash = ZeroEx.getOrderHashHex(exchangeAddress, orderWithZeroTaker);
             expect(orderHash).to.be.equal(expectedOrderHash);
         });
     });
diff --git a/test/exchange_wrapper.ts b/test/exchange_wrapper_test.ts
index e42454089..ede4198d8 100644
--- a/test/exchange_wrapper.ts
+++ b/test/exchange_wrapper_test.ts
@@ -3,6 +3,8 @@ import * as chai from 'chai';
 import {web3Factory} from './utils/web3_factory';
 import {ZeroEx} from '../src/0x.js';
 import {BlockchainLifecycle} from './utils/blockchain_lifecycle';
+import * as BigNumber from 'bignumber.js';
+import {createSignedOrder} from './utils/order';
 
 const expect = chai.expect;
 const blockchainLifecycle = new BlockchainLifecycle();
@@ -89,4 +91,12 @@ describe('ExchangeWrapper', () => {
             expect(isValid).to.be.true;
         });
     });
+    describe('#fillOrderAsync', async () => {
+        const signedOrder = await createSignedOrder(zeroEx);
+        it('should throw when the fill amount is zero', async () => {
+            const fillAmount = new BigNumber(0);
+            expect(zeroEx.exchange.fillOrderAsync(signedOrder, fillAmount))
+                .to.be.rejectedWith('This order has already been filled or cancelled');
+        });
+    });
 });
diff --git a/test/utils/blockchain_lifecycle.ts b/test/utils/blockchain_lifecycle.ts
index 68e169ac0..50eb57b95 100644
--- a/test/utils/blockchain_lifecycle.ts
+++ b/test/utils/blockchain_lifecycle.ts
@@ -17,4 +17,4 @@ export class BlockchainLifecycle {
             throw new Error(`Snapshot with id #${this.snapshotId} failed to revert`);
         }
     }
-};
+}
diff --git a/test/utils/order.ts b/test/utils/order.ts
new file mode 100644
index 000000000..a69c1b62f
--- /dev/null
+++ b/test/utils/order.ts
@@ -0,0 +1,28 @@
+import {SignedOrder} from '../../src/types';
+import * as BigNumber from 'bignumber.js';
+import * as _ from 'lodash';
+import {ZeroEx} from '../../src/0x.js';
+import {constants} from './constants';
+
+export async function createSignedOrder(zeroEx: ZeroEx): Promise<SignedOrder> {
+    // TODO: fetch properly
+    const EXCHANGE_ADDRESS = '0xb69e673309512a9d726f87304c6984054f87a93b';
+    const INF_TIMESTAMP = 2524604400;
+    const order = {
+        maker: '0x5409ed021d9299bf6814279a6a1411a7e866a631',
+        taker: undefined,
+        makerFee: new BigNumber(0),
+        takerFee: new BigNumber(0),
+        makerTokenAmount: new BigNumber(5000000000000000000),
+        takerTokenAmount: new BigNumber(42000000000000000000),
+        makerTokenAddress: '0x07f96aa816c1f244cbc6ef114bb2b023ba54a2eb',
+        takerTokenAddress: '0x1e2f9e10d02a6b8f8f69fcbf515e75039d2ea30d',
+        salt: ZeroEx.generatePseudoRandomSalt(),
+        feeRecipient: constants.NULL_ADDRESS,
+        expirationUnixTimestampSec: new BigNumber(INF_TIMESTAMP),
+    };
+    const orderHash = ZeroEx.getOrderHashHex(EXCHANGE_ADDRESS, order);
+    const ecSignature = await zeroEx.signOrderHashAsync(orderHash);
+    const signedOrder: SignedOrder = _.assign(order, {ecSignature});
+    return signedOrder;
+}