mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-10-31 20:27:11 +01:00 
			
		
		
		
	Merge branch 'master' of github.com:philsquared/Catch
This commit is contained in:
		| @@ -5,8 +5,8 @@ | ||||
|  *  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_RUNNERCONFIG_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_RUNNERCONFIG_HPP_INCLUDED | ||||
| #ifndef TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED | ||||
|  | ||||
| #include "catch_test_spec.h" | ||||
| #include "catch_context.h" | ||||
| @@ -172,4 +172,4 @@ namespace Catch { | ||||
|      | ||||
| } // end namespace Catch | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_RUNNERCONFIG_HPP_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED | ||||
|   | ||||
| @@ -5,6 +5,9 @@ | ||||
|  *  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_CONTEXT_IMPL_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED | ||||
|  | ||||
| #include "catch_runner_impl.hpp" | ||||
|  | ||||
| #include "catch_context.h" | ||||
| @@ -105,3 +108,5 @@ namespace Catch { | ||||
|         currentContext = NULL; | ||||
|     } | ||||
| } | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  *  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_EXCEPTION_TRANSLATOR_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_HPP_INCLUDED | ||||
| #ifndef TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED | ||||
|  | ||||
| #include "catch_interfaces_exception.h" | ||||
|  | ||||
| @@ -71,4 +71,4 @@ namespace Catch { | ||||
|     }; | ||||
| } | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_HPP_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED | ||||
|   | ||||
| @@ -83,4 +83,4 @@ namespace Catch { | ||||
|  | ||||
| } // end namespace Catch | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_GENERATORS_IMPL_HPP_INCLUDED | ||||
|   | ||||
| @@ -5,6 +5,8 @@ | ||||
|  *  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_IMPL_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED | ||||
|  | ||||
| // Collect all the implementation files together here | ||||
| // These are the equivalent of what would usually be cpp files | ||||
| @@ -69,3 +71,5 @@ namespace Catch { | ||||
| #ifdef __clang__ | ||||
| #pragma clang diagnostic pop | ||||
| #endif | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  *  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_INTERFACES_EXCEPTIONS_H_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTIONS_H_INCLUDED | ||||
| #ifndef TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED | ||||
|  | ||||
| #include <string> | ||||
| #include "catch_interfaces_registry_hub.h" | ||||
| @@ -63,4 +63,4 @@ namespace Catch { | ||||
|     namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ) ); }\ | ||||
|     static std::string INTERNAL_CATCH_UNIQUE_NAME(  catch_internal_ExceptionTranslator )( signature ) | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_INTERFACES_EXCEPTIONS_H_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  *  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_IREPORTERREGISTRY_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_IREPORTERREGISTRY_INCLUDED | ||||
| #ifndef TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED | ||||
|  | ||||
| #include "catch_common.h" | ||||
| #include "catch_totals.hpp" | ||||
| @@ -90,4 +90,4 @@ namespace Catch | ||||
|     } | ||||
| } | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_IREPORTERREGISTRY_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  *  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_INTERFACES_RUNNER_H_INCLUDED | ||||
| #define TWOBLUECUBES_INTERNAL_CATCH_INTERFACES_RUNNER_H_INCLUDED | ||||
| #ifndef TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED | ||||
|  | ||||
| #include "catch_totals.hpp" | ||||
|  | ||||
| @@ -20,4 +20,4 @@ namespace Catch { | ||||
|     }; | ||||
| } | ||||
|  | ||||
| #endif // TWOBLUECUBES_INTERNAL_CATCH_INTERFACES_RUNNER_H_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED | ||||
|   | ||||
| @@ -29,4 +29,4 @@ namespace Catch { | ||||
|      | ||||
| } // end namespace Catch | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_HPP_INCLUDED | ||||
|   | ||||
| @@ -5,6 +5,9 @@ | ||||
|  *  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_HUB_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_REGISTRY_HUB_HPP_INCLUDED | ||||
|  | ||||
| #include "catch_interfaces_registry_hub.h" | ||||
|  | ||||
| #include "catch_test_case_registry_impl.hpp" | ||||
| @@ -72,3 +75,5 @@ namespace Catch { | ||||
|     } | ||||
|  | ||||
| } // end namespace Catch | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_REGISTRY_HUB_HPP_INCLUDED | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  *  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_RESULT_INFO_H_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_RESULT_INFO_H_INCLUDED | ||||
| #ifndef TWOBLUECUBES_CATCH_RESULTINFO_H_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_RESULTINFO_H_INCLUDED | ||||
|  | ||||
| #include <string> | ||||
| #include "catch_result_type.h" | ||||
| @@ -52,4 +52,4 @@ namespace Catch { | ||||
|      | ||||
| } // end namespace Catch | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_RESULT_INFO_H_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_RESULTINFO_H_INCLUDED | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  *  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_RESULT_INFO_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_RESULT_INFO_HPP_INCLUDED | ||||
| #ifndef TWOBLUECUBES_CATCH_RESULTINFO_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_RESULTINFO_HPP_INCLUDED | ||||
|  | ||||
| #include "catch_resultinfo.h" | ||||
|  | ||||
| @@ -113,4 +113,4 @@ namespace Catch { | ||||
|  | ||||
| } // end namespace Catch | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_RESULT_INFO_HPP_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_RESULTINFO_HPP_INCLUDED | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  *  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 | ||||
| #ifndef TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED | ||||
|  | ||||
| #include "catch_interfaces_runner.h" | ||||
| #include "catch_interfaces_reporter.h" | ||||
| @@ -308,4 +308,4 @@ namespace Catch { | ||||
|      | ||||
| } // end namespace Catch | ||||
|  | ||||
| #endif // TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  *  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_RUNNING_TEST_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_INTERNAL_CATCH_RUNNING_TEST_HPP_INCLUDED | ||||
| #ifndef TWOBLUECUBES_CATCH_RUNNING_TEST_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_RUNNING_TEST_HPP_INCLUDED | ||||
|  | ||||
| #include "catch_test_case_info.h" | ||||
| #include "catch_section_info.hpp" | ||||
| @@ -116,4 +116,4 @@ namespace Catch { | ||||
|     }; | ||||
| } | ||||
|  | ||||
| #endif // TWOBLUECUBES_INTERNAL_CATCH_RUNNING_TEST_HPP_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_RUNNING_TEST_HPP_INCLUDED | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  *  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_SECTION_INFO_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_INTERNAL_CATCH_SECTION_INFO_HPP_INCLUDED | ||||
| #ifndef TWOBLUECUBES_CATCH_SECTION_INFO_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_SECTION_INFO_HPP_INCLUDED | ||||
|  | ||||
| #include "catch_common.h" | ||||
|  | ||||
| @@ -99,4 +99,4 @@ namespace Catch { | ||||
|     }; | ||||
| } | ||||
|  | ||||
| #endif // TWOBLUECUBES_INTERNAL_CATCH_SECTION_INFO_HPP_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_SECTION_INFO_HPP_INCLUDED | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  *  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_TESTCASEINFO_H_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_TESTCASEINFO_H_INCLUDED | ||||
| #ifndef TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED | ||||
|  | ||||
| #include "catch_common.h" | ||||
|  | ||||
| @@ -54,4 +54,4 @@ namespace Catch { | ||||
|     }; | ||||
| } | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_TESTCASEINFO_H_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  *  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_TESTCASEINFO_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_TESTCASEINFO_HPP_INCLUDED | ||||
| #ifndef TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED | ||||
|  | ||||
| #include "catch_tags.hpp" | ||||
| #include "catch_test_case_info.h" | ||||
| @@ -109,4 +109,4 @@ namespace Catch { | ||||
|  | ||||
| } // end namespace Catch | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_TESTCASEINFO_HPP_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED | ||||
|   | ||||
| @@ -5,6 +5,9 @@ | ||||
|  *  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_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED | ||||
|  | ||||
| #include "catch_test_registry.hpp" | ||||
| #include "catch_test_case_info.h" | ||||
| #include "catch_test_spec.h" | ||||
| @@ -125,3 +128,5 @@ namespace Catch { | ||||
|      | ||||
| } // end namespace Catch | ||||
|  | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  *  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 | ||||
| #ifndef TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED | ||||
|  | ||||
| #include "catch_common.h" | ||||
| #include "catch_interfaces_testcase.h" | ||||
| @@ -87,4 +87,4 @@ private: | ||||
|     } \ | ||||
|     void INTERNAL_CATCH_UNIQUE_NAME( TestCaseMethod_catch_internal_ )::test() | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_REGISTRY_HPP_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  *  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 | ||||
| #ifndef TWOBLUECUBES_CATCH_TEST_SPEC_H_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_TEST_SPEC_H_INCLUDED | ||||
|  | ||||
| #include "catch_test_case_info.h" | ||||
| #include "catch_tags.hpp" | ||||
| @@ -161,4 +161,4 @@ namespace Catch { | ||||
|  | ||||
| } | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_TESTSPEC_H_INCLUDED | ||||
| #endif // TWOBLUECUBES_CATCH_TEST_SPEC_H_INCLUDED | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Phil Nash
					Phil Nash