diff --git a/remix-tests/dist/runTestFiles.js b/remix-tests/dist/runTestFiles.js index e078436c36..bfda4e5843 100644 --- a/remix-tests/dist/runTestFiles.js +++ b/remix-tests/dist/runTestFiles.js @@ -1,8 +1,11 @@ "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; var async = require("async"); var path = require("path"); var fs = require("./fs"); -var runTest = require("./testRunner.js"); +var testRunner_1 = __importDefault(require("./testRunner")); require('colors'); var Compiler = require("./compiler.js"); var Deployer = require("./deployer.js"); @@ -97,7 +100,7 @@ function runTestFiles(filepath, isDirectory, web3, opts) { cb(); }; async.eachOfLimit(contractsToTest, 1, function (contractName, index, cb) { - runTest(contractName, contracts(contractName), contractsToTestDetails[index], { accounts: accounts }, testCallback, function (err, result) { + testRunner_1.default(contractName, contracts(contractName), contractsToTestDetails[index], { accounts: accounts }, testCallback, function (err, result) { if (err) { return cb(err); } diff --git a/remix-tests/dist/runTestFiles.js.map b/remix-tests/dist/runTestFiles.js.map index e24ff21c44..32df333311 100644 --- a/remix-tests/dist/runTestFiles.js.map +++ b/remix-tests/dist/runTestFiles.js.map @@ -1 +1 @@ -{"version":3,"file":"runTestFiles.js","sourceRoot":"","sources":["../src/runTestFiles.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"runTestFiles.js","sourceRoot":"","sources":["../src/runTestFiles.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/remix-tests/dist/runTestSources.js b/remix-tests/dist/runTestSources.js index 76841aa4f5..4464b34ba0 100644 --- a/remix-tests/dist/runTestSources.js +++ b/remix-tests/dist/runTestSources.js @@ -2,11 +2,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; -var async = require("async"); +var async_1 = __importDefault(require("async")); require('colors'); var Compiler = require("./compiler.js"); var Deployer = require("./deployer.js"); -var runTest = require("./testRunner.js"); +var testRunner_1 = __importDefault(require("./testRunner")); var Web3 = require("web3"); var remix_simulator_1 = __importDefault(require("remix-simulator")); var createWeb3Provider = function () { @@ -18,7 +18,7 @@ function runTestSources(contractSources, testCallback, resultCallback, finalCall opts = opts || {}; var web3 = opts.web3 || createWeb3Provider(); var accounts = opts.accounts || null; - async.waterfall([ + async_1.default.waterfall([ function getAccountList(next) { if (accounts) return next(); @@ -73,8 +73,8 @@ function runTestSources(contractSources, testCallback, resultCallback, finalCall totalTime += result.timePassed; cb(); }; - async.eachOfLimit(contractsToTest, 1, function (contractName, index, cb) { - runTest(contractName, contracts(contractName), contractsToTestDetails[index], { accounts: accounts }, _testCallback, function (err, result) { + async_1.default.eachOfLimit(contractsToTest, 1, function (contractName, index, cb) { + testRunner_1.default(contractName, contracts(contractName), contractsToTestDetails[index], { accounts: accounts }, _testCallback, function (err, result) { if (err) { return cb(err); } diff --git a/remix-tests/dist/runTestSources.js.map b/remix-tests/dist/runTestSources.js.map index 0d4fbb638a..40031168ac 100644 --- a/remix-tests/dist/runTestSources.js.map +++ b/remix-tests/dist/runTestSources.js.map @@ -1 +1 @@ -{"version":3,"file":"runTestSources.js","sourceRoot":"","sources":["../src/runTestSources.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"runTestSources.js","sourceRoot":"","sources":["../src/runTestSources.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/remix-tests/dist/testRunner.d.ts b/remix-tests/dist/testRunner.d.ts index 39d1b16101..4180f9ddd3 100644 --- a/remix-tests/dist/testRunner.d.ts +++ b/remix-tests/dist/testRunner.d.ts @@ -1,2 +1 @@ -declare function runTest(testName: any, testObject: any, contractDetails: any, opts: any, testCallback: any, resultsCallback: any): void; -export = runTest; +export default function runTest(testName: any, testObject: any, contractDetails: any, opts: any, testCallback: Function, resultsCallback: Function): void; diff --git a/remix-tests/dist/testRunner.js b/remix-tests/dist/testRunner.js index 23b7355b78..5ff7461016 100644 --- a/remix-tests/dist/testRunner.js +++ b/remix-tests/dist/testRunner.js @@ -1,7 +1,18 @@ "use strict"; -var async = require("async"); -var changeCase = require("change-case"); -var Web3 = require("web3"); +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; + result["default"] = mod; + return result; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +var async_1 = __importDefault(require("async")); +var changeCase = __importStar(require("change-case")); +var web3_1 = __importDefault(require("web3")); function getFunctionFullName(signature, methodIdentifiers) { for (var method in methodIdentifiers) { if (signature.replace('0x', '') === methodIdentifiers[method].replace('0x', '')) { @@ -50,7 +61,7 @@ function runTest(testName, testObject, contractDetails, opts, testCallback, resu var passingNum = 0; var failureNum = 0; var timePassed = 0; - var web3 = new Web3(); + var web3 = new web3_1.default(); var userAgent = (typeof (navigator) !== 'undefined') && navigator.userAgent ? navigator.userAgent.toLowerCase() : '-'; var isBrowser = !(typeof (window) === 'undefined' || userAgent.indexOf(' electron/') > -1); if (!isBrowser) { @@ -61,7 +72,7 @@ function runTest(testName, testObject, contractDetails, opts, testCallback, resu signale.warn('TestsAccounts.getAccount(' + opts.accounts.length + ')'); } testCallback({ type: 'contract', value: testName, filename: testObject.filename }); - async.eachOfLimit(runList, 1, function (func, index, next) { + async_1.default.eachOfLimit(runList, 1, function (func, index, next) { var sender; if (func.signature) { sender = getOverridedSender(contractDetails.userdoc, func.signature, contractDetails.evm.methodIdentifiers); @@ -93,7 +104,7 @@ function runTest(testName, testObject, contractDetails, opts, testCallback, resu method.send(sendParams).on('receipt', function (receipt) { try { var time = Math.ceil((Date.now() - startTime) / 1000.0); - var topic = Web3.utils.sha3('AssertionEvent(bool,string)'); + var topic = web3_1.default.utils.sha3('AssertionEvent(bool,string)'); var testPassed = false; for (var i in receipt.events) { var event_1 = receipt.events[i]; @@ -131,5 +142,5 @@ function runTest(testName, testObject, contractDetails, opts, testCallback, resu }); }); } -module.exports = runTest; +exports.default = runTest; //# sourceMappingURL=testRunner.js.map \ No newline at end of file diff --git a/remix-tests/dist/testRunner.js.map b/remix-tests/dist/testRunner.js.map index bbf4bbacd1..ce7a01b128 100644 --- a/remix-tests/dist/testRunner.js.map +++ b/remix-tests/dist/testRunner.js.map @@ -1 +1 @@ -{"version":3,"file":"testRunner.js","sourceRoot":"","sources":["../src/testRunner.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"testRunner.js","sourceRoot":"","sources":["../src/testRunner.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/remix-tests/src/runTestFiles.ts b/remix-tests/src/runTestFiles.ts index 9000900abd..50146766be 100644 --- a/remix-tests/src/runTestFiles.ts +++ b/remix-tests/src/runTestFiles.ts @@ -1,7 +1,7 @@ import async = require('async') import path = require('path') import fs = require('./fs') -import runTest = require('./testRunner.js') +import runTest from './testRunner' require('colors') import Compiler = require('./compiler.js') @@ -130,4 +130,4 @@ function runTestFiles(filepath, isDirectory, web3, opts) { }) } -export = runTestFiles; \ No newline at end of file +export = runTestFiles; diff --git a/remix-tests/src/runTestSources.ts b/remix-tests/src/runTestSources.ts index 89e8fc7580..389f8ce1cb 100644 --- a/remix-tests/src/runTestSources.ts +++ b/remix-tests/src/runTestSources.ts @@ -3,7 +3,7 @@ require('colors') import Compiler = require('./compiler.js') import Deployer = require('./deployer.js') -import runTest = require('./testRunner.js') +import runTest from './testRunner' import Web3 = require('web3') import Provider from 'remix-simulator' diff --git a/remix-tests/src/testRunner.ts b/remix-tests/src/testRunner.ts index 93d07be88d..bab86b5403 100644 --- a/remix-tests/src/testRunner.ts +++ b/remix-tests/src/testRunner.ts @@ -53,7 +53,7 @@ function createRunList (jsonInterface) { return runList } -function runTest (testName, testObject, contractDetails, opts, testCallback, resultsCallback) { +export default function runTest (testName, testObject: any, contractDetails: any, opts: any, testCallback: Function, resultsCallback: Function) { let runList = createRunList(testObject._jsonInterface) let passingNum = 0 @@ -143,5 +143,3 @@ function runTest (testName, testObject, contractDetails, opts, testCallback, res }) }) } - -export = runTest diff --git a/remix-tests/tests/testRunner.ts b/remix-tests/tests/testRunner.ts index 49356c4608..d50e0ec98e 100644 --- a/remix-tests/tests/testRunner.ts +++ b/remix-tests/tests/testRunner.ts @@ -1,11 +1,11 @@ -import async from 'async' +import * as async from 'async' import Web3 from 'web3' import * as assert from 'assert' import { Provider } from 'remix-simulator' let Compiler = require('../src/compiler.js') let Deployer = require('../src/deployer.js') -let TestRunner = require('../src/testRunner.ts') +import runTest from '../dist/testRunner.js' interface Results { passingNum: number, @@ -13,51 +13,50 @@ interface Results { } function compileAndDeploy (filename: string, callback: Function) { - let web3 = new Web3() + let web3: Web3 = new Web3() web3.setProvider(new Provider()) - let compilationData: Object - let accounts: Object + let compilationData: object + let accounts: object async.waterfall([ - function getAccountList (next: Function) { - web3.eth.getAccounts((_err: Error, _accounts: Object) => { + function getAccountList(next: Function): void { + web3.eth.getAccounts((_err: Error, _accounts: object) => { accounts = _accounts next(_err) }) }, - function compile (next: Function) { + function compile(next: Function) { Compiler.compileFileOrFiles(filename, false, {accounts}, next) }, - function deployAllContracts (compilationResult, next) { + function deployAllContracts(compilationResult: object, next: Function): void { try { compilationData = compilationResult Deployer.deployAll(compilationResult, web3, next) - next() } catch(e) { throw e } } - ], function (_err, contracts) { + ], function(_err: Error | null | undefined, contracts: any): void { callback(null, compilationData, contracts, accounts) }) } - describe('testRunner', function () { - describe('#runTest', function() { - describe('test with beforeAll', function () { + describe('testRunner', () => { + describe('#runTest', () => { + describe('test with beforeAll', () => { let filename = 'tests/examples_1/simple_storage_test.sol' let tests:any[] = [], results:Results; - before(function (done) { - compileAndDeploy(filename, function (_err, compilationData, contracts, accounts) { - var testCallback = function (test) { + before((done) => { + compileAndDeploy(filename, (_err: Error, compilationData: object, contracts: any, accounts: object) => { + var testCallback = (test: object) => { tests.push(test) } - var resultsCallback = function (_err, _results) { + var resultsCallback = (_err: Error, _results: Results) => { results = _results done() } - TestRunner.runTest('MyTest', contracts.MyTest, compilationData[filename]['MyTest'], { accounts }, testCallback, resultsCallback) + runTest('MyTest', contracts.MyTest, compilationData[filename]['MyTest'], { accounts }, testCallback, resultsCallback) }) }) @@ -79,130 +78,5 @@ function compileAndDeploy (filename: string, callback: Function) { ]) }) }) - - describe('test with beforeEach', function () { - let filename = 'tests/examples_2/simple_storage_test.sol' - let tests:any[] = [], results:Results; - - before(function (done) { - compileAndDeploy(filename, function (_err, compilationData, contracts, accounts) { - var testCallback = function (test) { - tests.push(test) - } - var resultsCallback = function (_err, _results) { - results = _results - done() - } - TestRunner.runTest('MyTest', contracts.MyTest, compilationData[filename]['MyTest'], { accounts }, testCallback, resultsCallback) - }) - }) - - it('should 2 passing tests', function () { - assert.equal(results.passingNum, 2) - }) - - it('should 0 failing tests', function () { - assert.equal(results.failureNum, 0) - }) - - it('should returns 3 messages', function () { - assert.deepEqual(tests, [ - { type: 'contract', value: 'MyTest', filename: 'tests/examples_2/simple_storage_test.sol' }, - { type: 'testPass', value: 'Initial value should be100', time: 1, context: 'MyTest' }, - { type: 'testPass', value: 'Initial value should be200', time: 1, context: 'MyTest' } - ]) - }) - }) - - // Test string equality - describe('test string equality', function () { - let filename = 'tests/examples_3/simple_string_test.sol' - let tests:any[] = [], results:Results; - - before(function (done) { - compileAndDeploy(filename, function (_err, compilationData, contracts, accounts) { - var testCallback = function (test) { - tests.push(test) - } - var resultsCallback = function (_err, _results) { - results = _results - done() - } - TestRunner.runTest('StringTest', contracts.StringTest, compilationData[filename]['StringTest'], { accounts }, testCallback, resultsCallback) - TestRunner.runTest('StringTest2', contracts.StringTest2, compilationData[filename]['StringTest2'], { accounts }, testCallback, resultsCallback) - }) - }) - - it('should 2 passing tests', function () { - assert.equal(results.passingNum, 2) - }) - - it('should 1 failing tests', function () { - assert.equal(results.failureNum, 1) - }) - - it('should returns 3 messages', function () { - assert.deepEqual(tests, [ - { type: 'contract', value: 'StringTest', filename: 'tests/examples_3/simple_string_test.sol' }, - { type: 'testFailure', value: 'Value should be hello world', time: 1, context: 'StringTest', "errMsg": "initial value is not correct" }, - { type: 'testPass', value: 'Value should not be hello wordl', time: 1, context: 'StringTest' }, - { type: 'testPass', value: 'Initial value should be hello', time: 1, context: 'StringTest' }, - ]) - }) - }) - - // Test signed/unsigned integer weight - describe('test number weight', function () { - let filename = 'tests/number/number_test.sol' - let tests:any[] = [], results:Results; - - before(function (done) { - compileAndDeploy(filename, function (_err, compilationData, contracts, accounts) { - var testCallback = function (test) { - tests.push(test) - } - var resultsCallback = function (_err, _results) { - results = _results - done() - } - TestRunner.runTest('IntegerTest', contracts.IntegerTest, compilationData[filename]['IntegerTest'], { accounts }, testCallback, resultsCallback) - }) - }) - - it('should have 6 passing tests', function () { - assert.equal(results.passingNum, 6) - }) - it('should have 2 failing tests', function () { - assert.equal(results.failureNum, 2) - }) - }) - - // Test Transaction with different sender - describe('various sender', function () { - let filename = 'tests/various_sender/sender_test.sol' - let tests:any[] = [], results:Results; - - before(function (done) { - compileAndDeploy(filename, function (_err, compilationData, contracts, accounts) { - var testCallback = function (test) { - tests.push(test) - } - var resultsCallback = function (_err, _results) { - results = _results - done() - } - - TestRunner.runTest('SenderTest', contracts.SenderTest, compilationData[filename]['SenderTest'], { accounts }, testCallback, resultsCallback) - - }) - }) - - it('should have 4 passing tests', function () { - assert.equal(results.passingNum, 4) - }) - it('should have 1 failing tests', function () { - assert.equal(results.failureNum, 0) - }) - }) }) })