diff options
| author | Phil Nash | 2012-08-14 19:35:30 +0100 |
|---|---|---|
| committer | Phil Nash | 2012-08-14 19:35:30 +0100 |
| commit | d0a5461addb2997424d14e570b751bc223bff02b (patch) | |
| tree | 6420e26cee4ffc738c64bd3911dc48d619b1dc58 /include | |
| parent | ddfe963623789fcf4e2f93163b0c5f97847d6c45 (diff) | |
| download | catch3-d0a5461addb2997424d14e570b751bc223bff02b.tar.gz | |
Moved TestSpec into its own file
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_runner_impl.hpp | 1 | ||||
| -rw-r--r-- | include/internal/catch_test_case_info.h | 26 | ||||
| -rw-r--r-- | include/internal/catch_test_spec.h | 40 |
3 files changed, 41 insertions, 26 deletions
diff --git a/include/internal/catch_runner_impl.hpp b/include/internal/catch_runner_impl.hpp index 11603b69..da60a90c 100644 --- a/include/internal/catch_runner_impl.hpp +++ b/include/internal/catch_runner_impl.hpp @@ -17,6 +17,7 @@ #include "catch_capture.hpp" #include "catch_totals.hpp" #include "catch_running_test.hpp" +#include "catch_test_spec.h" #include <set> #include <string> diff --git a/include/internal/catch_test_case_info.h b/include/internal/catch_test_case_info.h index 6f6527d3..5e5a64d8 100644 --- a/include/internal/catch_test_case_info.h +++ b/include/internal/catch_test_case_info.h @@ -44,32 +44,6 @@ namespace Catch { std::string m_description; SourceLineInfo m_lineInfo; }; - - /////////////////////////////////////////////////////////////////////////// - - class TestSpec { - public: - TestSpec( const std::string& rawSpec ) - : m_rawSpec( rawSpec ), - m_isWildcarded( false ) { - - if( m_rawSpec[m_rawSpec.size()-1] == '*' ) { - m_rawSpec = m_rawSpec.substr( 0, m_rawSpec.size()-1 ); - m_isWildcarded = true; - } - } - - bool matches ( const std::string& testName ) const { - if( !m_isWildcarded ) - return m_rawSpec == testName; - else - return testName.size() >= m_rawSpec.size() && testName.substr( 0, m_rawSpec.size() ) == m_rawSpec; - } - - private: - std::string m_rawSpec; - bool m_isWildcarded; - }; } #endif // TWOBLUECUBES_CATCH_TESTCASEINFO_H_INCLUDED diff --git a/include/internal/catch_test_spec.h b/include/internal/catch_test_spec.h new file mode 100644 index 00000000..90013248 --- /dev/null +++ b/include/internal/catch_test_spec.h @@ -0,0 +1,40 @@ +/* + * Created by Phil on 14/8/2012. + * 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_TESTSPEC_H_INCLUDED +#define TWOBLUECUBES_CATCH_TESTSPEC_H_INCLUDED + +#include <string> + +namespace Catch { + + class TestSpec { + public: + TestSpec( const std::string& rawSpec ) + : m_rawSpec( rawSpec ), + m_isWildcarded( false ) { + + if( m_rawSpec[m_rawSpec.size()-1] == '*' ) { + m_rawSpec = m_rawSpec.substr( 0, m_rawSpec.size()-1 ); + m_isWildcarded = true; + } + } + + bool matches ( const std::string& testName ) const { + if( !m_isWildcarded ) + return m_rawSpec == testName; + else + return testName.size() >= m_rawSpec.size() && testName.substr( 0, m_rawSpec.size() ) == m_rawSpec; + } + + private: + std::string m_rawSpec; + bool m_isWildcarded; + }; +} + +#endif // TWOBLUECUBES_CATCH_TESTSPEC_H_INCLUDED |