Merge pull request #8 from cgewecke/draft-tests

Draft test suite

package.json

@@ -7,7 +7,7 @@
     "test": "test"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "mocha --timeout 10000"
   },
   "author": "",
   "license": "ISC",

test/function.js

@@ -0,0 +1,39 @@
+var solc = require('solc');
+var getInstrumentedVersion = require('./../instrumentSolidity.js');
+var util = require('./util/util.js');
+
+/**
+ * NB: passing '1' to solc as an option activates the optimiser
+ * NB: solc will throw if there is a compilation error, causing the test to fail
+ *     and passing the error to mocha.
+ */
+describe('function declarations', function(){
+
+  it('should compile after instrumenting an ordinary function declaration', function(){
+    var contract = util.getCode('function/function.sol');
+    var info = getInstrumentedVersion(contract, "test.sol", true);
+    var output = solc.compile(info.contract, 1); 
+    util.report(output.errors);
+  })
+
+  it('should compile after instrumenting an abstract function declaration', function(){
+    var contract = util.getCode('function/abstract.sol');
+    var info = getInstrumentedVersion(contract, "test.sol", true);
+    var output = solc.compile(info.contract, 1); 
+    util.report(output.errors);
+  })
+
+  it('should compile after instrumenting a function declaration with an empty body', function(){
+    var contract = util.getCode('function/empty-body.sol');
+    var info = getInstrumentedVersion(contract, "test.sol", true);
+    var output = solc.compile(info.contract, 1); 
+    util.report(output.errors);
+  })
+
+  it('should compile after instrumenting lots of declarations in row', function(){
+    var contract = util.getCode('function/multiple.sol');
+    var info = getInstrumentedVersion(contract, "test.sol", true);
+    var output = solc.compile(info.contract, 1); 
+    util.report(output.errors);
+  })
+})

test/if.js

@@ -0,0 +1,44 @@
+var solc = require('solc');
+var getInstrumentedVersion = require('./../instrumentSolidity.js');
+var util = require('./util/util.js')
+
+/**
+ * NB: passing '1' to solc as an option activates the optimiser
+ */
+describe('if, else, and else if statements', function(){
+
+  it('should compile after instrumenting else statements with brackets',function(){
+    var contract = util.getCode('if/else-with-brackets.sol');
+    var info = getInstrumentedVersion(contract, "test.sol", true);
+    var output = solc.compile(info.contract, 1); 
+    util.report(output.errors);
+  })
+
+  it('should compile after instrumenting else statements without brackets',function(){
+    var contract = util.getCode('if/else-without-brackets.sol');
+    var info = getInstrumentedVersion(contract, "test.sol", true);
+    var output = solc.compile(info.contract, 1); 
+    util.report(output.errors);
+  })
+
+  it('should compile after instrumenting if statements with no brackets',function(){
+    var contract = util.getCode('if/if-no-brackets.sol');
+    var info = getInstrumentedVersion(contract, "test.sol", true);
+    var output = solc.compile(info.contract, 1); 
+    util.report(output.errors);
+  })
+
+  it('should compile after instrumenting if statements with brackets',function(){
+    var contract = util.getCode('if/if-with-brackets.sol');
+    var info = getInstrumentedVersion(contract, "test.sol", true);
+    var output = solc.compile(info.contract, 1); 
+    util.report(output.errors);
+  })
+
+  it('should compile after instrumenting nested if statements with missing else statements',function(){
+    var contract = util.getCode('if/nested-if-missing-else.sol');
+    var info = getInstrumentedVersion(contract, "test.sol", true);
+    var output = solc.compile(info.contract, 1); 
+    util.report(output.errors);
+  })
+})

test/return.js

@@ -0,0 +1,20 @@
+var solc = require('solc');
+var getInstrumentedVersion = require('./../instrumentSolidity.js');
+var util = require('./util/util.js');
+
+describe('return statements', function(){
+
+  it('should compile after instrumenting function that returns true',function(){
+    var contract = util.getCode('return/return.sol');
+    var info = getInstrumentedVersion(contract, "test.sol", true);
+    var output = solc.compile(info.contract, 1); 
+    util.report(output.errors); 
+  })
+
+  it('should compile after instrumenting function that returns without specifying val (null)',function(){
+    var contract = util.getCode('return/return-null.sol');
+    var info = getInstrumentedVersion(contract, "test.sol", true);
+    var output = solc.compile(info.contract, 1); 
+    util.report(output.errors);
+  })
+})

