GrantableTokenMock

contracts/test-helpers/GrantableTokenMock.sol

+pragma solidity ^0.4.4;
+import "./StandardTokenMock.sol";
+
+contract GrantableTokenMock is StandardTokenMock {
+  function GrantableTokenMock(address initialAccount, uint initialBalance)
+           StandardTokenMock(initialAccount, initialBalance) {}
+}

contracts/token/GrantableToken.sol

@@ -28,7 +28,7 @@ contract GrantableToken is StandardToken {
     grantStock(_to, _value);
   }
 
-  function removeStockGrant(address _holder, uint _grantId) {
+  function revokeStockGrant(address _holder, uint _grantId) {
     StockGrant grant = grants[_holder][_grantId];
 
     if (grant.granter != msg.sender) throw;

test/AGrantableToken.js

+const assertJump = require('./helpers/assertJump');
+
+contract('GrantableToken', function(accounts) {
+
+  it("should return the correct totalSupply after construction", async function() {
+    let token = await StandardTokenMock.new(accounts[0], 100);
+    let totalSupply = await token.totalSupply();
+
+    assert.equal(totalSupply, 100);
+  })
+
+  it("should return the correct allowance amount after approval", async function() {
+    let token = await StandardTokenMock.new();
+    let approve = await token.approve(accounts[1], 100);
+    let allowance = await token.allowance(accounts[0], accounts[1]);
+
+    assert.equal(allowance, 100);
+  });
+
+  it("should return correct balances after transfer", async function() {
+    let token = await StandardTokenMock.new(accounts[0], 100);
+    let transfer = await token.transfer(accounts[1], 100);
+    let balance0 = await token.balanceOf(accounts[0]);
+    assert.equal(balance0, 0);
+
+    let balance1 = await token.balanceOf(accounts[1]);
+    assert.equal(balance1, 100);
+  });
+
+  it("should throw an error when trying to transfer more than balance", async function() {
+    let token = await StandardTokenMock.new(accounts[0], 100);
+    try {
+      let transfer = await token.transfer(accounts[1], 101);
+    } catch(error) {
+      return assertJump(error);
+    }
+    assert.fail('should have thrown before');
+  });
+
+  it("should return correct balances after transfering from another account", async function() {
+    let token = await StandardTokenMock.new(accounts[0], 100);
+    let approve = await token.approve(accounts[1], 100);
+    let transferFrom = await token.transferFrom(accounts[0], accounts[2], 100, {from: accounts[1]});
+
+    let balance0 = await token.balanceOf(accounts[0]);
+    assert.equal(balance0, 0);
+
+    let balance1 = await token.balanceOf(accounts[2]);
+    assert.equal(balance1, 100);
+
+    let balance2 = await token.balanceOf(accounts[1]);
+    assert.equal(balance2, 0);
+  });
+
+  it("should throw an error when trying to transfer more than allowed", async function() {
+    let token = await StandardTokenMock.new();
+    let approve = await token.approve(accounts[1], 99);
+    try {
+      let transfer = await token.transferFrom(accounts[0], accounts[2], 100, {from: accounts[1]});
+    } catch (error) {
+      return assertJump(error);
+    }
+    assert.fail('should have thrown before');
+  });
+
+});