added contract block to allow truffle-test single file execution

test/ABITests.test.js

@@ -1,5 +1,4 @@
 var Tx = require('ethereumjs-tx');
-
 var tokenUtils = require('./TokenTestUtils');
 var FiatToken = tokenUtils.FiatToken;
 var name = tokenUtils.name;
@@ -57,7 +56,7 @@ function mockStringAddressEncode(methodName, address) {
     return functionSignature(methodName) + version + encodeAddress(address);
 }
 
-async function run_tests(newToken) {
+async function run_tests(newToken, accounts) {
 
     beforeEach(async function checkBefore() {
         rawToken = await newToken();
@@ -282,8 +281,9 @@ async function run_tests(newToken) {
     });
 }
 
+var testWrapper = require('./TestWrapper');
+testWrapper.execute('FiatToken_ABIHackingTests', run_tests);
+
 module.exports = {
     run_tests: run_tests,
 }
-
-

test/EventsTests.js

@@ -39,7 +39,7 @@ var checkTransferEvents = tokenUtils.checkTransferEvents;
 
 var amount = 100;
 
-async function run_tests(newToken) {
+async function run_tests(newToken, accounts) {
 
   beforeEach('Make fresh token contract', async function () {
       rawToken = await FiatToken.new();
@@ -146,6 +146,9 @@ async function run_tests(newToken) {
   });
 }
 
+var testWrapper = require('./TestWrapper');
+testWrapper.execute('FiatToken_EventTests', run_tests);
+
 module.exports = {
   run_tests: run_tests,
 }

test/ExtendedPositiveTests.js

@@ -27,7 +27,7 @@ var upgradeTo = tokenUtils.upgradeTo;
 
 var amount = 100;
 
-async function run_tests(newToken) {
+async function run_tests(newToken, accounts) {
 
   beforeEach('Make fresh token contract', async function () {
     rawToken = await newToken();
@@ -416,6 +416,9 @@ async function run_tests(newToken) {
 
  }
 
+var testWrapper = require('./TestWrapper');
+testWrapper.execute('FiatToken_ExtendedPositiveTests', run_tests);
+
 module.exports = {
   run_tests: run_tests,
 }

test/FiatTokenLegacy.test.js

@@ -677,6 +677,9 @@ async function run_tests(newToken, accounts) {
   });
 }
 
+var testWrapper = require('./TestWrapper');
+testWrapper.execute('FiatToken_LegacyTests', run_tests);
+
 module.exports = {
   run_tests: run_tests,
 }

test/MiscTests.js

@@ -29,7 +29,7 @@ var FiatToken = tokenUtils.FiatToken;
 var maxAmount = "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
 var amount = 100;
 
-async function run_tests(newToken) {
+async function run_tests(newToken, accounts) {
 
   beforeEach('Make fresh token contract', async function () {
     rawToken = await newToken();
@@ -557,6 +557,9 @@ async function run_tests(newToken) {
    });
 }
 
+var testWrapper = require('./TestWrapper');
+testWrapper.execute('FiatToken_MiscTests', run_tests);
+
 module.exports = {
   run_tests: run_tests,
 }

test/NegativeTests.js

@@ -32,7 +32,7 @@ var amount = 100;
 let longZero = 0x0000000000000000000000000000000000000000;
 let shortZero = 0x00;
 
-async function run_tests(newToken) {
+async function run_tests(newToken, accounts) {
 
   beforeEach('Make fresh token contract', async function () {
     rawToken = await newToken();
@@ -677,6 +677,9 @@ async function run_tests(newToken) {
   });
 }
 
+var testWrapper = require('./TestWrapper');
+testWrapper.execute('FiatToken_NegativeTests', run_tests);
+
 module.exports = {
   run_tests: run_tests,
 }

test/PositiveTests.js

@@ -26,7 +26,7 @@ var FiatToken = tokenUtils.FiatToken;
 
 var amount = 100;
 
-async function run_tests(newToken) {
+async function run_tests(newToken, accounts) {
 
   beforeEach('Make fresh token contract', async function () {
     rawToken = await newToken();
@@ -268,6 +268,9 @@ async function run_tests(newToken) {
 
 }
 
+var testWrapper = require('./TestWrapper');
+testWrapper.execute('FiatToken_PositiveTests', run_tests);
+
 module.exports = {
   run_tests: run_tests,
 }

test/ProxyNegativeTests.js

@@ -32,7 +32,7 @@ var UpgradedFiatTokenNewFields = tokenUtils.UpgradedFiatTokenNewFields;
 
 var amount = 100;
 
-async function run_tests(newToken) {
+async function run_tests(newToken, accounts) {
 
   beforeEach('Make fresh token contract', async function () {
     rawToken = await newToken();
@@ -142,6 +142,9 @@ async function run_tests(newToken) {
 
 }
 
+var testWrapper = require('./TestWrapper');
+testWrapper.execute('FiatToken_ProxyNegativeTests', run_tests);
+
 module.exports = {
   run_tests: run_tests,
 }

test/ProxyPositiveTests.js

@@ -41,7 +41,7 @@ var sendRawTransaction = abiUtils.sendRawTransaction;
 
 var amount = 100;
 
-async function run_tests(newToken) {
+async function run_tests(newToken, accounts) {
 
   beforeEach('Make fresh token contract', async function () {
     rawToken = await newToken();
@@ -314,6 +314,9 @@ async function run_tests(newToken) {
 
 }
 
+var testWrapper = require('./TestWrapper');
+testWrapper.execute('FiatToken_ProxyPositiveTests', run_tests);
+
 module.exports = {
   run_tests: run_tests,
 }

test/TestWrapper.js

@@ -1,23 +1,4 @@
 var tokenUtils = require('./TokenTestUtils');
-var positive_tests = require('./PositiveTests');
-var extended_positive_tests = require('./ExtendedPositiveTests');
-var negative_tests = require('./NegativeTests');
-var misc_tests = require('./MiscTests');
-var abi_tests = require('./ABITests.test');
-var legacy_tests = require('./FiatTokenLegacy.test');
-var proxy_positive_tests = require('./ProxyPositiveTests');
-var proxy_negative_tests = require('./ProxyNegativeTests');
-var events_tests = require('./EventsTests');
-
-var name = tokenUtils.name;
-var symbol = tokenUtils.symbol;
-var currency = tokenUtils.currency;
-var decimals = tokenUtils.decimals;
-var tokenOwnerAccount = tokenUtils.tokenOwnerAccount;
-var blacklisterAccount = tokenUtils.blacklisterAccount;
-var masterMinterAccount = tokenUtils.masterMinterAccount;
-var pauserAccount = tokenUtils.pauserAccount;
-var arbitraryAccount = tokenUtils.arbitraryAccount;
 var UpgradedFiatToken = tokenUtils.UpgradedFiatToken;
 var FiatToken = tokenUtils.FiatToken;
 
@@ -34,78 +15,20 @@ async function newUpgradedToken() {
 	return token;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-
-// Run specific tests combos by commenting/uncommenting the contract blocks below.
-
-contract('FiatToken_ABIHackingTests', async function () {
-  await abi_tests.run_tests(newToken);
-});
-
-contract('FiatToken_ABIHackingTests_Upgraded', async function () {
-  await abi_tests.run_tests(newUpgradedToken);
-});
-
-contract('FiatToken_PositiveTests', async function () {
-  await positive_tests.run_tests(newToken);
-});
-
-contract('FiatToken_PositiveTests_Upgraded', async function () {
-  await positive_tests.run_tests(newUpgradedToken);
-});
-
-contract('FiatToken_ExtendedPositiveTests', async function () {
-  await extended_positive_tests.run_tests(newToken);
-});
-
-contract('FiatToken_ExtendedPositiveTests_Upgraded', async function () {
-  await extended_positive_tests.run_tests(newUpgradedToken);
-});
-
-contract('FiatToken_NegativeTests', async function () {
-  await negative_tests.run_tests(newToken);
-});
-
-contract('FiatToken_NegativeTests_Upgraded', async function () {
-  await negative_tests.run_tests(newUpgradedToken);
-});
+// Executes the run_tests_function using an original and
+// an upgraded token.  The test_suite_name is printed standard output.
+function execute(test_suite_name, run_tests_function) {
+    contract(test_suite_name, async function (accounts) {
+        await run_tests_function(newToken, accounts);
+    });
 
-contract('FiatToken_MiscTests', async function () {
-  await misc_tests.run_tests(newToken);
-});
+    contract(test_suite_name + " Upgraded", async function (accounts) {
+        await run_tests_function(newUpgradedToken, accounts);
+    });
 
-contract('FiatToken_MiscTests_Upgraded', async function () {
-  await misc_tests.run_tests(newUpgradedToken);
-});
-
-contract('FiatToken_ProxyPositiveTests', async function (accounts) {
-  await proxy_positive_tests.run_tests(newToken);
-});
-
-contract('FiatToken_ProxyPositiveTests_Upgraded', async function (accounts) {
-  await proxy_positive_tests.run_tests(newUpgradedToken);
-});
-
-contract('FiatToken_ProxyNegativeTests', async function (accounts) {
-  await proxy_negative_tests.run_tests(newToken);
-});
-
-contract('FiatToken_ProxyNegativeTests_Upgraded', async function (accounts) {
-  await proxy_negative_tests.run_tests(newUpgradedToken);
-});
-
-contract('FiatToken_LegacyTests', async function (accounts) {
-  await legacy_tests.run_tests(newToken, accounts);
-});
-
-contract('FiatToken_LegacyTests_Upgraded', async function (accounts) {
-  await legacy_tests.run_tests(newUpgradedToken, accounts);
-});
-
-contract('FiatToken_EventTests', async function () {
-  await events_tests.run_tests(newToken);
-});
+    return;
+}
 
-contract('FiatToken_EventTests_Upgraded', async function () {
-  await events_tests.run_tests(newUpgradedToken);
-});
+module.exports = {
+    execute: execute
+}