test/sources/function/abstract.sol

@@ -0,0 +1,5 @@
+pragma solidity ^0.4.3;
+
+contract Test {  
+    function abstractFn(uint x);
+}

test/sources/function/empty-body.sol

@@ -0,0 +1,5 @@
+pragma solidity ^0.4.3;
+
+contract Test {  
+    function emptyBody(uint x){}
+}

test/sources/function/function.sol

@@ -0,0 +1,7 @@
+pragma solidity ^0.4.3;
+
+contract Test {  
+    function a(bytes32 x) {
+        x;
+    }
+}

test/sources/function/multiple.sol

@@ -0,0 +1,15 @@
+pragma solidity ^0.4.3;
+
+contract Test {  
+    function f1(bytes32 x) {
+        x = 1;
+    }
+
+    function f2(uint x){ x = 2; }
+
+    address a;
+
+    function f3(uint y){
+        y = 1;
+    }
+}

test/sources/if/else-with-brackets.sol

@@ -0,0 +1,11 @@
+pragma solidity ^0.4.3;
+
+contract Test {  
+    function a(uint x) {
+        if (x == 1) {
+            throw;
+        } else {
+            x = 5;
+        }
+    }
+}

test/sources/if/else-without-brackets.sol

@@ -0,0 +1,10 @@
+pragma solidity ^0.4.3;
+
+contract Test {  
+    function a(uint x) {
+        if (x == 1) { 
+            throw;
+        } else 
+            x = 5;
+    }
+}

test/sources/if/if-no-brackets.sol

@@ -0,0 +1,7 @@
+pragma solidity ^0.4.3;
+
+contract Test {
+    function a(uint x) {
+        if (x == 1) throw;
+    }
+}

test/sources/if/if-with-brackets.sol

@@ -0,0 +1,7 @@
+pragma solidity ^0.4.3;
+
+contract Test {
+    function a(uint x) {
+        if (x == 1) { throw; }
+    }
+}

test/sources/if/nested-if-missing-else.sol

@@ -0,0 +1,11 @@
+pragma solidity ^0.4.3;
+
+contract Test {   
+    function a(uint x,uint y, uint z) {
+        if (x==y){
+        } else if (x==2){
+            if (y==z){
+            }
+        }
+    }
+}

test/sources/return/return-null.sol

@@ -0,0 +1,7 @@
+pragma solidity ^0.4.3;
+
+contract Test {  
+    function a(uint x) returns (bool) {
+        return;
+    }
+}

test/sources/return/return.sol

@@ -0,0 +1,7 @@
+pragma solidity ^0.4.3;
+
+contract Test {  
+    function a(uint x) returns (bool) {
+        return true;
+    }
+}

test/sources/statements/fn-argument-multiline.sol

@@ -0,0 +1,22 @@
+pragma solidity ^0.4.3;
+
+contract Test {  
+
+    function multiline(
+        uint a, 
+        uint b, 
+        uint c, 
+        bytes32 d) 
+    {
+        var x = a;
+    }
+
+    function Test(){
+        multiline(
+            1,
+            2,
+            3,
+            sha3('hello')
+        );
+    }
+}

test/sources/statements/fn-argument.sol

@@ -0,0 +1,11 @@
+pragma solidity ^0.4.3;
+
+contract Test {  
+    function a(bytes32 x) {
+        x;
+    }
+
+    function b (){
+        a(sha3(0));
+    }   
+}

test/sources/statements/if-consequent-no-brackets-multiline.sol

@@ -0,0 +1,8 @@
+pragma solidity ^0.4.3;
+
+contract Test {
+    function a(uint x) {
+        if (x == 1) 
+            throw;
+    }
+}

test/sources/statements/multiple.sol

@@ -0,0 +1,8 @@
+pragma solidity ^0.4.3;
+
+contract Test {  
+    function a(uint x) {
+        sha3(x);
+        sha3(0);
+    }
+}

test/sources/statements/single.sol

@@ -0,0 +1,7 @@
+pragma solidity ^0.4.3;
+
+contract Test {  
+    function a(uint x) {
+        sha3(x);
+    }
+}