Update returns tests (move to generic expressions)

test/units/expressions.js

@@ -1,7 +1,7 @@
 const assert = require('assert');
 const util = require('./../util/util.js');
 
-describe('generic expressions', () => {
+describe('generic expressions / misc', () => {
   it('should compile after instrumenting a single binary expression', () => {
     const info = util.instrumentAndCompile('expressions/single-binary-expression');
     util.report(info.solcOutput.errors);
@@ -11,4 +11,9 @@ describe('generic expressions', () => {
     const info = util.instrumentAndCompile('expressions/new-expression');
     util.report(info.solcOutput.errors);
   });
+
+  it('should compile after instrumenting function that returns true', () => {
+    const info = util.instrumentAndCompile('return/return');
+    util.report(info.solcOutput.errors);
+  });
 });

test/units/return.js

@@ -1,14 +0,0 @@
-/* eslint-env node, mocha */
-
-/*const solc = require('solc');
-const getInstrumentedVersion = require('./../lib/instrumentSolidity.js');
-const util = require('./util/util.js');
-
-describe('return statements', () => {
-  it('should compile after instrumenting function that returns true', () => {
-    const contract = util.getCode('return/return.sol');
-    const info = getInstrumentedVersion(contract, 'test.sol');
-    const output = JSON.parse(solc.compile(util.codeToCompilerInput(info.contract)));
-    util.report(output.errors);
-  });
-});*/