From 06c32862b3d7d20544ba876e590e799667b3afa8 Mon Sep 17 00:00:00 2001 From: offa Date: Tue, 21 Jan 2020 21:04:42 +0100 Subject: [PATCH] Some refactorings: - Overrides added - usages of push_back() replaced with emplace_back() - Loop variable made const-refernce - NULL replaced with nullptr - Names used in the declaration and definition unified - size() replaced with empty - Identical cases merged --- examples/210-Evt-EventListeners.cpp | 4 ++-- examples/231-Cfg-OutputStreams.cpp | 2 +- src/catch2/catch_commandline.cpp | 7 +++---- src/catch2/catch_console_colour.cpp | 16 ++++++++-------- src/catch2/catch_enum_values_registry.cpp | 2 +- src/catch2/catch_message.cpp | 4 ++-- src/catch2/catch_session.cpp | 4 ++-- src/catch2/catch_test_case_tracker.cpp | 4 ++-- src/catch2/reporters/catch_reporter_junit.cpp | 4 ---- .../SelfTest/UsageTests/ToStringVector.tests.cpp | 6 +++--- 10 files changed, 24 insertions(+), 29 deletions(-) diff --git a/examples/210-Evt-EventListeners.cpp b/examples/210-Evt-EventListeners.cpp index 4b9d6519..0e03902e 100644 --- a/examples/210-Evt-EventListeners.cpp +++ b/examples/210-Evt-EventListeners.cpp @@ -30,7 +30,7 @@ std::ostream& operator<<(std::ostream& out, Catch::Tag t) { template< typename T > std::ostream& operator<<( std::ostream& os, std::vector const& v ) { os << "{ "; - for ( auto x : v ) + for ( const auto& x : v ) os << x << ", "; return os << "}"; } @@ -63,7 +63,7 @@ void print( std::ostream& os, int const level, Catch::MessageInfo const& info ) void print( std::ostream& os, int const level, std::string const& title, std::vector const& v ) { os << ws(level ) << title << ":\n"; - for ( auto x : v ) + for ( const auto& x : v ) { os << ws(level+1) << "{\n"; print( os, level+2, x ); diff --git a/examples/231-Cfg-OutputStreams.cpp b/examples/231-Cfg-OutputStreams.cpp index 2e92ec80..6c97d1be 100644 --- a/examples/231-Cfg-OutputStreams.cpp +++ b/examples/231-Cfg-OutputStreams.cpp @@ -18,7 +18,7 @@ class out_buff : public std::stringbuf { public: out_buff(std::FILE* stream):m_stream(stream) {} ~out_buff(); - int sync() { + int sync() override { int ret = 0; for (unsigned char c : str()) { if (putc(c, m_stream) == EOF) { diff --git a/src/catch2/catch_commandline.cpp b/src/catch2/catch_commandline.cpp index 434664c8..3640a226 100644 --- a/src/catch2/catch_commandline.cpp +++ b/src/catch2/catch_commandline.cpp @@ -50,14 +50,13 @@ namespace Catch { if( !startsWith( line, '"' ) ) line = '"' + line + '"'; config.testsOrTags.push_back( line ); - config.testsOrTags.push_back( "," ); - + config.testsOrTags.emplace_back( "," ); } } //Remove comma in the end if(!config.testsOrTags.empty()) config.testsOrTags.erase( config.testsOrTags.end()-1 ); - + return ParserResult::ok( ParseResultType::Matched ); }; auto const setTestOrder = [&]( std::string const& order ) { @@ -211,7 +210,7 @@ namespace Catch { | Opt( config.benchmarkNoAnalysis ) ["--benchmark-no-analysis"] ( "perform only measurements; do not perform any analysis" ) - | Arg( config.testsOrTags, "test name|pattern|tags" ) + | Arg( config.testsOrTags, "test name|pattern|tags" ) ( "which test or tests to use" ); return cli; diff --git a/src/catch2/catch_console_colour.cpp b/src/catch2/catch_console_colour.cpp index 6a9bcc38..07b150cb 100644 --- a/src/catch2/catch_console_colour.cpp +++ b/src/catch2/catch_console_colour.cpp @@ -34,7 +34,7 @@ namespace Catch { }; struct NoColourImpl : IColourImpl { - void use( Colour::Code ) {} + void use( Colour::Code ) override {} static IColourImpl* instance() { static NoColourImpl s_instance; @@ -208,13 +208,13 @@ namespace Catch { namespace Catch { Colour::Colour( Code _colourCode ) { use( _colourCode ); } - Colour::Colour( Colour&& rhs ) noexcept { - m_moved = rhs.m_moved; - rhs.m_moved = true; + Colour::Colour( Colour&& other ) noexcept { + m_moved = other.m_moved; + other.m_moved = true; } - Colour& Colour::operator=( Colour&& rhs ) noexcept { - m_moved = rhs.m_moved; - rhs.m_moved = true; + Colour& Colour::operator=( Colour&& other ) noexcept { + m_moved = other.m_moved; + other.m_moved = true; return *this; } @@ -226,7 +226,7 @@ namespace Catch { // However, under some conditions it does happen (see #1626), // and this change is small enough that we can let practicality // triumph over purity in this case. - if (impl != NULL) { + if (impl != nullptr) { impl->use( _colourCode ); } } diff --git a/src/catch2/catch_enum_values_registry.cpp b/src/catch2/catch_enum_values_registry.cpp index 79261bcf..11d15dc6 100644 --- a/src/catch2/catch_enum_values_registry.cpp +++ b/src/catch2/catch_enum_values_registry.cpp @@ -60,7 +60,7 @@ namespace Catch { assert( valueNames.size() == values.size() ); std::size_t i = 0; for( auto value : values ) - enumInfo->m_values.push_back({ value, valueNames[i++] }); + enumInfo->m_values.emplace_back(value, valueNames[i++]); return enumInfo; } diff --git a/src/catch2/catch_message.cpp b/src/catch2/catch_message.cpp index bd0b60ba..24cd789b 100644 --- a/src/catch2/catch_message.cpp +++ b/src/catch2/catch_message.cpp @@ -111,7 +111,7 @@ namespace Catch { pos = skipq(pos, c); break; case ',': - if (start != pos && openings.size() == 0) { + if (start != pos && openings.empty()) { m_messages.emplace_back(macroName, lineInfo, resultType); m_messages.back().message = static_cast(trimmed(start, pos)); m_messages.back().message += " := "; @@ -119,7 +119,7 @@ namespace Catch { } } } - assert(openings.size() == 0 && "Mismatched openings"); + assert(openings.empty() && "Mismatched openings"); m_messages.emplace_back(macroName, lineInfo, resultType); m_messages.back().message = static_cast(trimmed(start, names.size() - 1)); m_messages.back().message += " := "; diff --git a/src/catch2/catch_session.cpp b/src/catch2/catch_session.cpp index fd3e4f62..c839eacf 100644 --- a/src/catch2/catch_session.cpp +++ b/src/catch2/catch_session.cpp @@ -204,11 +204,11 @@ namespace Catch { char **utf8Argv = new char *[ argc ]; for ( int i = 0; i < argc; ++i ) { - int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, NULL, 0, NULL, NULL ); + int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr ); utf8Argv[ i ] = new char[ bufSize ]; - WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, NULL, NULL ); + WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, nullptr, nullptr ); } int returnCode = applyCommandLine( argc, utf8Argv ); diff --git a/src/catch2/catch_test_case_tracker.cpp b/src/catch2/catch_test_case_tracker.cpp index 51aa56ff..2d179836 100644 --- a/src/catch2/catch_test_case_tracker.cpp +++ b/src/catch2/catch_test_case_tracker.cpp @@ -224,8 +224,8 @@ namespace TestCaseTracking { void SectionTracker::addInitialFilters( std::vector const& filters ) { if( !filters.empty() ) { m_filters.reserve( m_filters.size() + filters.size() + 2 ); - m_filters.push_back(""); // Root - should never be consulted - m_filters.push_back(""); // Test Case - not a section filter + m_filters.emplace_back(""); // Root - should never be consulted + m_filters.emplace_back(""); // Test Case - not a section filter m_filters.insert( m_filters.end(), filters.begin(), filters.end() ); } } diff --git a/src/catch2/reporters/catch_reporter_junit.cpp b/src/catch2/reporters/catch_reporter_junit.cpp index 9e4691a1..b7aec37e 100644 --- a/src/catch2/reporters/catch_reporter_junit.cpp +++ b/src/catch2/reporters/catch_reporter_junit.cpp @@ -228,11 +228,7 @@ namespace Catch { elementName = "error"; break; case ResultWas::ExplicitFailure: - elementName = "failure"; - break; case ResultWas::ExpressionFailed: - elementName = "failure"; - break; case ResultWas::DidntThrowException: elementName = "failure"; break; diff --git a/tests/SelfTest/UsageTests/ToStringVector.tests.cpp b/tests/SelfTest/UsageTests/ToStringVector.tests.cpp index 1283b4a6..5ce2ff75 100644 --- a/tests/SelfTest/UsageTests/ToStringVector.tests.cpp +++ b/tests/SelfTest/UsageTests/ToStringVector.tests.cpp @@ -17,9 +17,9 @@ TEST_CASE( "vector -> toString", "[toString][vector]" ) { std::vector vv; REQUIRE( ::Catch::Detail::stringify(vv) == "{ }" ); - vv.push_back( "hello" ); + vv.emplace_back( "hello" ); REQUIRE( ::Catch::Detail::stringify(vv) == "{ \"hello\" }" ); - vv.push_back( "world" ); + vv.emplace_back( "world" ); REQUIRE( ::Catch::Detail::stringify(vv) == "{ \"hello\", \"world\" }" ); } @@ -83,4 +83,4 @@ TEST_CASE( "array -> toString", "[toString][containers][array]" ) { REQUIRE( Catch::Detail::stringify( oneValue ) == "{ 42 }" ); std::array twoValues = {{ 42, 250 }}; REQUIRE( Catch::Detail::stringify( twoValues ) == "{ 42, 250 }" ); -} \ No newline at end of file +}