Unverified Commit 34cf8817 authored by yann300's avatar yann300 Committed by GitHub

Merge pull request #1615 from ethereum/testGeneration

Test generation fixes for solc 0.5.0
parents 637afcf7 abcd7a65
...@@ -193,7 +193,7 @@ module.exports = class TestTab { ...@@ -193,7 +193,7 @@ module.exports = class TestTab {
} }
} }
var testContractSample = `pragma solidity ^0.4.0; var testContractSample = `pragma solidity >=0.4.0 <0.6.0;
import "remix_tests.sol"; // this import is automatically injected by Remix. import "remix_tests.sol"; // this import is automatically injected by Remix.
// file name has to end with '_test.sol' // file name has to end with '_test.sol'
...@@ -201,16 +201,17 @@ contract test_1 { ...@@ -201,16 +201,17 @@ contract test_1 {
function beforeAll() public { function beforeAll() public {
// here should instantiate tested contract // here should instantiate tested contract
Assert.equal(uint(4), uint(3), "error in before all function");
} }
function check1() public { function check1() public {
// this function is not constant, use 'Assert' to test the contract // use 'Assert' to test the contract
Assert.equal(uint(2), uint(1), "error message"); Assert.equal(uint(2), uint(1), "error message");
Assert.equal(uint(2), uint(2), "error message"); Assert.equal(uint(2), uint(2), "error message");
} }
function check2() public constant returns (bool) { function check2() public view returns (bool) {
// this function is constant, use the return value (true or false) to test the contract // use the return value (true or false) to test the contract
return true; return true;
} }
} }
...@@ -219,16 +220,17 @@ contract test_2 { ...@@ -219,16 +220,17 @@ contract test_2 {
function beforeAll() public { function beforeAll() public {
// here should instantiate tested contract // here should instantiate tested contract
Assert.equal(uint(4), uint(3), "error in before all function");
} }
function check1() public { function check1() public {
// this function is not constant, use 'Assert' to test the contract // use 'Assert' to test the contract
Assert.equal(uint(2), uint(1), "error message"); Assert.equal(uint(2), uint(1), "error message");
Assert.equal(uint(2), uint(2), "error message"); Assert.equal(uint(2), uint(2), "error message");
} }
function check2() public constant returns (bool) { function check2() public view returns (bool) {
// this function is constant, use the return value (true or false) to test the contract // use the return value (true or false) to test the contract
return true; return true;
} }
}` }`
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