From 635216e2c6f39ded1e7aa7566a0354a3bc70dd24 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Sat, 13 Nov 2010 09:39:45 +0000 Subject: [PATCH] Move the Xcode project around a bit --- .gitignore | 2 +- Test/TestMain.cpp | 12 +- Test/{ => Xcode}/Test.1 | 0 .../Test.xcodeproj/project.pbxproj | 120 ++++++++++-------- 4 files changed, 76 insertions(+), 58 deletions(-) rename Test/{ => Xcode}/Test.1 (100%) rename Test/{ => Xcode}/Test.xcodeproj/project.pbxproj (55%) diff --git a/.gitignore b/.gitignore index 35fc7a6e..0b5b0a97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -Test/build +*.build *.pbxuser *.mode1v3 *.ncb diff --git a/Test/TestMain.cpp b/Test/TestMain.cpp index 98f85160..f083724d 100644 --- a/Test/TestMain.cpp +++ b/Test/TestMain.cpp @@ -59,7 +59,17 @@ int main (int argc, char * const argv[]) if( result == 0 ) { - std::cout << "All " << runner.getSuccessCount() + runner.getFailureCount() << " tests completed successfully" << std::endl; + const size_t expectedTestCaseCount = 97; // !TBD factor this out + size_t testCaseCount = runner.getSuccessCount() + runner.getFailureCount(); + std::cout << "All " << testCaseCount << " tests completed successfully" << std::endl; + if( testCaseCount != expectedTestCaseCount ) + { + std::cerr << "- but we were expecting " << expectedTestCaseCount + << " test to run. Where some added or removed, or were they not compiled in?" + << std::endl; + return 1; + } + } return result; } diff --git a/Test/Test.1 b/Test/Xcode/Test.1 similarity index 100% rename from Test/Test.1 rename to Test/Xcode/Test.1 diff --git a/Test/Test.xcodeproj/project.pbxproj b/Test/Xcode/Test.xcodeproj/project.pbxproj similarity index 55% rename from Test/Test.xcodeproj/project.pbxproj rename to Test/Xcode/Test.xcodeproj/project.pbxproj index 4cb5cb97..f995e53d 100644 --- a/Test/Test.xcodeproj/project.pbxproj +++ b/Test/Xcode/Test.xcodeproj/project.pbxproj @@ -7,12 +7,12 @@ objects = { /* Begin PBXBuildFile section */ - 4A3BFFB9128DCF06005609E3 /* TestMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A3BFFB8128DCF06005609E3 /* TestMain.cpp */; }; - 4AFC38CD12887D80003A0C29 /* ConditionTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AFC38CC12887D80003A0C29 /* ConditionTests.cpp */; }; - 4AFC3A9912893C56003A0C29 /* ExceptionTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AFC3A9812893C56003A0C29 /* ExceptionTests.cpp */; }; - 4AFC3AA912893E54003A0C29 /* MessageTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AFC3AA812893E54003A0C29 /* MessageTests.cpp */; }; - 4AFC3B0B12894114003A0C29 /* ClassTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AFC3B0A12894114003A0C29 /* ClassTests.cpp */; }; - 4AFC3B671289C7E3003A0C29 /* TrickyTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AFC3B661289C7E3003A0C29 /* TrickyTests.cpp */; }; + 4A595364128E920B009DC1B9 /* ClassTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A59535F128E920B009DC1B9 /* ClassTests.cpp */; }; + 4A595365128E920B009DC1B9 /* ConditionTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A595360128E920B009DC1B9 /* ConditionTests.cpp */; }; + 4A595366128E920B009DC1B9 /* ExceptionTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A595361128E920B009DC1B9 /* ExceptionTests.cpp */; }; + 4A595367128E920B009DC1B9 /* MessageTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A595362128E920B009DC1B9 /* MessageTests.cpp */; }; + 4A595368128E920B009DC1B9 /* TrickyTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A595363128E920B009DC1B9 /* TrickyTests.cpp */; }; + 4A59537A128E9354009DC1B9 /* TestMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A595379128E9354009DC1B9 /* TestMain.cpp */; }; 8DD76F6A0486A84900D96B5E /* Test.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6859E8B029090EE04C91782 /* Test.1 */; }; /* End PBXBuildFile section */ @@ -30,28 +30,28 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 4A3BFFB8128DCF06005609E3 /* TestMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestMain.cpp; sourceTree = ""; }; - 4A3BFFF0128DD23C005609E3 /* catch_runnerconfig.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_runnerconfig.hpp; path = ../internal/catch_runnerconfig.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC341512809A36003A0C29 /* catch_capture.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_capture.hpp; path = ../internal/catch_capture.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC341612809A36003A0C29 /* catch_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = catch_common.h; path = ../internal/catch_common.h; sourceTree = SOURCE_ROOT; }; - 4AFC341712809A36003A0C29 /* catch_registry.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_registry.hpp; path = ../internal/catch_registry.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC341812809A36003A0C29 /* catch_reporter_registry.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_reporter_registry.hpp; path = ../internal/catch_reporter_registry.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC341912809A36003A0C29 /* catch_resultinfo.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_resultinfo.hpp; path = ../internal/catch_resultinfo.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC341A12809A36003A0C29 /* catch_runner_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_runner_impl.hpp; path = ../internal/catch_runner_impl.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC341B12809A36003A0C29 /* catch_testcaseinfo.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_testcaseinfo.hpp; path = ../internal/catch_testcaseinfo.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC341C12809A45003A0C29 /* catch_default_main.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_default_main.hpp; path = ../catch_default_main.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC341D12809A45003A0C29 /* catch_reporter_basic.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_reporter_basic.hpp; path = ../catch_reporter_basic.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC341E12809A45003A0C29 /* catch_reporter_xml.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_reporter_xml.hpp; path = ../catch_reporter_xml.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC341F12809A45003A0C29 /* catch_list.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_list.hpp; path = ../internal/catch_list.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC342012809A45003A0C29 /* catch.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch.hpp; path = ../catch.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC346412809D41003A0C29 /* catch_commandline.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_commandline.hpp; path = ../internal/catch_commandline.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC359B1281F00B003A0C29 /* catch_section.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_section.hpp; path = ../internal/catch_section.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC38161284B387003A0C29 /* catch_runner.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_runner.hpp; path = ../catch_runner.hpp; sourceTree = SOURCE_ROOT; }; - 4AFC38CC12887D80003A0C29 /* ConditionTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConditionTests.cpp; sourceTree = ""; }; - 4AFC3A9812893C56003A0C29 /* ExceptionTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExceptionTests.cpp; sourceTree = ""; }; - 4AFC3AA812893E54003A0C29 /* MessageTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MessageTests.cpp; sourceTree = ""; }; - 4AFC3B0A12894114003A0C29 /* ClassTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClassTests.cpp; sourceTree = ""; }; - 4AFC3B661289C7E3003A0C29 /* TrickyTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrickyTests.cpp; sourceTree = ""; }; + 4A59535F128E920B009DC1B9 /* ClassTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClassTests.cpp; path = ../ClassTests.cpp; sourceTree = SOURCE_ROOT; }; + 4A595360128E920B009DC1B9 /* ConditionTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConditionTests.cpp; path = ../ConditionTests.cpp; sourceTree = SOURCE_ROOT; }; + 4A595361128E920B009DC1B9 /* ExceptionTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ExceptionTests.cpp; path = ../ExceptionTests.cpp; sourceTree = SOURCE_ROOT; }; + 4A595362128E920B009DC1B9 /* MessageTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MessageTests.cpp; path = ../MessageTests.cpp; sourceTree = SOURCE_ROOT; }; + 4A595363128E920B009DC1B9 /* TrickyTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TrickyTests.cpp; path = ../TrickyTests.cpp; sourceTree = SOURCE_ROOT; }; + 4A595379128E9354009DC1B9 /* TestMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TestMain.cpp; path = ../TestMain.cpp; sourceTree = SOURCE_ROOT; }; + 4A59537F128E93CA009DC1B9 /* catch_default_main.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_default_main.hpp; path = ../../catch_default_main.hpp; sourceTree = SOURCE_ROOT; }; + 4A595380128E93CA009DC1B9 /* catch_reporter_basic.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_reporter_basic.hpp; path = ../../catch_reporter_basic.hpp; sourceTree = SOURCE_ROOT; }; + 4A595381128E93CA009DC1B9 /* catch_reporter_xml.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_reporter_xml.hpp; path = ../../catch_reporter_xml.hpp; sourceTree = SOURCE_ROOT; }; + 4A595382128E93CA009DC1B9 /* catch_runner.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_runner.hpp; path = ../../catch_runner.hpp; sourceTree = SOURCE_ROOT; }; + 4A595383128E93CA009DC1B9 /* catch.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch.hpp; path = ../../catch.hpp; sourceTree = SOURCE_ROOT; }; + 4A595384128E93E0009DC1B9 /* catch_capture.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_capture.hpp; path = ../../internal/catch_capture.hpp; sourceTree = SOURCE_ROOT; }; + 4A595385128E93E1009DC1B9 /* catch_commandline.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_commandline.hpp; path = ../../internal/catch_commandline.hpp; sourceTree = SOURCE_ROOT; }; + 4A595386128E93E1009DC1B9 /* catch_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = catch_common.h; path = ../../internal/catch_common.h; sourceTree = SOURCE_ROOT; }; + 4A595387128E93E1009DC1B9 /* catch_list.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_list.hpp; path = ../../internal/catch_list.hpp; sourceTree = SOURCE_ROOT; }; + 4A595388128E93E1009DC1B9 /* catch_registry.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_registry.hpp; path = ../../internal/catch_registry.hpp; sourceTree = SOURCE_ROOT; }; + 4A595389128E93E1009DC1B9 /* catch_reporter_registry.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_reporter_registry.hpp; path = ../../internal/catch_reporter_registry.hpp; sourceTree = SOURCE_ROOT; }; + 4A59538A128E93E1009DC1B9 /* catch_resultinfo.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_resultinfo.hpp; path = ../../internal/catch_resultinfo.hpp; sourceTree = SOURCE_ROOT; }; + 4A59538B128E93E1009DC1B9 /* catch_runner_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_runner_impl.hpp; path = ../../internal/catch_runner_impl.hpp; sourceTree = SOURCE_ROOT; }; + 4A59538C128E93E1009DC1B9 /* catch_runnerconfig.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_runnerconfig.hpp; path = ../../internal/catch_runnerconfig.hpp; sourceTree = SOURCE_ROOT; }; + 4A59538D128E93E1009DC1B9 /* catch_section.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_section.hpp; path = ../../internal/catch_section.hpp; sourceTree = SOURCE_ROOT; }; + 4A59538E128E93E1009DC1B9 /* catch_testcaseinfo.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_testcaseinfo.hpp; path = ../../internal/catch_testcaseinfo.hpp; sourceTree = SOURCE_ROOT; }; 8DD76F6C0486A84900D96B5E /* Test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Test; sourceTree = BUILT_PRODUCTS_DIR; }; C6859E8B029090EE04C91782 /* Test.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = Test.1; sourceTree = ""; }; /* End PBXFileReference section */ @@ -80,13 +80,9 @@ 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( - 4A3BFFB8128DCF06005609E3 /* TestMain.cpp */, + 4A595379128E9354009DC1B9 /* TestMain.cpp */, + 4A59535E128E91FA009DC1B9 /* Test Cases */, 4AFC341312809A12003A0C29 /* Catch */, - 4AFC38CC12887D80003A0C29 /* ConditionTests.cpp */, - 4AFC3A9812893C56003A0C29 /* ExceptionTests.cpp */, - 4AFC3AA812893E54003A0C29 /* MessageTests.cpp */, - 4AFC3B0A12894114003A0C29 /* ClassTests.cpp */, - 4AFC3B661289C7E3003A0C29 /* TrickyTests.cpp */, ); name = Source; sourceTree = ""; @@ -99,14 +95,26 @@ name = Products; sourceTree = ""; }; + 4A59535E128E91FA009DC1B9 /* Test Cases */ = { + isa = PBXGroup; + children = ( + 4A59535F128E920B009DC1B9 /* ClassTests.cpp */, + 4A595360128E920B009DC1B9 /* ConditionTests.cpp */, + 4A595361128E920B009DC1B9 /* ExceptionTests.cpp */, + 4A595362128E920B009DC1B9 /* MessageTests.cpp */, + 4A595363128E920B009DC1B9 /* TrickyTests.cpp */, + ); + name = "Test Cases"; + sourceTree = ""; + }; 4AFC341312809A12003A0C29 /* Catch */ = { isa = PBXGroup; children = ( - 4AFC342012809A45003A0C29 /* catch.hpp */, - 4AFC341C12809A45003A0C29 /* catch_default_main.hpp */, - 4AFC341D12809A45003A0C29 /* catch_reporter_basic.hpp */, - 4AFC341E12809A45003A0C29 /* catch_reporter_xml.hpp */, - 4AFC38161284B387003A0C29 /* catch_runner.hpp */, + 4A59537F128E93CA009DC1B9 /* catch_default_main.hpp */, + 4A595380128E93CA009DC1B9 /* catch_reporter_basic.hpp */, + 4A595381128E93CA009DC1B9 /* catch_reporter_xml.hpp */, + 4A595382128E93CA009DC1B9 /* catch_runner.hpp */, + 4A595383128E93CA009DC1B9 /* catch.hpp */, 4AFC341412809A1B003A0C29 /* Internal */, ); name = Catch; @@ -115,17 +123,17 @@ 4AFC341412809A1B003A0C29 /* Internal */ = { isa = PBXGroup; children = ( - 4A3BFFF0128DD23C005609E3 /* catch_runnerconfig.hpp */, - 4AFC341F12809A45003A0C29 /* catch_list.hpp */, - 4AFC359B1281F00B003A0C29 /* catch_section.hpp */, - 4AFC346412809D41003A0C29 /* catch_commandline.hpp */, - 4AFC341512809A36003A0C29 /* catch_capture.hpp */, - 4AFC341612809A36003A0C29 /* catch_common.h */, - 4AFC341712809A36003A0C29 /* catch_registry.hpp */, - 4AFC341812809A36003A0C29 /* catch_reporter_registry.hpp */, - 4AFC341912809A36003A0C29 /* catch_resultinfo.hpp */, - 4AFC341A12809A36003A0C29 /* catch_runner_impl.hpp */, - 4AFC341B12809A36003A0C29 /* catch_testcaseinfo.hpp */, + 4A595384128E93E0009DC1B9 /* catch_capture.hpp */, + 4A595385128E93E1009DC1B9 /* catch_commandline.hpp */, + 4A595386128E93E1009DC1B9 /* catch_common.h */, + 4A595387128E93E1009DC1B9 /* catch_list.hpp */, + 4A595388128E93E1009DC1B9 /* catch_registry.hpp */, + 4A595389128E93E1009DC1B9 /* catch_reporter_registry.hpp */, + 4A59538A128E93E1009DC1B9 /* catch_resultinfo.hpp */, + 4A59538B128E93E1009DC1B9 /* catch_runner_impl.hpp */, + 4A59538C128E93E1009DC1B9 /* catch_runnerconfig.hpp */, + 4A59538D128E93E1009DC1B9 /* catch_section.hpp */, + 4A59538E128E93E1009DC1B9 /* catch_testcaseinfo.hpp */, ); name = Internal; sourceTree = ""; @@ -181,12 +189,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4AFC38CD12887D80003A0C29 /* ConditionTests.cpp in Sources */, - 4AFC3A9912893C56003A0C29 /* ExceptionTests.cpp in Sources */, - 4AFC3AA912893E54003A0C29 /* MessageTests.cpp in Sources */, - 4AFC3B0B12894114003A0C29 /* ClassTests.cpp in Sources */, - 4AFC3B671289C7E3003A0C29 /* TrickyTests.cpp in Sources */, - 4A3BFFB9128DCF06005609E3 /* TestMain.cpp in Sources */, + 4A595364128E920B009DC1B9 /* ClassTests.cpp in Sources */, + 4A595365128E920B009DC1B9 /* ConditionTests.cpp in Sources */, + 4A595366128E920B009DC1B9 /* ExceptionTests.cpp in Sources */, + 4A595367128E920B009DC1B9 /* MessageTests.cpp in Sources */, + 4A595368128E920B009DC1B9 /* TrickyTests.cpp in Sources */, + 4A59537A128E9354009DC1B9 /* TestMain.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };