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

Decoupled error checking and report printing in CommonSyntaxTest.

Browse Source
This commit is contained in:
a3d4 2020-03-07 01:18:42 +01:00
parent 66783c30ce
commit bb38ce1759
5 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/CommonSyntaxTest.cpp
View File

@ -68,21 +68,25 @@ TestCase::TestResult CommonSyntaxTest::run(ostream& _stream, string const& _line
{ {
parseAndAnalyze(); parseAndAnalyze();
return printExpectationAndError(_stream, _linePrefix, _formatted) ? TestResult::Success : TestResult::Failure; return conclude(_stream, _linePrefix, _formatted);
} }
bool CommonSyntaxTest::printExpectationAndError(ostream& _stream, string const& _linePrefix, bool _formatted) TestCase::TestResult CommonSyntaxTest::conclude(ostream& _stream, string const& _linePrefix, bool _formatted)
{ {
if (m_expectations != m_errorList) if (m_expectations == m_errorList)
{ return TestResult::Success;
string nextIndentLevel = _linePrefix + " ";
AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << endl; printExpectationAndError(_stream, _linePrefix, _formatted);
printErrorList(_stream, m_expectations, nextIndentLevel, _formatted); return TestResult::Failure;
AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << endl; }
printErrorList(_stream, m_errorList, nextIndentLevel, _formatted);
return false; void CommonSyntaxTest::printExpectationAndError(ostream& _stream, string const& _linePrefix, bool _formatted)
} {
return true; string nextIndentLevel = _linePrefix + " ";
AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << endl;
printErrorList(_stream, m_expectations, nextIndentLevel, _formatted);
AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << endl;
printErrorList(_stream, m_errorList, nextIndentLevel, _formatted);
} }
void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix, bool _formatted) const void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix, bool _formatted) const

3
test/CommonSyntaxTest.h
View File

@ -73,7 +73,8 @@ protected:
bool _formatted = false bool _formatted = false
); );
virtual bool printExpectationAndError(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false); TestResult conclude(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false);
void printExpectationAndError(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false);
static std::vector<SyntaxTestError> parseExpectations(std::istream& _stream); static std::vector<SyntaxTestError> parseExpectations(std::istream& _stream);

2
test/libsolidity/SMTCheckerJSONTest.cpp
View File

@ -135,7 +135,7 @@ TestCase::TestResult SMTCheckerJSONTest::run(ostream& _stream, string const& _li
} }
} }
return printExpectationAndError(_stream, _linePrefix, _formatted) ? TestResult::Success : TestResult::Failure; return conclude(_stream, _linePrefix, _formatted);
} }
vector<string> SMTCheckerJSONTest::hashesFromJson(Json::Value const& _jsonObj, string const& _auxInput, string const& _smtlib) vector<string> SMTCheckerJSONTest::hashesFromJson(Json::Value const& _jsonObj, string const& _auxInput, string const& _smtlib)

2
test/libsolidity/SMTCheckerTest.cpp
View File

@ -57,5 +57,5 @@ TestCase::TestResult SMTCheckerTest::run(ostream& _stream, string const& _linePr
parseAndAnalyze(); parseAndAnalyze();
filterObtainedErrors(); filterObtainedErrors();
return printExpectationAndError(_stream, _linePrefix, _formatted) ? TestResult::Success : TestResult::Failure; return conclude(_stream, _linePrefix, _formatted);
} }

2
test/libsolidity/SyntaxTest.cpp
View File

@ -47,7 +47,7 @@ TestCase::TestResult SyntaxTest::run(ostream& _stream, string const& _linePrefix
parseAndAnalyze(); parseAndAnalyze();
filterObtainedErrors(); filterObtainedErrors();
return printExpectationAndError(_stream, _linePrefix, _formatted) ? TestResult::Success : TestResult::Failure; return conclude(_stream, _linePrefix, _formatted);
} }
void SyntaxTest::setupCompiler() void SyntaxTest::setupCompiler()