Updating to use normative directory structure

expect.xcodeproj/project.pbxproj

@@ -23,10 +23,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		CD2973D21D7B684400E37217 /* expect.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = expect.hpp; sourceTree = "<group>"; };
 		CD3A75E51E2596B9008C6DC2 /* expect.t.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = expect.t.h; sourceTree = "<group>"; };
 		CD3A75EB1E259748008C6DC2 /* expect_tc */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = expect_tc; sourceTree = BUILT_PRODUCTS_DIR; };
 		CD3A75F31E2597A8008C6DC2 /* expect_tc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = expect_tc.cpp; sourceTree = "<group>"; };
+		CDAA170221A3A8AB007BBA11 /* expect */ = {isa = PBXFileReference; lastKnownFileType = folder; name = expect; path = include/expect; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -43,7 +43,7 @@
 		CD2973BB1D7B67EF00E37217 = {
 			isa = PBXGroup;
 			children = (
-				CD3A75F71E25B2FF008C6DC2 /* src */,
+				CDAA170221A3A8AB007BBA11 /* expect */,
 				CD3A75F61E25B2FB008C6DC2 /* test */,
 				CD2973C51D7B67EF00E37217 /* Products */,
 			);
@@ -63,15 +63,7 @@
 				CD3A75E51E2596B9008C6DC2 /* expect.t.h */,
 				CD3A75F31E2597A8008C6DC2 /* expect_tc.cpp */,
 			);
-			name = test;
-			sourceTree = "<group>";
-		};
-		CD3A75F71E25B2FF008C6DC2 /* src */ = {
-			isa = PBXGroup;
-			children = (
-				CD2973D21D7B684400E37217 /* expect.hpp */,
-			);
-			name = src;
+			path = test;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -101,7 +93,7 @@
 		CD2973BC1D7B67EF00E37217 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = "Sam Jaffe";
 				TargetAttributes = {
 					CD3A75EA1E259748008C6DC2 = {
@@ -140,7 +132,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cxxtestgen --error-printer -o expect_tc.cpp expect.t.h";
+			shellScript = "cd test\ncxxtestgen --error-printer -o expect_tc.cpp expect.t.h\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -164,13 +156,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -207,13 +209,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -270,6 +282,7 @@
 				CD3A75F11E259748008C6DC2 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

test/expect_tc.cpp

@@ -0,0 +1,104 @@
+/* Generated file, do not edit */
+
+#ifndef CXXTEST_RUNNING
+#define CXXTEST_RUNNING
+#endif
+
+#define _CXXTEST_HAVE_STD
+#define _CXXTEST_HAVE_EH
+#include <cxxtest/TestListener.h>
+#include <cxxtest/TestTracker.h>
+#include <cxxtest/TestRunner.h>
+#include <cxxtest/RealDescriptions.h>
+#include <cxxtest/TestMain.h>
+#include <cxxtest/ErrorPrinter.h>
+
+int main( int argc, char *argv[] ) {
+ int status;
+    CxxTest::ErrorPrinter tmp;
+    CxxTest::RealWorldDescription::_worldName = "cxxtest";
+    status = CxxTest::Main< CxxTest::ErrorPrinter >( tmp, argc, argv );
+    return status;
+}
+bool suite_expect_TestSuite_init = false;
+#include "expect.t.h"
+
+static expect_TestSuite suite_expect_TestSuite;
+
+static CxxTest::List Tests_expect_TestSuite = { 0, 0 };
+CxxTest::StaticSuiteDescription suiteDescription_expect_TestSuite( "expect.t.h", 18, "expect_TestSuite", suite_expect_TestSuite, Tests_expect_TestSuite );
+
+static class TestDescription_suite_expect_TestSuite_test_expect_simple : public CxxTest::RealTestDescription {
+public:
+ TestDescription_suite_expect_TestSuite_test_expect_simple() : CxxTest::RealTestDescription( Tests_expect_TestSuite, suiteDescription_expect_TestSuite, 20, "test_expect_simple" ) {}
+ void runTest() { suite_expect_TestSuite.test_expect_simple(); }
+} testDescription_suite_expect_TestSuite_test_expect_simple;
+
+static class TestDescription_suite_expect_TestSuite_test_expect_fails : public CxxTest::RealTestDescription {
+public:
+ TestDescription_suite_expect_TestSuite_test_expect_fails() : CxxTest::RealTestDescription( Tests_expect_TestSuite, suiteDescription_expect_TestSuite, 25, "test_expect_fails" ) {}
+ void runTest() { suite_expect_TestSuite.test_expect_fails(); }
+} testDescription_suite_expect_TestSuite_test_expect_fails;
+
+static class TestDescription_suite_expect_TestSuite_test_expect_fails_with_error_type : public CxxTest::RealTestDescription {
+public:
+ TestDescription_suite_expect_TestSuite_test_expect_fails_with_error_type() : CxxTest::RealTestDescription( Tests_expect_TestSuite, suiteDescription_expect_TestSuite, 30, "test_expect_fails_with_error_type" ) {}
+ void runTest() { suite_expect_TestSuite.test_expect_fails_with_error_type(); }
+} testDescription_suite_expect_TestSuite_test_expect_fails_with_error_type;
+
+static class TestDescription_suite_expect_TestSuite_test_expect_fails_with_error_message : public CxxTest::RealTestDescription {
+public:
+ TestDescription_suite_expect_TestSuite_test_expect_fails_with_error_message() : CxxTest::RealTestDescription( Tests_expect_TestSuite, suiteDescription_expect_TestSuite, 35, "test_expect_fails_with_error_message" ) {}
+ void runTest() { suite_expect_TestSuite.test_expect_fails_with_error_message(); }
+} testDescription_suite_expect_TestSuite_test_expect_fails_with_error_message;
+
+static class TestDescription_suite_expect_TestSuite_test_expect_fails_with_custom_error_message : public CxxTest::RealTestDescription {
+public:
+ TestDescription_suite_expect_TestSuite_test_expect_fails_with_custom_error_message() : CxxTest::RealTestDescription( Tests_expect_TestSuite, suiteDescription_expect_TestSuite, 47, "test_expect_fails_with_custom_error_message" ) {}
+ void runTest() { suite_expect_TestSuite.test_expect_fails_with_custom_error_message(); }
+} testDescription_suite_expect_TestSuite_test_expect_fails_with_custom_error_message;
+
+static class TestDescription_suite_expect_TestSuite_test_expect_graceful : public CxxTest::RealTestDescription {
+public:
+ TestDescription_suite_expect_TestSuite_test_expect_graceful() : CxxTest::RealTestDescription( Tests_expect_TestSuite, suiteDescription_expect_TestSuite, 57, "test_expect_graceful" ) {}
+ void runTest() { suite_expect_TestSuite.test_expect_graceful(); }
+} testDescription_suite_expect_TestSuite_test_expect_graceful;
+
+static class TestDescription_suite_expect_TestSuite_test_expect_graceful_rval : public CxxTest::RealTestDescription {
+public:
+ TestDescription_suite_expect_TestSuite_test_expect_graceful_rval() : CxxTest::RealTestDescription( Tests_expect_TestSuite, suiteDescription_expect_TestSuite, 69, "test_expect_graceful_rval" ) {}
+ void runTest() { suite_expect_TestSuite.test_expect_graceful_rval(); }
+} testDescription_suite_expect_TestSuite_test_expect_graceful_rval;
+
+static class TestDescription_suite_expect_TestSuite_test_return_ensure : public CxxTest::RealTestDescription {
+public:
+ TestDescription_suite_expect_TestSuite_test_return_ensure() : CxxTest::RealTestDescription( Tests_expect_TestSuite, suiteDescription_expect_TestSuite, 73, "test_return_ensure" ) {}
+ void runTest() { suite_expect_TestSuite.test_return_ensure(); }
+} testDescription_suite_expect_TestSuite_test_return_ensure;
+
+static class TestDescription_suite_expect_TestSuite_test_return_ensure_throws : public CxxTest::RealTestDescription {
+public:
+ TestDescription_suite_expect_TestSuite_test_return_ensure_throws() : CxxTest::RealTestDescription( Tests_expect_TestSuite, suiteDescription_expect_TestSuite, 78, "test_return_ensure_throws" ) {}
+ void runTest() { suite_expect_TestSuite.test_return_ensure_throws(); }
+} testDescription_suite_expect_TestSuite_test_return_ensure_throws;
+
+static class TestDescription_suite_expect_TestSuite_test_return_ensure_throws_message : public CxxTest::RealTestDescription {
+public:
+ TestDescription_suite_expect_TestSuite_test_return_ensure_throws_message() : CxxTest::RealTestDescription( Tests_expect_TestSuite, suiteDescription_expect_TestSuite, 87, "test_return_ensure_throws_message" ) {}
+ void runTest() { suite_expect_TestSuite.test_return_ensure_throws_message(); }
+} testDescription_suite_expect_TestSuite_test_return_ensure_throws_message;
+
+static class TestDescription_suite_expect_TestSuite_test_return_ensure_throws_custom_message : public CxxTest::RealTestDescription {
+public:
+ TestDescription_suite_expect_TestSuite_test_return_ensure_throws_custom_message() : CxxTest::RealTestDescription( Tests_expect_TestSuite, suiteDescription_expect_TestSuite, 98, "test_return_ensure_throws_custom_message" ) {}
+ void runTest() { suite_expect_TestSuite.test_return_ensure_throws_custom_message(); }
+} testDescription_suite_expect_TestSuite_test_return_ensure_throws_custom_message;
+
+static class TestDescription_suite_expect_TestSuite_test_return_ensure_throws_custom : public CxxTest::RealTestDescription {
+public:
+ TestDescription_suite_expect_TestSuite_test_return_ensure_throws_custom() : CxxTest::RealTestDescription( Tests_expect_TestSuite, suiteDescription_expect_TestSuite, 107, "test_return_ensure_throws_custom" ) {}
+ void runTest() { suite_expect_TestSuite.test_return_ensure_throws_custom(); }
+} testDescription_suite_expect_TestSuite_test_return_ensure_throws_custom;
+
+#include <cxxtest/Root.cpp>
+const char* CxxTest::RealWorldDescription::_worldName = "cxxtest";