Commit 7396ff66 authored by Iuri Matias's avatar Iuri Matias

move console printing test callbacks into runFile method

parent 2ee6ec8a
var async = require('async'); var async = require('async');
require('colors');
let Compiler = require('./src/compiler.js'); let Compiler = require('./src/compiler.js');
let Deployer = require('./src/deployer.js'); let Deployer = require('./src/deployer.js');
let TestRunner = require('./src/testRunner.js'); let TestRunner = require('./src/testRunner.js');
var runTest = function(contractName, contractObj, cb) { var runTest = function(contractName, contractObj, testCallback, resultsCallback) {
var testCallback = function(result) {
if (result.type === 'contract') {
console.log(("#" + result.value).green);
} else if (result.type === 'testPass') {
console.log("\t✓ ".green.bold + result.value.grey);
} else if (result.type === 'testFailure') {
console.log("\t✘ ".bold.red + result.value.red);
}
}
var resultsCallback = function(err, result) {
if (err) {
return cb(err);
}
if (result.passingNum > 0) {
console.log((result.passingNum + " passing").green);
}
if (result.failureNum > 0) {
console.log((result.failureNum + " failing").red);
}
cb();
}
TestRunner.runTest(contractName, contractObj, testCallback, resultsCallback); TestRunner.runTest(contractName, contractObj, testCallback, resultsCallback);
} }
...@@ -39,7 +18,29 @@ var runTestFile = function(filename, web3) { ...@@ -39,7 +18,29 @@ var runTestFile = function(filename, web3) {
Deployer.deployAll(compilationResult, web3, next); Deployer.deployAll(compilationResult, web3, next);
}, },
function runTests(contracts, next) { function runTests(contracts, next) {
runTest("SimpleStorage", contracts.MyTest, next); var testCallback = function(result) {
if (result.type === 'contract') {
console.log(("#" + result.value).green);
} else if (result.type === 'testPass') {
console.log("\t✓ ".green.bold + result.value.grey);
} else if (result.type === 'testFailure') {
console.log("\t✘ ".bold.red + result.value.red);
}
}
var resultsCallback = function(err, result) {
if (err) {
return cb(err);
}
if (result.passingNum > 0) {
console.log((result.passingNum + " passing").green);
}
if (result.failureNum > 0) {
console.log((result.failureNum + " failing").red);
}
next();
}
runTest(filename, contracts.MyTest, testCallback, resultsCallback);
} }
], function() { ], function() {
}); });
......
var async = require('async'); var async = require('async');
var changeCase = require('change-case'); var changeCase = require('change-case');
require('colors');
function runTest(testName, testObject, testCallback, resultsCallback) { function runTest(testName, testObject, testCallback, resultsCallback) {
let runList = []; let runList = [];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment