[test] Assembler: Update tests: Assembly::m_sourceList not a member anymore.

This commit is contained in:
Alexander Arlt 2023-04-26 20:08:09 -05:00
parent 98944cba5b
commit b02031302a

View File

@ -57,7 +57,6 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
{ {
EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion(); EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
Assembly _assembly{evmVersion, false, {}}; Assembly _assembly{evmVersion, false, {}};
_assembly.setSourceList({"root.asm", "sub.asm", "verbatim.asm"});
auto root_asm = make_shared<string>("root.asm"); auto root_asm = make_shared<string>("root.asm");
_assembly.setSourceLocation({1, 3, root_asm}); _assembly.setSourceLocation({1, 3, root_asm});
@ -208,7 +207,7 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
}; };
Json::Value jsonValue; Json::Value jsonValue;
BOOST_CHECK(util::jsonParseStrict(json, jsonValue)); BOOST_CHECK(util::jsonParseStrict(json, jsonValue));
BOOST_CHECK_EQUAL(util::jsonCompactPrint(_assembly.assemblyJSON()), util::jsonCompactPrint(jsonValue)); BOOST_CHECK_EQUAL(util::jsonCompactPrint(_assembly.assemblyJSON({"root.asm", "sub.asm", "verbatim.asm"})), util::jsonCompactPrint(jsonValue));
} }
BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps) BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
@ -299,7 +298,6 @@ BOOST_AUTO_TEST_CASE(immutable)
{ {
EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion(); EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
Assembly _assembly{evmVersion, true, {}}; Assembly _assembly{evmVersion, true, {}};
_assembly.setSourceList({"root.asm", "sub.asm"});
auto root_asm = make_shared<string>("root.asm"); auto root_asm = make_shared<string>("root.asm");
_assembly.setSourceLocation({1, 3, root_asm}); _assembly.setSourceLocation({1, 3, root_asm});
@ -376,7 +374,7 @@ BOOST_AUTO_TEST_CASE(immutable)
"}\n" "}\n"
); );
BOOST_CHECK_EQUAL( BOOST_CHECK_EQUAL(
util::jsonCompactPrint(_assembly.assemblyJSON()), util::jsonCompactPrint(_assembly.assemblyJSON({"root.asm", "sub.asm"})),
"{\".code\":[" "{\".code\":["
"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"2A\"}," "{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"2A\"},"
"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"0\"}," "{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"0\"},"