Merge remote-tracking branch 'upstream/master'

README.md

@@ -1,3 +1,109 @@
 [![Build Status](https://travis-ci.org/ethereum/remix-tests.svg?branch=master)](https://travis-ci.org/ethereum/remix-tests)
 
-# remix-tests
+Remix-Tests
+---
+
+### Installation
+
+`npm -g install remix-tests`
+
+### Test structure
+
+Example test file:
+```Javascript
+pragma solidity ^0.4.7;
+import "remix_tests.sol"; // injected by remix-tests
+import "./simple_storage.sol";
+
+contract MyTest {
+  SimpleStorage foo;
+  uint i = 0;
+
+  function beforeAll() {
+    foo = new SimpleStorage();
+  }
+
+  function beforeEach() {
+    if (i == 1) {
+      foo.set(200);
+    }
+    i += 1;
+  }
+
+  function initialValueShouldBe100() public {
+    Assert.equal(foo.get(), 100, "initial value is not correct");
+  }
+
+  function initialValueShouldBe200() public constant returns {
+    return Assert.equal(foo.get(), 200, "initial value is not correct");
+  }
+
+}
+```
+
+Available special functions:
+* `beforeEach` - runs before each test
+* `beforeAll` - runs before all tests
+
+#### Assert library
+
+Available functions:
+`Assert.ok(value, message)`
+`Assert.equal(value1, value2, message)`
+`Assert.notEqual(value1, value2, message)`
+
+supported values currently are: `bool` `uint` `int` `address` `bytes32`
+
+### Command Line
+
+Remix-Tests will assume the tests will files whose name end with "_test.sol". e.g `simple_storage_test.sol`
+
+Usage:
+
+* A directory with tests files `remix-tests examples/`
+* A test file `remix-tests examples/simple_storage_test.sol`
+
+### Library
+
+Importing the library:
+```Javascript
+const RemixTests = require('remix-tests');
+```
+
+Running a single test object:
+```Javascript
+remixTests.runTest(contractName, contractObj, testCallback, resultsCallback)
+```
+params:
+`testName` - `string` name of the test
+`testObj` -  web3.js 1.0 contract instance of the test
+`testCallback(object)` -  called each time there is a test event. 3 possible type of objects:
+* `{ type: 'contract', value: '<TestName>', filename: '<test_filename.sol>' }`
+* `{ type: 'testPass', value: '<name of testing function>', time: <time taken>, context: '<TestName>'}`
+* `{ type: 'testFailure', value: '<name of testing function>', time: <time taken>, context: '<TestName>', errMsg: '<message in the Assert>' }`
+
+`resultsCallback(object)`
+* `passingNum` - number of passing tests
+* `failureNum` - number of failing tests
+* `timePassed` - time it took for all the tests to run (in seconds)
+
+
+Running a set of tests given the sourcecode:
+```Javascript
+remixTests.runTestSources(contractSources, testCallback, resultCallback, finalCallback, importFileCb);
+```
+params:
+`contractSources` - `object` -> `filename => { content: source }`
+`testCallback(object)` - called each time there is a test event. 3 possible type of objects:
+* `{ type: 'contract', value: '<TestName>', filename: '<test_filename.sol>' }`
+* `{ type: 'testPass', value: '<name of testing function>', time: <time taken>, context: '<TestName>'}`
+* `{ type: 'testFailure', value: '<name of testing function>', time: <time taken>, context: '<TestName>', errMsg: '<message in the Assert>' }`
+
+`resultCallback(object)`
+* `passingNum` - number of passing tests
+* `failureNum` - number of failing tests
+* `timePassed` - time it took for all the tests to run (in seconds)
+
+`finalCallback(err)` - called when all tests finish running.
+`importCb(url, cb)`
+

sol/tests.sol.js

@@ -10,93 +10,93 @@ library Assert {
 
   function ok(bool a, string message) public returns (bool result) {
     result = a;
-    AssertionEvent(result, message);
+    emit AssertionEvent(result, message);
   }
 
   function equal(uint a, uint b, string message) public returns (bool result) {
     result = (a == b);
-    AssertionEvent(result, message);
+    emit AssertionEvent(result, message);
   }
 
   function equal(int a, int b, string message) public returns (bool result) {
     result = (a == b);
-    AssertionEvent(result, message);
+    emit AssertionEvent(result, message);
   }
 
   function equal(bool a, bool b, string message) public returns (bool result) {
     result = (a == b);
-    AssertionEvent(result, message);
+    emit AssertionEvent(result, message);
   }
 
   // TODO: only for certain versions of solc
   //function equal(fixed a, fixed b, string message) public returns (bool result) {
   //  result = (a == b);
-  //  AssertionEvent(result, message);
+  //  emit AssertionEvent(result, message);
   //}
 
   // TODO: only for certain versions of solc
   //function equal(ufixed a, ufixed b, string message) public returns (bool result) {
   //  result = (a == b);
-  //  AssertionEvent(result, message);
+  //  emit AssertionEvent(result, message);
   //}
 
   function equal(address a, address b, string message) public returns (bool result) {
     result = (a == b);
-    AssertionEvent(result, message);
+    emit AssertionEvent(result, message);
   }
 
   function equal(bytes32 a, bytes32 b, string message) public returns (bool result) {
     result = (a == b);
-    AssertionEvent(result, message);
+    emit AssertionEvent(result, message);
   }
 
   // TODO: needs to be convert to bytes first to be comparable
   //function equal(string a, string b, string message) public returns (bool result) {
   //  result = (a == b);
-  //  AssertionEvent(result, message);
+  //  emit AssertionEvent(result, message);
   //}
 
   function notEqual(uint a, uint b, string message) public returns (bool result) {
     result = (a != b);
-    AssertionEvent(result, message);
+    emit AssertionEvent(result, message);
   }
 
   function notEqual(int a, int b, string message) public returns (bool result) {
     result = (a != b);
-    AssertionEvent(result, message);
+    emit AssertionEvent(result, message);
   }
 
   function notEqual(bool a, bool b, string message) public returns (bool result) {
     result = (a != b);
-    AssertionEvent(result, message);
+    emit AssertionEvent(result, message);
   }
 
   // TODO: only for certain versions of solc
   //function notEqual(fixed a, fixed b, string message) public returns (bool result) {
   //  result = (a != b);
-  //  AssertionEvent(result, message);
+  //  emit AssertionEvent(result, message);
   //}
 
   // TODO: only for certain versions of solc
   //function notEqual(ufixed a, ufixed b, string message) public returns (bool result) {
   //  result = (a != b);
-  //  AssertionEvent(result, message);
+  //  emit AssertionEvent(result, message);
   //}
 
   function notEqual(address a, address b, string message) public returns (bool result) {
     result = (a != b);
-    AssertionEvent(result, message);
+    emit AssertionEvent(result, message);
   }
 
   function notEqual(bytes32 a, bytes32 b, string message) public returns (bool result) {
     result = (a != b);
-    AssertionEvent(result, message);
+    emit AssertionEvent(result, message);
   }
 
   // TODO: needs to be convert to bytes first to be comparable
   //function notEqual(string a, string b, string message) public returns (bool result) {
   //  result = (a != b);
-  //  AssertionEvent(result, message);
+  //  emit AssertionEvent(result, message);
   //}
 
 }

src/testRunner.js

@@ -7,7 +7,7 @@ function getAvailableFunctions (jsonInterface) {
 }
 
 function getTestFunctions (jsonInterface) {
-  let specialFunctions = ['beforeAll', 'beforeEach']
+  let specialFunctions = ['beforeAll', 'beforeEach', 'afterAll', 'afterEach']
   return jsonInterface.filter((x) => specialFunctions.indexOf(x.name) < 0 && x.type === 'function')
 }
 
@@ -25,6 +25,13 @@ function createRunList (jsonInterface) {
       runList.push({name: 'beforeEach', type: 'internal', constant: false})
     }
     runList.push({name: func.name, type: 'test', constant: func.constant})
+    if (availableFunctions.indexOf('afterEach') >= 0) {
+      runList.push({name: 'afterEach', type: 'internal', constant: false})
+    }
+  }
+
+  if (availableFunctions.indexOf('afterAll') >= 0) {
+    runList.push({name: 'afterAll', type: 'internal', constant: false})
   }
 
   return runList