From 4aa36f607185e8e2800b30d3d749f21877e2bc5b Mon Sep 17 00:00:00 2001 From: Michael Mortensen Date: Tue, 28 Dec 2010 15:17:27 +0100 Subject: [PATCH 1/2] Changed initialization order to avoid some warnings when compiling with g++. --- internal/catch_resultinfo.hpp | 14 +++++++------- internal/catch_runner_impl.hpp | 6 +++--- internal/catch_runnerconfig.hpp | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/catch_resultinfo.hpp b/internal/catch_resultinfo.hpp index dd99ea4d..8a6c58a9 100644 --- a/internal/catch_resultinfo.hpp +++ b/internal/catch_resultinfo.hpp @@ -40,20 +40,20 @@ namespace Catch public: ResultInfo() - : m_result( ResultWas::Unknown ), + : m_line( 0 ), + m_result( ResultWas::Unknown ), m_isNot( false ), - m_line( 0 ), m_expressionIncomplete( false ) {} ResultInfo( const std::string& expr, ResultWas::OfType result, bool isNot, const std::string& filename, std::size_t line, const std::string& macroName ) - : m_expr( expr ), + : m_macroName( macroName ), + m_filename( filename ), + m_line( line ), + m_expr( expr ), + m_op( m_expr[0] == '!' ? "!" : "" ), m_result( result ), m_isNot( isNot ), - m_op( m_expr[0] == '!' ? "!" : "" ), - m_filename( filename ), - m_line( line ), - m_macroName( macroName ), m_expressionIncomplete( false ) { } diff --git a/internal/catch_runner_impl.hpp b/internal/catch_runner_impl.hpp index ce2d929e..2bd49431 100644 --- a/internal/catch_runner_impl.hpp +++ b/internal/catch_runner_impl.hpp @@ -74,9 +74,9 @@ namespace Catch { public: explicit Runner( const RunnerConfig& config ) - : m_successes( 0 ), + : m_config( config ), + m_successes( 0 ), m_failures( 0 ), - m_config( config ), m_reporter( m_config.getReporter() ) { m_reporter->StartTesting(); @@ -219,4 +219,4 @@ namespace Catch }; } -#endif // TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED \ No newline at end of file +#endif // TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED diff --git a/internal/catch_runnerconfig.hpp b/internal/catch_runnerconfig.hpp index ea18d2f6..cf750e26 100644 --- a/internal/catch_runnerconfig.hpp +++ b/internal/catch_runnerconfig.hpp @@ -43,8 +43,8 @@ namespace Catch RunnerConfig() - : m_listSpec( listNone ), - m_reporter( NULL ), + : m_reporter( NULL ), + m_listSpec( listNone ), m_shouldDebugBreak( false ) {} From 9dfb8157a07c090b2db46d5c8a92b0a929b70e14 Mon Sep 17 00:00:00 2001 From: Michael Mortensen Date: Tue, 28 Dec 2010 15:42:46 +0100 Subject: [PATCH 2/2] Allow tests including catch to compile with g++ flags -Wall and -Werror. --- catch_reporter_basic.hpp | 4 +++- catch_reporter_junit.hpp | 11 ++++++++--- catch_reporter_xml.hpp | 4 +++- internal/catch_commandline.hpp | 4 +++- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/catch_reporter_basic.hpp b/catch_reporter_basic.hpp index 5331e6b7..427b4d01 100644 --- a/catch_reporter_basic.hpp +++ b/catch_reporter_basic.hpp @@ -142,6 +142,8 @@ namespace Catch case ResultWas::ExplicitFailure: m_config.stream() << "failed with message: '" << resultInfo.getMessage() << "'"; break; + default: + break; } if( resultInfo.hasExpression() ) @@ -170,4 +172,4 @@ namespace Catch } // end namespace Catch -#endif // TWOBLUECUBES_CATCH_REPORTER_BASIC_HPP_INCLUDED \ No newline at end of file +#endif // TWOBLUECUBES_CATCH_REPORTER_BASIC_HPP_INCLUDED diff --git a/catch_reporter_junit.hpp b/catch_reporter_junit.hpp index 09fb47c9..502c05fe 100644 --- a/catch_reporter_junit.hpp +++ b/catch_reporter_junit.hpp @@ -101,8 +101,13 @@ namespace Catch m_currentStats = &m_testSuiteStats; } - virtual void StartSection( const std::string& sectionName, const std::string description ){(sectionName,description);} - virtual void EndSection( const std::string& sectionName, std::size_t succeeded, std::size_t failed ){(sectionName, succeeded, failed);} + virtual void StartSection( const std::string& sectionName, const std::string description ) + { + } + + virtual void EndSection( const std::string& sectionName, std::size_t succeeded, std::size_t failed ) + { + } /////////////////////////////////////////////////////////////////////////// virtual void StartTestCase( const Catch::TestCaseInfo& testInfo ) @@ -252,4 +257,4 @@ namespace Catch } // end namespace Catch -#endif // TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED \ No newline at end of file +#endif // TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED diff --git a/catch_reporter_xml.hpp b/catch_reporter_xml.hpp index e641c21f..17704c26 100644 --- a/catch_reporter_xml.hpp +++ b/catch_reporter_xml.hpp @@ -130,6 +130,8 @@ namespace Catch .writeText( resultInfo.getMessage() ); m_currentTestSuccess = false; break; + default: + break; } if( resultInfo.hasExpression() ) m_xml.endElement(); @@ -150,4 +152,4 @@ namespace Catch } // end namespace Catch -#endif // TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED \ No newline at end of file +#endif // TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED diff --git a/internal/catch_commandline.hpp b/internal/catch_commandline.hpp index f2865515..a6f4adab 100644 --- a/internal/catch_commandline.hpp +++ b/internal/catch_commandline.hpp @@ -157,6 +157,8 @@ namespace Catch return setErrorMode( m_command + " does not accept arguments" ); m_config.setShouldDebugBreak( true ); break; + default: + break; } m_args.clear(); m_mode = mode; @@ -180,4 +182,4 @@ namespace Catch } // end namespace Catch -#endif // TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED \ No newline at end of file +#endif // TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED