Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Moved legacy_reporter_adapter files back into internal

Commit
1ece38ed2062c37f55db158505faf9b2a88ba8ce
Author
Phil Nash ·
Parents
3bd42417952e

Files · Download .tar.gz

Changes

 include/internal/catch_impl.hpp                                   | 2 +-
 include/{reporters => internal}/catch_legacy_reporter_adapter.h   | 0
 include/{reporters => internal}/catch_legacy_reporter_adapter.hpp | 0
 .../XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj  | 8 ++++----
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/internal/catch_impl.hpp b/include/internal/catch_impl.hpp
index 74350048..f3f214b2 100644
--- a/include/internal/catch_impl.hpp
+++ b/include/internal/catch_impl.hpp
@@ -29,8 +29,8 @@
 #include "catch_version.hpp"
 #include "catch_line_wrap.hpp"
 #include "catch_message.hpp"
+#include "catch_legacy_reporter_adapter.hpp"
 
-#include "../reporters/catch_legacy_reporter_adapter.hpp"
 #include "../reporters/catch_reporter_basic.hpp"
 #include "../reporters/catch_reporter_xml.hpp"
 #include "../reporters/catch_reporter_junit.hpp"
diff --git a/include/reporters/catch_legacy_reporter_adapter.h b/include/internal/catch_legacy_reporter_adapter.h
similarity index 100%
rename from include/reporters/catch_legacy_reporter_adapter.h
rename to include/internal/catch_legacy_reporter_adapter.h
diff --git a/include/reporters/catch_legacy_reporter_adapter.hpp b/include/internal/catch_legacy_reporter_adapter.hpp
similarity index 100%
rename from include/reporters/catch_legacy_reporter_adapter.hpp
rename to include/internal/catch_legacy_reporter_adapter.hpp
diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
index ea2e0916..bef07f61 100644
--- a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
+++ b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
@@ -57,8 +57,8 @@
 /* Begin PBXFileReference section */
 		266B06B616F3A60A004ED264 /* VariadicMacrosTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VariadicMacrosTests.cpp; path = ../../../SelfTest/VariadicMacrosTests.cpp; sourceTree = "<group>"; };
 		266ECD73170F3C620030D735 /* BDDTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BDDTests.cpp; path = ../../../SelfTest/BDDTests.cpp; sourceTree = "<group>"; };
-		266ECD751710B2EB0030D735 /* catch_legacy_reporter_adapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_legacy_reporter_adapter.h; sourceTree = "<group>"; };
-		266ECD761710B3970030D735 /* catch_legacy_reporter_adapter.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_legacy_reporter_adapter.hpp; sourceTree = "<group>"; };
+		266ECD8C1713614B0030D735 /* catch_legacy_reporter_adapter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catch_legacy_reporter_adapter.hpp; sourceTree = "<group>"; };
+		266ECD8D1713614B0030D735 /* catch_legacy_reporter_adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = catch_legacy_reporter_adapter.h; sourceTree = "<group>"; };
 		26847E5B16BBAB790043B9C1 /* catch_message.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_message.h; sourceTree = "<group>"; };
 		26847E5C16BBACB60043B9C1 /* catch_message.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_message.hpp; sourceTree = "<group>"; };
 		26847E5D16BBADB40043B9C1 /* catch_message.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = catch_message.cpp; path = ../../../SelfTest/SurrogateCpps/catch_message.cpp; sourceTree = "<group>"; };
@@ -258,8 +258,6 @@
 				4A6D0C67149B3E3D00DB3EAA /* catch_reporter_junit.hpp */,
 				4A6D0C68149B3E3D00DB3EAA /* catch_reporter_xml.hpp */,
 				4AB42F84166F3E1A0099F2C8 /* catch_reporter_console.hpp */,
-				266ECD751710B2EB0030D735 /* catch_legacy_reporter_adapter.h */,
-				266ECD761710B3970030D735 /* catch_legacy_reporter_adapter.hpp */,
 			);
 			name = reporters;
 			path = ../../../../include/reporters;
@@ -386,6 +384,8 @@
 		4AC91CC2155C388300DC5117 /* Infrastructure */ = {
 			isa = PBXGroup;
 			children = (
+				266ECD8C1713614B0030D735 /* catch_legacy_reporter_adapter.hpp */,
+				266ECD8D1713614B0030D735 /* catch_legacy_reporter_adapter.h */,
 				4A6D0C49149B3E3D00DB3EAA /* catch_common.h */,
 				4A6D0C4B149B3E3D00DB3EAA /* catch_debugger.hpp */,
 				4A6D0C60149B3E3D00DB3EAA /* catch_stream.hpp */,