From d0a5461addb2997424d14e570b751bc223bff02b Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Tue, 14 Aug 2012 19:35:30 +0100
Subject: [PATCH] Moved TestSpec into its own file

---
 include/internal/catch_runner_impl.hpp        |  1 +
 include/internal/catch_test_case_info.h       | 26 ------------
 include/internal/catch_test_spec.h            | 40 +++++++++++++++++++
 .../CatchSelfTest.xcodeproj/project.pbxproj   |  2 +
 4 files changed, 43 insertions(+), 26 deletions(-)
 create mode 100644 include/internal/catch_test_spec.h

diff --git a/include/internal/catch_runner_impl.hpp b/include/internal/catch_runner_impl.hpp
index 11603b6..da60a90 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 6f6527d..5e5a64d 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 0000000..9001324
--- /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
diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
index 5332b08..a3ecdc9 100644
--- a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
+++ b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
@@ -35,6 +35,7 @@
 
 /* Begin PBXFileReference section */
 		4A084F1C15DACEEA0027E631 /* catch_test_case_info.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_test_case_info.hpp; sourceTree = "<group>"; };
+		4A084F1D15DAD15F0027E631 /* catch_test_spec.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_test_spec.h; sourceTree = "<group>"; };
 		4A3D7DD01503869D005F9203 /* catch_matchers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catch_matchers.hpp; sourceTree = "<group>"; };
 		4A4B0F9715CE6CFB00AE2392 /* catch_registry_hub.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; path = catch_registry_hub.hpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		4A4B0F9915CE6EC100AE2392 /* catch_interfaces_registry_hub.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = catch_interfaces_registry_hub.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -260,6 +261,7 @@
 				4A7ADB4314F631E10094FE10 /* catch_totals.hpp */,
 				4AB77CB71553B72B00857BF0 /* catch_section_info.hpp */,
 				4AB77CB81553BB3800857BF0 /* catch_running_test.hpp */,
+				4A084F1D15DAD15F0027E631 /* catch_test_spec.h */,
 			);
 			name = "Test execution";
 			sourceTree = "<group>";