diff options
| author | Phil Nash | 2012-05-10 21:46:46 +0100 |
|---|---|---|
| committer | Phil Nash | 2012-05-10 21:46:46 +0100 |
| commit | d10d2d34855e7a092e28e94aa6beff5120bbe431 (patch) | |
| tree | 0f2c5fed78f5e8a85d2def1a3743a14f5bc6e843 /include/internal | |
| parent | d53573c95a7d3faa0f84c525efb2dfacab2c7461 (diff) | |
| download | catch3-d10d2d34855e7a092e28e94aa6beff5120bbe431.tar.gz | |
More reformatting
Diffstat (limited to 'include/internal')
| -rw-r--r-- | include/internal/catch_objc.hpp | 7 | ||||
| -rw-r--r-- | include/internal/catch_runner_impl.hpp | 9 | ||||
| -rw-r--r-- | include/internal/catch_test_case_registry_impl.hpp | 129 | ||||
| -rw-r--r-- | include/internal/catch_test_registry.hpp | 88 | ||||
| -rw-r--r-- | include/internal/catch_totals.hpp | 16 |
5 files changed, 59 insertions, 190 deletions
diff --git a/include/internal/catch_objc.hpp b/include/internal/catch_objc.hpp index e78f85fc..4920ebdc 100644 --- a/include/internal/catch_objc.hpp +++ b/include/internal/catch_objc.hpp @@ -1,15 +1,10 @@ /* - * catch_objc.hpp - * Catch - * * Created by Phil on 14/11/2010. * Copyright 2010 Two Blue Cubes Ltd. All rights reserved. * * Distributed under the Boost Software License, Version 1.0. (See accompanying * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - * */ - #ifndef TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED #define TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED @@ -321,4 +316,4 @@ return @ desc; \ } \ -(void) INTERNAL_CATCH_UNIQUE_NAME( Catch_TestCase_test ) -#endif // TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED
\ No newline at end of file +#endif // TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED diff --git a/include/internal/catch_runner_impl.hpp b/include/internal/catch_runner_impl.hpp index 7c138953..2e67b110 100644 --- a/include/internal/catch_runner_impl.hpp +++ b/include/internal/catch_runner_impl.hpp @@ -1,13 +1,9 @@ /* - * catch_runner.hpp - * Catch - * * Created by Phil on 22/10/2010. * Copyright 2010 Two Blue Cubes Ltd. All rights reserved. * * Distributed under the Boost Software License, Version 1.0. (See accompanying * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - * */ #ifndef TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED #define TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED @@ -25,8 +21,7 @@ #include <string> namespace Catch -{ - +{ class StreamRedirect { public: @@ -370,7 +365,7 @@ namespace Catch } m_info.clear(); } - + private: RunningTest* m_runningTest; ResultInfoBuilder m_currentResult; diff --git a/include/internal/catch_test_case_registry_impl.hpp b/include/internal/catch_test_case_registry_impl.hpp index 4036f905..b7a383a0 100644 --- a/include/internal/catch_test_case_registry_impl.hpp +++ b/include/internal/catch_test_case_registry_impl.hpp @@ -1,15 +1,10 @@ /* - * catch_test_case_registry_impl.hpp - * Catch - * * Created by Phil on 7/1/2011 * Copyright 2010 Two Blue Cubes Ltd. All rights reserved. * * Distributed under the Boost Software License, Version 1.0. (See accompanying * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - * */ - #include "catch_test_registry.hpp" #include "catch_test_case_info.hpp" #include "catch_context.h" @@ -20,35 +15,22 @@ namespace Catch { - class TestRegistry : public ITestCaseRegistry - { + class TestRegistry : public ITestCaseRegistry { public: - /////////////////////////////////////////////////////////////////////////// - TestRegistry - () - : m_unnamedCount( 0 ) - { - } + TestRegistry() : m_unnamedCount( 0 ) {} - /////////////////////////////////////////////////////////////////////////// - virtual void registerTest - ( - const TestCaseInfo& testInfo - ) - { - if( testInfo.getName() == "" ) - { + virtual void registerTest( const TestCaseInfo& testInfo ) { + if( testInfo.getName() == "" ) { std::ostringstream oss; oss << testInfo.getName() << "unnamed/" << ++m_unnamedCount; return registerTest( TestCaseInfo( testInfo, oss.str() ) ); } - if( m_functions.find( testInfo ) == m_functions.end() ) - { + + if( m_functions.find( testInfo ) == m_functions.end() ) { m_functions.insert( testInfo ); m_functionsInOrder.push_back( testInfo ); } - else - { + else { const TestCaseInfo& prev = *m_functions.find( testInfo ); std::cerr << "error: TEST_CASE( \"" << testInfo.getName() << "\" ) already defined.\n" << "\tFirst seen at " << SourceLineInfo( prev.getLineInfo() ) << "\n" @@ -57,29 +39,18 @@ namespace Catch } } - /////////////////////////////////////////////////////////////////////////// - virtual const std::vector<TestCaseInfo>& getAllTests - () - const - { + virtual const std::vector<TestCaseInfo>& getAllTests() const { return m_functionsInOrder; } - /////////////////////////////////////////////////////////////////////////// - virtual std::vector<TestCaseInfo> getMatchingTestCases - ( - const std::string& rawTestSpec - ) - { + virtual std::vector<TestCaseInfo> getMatchingTestCases( const std::string& rawTestSpec ) { TestSpec testSpec( rawTestSpec ); std::vector<TestCaseInfo> testList; std::vector<TestCaseInfo>::const_iterator it = m_functionsInOrder.begin(); std::vector<TestCaseInfo>::const_iterator itEnd = m_functionsInOrder.end(); - for(; it != itEnd; ++it ) - { - if( testSpec.matches( it->getName() ) ) - { + for(; it != itEnd; ++it ) { + if( testSpec.matches( it->getName() ) ) { testList.push_back( *it ); } } @@ -94,53 +65,26 @@ namespace Catch }; /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - - struct FreeFunctionTestCase : ITestCase - { - /////////////////////////////////////////////////////////////////////////// - FreeFunctionTestCase - ( - TestFunction fun - ) - : m_fun( fun ) - {} - /////////////////////////////////////////////////////////////////////////// - virtual void invoke - () - const - { + class FreeFunctionTestCase : public ITestCase { + public: + + FreeFunctionTestCase( TestFunction fun ) : m_fun( fun ) {} + + virtual void invoke() const { m_fun(); } - /////////////////////////////////////////////////////////////////////////// - virtual ITestCase* clone - () - const - { + virtual ITestCase* clone() const { return new FreeFunctionTestCase( m_fun ); } - /////////////////////////////////////////////////////////////////////////// - virtual bool operator == - ( - const ITestCase& other - ) - const - { + virtual bool operator == ( const ITestCase& other ) const { const FreeFunctionTestCase* ffOther = dynamic_cast<const FreeFunctionTestCase*> ( &other ); return ffOther && m_fun == ffOther->m_fun; } - /////////////////////////////////////////////////////////////////////////// - virtual bool operator < - ( - const ITestCase& other - ) - const - { + virtual bool operator < ( const ITestCase& other ) const { const FreeFunctionTestCase* ffOther = dynamic_cast<const FreeFunctionTestCase*> ( &other ); return ffOther && m_fun < ffOther->m_fun; } @@ -150,35 +94,20 @@ namespace Catch }; /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - AutoReg::AutoReg - ( - TestFunction function, - const char* name, - const char* description, - const SourceLineInfo& lineInfo - ) - { + AutoReg::AutoReg( TestFunction function, + const char* name, + const char* description, + const SourceLineInfo& lineInfo ) { registerTestCase( new FreeFunctionTestCase( function ), name, description, lineInfo ); } - /////////////////////////////////////////////////////////////////////////// - AutoReg::~AutoReg - () - { - } + AutoReg::~AutoReg() {} - /////////////////////////////////////////////////////////////////////////// - void AutoReg::registerTestCase - ( - ITestCase* testCase, - const char* name, - const char* description, - const SourceLineInfo& lineInfo - ) - { + void AutoReg::registerTestCase( ITestCase* testCase, + const char* name, + const char* description, + const SourceLineInfo& lineInfo ) { Context::getTestCaseRegistry().registerTest( TestCaseInfo( testCase, name, description, lineInfo ) ); } diff --git a/include/internal/catch_test_registry.hpp b/include/internal/catch_test_registry.hpp index e483fac0..9f55a2d2 100644 --- a/include/internal/catch_test_registry.hpp +++ b/include/internal/catch_test_registry.hpp @@ -1,13 +1,9 @@ /* - * catch_test_registry.hpp - * Catch - * * Created by Phil on 18/10/2010. * Copyright 2010 Two Blue Cubes Ltd. All rights reserved. * * Distributed under the Boost Software License, Version 1.0. (See accompanying * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - * */ #ifndef TWOBLUECUBES_CATCH_REGISTRY_HPP_INCLUDED #define TWOBLUECUBES_CATCH_REGISTRY_HPP_INCLUDED @@ -19,51 +15,26 @@ namespace Catch { template<typename C> -struct MethodTestCase : ITestCase +class MethodTestCase : public ITestCase { - /////////////////////////////////////////////////////////////////////////// - MethodTestCase - ( - void (C::*method)() - ) - : m_method( method ) - {} +public: + MethodTestCase( void (C::*method)() ) : m_method( method ) {} - /////////////////////////////////////////////////////////////////////////// - virtual void invoke - () - const - { + virtual void invoke() const { C obj; (obj.*m_method)(); } - /////////////////////////////////////////////////////////////////////////// - virtual ITestCase* clone - () - const - { + virtual ITestCase* clone() const { return new MethodTestCase<C>( m_method ); } - /////////////////////////////////////////////////////////////////////////// - virtual bool operator == - ( - const ITestCase& other - ) - const - { + virtual bool operator == ( const ITestCase& other ) const { const MethodTestCase* mtOther = dynamic_cast<const MethodTestCase*>( &other ); return mtOther && m_method == mtOther->m_method; } - /////////////////////////////////////////////////////////////////////////// - virtual bool operator < - ( - const ITestCase& other - ) - const - { + virtual bool operator < ( const ITestCase& other ) const { const MethodTestCase* mtOther = dynamic_cast<const MethodTestCase*>( &other ); return mtOther && &m_method < &mtOther->m_method; } @@ -76,44 +47,29 @@ typedef void(*TestFunction)(); struct AutoReg { - AutoReg - ( TestFunction function, - const char* name, - const char* description, - const SourceLineInfo& lineInfo - ); + AutoReg( TestFunction function, + const char* name, + const char* description, + const SourceLineInfo& lineInfo ); - /////////////////////////////////////////////////////////////////////////// template<typename C> - AutoReg - ( - void (C::*method)(), - const char* name, - const char* description, - const SourceLineInfo& lineInfo - ) - { + AutoReg( void (C::*method)(), + const char* name, + const char* description, + const SourceLineInfo& lineInfo ) { registerTestCase( new MethodTestCase<C>( method ), name, description, lineInfo ); } - /////////////////////////////////////////////////////////////////////////// - void registerTestCase - ( - ITestCase* testCase, - const char* name, - const char* description, - const SourceLineInfo& lineInfo - ); + void registerTestCase( ITestCase* testCase, + const char* name, + const char* description, + const SourceLineInfo& lineInfo ); - ~AutoReg - (); + ~AutoReg(); private: - AutoReg - ( const AutoReg& ); - - void operator= - ( const AutoReg& ); + AutoReg( const AutoReg& ); + void operator= ( const AutoReg& ); }; } // end namespace Catch diff --git a/include/internal/catch_totals.hpp b/include/internal/catch_totals.hpp index 8a523f3b..4a692880 100644 --- a/include/internal/catch_totals.hpp +++ b/include/internal/catch_totals.hpp @@ -12,32 +12,26 @@ namespace Catch { struct Counts { - Counts - () - : passed( 0 ), - failed( 0 ) - {} + Counts() : passed( 0 ), failed( 0 ) {} - Counts operator - ( const Counts& other ) const - { + Counts operator - ( const Counts& other ) const { Counts diff; diff.passed = passed - other.passed; diff.failed = failed - other.failed; return diff; } - std::size_t total() const - { + std::size_t total() const { return passed + failed; } + std::size_t passed; std::size_t failed; }; struct Totals { - Totals operator - ( const Totals& other ) const - { + Totals operator - ( const Totals& other ) const { Totals diff; diff.assertions = assertions - other.assertions; diff.testCases = testCases - other.testCases; |