From 88889a1a9d3c96bd4da24da50778778fcf2f2342 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Fri, 1 Jun 2018 10:48:29 -0400 Subject: [PATCH] update test_app tests --- lib/tests/run_tests.js | 7 +- .../test_app/test/another_storage_spec.js | 29 ++-- .../test_app/test/array_references_spec.js | 55 +++--- test_apps/test_app/test/lib_test_spec.js | 33 ++-- .../test_app/test/plugin_storage_spec.js | 30 ++-- .../test_app/test/simple_storage_spec.js | 35 ++-- test_apps/test_app/test/token_spec.js | 162 +++++++++--------- 7 files changed, 178 insertions(+), 173 deletions(-) diff --git a/lib/tests/run_tests.js b/lib/tests/run_tests.js index bd435bd9..8d4b12eb 100644 --- a/lib/tests/run_tests.js +++ b/lib/tests/run_tests.js @@ -22,6 +22,7 @@ function getFilesFromDir(filePath, cb) { module.exports = { run: function (filePath) { + const start = Date.now(); process.env.isTest = true; let failures = 0; if (!filePath) { @@ -82,11 +83,15 @@ module.exports = { process.exit(1); } if (failures) { - console.error(`Total number of failures: ${failures}`.red); + console.error(` > Total number of failures: ${failures}`.red.bold); + } else { + console.log(' > All tests passed'.green.bold); } // Clean contracts folder for next test run fs.remove('.embark/contracts', (_err) => { + const end = Date.now(); + console.log('Total time', end - start); process.exit(failures); }); }); diff --git a/test_apps/test_app/test/another_storage_spec.js b/test_apps/test_app/test/another_storage_spec.js index 255a5d4b..82ee75fb 100644 --- a/test_apps/test_app/test/another_storage_spec.js +++ b/test_apps/test_app/test/another_storage_spec.js @@ -1,21 +1,24 @@ +/*global contract, config, it, embark*/ +const assert = require('assert'); +const AnotherStorage = embark.require('Embark/contracts/AnotherStorage'); +const SimpleStorage = embark.require('Embark/contracts/SimpleStorage'); + +config({ + contracts: { + "SimpleStorage": { + args: [100] + }, + "AnotherStorage": { + args: ["$SimpleStorage"] + } + } +}); + contract("AnotherStorage", function() { this.timeout(0); - before(function(done) { - this.timeout(0); - var contractsConfig = { - "SimpleStorage": { - args: [100] - }, - "AnotherStorage": { - args: ["$SimpleStorage"] - } - }; - EmbarkSpec.deployAll(contractsConfig, () => { done() }); - }); it("set SimpleStorage address", async function() { let result = await AnotherStorage.methods.simpleStorageAddress().call(); assert.equal(result.toString(), SimpleStorage.options.address); }); - }); diff --git a/test_apps/test_app/test/array_references_spec.js b/test_apps/test_app/test/array_references_spec.js index 99cf37da..4ca15ab4 100644 --- a/test_apps/test_app/test/array_references_spec.js +++ b/test_apps/test_app/test/array_references_spec.js @@ -1,37 +1,42 @@ +/*global contract, config, it, embark*/ +const assert = require('assert'); +const SomeContract = embark.require('Embark/contracts/SomeContract'); +const SimpleStorage = embark.require('Embark/contracts/SimpleStorage'); +const MyToken2 = embark.require('Embark/contracts/MyToken2'); + +config({ + contracts: { + "SimpleStorage": { + args: [100] + }, + "Token": { + deploy: false, + args: [1000] + }, + "MyToken2": { + instanceOf: "Token", + args: [2000] + }, + "SomeContract": { + "args": [ + ["$MyToken2", "$SimpleStorage"], + 100 + ] + } + } +}); + contract("SomeContract", function() { this.timeout(0); - before(function(done) { - this.timeout(0); - var contractsConfig = { - "SimpleStorage": { - args: [100] - }, - "Token": { - deploy: false, - args: [1000] - }, - "MyToken2": { - instanceOf: "Token", - args: [2000] - }, - "SomeContract": { - "args": [ - ["$MyToken2", "$SimpleStorage"], - 100 - ] - } - }; - EmbarkSpec.deployAll(contractsConfig, () => { done() }); - }); it("set MyToken2 address", async function() { let address = await SomeContract.methods.addr_1().call(); - assert.equal(address, MyToken2.options.address); + assert.strictEqual(address, MyToken2.options.address); }); it("set SimpleStorage address", async function() { let address = await SomeContract.methods.addr_2().call(); - assert.equal(address, SimpleStorage.options.address); + assert.strictEqual(address, SimpleStorage.options.address); }); }); diff --git a/test_apps/test_app/test/lib_test_spec.js b/test_apps/test_app/test/lib_test_spec.js index 18aef2c9..7d158b69 100644 --- a/test_apps/test_app/test/lib_test_spec.js +++ b/test_apps/test_app/test/lib_test_spec.js @@ -1,22 +1,23 @@ +/*global contract, config, it, embark*/ +const assert = require('assert'); +const Test2 = embark.require('Embark/contracts/Test2'); + +config({ + contracts: { + "Test2": { + }, + "ZAMyLib": { + }, + "ZAMyLib2": { + "deploy": true + } + } +}); + contract("Test", function() { - before(function(done) { - this.timeout(0); - var contractsConfig = { - "Test2": { - }, - "ZAMyLib": { - }, - "ZAMyLib2": { - "deploy": true - } - }; - - EmbarkSpec.deployAll(contractsConfig, () => { done() }); - }); - it("should call library correctly", async function() { let result = await Test2.methods.testAdd().call(); - assert.equal(result, 3); + assert.strictEqual(parseInt(result, 10), 3); }); }); diff --git a/test_apps/test_app/test/plugin_storage_spec.js b/test_apps/test_app/test/plugin_storage_spec.js index 24a58c4e..90346c0e 100644 --- a/test_apps/test_app/test/plugin_storage_spec.js +++ b/test_apps/test_app/test/plugin_storage_spec.js @@ -1,23 +1,23 @@ -/*global contract, before, EmbarkSpec, PluginStorage, SimpleStorage, it*/ +/*global contract, config, it, embark*/ const assert = require('assert'); +const PluginStorage = embark.require('Embark/contracts/PluginStorage'); +const SimpleStorage = embark.require('Embark/contracts/SimpleStorage'); + +config({ + contracts: { + "SimpleStorage": { + args: [100] + }, + "PluginStorage": { + args: ["$SimpleStorage"] + } + } +}); + contract("PluginSimpleStorage", function () { this.timeout(0); - before((done) => { - const contractsConfig = { - "SimpleStorage": { - args: [100] - }, - "PluginStorage": { - args: ["$SimpleStorage"] - } - }; - EmbarkSpec.deployAll(contractsConfig, () => { - done(); - }); - }); - it("set SimpleStorage address", async function () { let result = await PluginStorage.methods.simpleStorageAddress().call(); assert.equal(result.toString(), SimpleStorage.options.address); diff --git a/test_apps/test_app/test/simple_storage_spec.js b/test_apps/test_app/test/simple_storage_spec.js index b43e0b35..0eba871a 100644 --- a/test_apps/test_app/test/simple_storage_spec.js +++ b/test_apps/test_app/test/simple_storage_spec.js @@ -1,31 +1,26 @@ +/*global contract, config, it, embark*/ +const assert = require('assert'); +const SimpleStorage = embark.require('Embark/contracts/SimpleStorage'); -contract("SimpleStorage", function() { +config({ + contracts: { + "SimpleStorage": { + args: [100] + } + } +}); +contract("SimpleStorage", function () { this.timeout(0); - before(function(done) { - this.timeout(0); - //config({ - // node: "http://localhost:8545" - //}); - - var contractsConfig = { - "SimpleStorage": { - args: [100] - } - }; - EmbarkSpec.deployAll(contractsConfig, () => { done() }); - }); - - it("should set constructor value", async function() { + it("should set constructor value", async function () { let result = await SimpleStorage.methods.storedData().call(); - assert.equal(result, 100); + assert.strictEqual(parseInt(result, 10), 100); }); - it("set storage value", async function() { + it("set storage value", async function () { await SimpleStorage.methods.set(150).send(); let result = await SimpleStorage.methods.get().call(); - assert.equal(result, 499650); + assert.strictEqual(parseInt(result, 10), 499650); }); - }); diff --git a/test_apps/test_app/test/token_spec.js b/test_apps/test_app/test/token_spec.js index 88dfc1a8..5390e665 100644 --- a/test_apps/test_app/test/token_spec.js +++ b/test_apps/test_app/test/token_spec.js @@ -1,86 +1,82 @@ -/*global describe, it, before*/ +/*global describe, config, it, embark*/ +const assert = require('assert'); +const Token = embark.require('Embark/contracts/Token'); +const MyToken = embark.require('Embark/contracts/MyToken'); +const MyToken2 = embark.require('Embark/contracts/MyToken2'); +const AlreadyDeployedToken = embark.require('Embark/contracts/AlreadyDeployedToken'); +const Test = embark.require('Embark/contracts/Test'); -describe("Token", function() { - - this.timeout(0); - before(function(done) { - this.timeout(0); - - //config({ - // node: "http://localhost:8545" - //}); - - var contractsConfig = { - "ZAMyLib": { - }, - "SimpleStorage": { - args: [100] - }, - "AnotherStorage": { - args: ["$SimpleStorage"] - }, - "Token": { - deploy: false, - args: [1000] - }, - "MyToken": { - instanceOf: "Token" - }, - "MyToken2": { - instanceOf: "Token", - args: [2000] - }, - "AlreadyDeployedToken": { - "address": "0xCAFECAFECAFECAFECAFECAFECAFECAFECAFECAFE", - instanceOf: "Token" - }, - "Test": { - onDeploy: [ - "Test.methods.changeAddress('$MyToken').send()" - ] - }, - "ContractArgs": { - "args": { - "initialValue": 123, - "_addresses": ["$MyToken2", "$SimpleStorage"] - } - }, - "SomeContract": { - "args": [ - ["$MyToken2", "$SimpleStorage"], - 100 - ] +config({ + contracts: { + ZAMyLib: {}, + SimpleStorage: { + args: [100] + }, + AnotherStorage: { + args: ["$SimpleStorage"] + }, + Token: { + deploy: false, + args: [1000] + }, + MyToken: { + instanceOf: "Token" + }, + MyToken2: { + instanceOf: "Token", + args: [2000] + }, + AlreadyDeployedToken: { + address: "0xCAFECAFECAFECAFECAFECAFECAFECAFECAFECAFE", + instanceOf: "Token" + }, + Test: { + onDeploy: ["Test.methods.changeAddress('$MyToken').send()"] + }, + ContractArgs: { + args: { + initialValue: 123, + _addresses: ["$MyToken2", "$SimpleStorage"] } - }; - EmbarkSpec.deployAll(contractsConfig, () => { done() }); - }); - - it("not deploy Token", function() { - assert.equal(Token.address, ""); - }); - - it("not deploy MyToken and MyToken2", function() { - assert.notEqual(MyToken.address, ""); - assert.notEqual(MyToken2.address, ""); - }); - - it("set MyToken Balance correctly", async function() { - let result = await MyToken.methods._supply().call(); - assert.equal(result, 1000); - }); - - it("set MyToken2 Balance correctly", async function() { - let result = await MyToken2.methods._supply().call(); - assert.equal(result, 2000); - }); - - it("get right address", function() { - assert.equal(AlreadyDeployedToken.address, "0xCAFECAFECAFECAFECAFECAFECAFECAFECAFECAFE"); - }); - - it("should use onDeploy", async function() { - let result = await Test.methods.addr().call(); - assert.equal(result, MyToken.address) - }); - + }, + SomeContract: { + args: [ + ["$MyToken2", "$SimpleStorage"], + 100 + ] + } + } +}); + +describe("Token", function () { + this.timeout(0); + + it("not deploy Token", function () { + assert.strictEqual(Token.address, undefined); + }); + + it("should deploy MyToken and MyToken2", function () { + assert.ok(MyToken.options.address); + assert.ok(MyToken2.options.address); + }); + + it("set MyToken Balance correctly", async function () { + let result = await MyToken.methods._supply().call(); + assert.strictEqual(parseInt(result, 10), 1000); + }); + + it("set MyToken2 Balance correctly", async function () { + let result = await MyToken2.methods._supply().call(); + assert.strictEqual(parseInt(result, 10), 2000); + }); + + it("get right address", function () { + assert.strictEqual(AlreadyDeployedToken.options.address.toLowerCase(), + "0xCAFECAFECAFECAFECAFECAFECAFECAFECAFECAFE".toLowerCase()); + }); + + it("should use onDeploy", async function () { + let result = await Test.methods.addr().call(); + assert.strictEqual(result, MyToken.options.address); + }); });