Skip to content

Commit 5bc3ff8

Browse files
author
Christopher Frederick
committed
Update TestUnitTest++ to use existing code
- Add files from the tests directory - Add $(SRCROOT)/../../ to the include paths - Link to libUnitTest++.a - Remove the TestUnitTest++ group (with main.cpp and TestUnitTest__.1) that was automatically generated by Xcode
1 parent 093ef7e commit 5bc3ff8

File tree

3 files changed

+88
-108
lines changed

3 files changed

+88
-108
lines changed

‎xcode_projects/xcode4-6/TestUnitTest++/TestUnitTest__.1

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎xcode_projects/xcode4-6/TestUnitTest++/main.cpp

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎xcode_projects/xcode4-6/UnitTest++.xcodeproj/project.pbxproj

Lines changed: 88 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,26 @@
5656
83D5FD1B171F910E005B0069 /* UnitTestPP.h in Headers */ = {isa = PBXBuildFile; fileRef = 83D5FCE5171F910E005B0069 /* UnitTestPP.h */; };
5757
83D5FD1E171F910E005B0069 /* XmlTestReporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FCEB171F910E005B0069 /* XmlTestReporter.cpp */; };
5858
83D5FD1F171F910E005B0069 /* XmlTestReporter.h in Headers */ = {isa = PBXBuildFile; fileRef = 83D5FCEC171F910E005B0069 /* XmlTestReporter.h */; };
59-
83D5FD27171F91B7005B0069 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD26171F91B7005B0069 /* main.cpp */; };
60-
83D5FD29171F91B7005B0069 /* TestUnitTest__.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83D5FD28171F91B7005B0069 /* TestUnitTest__.1 */; };
59+
83D5FD45171F9218005B0069 /* Main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD2E171F9218005B0069 /* Main.cpp */; };
60+
83D5FD46171F9218005B0069 /* TestAssertHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD33171F9218005B0069 /* TestAssertHandler.cpp */; };
61+
83D5FD47171F9218005B0069 /* TestCheckMacros.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD34171F9218005B0069 /* TestCheckMacros.cpp */; };
62+
83D5FD48171F9218005B0069 /* TestChecks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD35171F9218005B0069 /* TestChecks.cpp */; };
63+
83D5FD49171F9218005B0069 /* TestCompositeTestReporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD36171F9218005B0069 /* TestCompositeTestReporter.cpp */; };
64+
83D5FD4A171F9218005B0069 /* TestCurrentTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD37171F9218005B0069 /* TestCurrentTest.cpp */; };
65+
83D5FD4B171F9218005B0069 /* TestDeferredTestReporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD38171F9218005B0069 /* TestDeferredTestReporter.cpp */; };
66+
83D5FD4C171F9218005B0069 /* TestExceptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD39171F9218005B0069 /* TestExceptions.cpp */; };
67+
83D5FD4D171F9218005B0069 /* TestMemoryOutStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD3A171F9218005B0069 /* TestMemoryOutStream.cpp */; };
68+
83D5FD4E171F9218005B0069 /* TestTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD3B171F9218005B0069 /* TestTest.cpp */; };
69+
83D5FD4F171F9218005B0069 /* TestTestList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD3C171F9218005B0069 /* TestTestList.cpp */; };
70+
83D5FD50171F9218005B0069 /* TestTestMacros.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD3D171F9218005B0069 /* TestTestMacros.cpp */; };
71+
83D5FD51171F9218005B0069 /* TestTestResults.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD3E171F9218005B0069 /* TestTestResults.cpp */; };
72+
83D5FD52171F9218005B0069 /* TestTestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD3F171F9218005B0069 /* TestTestRunner.cpp */; };
73+
83D5FD53171F9218005B0069 /* TestTestSuite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD40171F9218005B0069 /* TestTestSuite.cpp */; };
74+
83D5FD54171F9218005B0069 /* TestTimeConstraint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD41171F9218005B0069 /* TestTimeConstraint.cpp */; };
75+
83D5FD55171F9218005B0069 /* TestTimeConstraintMacro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD42171F9218005B0069 /* TestTimeConstraintMacro.cpp */; };
76+
83D5FD56171F9218005B0069 /* TestUnitTestPP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD43171F9218005B0069 /* TestUnitTestPP.cpp */; };
77+
83D5FD57171F9218005B0069 /* TestXmlTestReporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83D5FD44171F9218005B0069 /* TestXmlTestReporter.cpp */; };
78+
83D5FD58171F9494005B0069 /* libUnitTest++.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8347D76F171F8D1C00FE3FC1 /* libUnitTest++.a */; };
6179
/* End PBXBuildFile section */
6280

