cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7034 from ethereum/automatedABIJsonTests

Browse Source 
Automated ABI Json tests.
This commit is contained in:
chriseth 2019-07-03 10:21:25 +02:00 committed by GitHub
commit c3c8bc09d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 1151 additions and 1098 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libdevcore/JSON.cpp
View File

@ -23,6 +23,8 @@
#include <libdevcore/CommonIO.h>
#include <boost/algorithm/string/replace.hpp>
#include <sstream>
#include <map>
#include <memory>
@ -44,9 +46,9 @@ namespace
class StreamWriterBuilder: public Json::StreamWriterBuilder
{
public:
explicit StreamWriterBuilder(map<string, string> const& _settings)
explicit StreamWriterBuilder(map<string, Json::Value> const& _settings)
{
for (auto const& iter :_settings)
for (auto const& iter: _settings)
this->settings_[iter.first] = iter.second;
}
};
@ -89,14 +91,16 @@ bool parse(Json::CharReaderBuilder& _builder, string const& _input, Json::Value&
string jsonPrettyPrint(Json::Value const& _input)
{
static map<string, string> settings{{"indentation", " "}};
static map<string, Json::Value> settings{{"indentation", " "}, {"enableYAMLCompatibility", true}};
static StreamWriterBuilder writerBuilder(settings);
return print(_input, writerBuilder);
string result = print(_input, writerBuilder);
boost::replace_all(result, " \n", "\n");
return result;
}
string jsonCompactPrint(Json::Value const& _input)
{
static map<string, string> settings{{"indentation", ""}};
static map<string, Json::Value> settings{{"indentation", ""}};
static StreamWriterBuilder writerBuilder(settings);
return print(_input, writerBuilder);
}

2
test/InteractiveTests.h
View File

@ -18,6 +18,7 @@
#pragma once
#include <test/TestCase.h>
#include <test/libsolidity/ABIJsonTest.h>
#include <test/libsolidity/ASTJSONTest.h>
#include <test/libsolidity/GasTest.h>
#include <test/libsolidity/SyntaxTest.h>
@ -59,6 +60,7 @@ Testsuite const g_interactiveTestsuites[] = {
{"Error Recovery", "libsolidity", "errorRecoveryTests", false, false, &SyntaxTest::createErrorRecovery},
{"Semantic", "libsolidity", "semanticTests", false, true, &SemanticTest::create},
{"JSON AST", "libsolidity", "ASTJSON", false, false, &ASTJSONTest::create},
{"JSON ABI", "libsolidity", "ABIJson", false, false, &ABIJsonTest::create},
{"SMT Checker", "libsolidity", "smtCheckerTests", true, false, &SyntaxTest::create},
{"SMT Checker JSON", "libsolidity", "smtCheckerTestsJSON", true, false, &SMTCheckerTest::create},
{"Gas Estimates", "libsolidity", "gasTests", false, false, &GasTest::create}

10
test/libdevcore/JSON.cpp
View File

@ -45,12 +45,12 @@ BOOST_AUTO_TEST_CASE(json_pretty_print)
BOOST_CHECK(
"{\n"
" \"1\" : 1,\n"
" \"2\" : \"2\",\n"
" \"3\" : \n"
" \"1\": 1,\n"
" \"2\": \"2\",\n"
" \"3\":\n"
" {\n"
" \"3.1\" : \"3.1\",\n"
" \"3.2\" : 2\n"
" \"3.1\": \"3.1\",\n"
" \"3.2\": 2\n"
" }\n"
"}" == jsonPrettyPrint(json));
}

28
test/libsolidity/ABIJson/basic_test.sol Normal file
View File

@ -0,0 +1,28 @@
contract test {
function f(uint a) public returns (uint d) { return a * 7; }
}
// ----
// :test
// [
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "a",
// "type": "uint256"
// }
// ],
// "name": "f",
// "outputs":
// [
// {
// "name": "d",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]

27
test/libsolidity/ABIJson/constructor_abi.sol Normal file
View File

@ -0,0 +1,27 @@
contract test {
constructor(uint param1, test param2, bool param3) public {}
}
// ----
// :test
// [
// {
// "inputs":
// [
// {
// "name": "param1",
// "type": "uint256"
// },
// {
// "name": "param2",
// "type": "address"
// },
// {
// "name": "param3",
// "type": "bool"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "constructor"
// }
// ]

4
test/libsolidity/ABIJson/empty_contract.sol Normal file
View File

@ -0,0 +1,4 @@
contract test { }
// ----
// :test
// []

40
test/libsolidity/ABIJson/empty_name_input_parameter_with_named_one.sol Normal file
View File

@ -0,0 +1,40 @@
contract test {
function f(uint, uint k) public returns (uint ret_k, uint ret_g) {
uint g = 8;
ret_k = k;
ret_g = g;
}
}
// ----
// :test
// [
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "",
// "type": "uint256"
// },
// {
// "name": "k",
// "type": "uint256"
// }
// ],
// "name": "f",
// "outputs":
// [
// {
// "name": "ret_k",
// "type": "uint256"
// },
// {
// "name": "ret_g",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]

30
test/libsolidity/ABIJson/empty_name_return_parameters.sol Normal file
View File

@ -0,0 +1,30 @@
contract test {
function f(uint k) public returns (uint) {
return k;
}
}
// ----
// :test
// [
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "k",
// "type": "uint256"
// }
// ],
// "name": "f",
// "outputs":
// [
// {
// "name": "",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]

57
test/libsolidity/ABIJson/event_structs.sol Normal file
View File

@ -0,0 +1,57 @@
pragma experimental ABIEncoderV2;
contract C {
struct S { uint a; T[] sub; bytes b; }
struct T { uint[2] x; }
event E(T t, S s);
}
// ----
// :C
// [
// {
// "anonymous": false,
// "inputs":
// [
// {
// "components":
// [
// {
// "name": "x",
// "type": "uint256[2]"
// }
// ],
// "indexed": false,
// "name": "t",
// "type": "tuple"
// },
// {
// "components":
// [
// {
// "name": "a",
// "type": "uint256"
// },
// {
// "components":
// [
// {
// "name": "x",
// "type": "uint256[2]"
// }
// ],
// "name": "sub",
// "type": "tuple[]"
// },
// {
// "name": "b",
// "type": "bytes"
// }
// ],
// "indexed": false,
// "name": "s",
// "type": "tuple"
// }
// ],
// "name": "E",
// "type": "event"
// }
// ]

75
test/libsolidity/ABIJson/events.sol Normal file
View File

@ -0,0 +1,75 @@
contract test {
function f(uint a) public returns (uint d) { return a * 7; }
event e1(uint b, address indexed c);
event e2();
event e2(uint a);
event e3() anonymous;
}
// ----
// :test
// [
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "a",
// "type": "uint256"
// }
// ],
// "name": "f",
// "outputs":
// [
// {
// "name": "d",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// },
// {
// "anonymous": false,
// "inputs":
// [
// {
// "indexed": false,
// "name": "b",
// "type": "uint256"
// },
// {
// "indexed": true,
// "name": "c",
// "type": "address"
// }
// ],
// "name": "e1",
// "type": "event"
// },
// {
// "anonymous": false,
// "inputs": [],
// "name": "e2",
// "type": "event"
// },
// {
// "anonymous": false,
// "inputs":
// [
// {
// "indexed": false,
// "name": "a",
// "type": "uint256"
// }
// ],
// "name": "e2",
// "type": "event"
// },
// {
// "anonymous": true,
// "inputs": [],
// "name": "e3",
// "type": "event"
// }
// ]

13
test/libsolidity/ABIJson/events_anonymous.sol Normal file
View File

@ -0,0 +1,13 @@
contract test {
event e() anonymous;
}
// ----
// :test
// [
// {
// "anonymous": true,
// "inputs": [],
// "name": "e",
// "type": "event"
// }
// ]

22
test/libsolidity/ABIJson/function_type.sol Normal file
View File

@ -0,0 +1,22 @@
contract test {
function g(function(uint) external returns (uint) x) public {}
}
// ----
// :test
// [
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "x",
// "type": "function"
// }
// ],
// "name": "g",
// "outputs": [],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]

12
test/libsolidity/ABIJson/include_fallback_function.sol Normal file
View File

@ -0,0 +1,12 @@
contract test {
function() external {}
}
// ----
// :test
// [
// {
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "fallback"
// }
// ]

119
test/libsolidity/ABIJson/inherited.sol Normal file
View File

@ -0,0 +1,119 @@
contract Base {
function baseFunction(uint p) public returns (uint i) { return p; }
event baseEvent(bytes32 indexed evtArgBase);
}
contract Derived is Base {
function derivedFunction(bytes32 p) public returns (bytes32 i) { return p; }
event derivedEvent(uint indexed evtArgDerived);
}
// ----
// :Base
// [
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "p",
// "type": "uint256"
// }
// ],
// "name": "baseFunction",
// "outputs":
// [
// {
// "name": "i",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// },
// {
// "anonymous": false,
// "inputs":
// [
// {
// "indexed": true,
// "name": "evtArgBase",
// "type": "bytes32"
// }
// ],
// "name": "baseEvent",
// "type": "event"
// }
// ]
//
//
// :Derived
// [
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "p",
// "type": "uint256"
// }
// ],
// "name": "baseFunction",
// "outputs":
// [
// {
// "name": "i",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// },
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "p",
// "type": "bytes32"
// }
// ],
// "name": "derivedFunction",
// "outputs":
// [
// {
// "name": "i",
// "type": "bytes32"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// },
// {
// "anonymous": false,
// "inputs":
// [
// {
// "indexed": true,
// "name": "evtArgDerived",
// "type": "uint256"
// }
// ],
// "name": "derivedEvent",
// "type": "event"
// },
// {
// "anonymous": false,
// "inputs":
// [
// {
// "indexed": true,
// "name": "evtArgBase",
// "type": "bytes32"
// }
// ],
// "name": "baseEvent",
// "type": "event"
// }
// ]

34
test/libsolidity/ABIJson/library_function.sol Normal file
View File

@ -0,0 +1,34 @@
library test {
struct StructType { uint a; }
function f(StructType storage b, uint[] storage c, test d) public returns (uint[] memory e, StructType storage f) { f = f; }
function f1(uint[] memory c, test d) public pure returns (uint[] memory e) { }
}
// ----
// :test
// [
// {
// "constant": true,
// "inputs":
// [
// {
// "name": "c",
// "type": "uint256[]"
// },
// {
// "name": "d",
// "type": "test"
// }
// ],
// "name": "f1",
// "outputs":
// [
// {
// "name": "e",
// "type": "uint256[]"
// }
// ],
// "payable": false,
// "stateMutability": "pure",
// "type": "function"
// }
// ]

50
test/libsolidity/ABIJson/multiple_methods.sol Normal file
View File

@ -0,0 +1,50 @@
contract test {
function f(uint a) public returns (uint d) { return a * 7; }
function g(uint b) public returns (uint e) { return b * 8; }
}
// ----
// :test
// [
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "a",
// "type": "uint256"
// }
// ],
// "name": "f",
// "outputs":
// [
// {
// "name": "d",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// },
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "b",
// "type": "uint256"
// }
// ],
// "name": "g",
// "outputs":
// [
// {
// "name": "e",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]

51
test/libsolidity/ABIJson/multiple_methods_order.sol Normal file
View File

@ -0,0 +1,51 @@
// methods are expected to be in alphabetical order
contract test {
function f(uint a) public returns (uint d) { return a * 7; }
function c(uint b) public returns (uint e) { return b * 8; }
}
// ----
// :test
// [
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "b",
// "type": "uint256"
// }
// ],
// "name": "c",
// "outputs":
// [
// {
// "name": "e",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// },
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "a",
// "type": "uint256"
// }
// ],
// "name": "f",
// "outputs":
// [
// {
// "name": "d",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]

32
test/libsolidity/ABIJson/multiple_params.sol Normal file
View File

@ -0,0 +1,32 @@
contract test {
function f(uint a, uint b) public returns (uint d) { return a + b; }
}
// ----
// :test
// [
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "a",
// "type": "uint256"
// },
// {
// "name": "b",
// "type": "uint256"
// }
// ],
// "name": "f",
// "outputs":
// [
// {
// "name": "d",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]

12
test/libsolidity/ABIJson/payabl_fallback_function.sol Normal file
View File

@ -0,0 +1,12 @@
contract test {
function () external payable {}
}
// ----
// :test
// [
// {
// "payable": true,
// "stateMutability": "payable",
// "type": "fallback"
// }
// ]

27
test/libsolidity/ABIJson/payable_constructor_abi.sol Normal file
View File

@ -0,0 +1,27 @@
contract test {
constructor(uint param1, test param2, bool param3) public payable {}
}
// ----
// :test
// [
// {
// "inputs":
// [
// {
// "name": "param1",
// "type": "uint256"
// },
// {
// "name": "param2",
// "type": "address"
// },
// {
// "name": "param3",
// "type": "bool"
// }
// ],
// "payable": true,
// "stateMutability": "payable",
// "type": "constructor"
// }
// ]

26
test/libsolidity/ABIJson/payable_function.sol Normal file
View File

@ -0,0 +1,26 @@
contract test {
function f() public {}
function g() public payable {}
}
// ----
// :test
// [
// {
// "constant": false,
// "inputs": [],
// "name": "f",
// "outputs": [],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// },
// {
// "constant": false,
// "inputs": [],
// "name": "g",
// "outputs": [],
// "payable": true,
// "stateMutability": "payable",
// "type": "function"
// }
// ]

54
test/libsolidity/ABIJson/pure_function.sol Normal file
View File

@ -0,0 +1,54 @@
contract test {
function foo(uint a, uint b) public returns (uint d) { return a + b; }
function boo(uint32 a) public pure returns (uint b) { return a * 4; }
}
// ----
// :test
// [
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "a",
// "type": "uint256"
// },
// {
// "name": "b",
// "type": "uint256"
// }
// ],
// "name": "foo",
// "outputs":
// [
// {
// "name": "d",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// },
// {
// "constant": true,
// "inputs":
// [
// {
// "name": "a",
// "type": "uint32"
// }
// ],
// "name": "boo",
// "outputs":
// [
// {
// "name": "b",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "pure",
// "type": "function"
// }
// ]

40
test/libsolidity/ABIJson/return_param_in_abi.sol Normal file
View File

@ -0,0 +1,40 @@
// bug #1801
contract test {
enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
constructor(ActionChoices param) public {}
function ret() public returns (ActionChoices) {
ActionChoices action = ActionChoices.GoLeft;
return action;
}
}
// ----
// :test
// [
// {
// "constant": false,
// "inputs": [],
// "name": "ret",
// "outputs":
// [
// {
// "name": "",
// "type": "uint8"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// },
// {
// "inputs":
// [
// {
// "name": "param",
// "type": "uint8"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "constructor"
// }
// ]

48
test/libsolidity/ABIJson/return_structs.sol Normal file
View File

@ -0,0 +1,48 @@
pragma experimental ABIEncoderV2;
contract C {
struct S { uint a; T[] sub; }
struct T { uint[2] x; }
function f() public returns (uint x, S memory s) {
}
}
// ----
// :C
// [
// {
// "constant": false,
// "inputs": [],
// "name": "f",
// "outputs":
// [
// {
// "name": "x",
// "type": "uint256"
// },
// {
// "components":
// [
// {
// "name": "a",
// "type": "uint256"
// },
// {
// "components":
// [
// {
// "name": "x",
// "type": "uint256[2]"
// }
// ],
// "name": "sub",
// "type": "tuple[]"
// }
// ],
// "name": "s",
// "type": "tuple"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]

40
test/libsolidity/ABIJson/return_structs_with_contracts.sol Normal file
View File

@ -0,0 +1,40 @@
pragma experimental ABIEncoderV2;
contract C {
struct S { C[] x; C y; }
function f() public returns (S memory s, C c) {
}
}
// ----
// :C
// [
// {
// "constant": false,
// "inputs": [],
// "name": "f",
// "outputs":
// [
// {
// "components":
// [
// {
// "name": "x",
// "type": "address[]"
// },
// {
// "name": "y",
// "type": "address"
// }
// ],
// "name": "s",
// "type": "tuple"
// },
// {
// "name": "c",
// "type": "address"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]

31
test/libsolidity/ABIJson/structs_and_arrays.sol Normal file
View File

@ -0,0 +1,31 @@
// bug #1801
contract test {
function f(string calldata a, bytes calldata b, uint[] calldata c) external {}
}
// ----
// :test
// [
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "a",
// "type": "string"
// },
// {
// "name": "b",
// "type": "bytes"
// },
// {
// "name": "c",
// "type": "uint256[]"
// }
// ],
// "name": "f",
// "outputs": [],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]

48
test/libsolidity/ABIJson/structs_in_libraries.sol Normal file
View File

@ -0,0 +1,48 @@
pragma experimental ABIEncoderV2;
library L {
struct S { uint a; T[] sub; bytes b; }
struct T { uint[2] x; }
function f(L.S storage s) public view {}
function g(L.S memory s) public view {}
}
// ----
// :L
// [
// {
// "constant": true,
// "inputs":
// [
// {
// "components":
// [
// {
// "name": "a",
// "type": "uint256"
// },
// {
// "components":
// [
// {
// "name": "x",
// "type": "uint256[2]"
// }
// ],
// "name": "sub",
// "type": "tuple[]"
// },
// {
// "name": "b",
// "type": "bytes"
// }
// ],
// "name": "s",
// "type": "tuple"
// }
// ],
// "name": "g",
// "outputs": [],
// "payable": false,
// "stateMutability": "view",
// "type": "function"
// }
// ]

54
test/libsolidity/ABIJson/view_function.sol Normal file
View File

@ -0,0 +1,54 @@
contract test {
function foo(uint a, uint b) public returns (uint d) { return a + b; }
function boo(uint32 a) public view returns(uint b) { return a * 4; }
}
// ----
// :test
// [
// {
// "constant": false,
// "inputs":
// [
// {
// "name": "a",
// "type": "uint256"
// },
// {
// "name": "b",
// "type": "uint256"
// }
// ],
// "name": "foo",
// "outputs":
// [
// {
// "name": "d",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "nonpayable",
// "type": "function"
// },
// {
// "constant": true,
// "inputs":
// [
// {
// "name": "a",
// "type": "uint32"
// }
// ],
// "name": "boo",
// "outputs":
// [
// {
// "name": "b",
// "type": "uint256"
// }
// ],
// "payable": false,
// "stateMutability": "view",
// "type": "function"
// }
// ]

103
test/libsolidity/ABIJsonTest.cpp Normal file
View File

@ -0,0 +1,103 @@
/*
This file is part of solidity.
solidity is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
solidity is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with solidity. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* Unit tests for the solidity compiler ABI JSON Interface output.
*/
#include <test/libsolidity/ABIJsonTest.h>
#include <test/Options.h>
#include <libsolidity/interface/CompilerStack.h>
#include <libdevcore/JSON.h>
#include <libdevcore/AnsiColorized.h>
#include <boost/algorithm/string.hpp>
#include <fstream>
using namespace std;
using namespace dev;
using namespace dev::solidity;
using namespace dev::solidity::test;
ABIJsonTest::ABIJsonTest(string const& _filename)
{
ifstream file(_filename);
if (!file)
BOOST_THROW_EXCEPTION(runtime_error("Cannot open test contract: \"" + _filename + "\"."));
file.exceptions(ios::badbit);
m_source = parseSourceAndSettings(file);
m_expectation = parseSimpleExpectations(file);
}
TestCase::TestResult ABIJsonTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
{
CompilerStack compiler;
compiler.setSources({{"", "pragma solidity >=0.0;\n" + m_source}});
compiler.setEVMVersion(dev::test::Options::get().evmVersion());
compiler.setOptimiserSettings(dev::test::Options::get().optimize);
if (!compiler.parseAndAnalyze())
BOOST_THROW_EXCEPTION(runtime_error("Parsing contract failed"));
m_obtainedResult.clear();
bool first = true;
for (string const& contractName: compiler.contractNames())
{
if (!first)
m_obtainedResult += "\n\n";
m_obtainedResult += " " + contractName + "\n";
m_obtainedResult += jsonPrettyPrint(compiler.contractABI(contractName)) + "\n";
first = false;
}
if (m_expectation != m_obtainedResult)
{
string nextIndentLevel = _linePrefix + " ";
AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::CYAN}) << _linePrefix << "Expected result:" << endl;
printIndented(_stream, m_expectation, nextIndentLevel);
AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::CYAN}) << _linePrefix << "Obtained result:" << endl;
printIndented(_stream, m_obtainedResult, nextIndentLevel);
return TestResult::Failure;
}
return TestResult::Success;
}
void ABIJsonTest::printSource(ostream& _stream, string const& _linePrefix, bool const) const
{
printIndented(_stream, m_source, _linePrefix);
}
void ABIJsonTest::printUpdatedExpectations(ostream& _stream, string const& _linePrefix) const
{
printIndented(_stream, m_obtainedResult, _linePrefix);
}
void ABIJsonTest::printIndented(ostream& _stream, string const& _output, string const& _linePrefix) const
{
stringstream output(_output);
string line;
while (getline(output, line))
if (line.empty())
// Avoid trailing spaces.
_stream << boost::trim_right_copy(_linePrefix) << endl;
else
_stream << _linePrefix << line << endl;
}

