From e1fec9b2877492658b079d3278a702310213fe2a Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 14 Nov 2016 23:37:19 +0100 Subject: JSON tests. --- test/libsolidity/ASTJSON.cpp | 14 ++++++++++++++ test/libsolidity/SolidityABIJSON.cpp | 23 +++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/test/libsolidity/ASTJSON.cpp b/test/libsolidity/ASTJSON.cpp index 6c062ee8..0180c4ac 100644 --- a/test/libsolidity/ASTJSON.cpp +++ b/test/libsolidity/ASTJSON.cpp @@ -197,6 +197,20 @@ BOOST_AUTO_TEST_CASE(non_utf8) BOOST_CHECK(literal["attributes"]["type"].asString().find("invalid") != string::npos); } +BOOST_AUTO_TEST_CASE(function_type) +{ + CompilerStack c; + c.addSource("a", "contract C { function f(function() external payable constant returns (uint) x) {} }"); + c.parse(); + map sourceIndices; + sourceIndices["a"] = 1; + Json::Value astJson = ASTJsonConverter(c.ast("a"), sourceIndices).json(); + Json::Value event = astJson["children"][0]["children"][0]; + BOOST_CHECK_EQUAL(event["name"], "EventDefinition"); + BOOST_CHECK_EQUAL(event["attributes"]["name"], "E"); + BOOST_CHECK_EQUAL(event["src"], "13:10:1"); +} + BOOST_AUTO_TEST_SUITE_END() } diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp index c01ff11b..f77ad5fc 100644 --- a/test/libsolidity/SolidityABIJSON.cpp +++ b/test/libsolidity/SolidityABIJSON.cpp @@ -703,6 +703,29 @@ BOOST_AUTO_TEST_CASE(payable_fallback_function) checkInterface(sourceCode, interface); } +BOOST_AUTO_TEST_CASE(function_type) +{ + char const* sourceCode = R"( + contract test { + function g(function(uint) external returns (uint)) {} + } + )"; + + char const* interface = R"( + [ + { + "constant" : false, + "payable": true, + "inputs": ["function"], + "name": "g", + "outputs": [], + "type" : "function" + } + ] + )"; + checkInterface(sourceCode, interface); +} + BOOST_AUTO_TEST_SUITE_END() } -- cgit