6381
/* Begin PBXCopyFilesBuildPhase section */
@@ -67,7 +85,6 @@
6785
dstPath = /usr/share/man/man1/;
6886
dstSubfolderSpec = 0;
6987
files = (
70-
83D5FD29171F91B7005B0069 /* TestUnitTest__.1 in CopyFiles */,
7188
);
7289
runOnlyForDeploymentPostprocessing = 1;
7390
};
@@ -125,8 +142,27 @@
125142
83D5FCEB171F910E005B0069 /* XmlTestReporter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XmlTestReporter.cpp; sourceTree = "<group>"; };
126143
83D5FCEC171F910E005B0069 /* XmlTestReporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XmlTestReporter.h; sourceTree = "<group>"; };
127144
83D5FD24171F91B7005B0069 /* TestUnitTest++ */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "TestUnitTest++"; sourceTree = BUILT_PRODUCTS_DIR; };
128-
83D5FD26171F91B7005B0069 /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
129-
83D5FD28171F91B7005B0069 /* TestUnitTest__.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = TestUnitTest__.1; sourceTree = "<group>"; };
145+
83D5FD2E171F9218005B0069 /* Main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Main.cpp; sourceTree = "<group>"; };
146+
83D5FD2F171F9218005B0069 /* RecordingReporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordingReporter.h; sourceTree = "<group>"; };
147+
83D5FD30171F9218005B0069 /* ScopedCurrentTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScopedCurrentTest.h; sourceTree = "<group>"; };
148+
83D5FD33171F9218005B0069 /* TestAssertHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestAssertHandler.cpp; sourceTree = "<group>"; };
149+
83D5FD34171F9218005B0069 /* TestCheckMacros.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestCheckMacros.cpp; sourceTree = "<group>"; };
150+
83D5FD35171F9218005B0069 /* TestChecks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestChecks.cpp; sourceTree = "<group>"; };
151+
83D5FD36171F9218005B0069 /* TestCompositeTestReporter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestCompositeTestReporter.cpp; sourceTree = "<group>"; };
152+
83D5FD37171F9218005B0069 /* TestCurrentTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestCurrentTest.cpp; sourceTree = "<group>"; };
153+
83D5FD38171F9218005B0069 /* TestDeferredTestReporter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestDeferredTestReporter.cpp; sourceTree = "<group>"; };
154+
83D5FD39171F9218005B0069 /* TestExceptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestExceptions.cpp; sourceTree = "<group>"; };
155+
83D5FD3A171F9218005B0069 /* TestMemoryOutStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestMemoryOutStream.cpp; sourceTree = "<group>"; };
156+
83D5FD3B171F9218005B0069 /* TestTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestTest.cpp; sourceTree = "<group>"; };
157+
83D5FD3C171F9218005B0069 /* TestTestList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestTestList.cpp; sourceTree = "<group>"; };
158+
83D5FD3D171F9218005B0069 /* TestTestMacros.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestTestMacros.cpp; sourceTree = "<group>"; };
159+
83D5FD3E171F9218005B0069 /* TestTestResults.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestTestResults.cpp; sourceTree = "<group>"; };
160+
83D5FD3F171F9218005B0069 /* TestTestRunner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestTestRunner.cpp; sourceTree = "<group>"; };
161+
83D5FD40171F9218005B0069 /* TestTestSuite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestTestSuite.cpp; sourceTree = "<group>"; };
162+
83D5FD41171F9218005B0069 /* TestTimeConstraint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestTimeConstraint.cpp; sourceTree = "<group>"; };
163+
83D5FD42171F9218005B0069 /* TestTimeConstraintMacro.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestTimeConstraintMacro.cpp; sourceTree = "<group>"; };
164+
83D5FD43171F9218005B0069 /* TestUnitTestPP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestUnitTestPP.cpp; sourceTree = "<group>"; };
165+
83D5FD44171F9218005B0069 /* TestXmlTestReporter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestXmlTestReporter.cpp; sourceTree = "<group>"; };
130166
/* End PBXFileReference section */
131167

