From bb38ce17598bd369fbe43aac7396661d415041c8 Mon Sep 17 00:00:00 2001
From: a3d4 <a3d4@pm.me>
Date: Sat, 7 Mar 2020 01:18:42 +0100
Subject: [PATCH] Decoupled error checking and report printing in
 CommonSyntaxTest.

---
 test/CommonSyntaxTest.cpp               | 28 ++++++++++++++-----------
 test/CommonSyntaxTest.h                 |  3 ++-
 test/libsolidity/SMTCheckerJSONTest.cpp |  2 +-
 test/libsolidity/SMTCheckerTest.cpp     |  2 +-
 test/libsolidity/SyntaxTest.cpp         |  2 +-
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp
index ebc80dc2f..e3edc3fb0 100644
--- a/test/CommonSyntaxTest.cpp
+++ b/test/CommonSyntaxTest.cpp
@@ -68,21 +68,25 @@ TestCase::TestResult CommonSyntaxTest::run(ostream& _stream, string const& _line
 {
 	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)
-	{
-		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);
-		return false;
-	}
-	return true;
+	if (m_expectations == m_errorList)
+		return TestResult::Success;
+
+	printExpectationAndError(_stream, _linePrefix, _formatted);
+	return TestResult::Failure;
+}
+
+void CommonSyntaxTest::printExpectationAndError(ostream& _stream, string const& _linePrefix, bool _formatted)
+{
+	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
diff --git a/test/CommonSyntaxTest.h b/test/CommonSyntaxTest.h
index 22acd5413..e761e1487 100644
--- a/test/CommonSyntaxTest.h
+++ b/test/CommonSyntaxTest.h
@@ -73,7 +73,8 @@ protected:
 		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);
 
diff --git a/test/libsolidity/SMTCheckerJSONTest.cpp b/test/libsolidity/SMTCheckerJSONTest.cpp
index fad5a127f..a1c23662a 100644
--- a/test/libsolidity/SMTCheckerJSONTest.cpp
+++ b/test/libsolidity/SMTCheckerJSONTest.cpp
@@ -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)
diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index f0bfed8d4..28c98ffab 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -57,5 +57,5 @@ TestCase::TestResult SMTCheckerTest::run(ostream& _stream, string const& _linePr
 	parseAndAnalyze();
 	filterObtainedErrors();
 
-	return printExpectationAndError(_stream, _linePrefix, _formatted) ? TestResult::Success : TestResult::Failure;
+	return conclude(_stream, _linePrefix, _formatted);
 }
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index 031a6085f..3ec506998 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -47,7 +47,7 @@ TestCase::TestResult SyntaxTest::run(ostream& _stream, string const& _linePrefix
 	parseAndAnalyze();
 	filterObtainedErrors();
 
-	return printExpectationAndError(_stream, _linePrefix, _formatted) ? TestResult::Success : TestResult::Failure;
+	return conclude(_stream, _linePrefix, _formatted);
 }
 
 void SyntaxTest::setupCompiler()