Tweaks to allow headers to be glued together.

Added Python script to generate single header.
Added new XCode project that runs self test against single header

projects/SelfTest/ApproxTests.cpp

@@ -17,7 +17,7 @@ TEST_CASE
 (
     "./succeeding/Approx/simple", 
     "Some simple comparisons between doubles"
- )
+)
 {
     double d = 1.23;
     
@@ -29,3 +29,17 @@ TEST_CASE
     REQUIRE( Approx( d ) != 1.22 );
     REQUIRE( Approx( d ) != 1.24 );
 }
+
+///////////////////////////////////////////////////////////////////////////////
+TEST_CASE
+(
+    "./succeeding/Approx/epsilon", 
+    "Approximate comparisons with different epsilons"
+ )
+{
+    double d = 1.23;
+    
+    REQUIRE( d != Approx( 1.231 ) );
+    REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) );
+//    REQUIRE( d != Approx( 1.232 ).epsilon( 0.1 ) );
+}

projects/SelfTest/TestMain.cpp

@@ -10,14 +10,11 @@
  *
  */
 
-//#include "../catch_with_main.hpp"
-#include "internal/catch_self_test.hpp"
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
 
-#include "catch_runner.hpp"
-int main (int argc, char * const argv[])
-{
-    return Catch::Main( argc, argv );
-}
+
+#include "catch_self_test.hpp"
 
 TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results" )
 {
@@ -50,7 +47,7 @@ TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results"
                     "Number of 'succeeding' tests is fixed" )
         {
             runner.runMatching( "./succeeding/*" );
-            CHECK( runner.getSuccessCount() == 223 );
+            CHECK( runner.getSuccessCount() == 231 );
             CHECK( runner.getFailureCount() == 0 );
         }
 

projects/SelfTest/catch_self_test.hpp

@@ -0,0 +1,153 @@
+/*
+ *  catch_self_test.hpp
+ *  Catch
+ *
+ *  Created by Phil on 14/01/2011.
+ *  Copyright 2011 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_SELF_TEST_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_SELF_TEST_HPP_INCLUDED
+
+#include "catch.hpp"
+
+namespace Catch
+{
+
+    class EmbeddedRunner
+    {
+    public:
+        ///////////////////////////////////////////////////////////////////////////
+        EmbeddedRunner
+        ()
+        {
+        }
+        
+        ///////////////////////////////////////////////////////////////////////////
+        std::size_t runMatching
+        (
+            const std::string& rawTestSpec
+        )
+        {
+            std::ostringstream oss;
+            Config config;
+            config.setStreamBuf( oss.rdbuf() );
+            config.setReporter( "basic" );
+
+            std::size_t result;
+            
+            // Scoped because Runner doesn't report EndTesting until its destructor
+            {
+                Runner runner( config );
+                result = runner.runMatching( rawTestSpec );
+                m_successes = runner.getSuccessCount();
+                m_failures = runner.getFailureCount();
+            }
+            m_output = oss.str();
+            return result;
+        }
+        
+        ///////////////////////////////////////////////////////////////////////////
+        std::string getOutput
+        ()
+        {
+            return m_output;
+        }
+        
+        ///////////////////////////////////////////////////////////////////////////
+        std::size_t getSuccessCount
+        ()
+        const
+        {
+            return m_successes;
+        }
+        
+        ///////////////////////////////////////////////////////////////////////////
+        std:: size_t getFailureCount
+        ()
+        const
+        {
+            return m_failures;
+        }
+
+    private:
+        std::size_t m_successes;
+        std::size_t m_failures;
+        std::string m_output;
+    };
+
+    class MetaTestRunner
+    {
+    public:
+        struct Expected
+        {
+            enum Result
+            {
+                ToSucceed,
+                ToFail
+            };
+        };
+        
+        ///////////////////////////////////////////////////////////////////////////
+        static void runMatching
+        (
+            const std::string& testSpec, 
+            Expected::Result expectedResult
+        )
+        {
+            forEach(    Hub::getTestCaseRegistry().getMatchingTestCases( testSpec ), 
+                        MetaTestRunner( expectedResult ) );
+        }
+        
+        ///////////////////////////////////////////////////////////////////////////
+        MetaTestRunner
+        (
+            Expected::Result expectedResult
+        )
+        : m_expectedResult( expectedResult )
+        {        
+        }
+        
+        ///////////////////////////////////////////////////////////////////////////
+        void operator()
+        (
+            const TestCaseInfo& testCase
+        )
+        {
+            EmbeddedRunner runner;
+            runner.runMatching( testCase.getName() );
+            switch( m_expectedResult )
+            {
+                case Expected::ToSucceed:
+                    if( runner.getFailureCount() > 0 )
+                    {
+                        INFO( runner.getOutput() );
+                        FAIL( "Expected test case '" 
+                             << testCase.getName() 
+                             << "' to succeed but there was/ were " 
+                             << runner.getFailureCount() << " failure(s)" );
+                    }
+                    break;
+                case Expected::ToFail:
+                    if( runner.getSuccessCount() > 0 )
+                    {
+                        INFO( runner.getOutput() );
+                        FAIL( "Expected test case '" 
+                             << testCase.getName() 
+                             << "' to fail but there was/ were " 
+                             << runner.getSuccessCount() << " success(es)" );
+                    }
+                    break;
+            }        
+        };
+        
+    private:
+        Expected::Result m_expectedResult;
+    };
+    
+}
+
+#endif // TWOBLUECUBES_CATCH_SELF_TEST_HPP_INCLUDED