132168
/* Begin PBXFrameworksBuildPhase section */
@@ -141,6 +177,7 @@
141177
isa = PBXFrameworksBuildPhase;
142178
buildActionMask = 2147483647;
143179
files = (
180+
83D5FD58171F9494005B0069 /* libUnitTest++.a in Frameworks */,
144181
);
145182
runOnlyForDeploymentPostprocessing = 0;
146183
};
@@ -151,7 +188,7 @@
151188
isa = PBXGroup;
152189
children = (
153190
83D5FCB4171F910E005B0069 /* UnitTest++ */,
154-
83D5FD25171F91B7005B0069 /* TestUnitTest++ */,
191+
83D5FD2D171F9218005B0069 /* tests */,
155192
8347D770171F8D1C00FE3FC1 /* Products */,
156193
);
157194
sourceTree = "<group>";
@@ -230,13 +267,33 @@
230267
path = Posix;
231268
sourceTree = "<group>";
232269
};
233-
83D5FD25171F91B7005B0069 /* TestUnitTest++ */ = {
270+
83D5FD2D171F9218005B0069 /* tests */ = {
234271
isa = PBXGroup;
235272
children = (
236-
83D5FD26171F91B7005B0069 /* main.cpp */,
237-
83D5FD28171F91B7005B0069 /* TestUnitTest__.1 */,
273+
83D5FD2E171F9218005B0069 /* Main.cpp */,
274+
83D5FD2F171F9218005B0069 /* RecordingReporter.h */,
275+
83D5FD30171F9218005B0069 /* ScopedCurrentTest.h */,
276+
83D5FD33171F9218005B0069 /* TestAssertHandler.cpp */,
277+
83D5FD34171F9218005B0069 /* TestCheckMacros.cpp */,
278+
83D5FD35171F9218005B0069 /* TestChecks.cpp */,
279+
83D5FD36171F9218005B0069 /* TestCompositeTestReporter.cpp */,
280+
83D5FD37171F9218005B0069 /* TestCurrentTest.cpp */,
281+
83D5FD38171F9218005B0069 /* TestDeferredTestReporter.cpp */,
282+
83D5FD39171F9218005B0069 /* TestExceptions.cpp */,
283+
83D5FD3A171F9218005B0069 /* TestMemoryOutStream.cpp */,
284+
83D5FD3B171F9218005B0069 /* TestTest.cpp */,
285+
83D5FD3C171F9218005B0069 /* TestTestList.cpp */,
286+
83D5FD3D171F9218005B0069 /* TestTestMacros.cpp */,
287+
83D5FD3E171F9218005B0069 /* TestTestResults.cpp */,
288+
83D5FD3F171F9218005B0069 /* TestTestRunner.cpp */,
289+
83D5FD40171F9218005B0069 /* TestTestSuite.cpp */,
290+
83D5FD41171F9218005B0069 /* TestTimeConstraint.cpp */,
291+
83D5FD42171F9218005B0069 /* TestTimeConstraintMacro.cpp */,
292+
83D5FD43171F9218005B0069 /* TestUnitTestPP.cpp */,
293+
83D5FD44171F9218005B0069 /* TestXmlTestReporter.cpp */,
238294
);
239-
path = "TestUnitTest++";
295+
name = tests;
296+
path = ../../tests;
240297
sourceTree = "<group>";
241298
};
242299
/* End PBXGroup section */
@@ -374,7 +431,25 @@
374431
isa = PBXSourcesBuildPhase;
375432
buildActionMask = 2147483647;
376433
files = (
377-
83D5FD27171F91B7005B0069 /* main.cpp in Sources */,
434+
83D5FD45171F9218005B0069 /* Main.cpp in Sources */,
435+
83D5FD46171F9218005B0069 /* TestAssertHandler.cpp in Sources */,
436+
83D5FD47171F9218005B0069 /* TestCheckMacros.cpp in Sources */,
437+
83D5FD48171F9218005B0069 /* TestChecks.cpp in Sources */,
438+
83D5FD49171F9218005B0069 /* TestCompositeTestReporter.cpp in Sources */,
439+
83D5FD4A171F9218005B0069 /* TestCurrentTest.cpp in Sources */,
440+
83D5FD4B171F9218005B0069 /* TestDeferredTestReporter.cpp in Sources */,
441+
83D5FD4C171F9218005B0069 /* TestExceptions.cpp in Sources */,
442+
83D5FD4D171F9218005B0069 /* TestMemoryOutStream.cpp in Sources */,
443+
83D5FD4E171F9218005B0069 /* TestTest.cpp in Sources */,
444+
83D5FD4F171F9218005B0069 /* TestTestList.cpp in Sources */,
445+
83D5FD50171F9218005B0069 /* TestTestMacros.cpp in Sources */,
446+
83D5FD51171F9218005B0069 /* TestTestResults.cpp in Sources */,
447+
83D5FD52171F9218005B0069 /* TestTestRunner.cpp in Sources */,
448+
83D5FD53171F9218005B0069 /* TestTestSuite.cpp in Sources */,
449+
83D5FD54171F9218005B0069 /* TestTimeConstraint.cpp in Sources */,
450+
83D5FD55171F9218005B0069 /* TestTimeConstraintMacro.cpp in Sources */,
451+
83D5FD56171F9218005B0069 /* TestUnitTestPP.cpp in Sources */,
452+
83D5FD57171F9218005B0069 /* TestXmlTestReporter.cpp in Sources */,
378453
);
379454
runOnlyForDeploymentPostprocessing = 0;
380455
};
@@ -457,13 +532,15 @@
457532
83D5FD2B171F91B7005B0069 /* Debug */ = {
458533
isa = XCBuildConfiguration;
459534
buildSettings = {
535+
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../";
460536
PRODUCT_NAME = "$(TARGET_NAME)";
461537
};
462538
name = Debug;
463539
};
464540
83D5FD2C171F91B7005B0069 /* Release */ = {
465541
isa = XCBuildConfiguration;
466542
buildSettings = {
543+
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../";
467544
PRODUCT_NAME = "$(TARGET_NAME)";
468545
};
469546
name = Release;

0 commit comments

Comments
 (0)