Permalink
Browse files

Updated GHUnit to the latest version

  • Loading branch information...
1 parent ae997d4 commit 65a5c1b2b7f6e98af6ba782acef80d0a654ab917 @royclarkson royclarkson committed Dec 22, 2010
Showing with 122 additions and 176 deletions.
  1. +0 −82 src/Classes/Helpers/GHUnitIOSTestMain.m
  2. +17 −17 src/Greenhouse.xcodeproj/project.pbxproj
  3. +1 −0 src/Libraries/GHUnit.framework/GHUnit
  4. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Headers
  5. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Resources
  6. BIN src/Libraries/GHUnit.framework/Versions/A/GHUnit
  7. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHAsyncTestCase.h
  8. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHTest+JUnitXML.h
  9. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHTest.h
  10. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHTestCase.h
  11. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHTestGroup+JUnitXML.h
  12. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHTestGroup.h
  13. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHTestMacros.h
  14. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHTestOperation.h
  15. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHTestRunner.h
  16. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHTestSuite.h
  17. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHTesting.h
  18. +21 −72 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHUnit.h
  19. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHUnitIPhoneAppDelegate.h
  20. 0 ...ies/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHUnitIPhoneTableViewDataSource.h
  21. 0 ...ries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHUnitIPhoneTestViewController.h
  22. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHUnitIPhoneView.h
  23. 0 ...ibraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/GHUnitIPhoneViewController.h
  24. 0 ...{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/NSException+GHTestFailureExceptions.h
  25. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Headers/NSValue+GHValueFormatter.h
  26. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/A/Resources/Info.plist
  27. 0 src/Libraries/{GHUnitIOS.framework → GHUnit.framework}/Versions/Current
  28. +0 −1 src/Libraries/GHUnitIOS.framework/GHUnitIOS
  29. BIN src/Libraries/GHUnitIOS.framework/Versions/A/GHUnitIOS
  30. +0 −3 src/Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnitIOS.h
  31. +82 −0 src/Other Sources/GHUnitIOSTestMain.m
  32. +1 −1 src/Tests/MyTest.m
@@ -1,82 +0,0 @@
-//
-// GHUnitIOSTestMain.m
-// GHUnitIPhone
-//
-// Created by Gabriel Handford on 1/25/09.
-// Copyright 2009. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#import <UIKit/UIKit.h>
-
-// If you are using the framework
-#import <GHUnitIOS/GHUnitIOS.h>
-// If you are using the static library and importing header files manually
-//#import "GHUnitIOS.h"
-
-// Default exception handler
-void exceptionHandler(NSException *exception) {
- NSLog(@"%@\n%@", [exception reason], GHUStackTraceFromException(exception));
-}
-
-int main(int argc, char *argv[]) {
-
- /*!
- For debugging:
- Go into the "Get Info" contextual menu of your (test) executable (inside the "Executables" group in the left panel of XCode).
- Then go in the "Arguments" tab. You can add the following environment variables:
-
- Default: Set to:
- NSDebugEnabled NO "YES"
- NSZombieEnabled NO "YES"
- NSDeallocateZombies NO "YES"
- NSHangOnUncaughtException NO "YES"
-
- NSEnableAutoreleasePool YES "NO"
- NSAutoreleaseFreedObjectCheckEnabled NO "YES"
- NSAutoreleaseHighWaterMark 0 non-negative integer
- NSAutoreleaseHighWaterResolution 0 non-negative integer
-
- For info on these varaiables see NSDebug.h; http://theshadow.uw.hu/iPhoneSDKdoc/Foundation.framework/NSDebug.h.html
-
- For malloc debugging see: http://developer.apple.com/mac/library/documentation/Performance/Conceptual/ManagingMemory/Articles/MallocDebug.html
- */
-
- NSSetUncaughtExceptionHandler(&exceptionHandler);
-
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
- // Register any special test case classes
- //[[GHTesting sharedInstance] registerClassName:@"GHSpecialTestCase"];
-
- int retVal = 0;
- // If GHUNIT_CLI is set we are using the command line interface and run the tests
- // Otherwise load the GUI app
- if (getenv("GHUNIT_CLI")) {
- retVal = [GHTestRunner run];
- } else {
- retVal = UIApplicationMain(argc, argv, nil, @"GHUnitIPhoneAppDelegate");
- }
- [pool release];
- return retVal;
-}
@@ -119,6 +119,7 @@
81168A9612565FCF0055A4F3 /* TweetsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 81168A6812565FCF0055A4F3 /* TweetsViewController.xib */; };
81168A9712565FCF0055A4F3 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 81168A6912565FCF0055A4F3 /* Settings.bundle */; };
811BA5D0120C58E40045BB34 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 811BA5CF120C58E40045BB34 /* CoreLocation.framework */; };
+ 813A678712C1B46D00669912 /* GHUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 813A676F12C1B36500669912 /* GHUnit.framework */; };
814FC4931256862700DB3123 /* YAJLIOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81DD7CC412270A0C00F62D5D /* YAJLIOS.framework */; };
814FC4CA125A492D00DB3123 /* Venue.m in Sources */ = {isa = PBXBuildFile; fileRef = 814FC4C9125A492D00DB3123 /* Venue.m */; };
814FC5A2125A81EC00DB3123 /* VenueDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 814FC5A1125A81EC00DB3123 /* VenueDetailsViewController.m */; };
@@ -127,14 +128,13 @@
8157797D1276254200EA593E /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 811BA5CF120C58E40045BB34 /* CoreLocation.framework */; };
8157797E1276254200EA593E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
8157797F1276254200EA593E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
- 815779801276256A00EA593E /* GHUnitIOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8157792212761B5D00EA593E /* GHUnitIOS.framework */; };
815779961276294400EA593E /* MyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 815779951276294400EA593E /* MyTest.m */; };
+ 81856ECC12C1B699006BAD62 /* GHUnitIOSTestMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 81856ECB12C1B699006BAD62 /* GHUnitIOSTestMain.m */; };
819E443C11FF1FA600DBC0BB /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 819E443B11FF1FA600DBC0BB /* MapKit.framework */; };
81B9EA5A125B6BB90067B8CA /* VenueRoom.m in Sources */ = {isa = PBXBuildFile; fileRef = 81B9EA59125B6BB90067B8CA /* VenueRoom.m */; };
81B9EBC3125C20FF0067B8CA /* CustomTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 81B9EBC2125C20FF0067B8CA /* CustomTabBar.m */; };
81B9EBC6125C210E0067B8CA /* CustomToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 81B9EBC5125C210E0067B8CA /* CustomToolbar.m */; };
81B9EBD6125C236C0067B8CA /* CustomNavigationBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 81B9EBD5125C236C0067B8CA /* CustomNavigationBar.m */; };
- 81C09D7E1277228B00996CA2 /* GHUnitIOSTestMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 81C09D7D1277228B00996CA2 /* GHUnitIOSTestMain.m */; };
81E75F3A11BE0D5800E6B283 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81E75F3911BE0D5800E6B283 /* Security.framework */; };
81F8DEC01227801000C3E8FD /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81F8DEBF1227801000C3E8FD /* QuartzCore.framework */; };
81FF3FFC123AB0ED00439B37 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 81FF3FFB123AB0ED00439B37 /* main.m */; };
@@ -326,16 +326,17 @@
81168A6812565FCF0055A4F3 /* TweetsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TweetsViewController.xib; sourceTree = "<group>"; };
81168A6912565FCF0055A4F3 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
811BA5CF120C58E40045BB34 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
+ 813A676F12C1B36500669912 /* GHUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GHUnit.framework; path = Libraries/GHUnit.framework; sourceTree = "<group>"; };
814FC4C8125A492D00DB3123 /* Venue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Venue.h; sourceTree = "<group>"; };
814FC4C9125A492D00DB3123 /* Venue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Venue.m; sourceTree = "<group>"; };
814FC4D3125A5A6600DB3123 /* WebDataModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDataModel.h; sourceTree = "<group>"; };
814FC5A0125A81EC00DB3123 /* VenueDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VenueDetailsViewController.h; sourceTree = "<group>"; };
814FC5A1125A81EC00DB3123 /* VenueDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VenueDetailsViewController.m; sourceTree = "<group>"; };
814FC5A3125A820700DB3123 /* VenueDetailsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VenueDetailsViewController.xib; sourceTree = "<group>"; };
- 8157792212761B5D00EA593E /* GHUnitIOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GHUnitIOS.framework; path = Libraries/GHUnitIOS.framework; sourceTree = "<group>"; };
8157795A12761C0C00EA593E /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
815779701276241C00EA593E /* Tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
815779951276294400EA593E /* MyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyTest.m; sourceTree = "<group>"; };
+ 81856ECB12C1B699006BAD62 /* GHUnitIOSTestMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHUnitIOSTestMain.m; sourceTree = "<group>"; };
819E443B11FF1FA600DBC0BB /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
81B9EA58125B6BB90067B8CA /* VenueRoom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VenueRoom.h; sourceTree = "<group>"; };
81B9EA59125B6BB90067B8CA /* VenueRoom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VenueRoom.m; sourceTree = "<group>"; };
@@ -345,7 +346,6 @@
81B9EBC5125C210E0067B8CA /* CustomToolbar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomToolbar.m; sourceTree = "<group>"; };
81B9EBD4125C236C0067B8CA /* CustomNavigationBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomNavigationBar.h; sourceTree = "<group>"; };
81B9EBD5125C236C0067B8CA /* CustomNavigationBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomNavigationBar.m; sourceTree = "<group>"; };
- 81C09D7D1277228B00996CA2 /* GHUnitIOSTestMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHUnitIOSTestMain.m; sourceTree = "<group>"; };
81DD7CC412270A0C00F62D5D /* YAJLIOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = YAJLIOS.framework; path = Libraries/YAJLIOS.framework; sourceTree = "<group>"; };
81E75F3911BE0D5800E6B283 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
81F8DEBF1227801000C3E8FD /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
@@ -379,7 +379,7 @@
8157797D1276254200EA593E /* CoreLocation.framework in Frameworks */,
8157797E1276254200EA593E /* Foundation.framework in Frameworks */,
8157797F1276254200EA593E /* UIKit.framework in Frameworks */,
- 815779801276256A00EA593E /* GHUnitIOS.framework in Frameworks */,
+ 813A678712C1B46D00669912 /* GHUnit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -421,7 +421,7 @@
81E75F3911BE0D5800E6B283 /* Security.framework */,
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
81DD7CC412270A0C00F62D5D /* YAJLIOS.framework */,
- 8157792212761B5D00EA593E /* GHUnitIOS.framework */,
+ 813A676F12C1B36500669912 /* GHUnit.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -499,7 +499,6 @@
8116897512565F5E0055A4F3 /* TwitterProfileImageDownloader.m */,
8116897612565F5E0055A4F3 /* UserSettings.h */,
8116897712565F5E0055A4F3 /* UserSettings.m */,
- 81C09D7D1277228B00996CA2 /* GHUnitIOSTestMain.m */,
);
path = Helpers;
sourceTree = "<group>";
@@ -753,6 +752,7 @@
81FF3FF9123AB0ED00439B37 /* DLog.h */,
81FF3FFA123AB0ED00439B37 /* Greenhouse_Prefix.pch */,
81FF3FFB123AB0ED00439B37 /* main.m */,
+ 81856ECB12C1B699006BAD62 /* GHUnitIOSTestMain.m */,
);
path = "Other Sources";
sourceTree = "<group>";
@@ -966,7 +966,7 @@
buildActionMask = 2147483647;
files = (
815779961276294400EA593E /* MyTest.m in Sources */,
- 81C09D7E1277228B00996CA2 /* GHUnitIOSTestMain.m in Sources */,
+ 81856ECC12C1B699006BAD62 /* GHUnitIOSTestMain.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1118,7 +1118,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = Tests;
- SDKROOT = iphoneos4.1;
+ SDKROOT = iphoneos;
};
name = "Debug [localhost]";
};
@@ -1145,7 +1145,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = Tests;
- SDKROOT = iphoneos4.1;
+ SDKROOT = iphoneos;
};
name = "Debug [qa]";
};
@@ -1172,7 +1172,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = Tests;
- SDKROOT = iphoneos4.1;
+ SDKROOT = iphoneos;
};
name = "Debug [production]";
};
@@ -1199,7 +1199,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = Tests;
- SDKROOT = iphoneos4.1;
+ SDKROOT = iphoneos;
};
name = "Release [localhost]";
};
@@ -1226,7 +1226,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = Tests;
- SDKROOT = iphoneos4.1;
+ SDKROOT = iphoneos;
};
name = "Release [qa]";
};
@@ -1253,7 +1253,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = Tests;
- SDKROOT = iphoneos4.1;
+ SDKROOT = iphoneos;
};
name = "Release [production]";
};
@@ -1280,7 +1280,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = Tests;
- SDKROOT = iphoneos4.1;
+ SDKROOT = iphoneos;
};
name = "Ad Hoc Distribution [qa]";
};
@@ -1307,7 +1307,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = Tests;
- SDKROOT = iphoneos4.1;
+ SDKROOT = iphoneos;
};
name = "Ad Hoc Distribution [production]";
};
@@ -1334,7 +1334,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = Tests;
- SDKROOT = iphoneos4.1;
+ SDKROOT = iphoneos;
};
name = "App Store Distribution";
};
Binary file not shown.
Oops, something went wrong.

0 comments on commit 65a5c1b

Please sign in to comment.