|
28 | 28 | using namespace dev;
|
29 | 29 | using namespace solidity;
|
30 | 30 | using namespace dev::solidity::test;
|
31 |
| -using namespace dev::solidity::test::formatting; |
| 31 | +using namespace dev::formatting; |
32 | 32 | using namespace std;
|
33 |
| -namespace fs = boost::filesystem; |
34 | 33 | using namespace boost;
|
35 | 34 | using namespace boost::algorithm;
|
36 | 35 | using namespace boost::unit_test;
|
| 36 | +namespace fs = boost::filesystem; |
37 | 37 |
|
38 | 38 | namespace
|
39 | 39 | {
|
@@ -134,7 +134,7 @@ namespace
|
134 | 134 | _stream << endl << _linePrefix << newline << ws;
|
135 | 135 |
|
136 | 136 | bytes output = _renderResult ? call.expectations.rawBytes() : _test.rawBytes;
|
137 |
| - FormattedScope(_stream, highlight, {formatting::RED_BACKGROUND}) << |
| 137 | + AnsiColorized(_stream, highlight, {RED_BACKGROUND}) << |
138 | 138 | formatBytes(output, call.expectations.result);
|
139 | 139 | };
|
140 | 140 |
|
@@ -184,15 +184,15 @@ bool SemanticTest::run(ostream& _stream, string const& _linePrefix, bool const _
|
184 | 184 |
|
185 | 185 | if (!success)
|
186 | 186 | {
|
187 |
| - FormattedScope(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << endl; |
| 187 | + AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << endl; |
188 | 188 | for (auto const& test: m_tests)
|
189 | 189 | _stream << formatFunctionCallTest(test, _linePrefix, false, true);
|
190 | 190 |
|
191 |
| - FormattedScope(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << endl; |
| 191 | + AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << endl; |
192 | 192 | for (auto const& test: m_tests)
|
193 | 193 | _stream << formatFunctionCallTest(test, _linePrefix, true, true);
|
194 | 194 |
|
195 |
| - FormattedScope(_stream, _formatted, {BOLD, RED}) << _linePrefix |
| 195 | + AnsiColorized(_stream, _formatted, {BOLD, RED}) << _linePrefix |
196 | 196 | << "Attention: Updates on the test will apply the detected format displayed." << endl;
|
197 | 197 | return false;
|
198 | 198 | }
|
|
0 commit comments