cerc-io/solidity
15
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

Make better use of virtual functions to customize CommonSyntaxTest in test cases based on it

Browse Source
This commit is contained in:
Kamil Śliwak 2023-08-04 17:42:22 +02:00
parent 511712570b
commit aecb11eff4
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/libsolidity/SMTCheckerTest.cpp
View File

@ -127,14 +127,11 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
m_modelCheckerSettings.bmcLoopIterations = std::optional<unsigned>{bmcLoopIterations}; m_modelCheckerSettings.bmcLoopIterations = std::optional<unsigned>{bmcLoopIterations};
} }
TestCase::TestResult SMTCheckerTest::run(ostream& _stream, string const& _linePrefix, bool _formatted) void SMTCheckerTest::setupCompiler()
{ {
setupCompiler(); SyntaxTest::setupCompiler();
compiler().setModelCheckerSettings(m_modelCheckerSettings);
parseAndAnalyze();
filterObtainedErrors();
return conclude(_stream, _linePrefix, _formatted); compiler().setModelCheckerSettings(m_modelCheckerSettings);
} }
void SMTCheckerTest::filterObtainedErrors() void SMTCheckerTest::filterObtainedErrors()

3
test/libsolidity/SMTCheckerTest.h
View File

@ -38,8 +38,7 @@ public:
} }
SMTCheckerTest(std::string const& _filename); SMTCheckerTest(std::string const& _filename);
TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false) override; void setupCompiler() override;
void filterObtainedErrors() override; void filterObtainedErrors() override;
void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override; void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override;

13
test/libsolidity/SyntaxTest.cpp
View File

@ -43,15 +43,6 @@ SyntaxTest::SyntaxTest(string const& _filename, langutil::EVMVersion _evmVersion
m_parserErrorRecovery = _parserErrorRecovery; m_parserErrorRecovery = _parserErrorRecovery;
} }
TestCase::TestResult SyntaxTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
{
setupCompiler();
parseAndAnalyze();
filterObtainedErrors();
return conclude(_stream, _linePrefix, _formatted);
}
string SyntaxTest::addPreamble(string const& _sourceCode) string SyntaxTest::addPreamble(string const& _sourceCode)
{ {
// Silence compiler version warning // Silence compiler version warning
@ -83,6 +74,8 @@ void SyntaxTest::setupCompiler()
void SyntaxTest::parseAndAnalyze() void SyntaxTest::parseAndAnalyze()
{ {
setupCompiler();
if (compiler().parse() && compiler().analyze()) if (compiler().parse() && compiler().analyze())
try try
{ {
@ -112,6 +105,8 @@ void SyntaxTest::parseAndAnalyze()
-1 -1
}); });
} }
filterObtainedErrors();
} }
void SyntaxTest::filterObtainedErrors() void SyntaxTest::filterObtainedErrors()

4
test/libsolidity/SyntaxTest.h
View File

@ -47,13 +47,11 @@ public:
} }
SyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVersion, bool _parserErrorRecovery = false); SyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVersion, bool _parserErrorRecovery = false);
TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false) override;
protected: protected:
/// Returns @param _sourceCode prefixed with the version pragma and the SPDX license identifier. /// Returns @param _sourceCode prefixed with the version pragma and the SPDX license identifier.
static std::string addPreamble(std::string const& _sourceCode); static std::string addPreamble(std::string const& _sourceCode);
void setupCompiler(); virtual void setupCompiler();
void parseAndAnalyze() override; void parseAndAnalyze() override;
virtual void filterObtainedErrors(); virtual void filterObtainedErrors();