refactor runTests

src/testRunner.js

@@ -1,11 +1,19 @@
 var async = require('async')
 var changeCase = require('change-case')
 
-function runTest (testName, testObject, testCallback, resultsCallback) {
+function getAvailableFunctions (jsonInterface) {
-  let runList = []
+  return jsonInterface.reverse().filter((x) => x.type === 'function').map((x) => x.name)
+}
+
+function getTestFunctions (jsonInterface) {
   let specialFunctions = ['beforeAll', 'beforeEach']
-  let availableFunctions = testObject._jsonInterface.reverse().filter((x) => x.type === 'function').map((x) => x.name)
+  return jsonInterface.filter((x) => specialFunctions.indexOf(x.name) < 0 && x.type === 'function')
-  let testFunctions = testObject._jsonInterface.filter((x) => specialFunctions.indexOf(x.name) < 0 && x.type === 'function')
+}
+
+function createRunList (jsonInterface) {
+  let availableFunctions = getAvailableFunctions(jsonInterface)
+  let testFunctions = getTestFunctions(jsonInterface)
+  let runList = []
 
   if (availableFunctions.indexOf('beforeAll') >= 0) {
     runList.push({name: 'beforeAll', type: 'internal', constant: false})
@@ -18,6 +26,12 @@ function runTest (testName, testObject, testCallback, resultsCallback) {
     runList.push({name: func.name, type: 'test', constant: func.constant})
   }
 
+  return runList
+}
+
+function runTest (testName, testObject, testCallback, resultsCallback) {
+  let runList = createRunList(testObject._jsonInterface)
+
   let passingNum = 0
   let failureNum = 0
   let timePassed = 0

tests/testRunner.js

@@ -50,9 +50,9 @@ describe('testRunner', function () {
 
     it('should returns 3 messages', function () {
       assert.deepEqual(tests, [
-        { type: 'contract', value: 'MyTest' },
+        { type: 'contract',    value: 'MyTest' },
-        { type: 'testPass', value: 'Initial value should be100' },
+        { type: 'testPass',    value: 'Initial value should be100', time: 1 },
-        { type: 'testFailure', value: 'Initial value should be200' }
+        { type: 'testFailure', value: 'Initial value should be200', time: 1 }
       ])
     })
   })
@@ -85,8 +85,8 @@ describe('testRunner', function () {
     it('should returns 3 messages', function () {
       assert.deepEqual(tests, [
         { type: 'contract', value: 'MyTest' },
-        { type: 'testPass', value: 'Initial value should be100' },
+        { type: 'testPass', value: 'Initial value should be100', time: 1 },
-        { type: 'testPass', value: 'Initial value should be200' }
+        { type: 'testPass', value: 'Initial value should be200', time: 1 }
       ])
     })
   })