Error report: style issues

This commit is contained in:
Dimitry 2015-08-13 12:18:29 +03:00
parent 4de035e5ba
commit 5cfacc2e7a
2 changed files with 6 additions and 7 deletions

View File

@ -319,7 +319,7 @@ int ImportTest::compareStates(State const& _stateExpect, State const& _statePost
int ImportTest::exportTest(bytes const& _output) int ImportTest::exportTest(bytes const& _output)
{ {
int err = 0; int err = 0;
// export output // export output
m_testObject["out"] = (_output.size() > 4096 && !Options::get().fulloutput) ? "#" + toString(_output.size()) : toHex(_output, 2, HexPrefix::Add); m_testObject["out"] = (_output.size() > 4096 && !Options::get().fulloutput) ? "#" + toString(_output.size()) : toHex(_output, 2, HexPrefix::Add);
// compare expected output with post output // compare expected output with post output
@ -797,8 +797,7 @@ Options::Options()
std::cout.rdbuf(strCout.rdbuf()); std::cout.rdbuf(strCout.rdbuf());
std::cerr.rdbuf(strCout.rdbuf()); std::cerr.rdbuf(strCout.rdbuf());
} }
else else if (indentLevel == "1")
if (indentLevel == "1")
logVerbosity = Verbosity::NiceReport; logVerbosity = Verbosity::NiceReport;
else else
logVerbosity = Verbosity::Full; logVerbosity = Verbosity::Full;

View File

@ -62,20 +62,20 @@ int main( int argc, char* argv[] )
? boost::exit_success ? boost::exit_success
: results_collector.results( framework::master_test_suite().p_id ).result_code(); : results_collector.results( framework::master_test_suite().p_id ).result_code();
} }
catch( framework::nothing_to_test const& ) { catch (framework::nothing_to_test const&) {
return boost::exit_success; return boost::exit_success;
} }
catch( framework::internal_error const& ex ) { catch (framework::internal_error const& ex) {
results_reporter::get_stream() << "Boost.Test framework internal error: " << ex.what() << std::endl; results_reporter::get_stream() << "Boost.Test framework internal error: " << ex.what() << std::endl;
return boost::exit_exception_failure; return boost::exit_exception_failure;
} }
catch( framework::setup_error const& ex ) { catch (framework::setup_error const& ex) {
results_reporter::get_stream() << "Test setup error: " << ex.what() << std::endl; results_reporter::get_stream() << "Test setup error: " << ex.what() << std::endl;
return boost::exit_exception_failure; return boost::exit_exception_failure;
} }
catch( ... ) { catch (...) {
results_reporter::get_stream() << "Boost.Test framework internal error: unknown reason" << std::endl; results_reporter::get_stream() << "Boost.Test framework internal error: unknown reason" << std::endl;
return boost::exit_exception_failure; return boost::exit_exception_failure;