57
test/libsolidity/ABIJsonTest.h Normal file
View File

@ -0,0 +1,57 @@
/*
This file is part of solidity.
solidity is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
solidity is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with solidity. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* Unit tests for the solidity compiler ABI JSON Interface output.
*/
#pragma once
#include <test/TestCase.h>
#include <string>
namespace dev
{
namespace solidity
{
namespace test
{
class ABIJsonTest: public TestCase
{
public:
static std::unique_ptr<TestCase> create(Config const& _config)
{ return std::unique_ptr<TestCase>(new ABIJsonTest(_config.filename)); }
ABIJsonTest(std::string const& _filename);
TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
void printSource(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) const override;
void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override;
private:
void printIndented(std::ostream& _stream, std::string const& _output, std::string const& _linePrefix = "") const;
std::string m_source;
std::string m_expectation;
std::string m_obtainedResult;
};
}
}
}

1088
test/libsolidity/SolidityABIJSON.cpp
View File

File diff suppressed because it is too large Load Diff

1
test/tools/CMakeLists.txt
View File

@ -25,6 +25,7 @@ add_executable(isoltest
../libsolidity/SolidityExecutionFramework.cpp
../ExecutionFramework.cpp
../RPCSession.cpp
../libsolidity/ABIJsonTest.cpp
../libsolidity/ASTJSONTest.cpp
../libsolidity/SMTCheckerJSONTest.cpp
../libyul/ObjectCompilerTest.cpp