Update GHUnit

@@ -28,19 +28,40 @@
 //
 //
 
 
 #import <Foundation/Foundation.h>
 #import <Foundation/Foundation.h>
-#import <Foundation/NSDebug.h>
 
 
 #import <GHUnit/GHUnit.h>
 #import <GHUnit/GHUnit.h>
 #import <GHUnit/GHTestApp.h>
 #import <GHUnit/GHTestApp.h>
 #import <GHUnit/GHTesting.h>
 #import <GHUnit/GHTesting.h>
 
 
+// Default exception handler
+void exceptionHandler(NSException *exception) {	
+	NSLog(@"%@\n%@", [exception reason], GHUStackTraceFromException(exception));
+}
+
 int main(int argc, char *argv[]) {
 int main(int argc, char *argv[]) {
-	// Setup any NSDebug settings
-	NSDebugEnabled = YES;
-	NSZombieEnabled = YES;
-	NSDeallocateZombies = NO;
-	NSHangOnUncaughtException = YES;
-	setenv("NSAutoreleaseFreedObjectCheckEnabled", "1", 1);
+	
+	/*!
+	 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];
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	
 	
@@ -58,6 +79,8 @@ int main(int argc, char *argv[]) {
 		// To run a different test suite:
 		// To run a different test suite:
 		//GHTestSuite *suite = [GHTestSuite suiteWithTestFilter:@"GHSlowTest,GHAsyncTestCaseTest"];
 		//GHTestSuite *suite = [GHTestSuite suiteWithTestFilter:@"GHSlowTest,GHAsyncTestCaseTest"];
 		//GHTestApp *app = [[GHTestApp alloc] initWithSuite:suite];
 		//GHTestApp *app = [[GHTestApp alloc] initWithSuite:suite];
+		// Or set global:
+		//GHUnitTest = @"GHSlowTest";
 		[NSApp run];
 		[NSApp run];
 		[app release];		
 		[app release];		
 	}
 	}

@@ -8,8 +8,7 @@
 
 
 #import <Cocoa/Cocoa.h>
 #import <Cocoa/Cocoa.h>
 
 
-@interface BWSplitView : NSSplitView 
-{
+@interface BWSplitView : NSSplitView  {
 	NSColor *color;
 	NSColor *color;
 	BOOL colorIsEnabled, checkboxIsEnabled, dividerCanCollapse, collapsibleSubviewCollapsed;
 	BOOL colorIsEnabled, checkboxIsEnabled, dividerCanCollapse, collapsibleSubviewCollapsed;
 	id secondaryDelegate;
 	id secondaryDelegate;

@@ -63,7 +63,7 @@ typedef struct {
  */
  */
 extern GHTestStats GHTestStatsMake(NSInteger succeedCount, NSInteger failureCount, NSInteger cancelCount, NSInteger testCount);
 extern GHTestStats GHTestStatsMake(NSInteger succeedCount, NSInteger failureCount, NSInteger cancelCount, NSInteger testCount);
 
 
-const GHTestStats GHTestStatsEmpty;
+extern const GHTestStats GHTestStatsEmpty;
 
 
 extern NSString *NSStringFromGHTestStats(GHTestStats stats);
 extern NSString *NSStringFromGHTestStats(GHTestStats stats);
 
 

@@ -83,7 +83,7 @@
  - (void)testB { }
  - (void)testB { }
  
  
  // Override any exceptions; By default exceptions are raised, causing a test failure
  // Override any exceptions; By default exceptions are raised, causing a test failure
- - (void)failWithException:(NSException*)exception { }
+ - (void)failWithException:(NSException *)exception { }
  
  
  @end
  @end
  @endcode
  @endcode

@@ -7,9 +7,9 @@
 //
 //
 
 
 #import "GHTestViewModel.h"
 #import "GHTestViewModel.h"
-
 @class GHTestOutlineViewModel;
 @class GHTestOutlineViewModel;
 
 
+
 @protocol GHTestOutlineViewModelDelegate <NSObject>
 @protocol GHTestOutlineViewModelDelegate <NSObject>
 - (void)testOutlineViewModelDidChangeSelection:(GHTestOutlineViewModel *)testOutlineViewModel;
 - (void)testOutlineViewModelDidChangeSelection:(GHTestOutlineViewModel *)testOutlineViewModel;
 @end
 @end

@@ -143,6 +143,11 @@
 
 
 - (void)cancel;
 - (void)cancel;
 
 
+/*!
+ Write message to console.
+ */
+- (void)log:(NSString *)message;
+
 @end
 @end
 
 
 
 

@@ -85,6 +85,13 @@ extern NSString *GHUnitTest;
 + (GHTestSuite *)suiteWithTestFilter:(NSString *)testFilter;
 + (GHTestSuite *)suiteWithTestFilter:(NSString *)testFilter;
 
 
 /*!
 /*!
+ Create suite of tests that start with prefix.
+ @param prefix If test case class starts with the prefix; If nil or empty string, returns all tests
+ @param options Compare options
+ */
++ (GHTestSuite *)suiteWithPrefix:(NSString *)prefix options:(NSStringCompareOptions)options;
+
+/*!
  Suite for a single test/method.
  Suite for a single test/method.
  @param testCaseClass
  @param testCaseClass
  @param method
  @param method

@@ -80,4 +80,6 @@
 - (void)loadDefaults;
 - (void)loadDefaults;
 - (void)saveDefaults;
 - (void)saveDefaults;
 
 
+- (BOOL)isShowingDetails;
+
 @end
 @end

@@ -110,30 +110,33 @@
 	NSMutableArray */* of GHTestNode*/children_;
 	NSMutableArray */* of GHTestNode*/children_;
 
 
 	id<GHTestNodeDelegate> delegate_;
 	id<GHTestNodeDelegate> delegate_;
-}
 
 
+}
 
 
 
 
-@property (readonly, nonatomic) NSString *identifier;
-@property (readonly, nonatomic) NSString *name;
 @property (readonly, nonatomic) NSArray */* of GHTestNode*/children;
 @property (readonly, nonatomic) NSArray */* of GHTestNode*/children;
 @property (readonly, nonatomic) id<GHTest> test;
 @property (readonly, nonatomic) id<GHTest> test;
-@property (readonly, nonatomic) GHTestStatus status;
-@property (readonly, nonatomic) NSString *statusString;
-@property (readonly, nonatomic) NSString *stackTrace;
-@property (readonly, nonatomic) NSString *log;
-@property (readonly, nonatomic) BOOL isRunning;
-@property (readonly, nonatomic) BOOL isEnded;
-@property (readonly, nonatomic) BOOL isGroupTest; // YES if test has "sub tests"
-
-@property (assign, nonatomic, getter=isSelected) BOOL selected;
 @property (assign, nonatomic) id<GHTestNodeDelegate> delegate;
 @property (assign, nonatomic) id<GHTestNodeDelegate> delegate;
 
 
 - (id)initWithTest:(id<GHTest>)test children:(NSArray */*of GHTestNode */)children source:(GHTestViewModel *)source;
 - (id)initWithTest:(id<GHTest>)test children:(NSArray */*of GHTestNode */)children source:(GHTestViewModel *)source;
 + (GHTestNode *)nodeWithTest:(id<GHTest>)test children:(NSArray */*of GHTestNode */)children source:(GHTestViewModel *)source;
 + (GHTestNode *)nodeWithTest:(id<GHTest>)test children:(NSArray */*of GHTestNode */)children source:(GHTestViewModel *)source;
 
 
+- (NSString *)identifier;
+- (NSString *)name;
 - (NSString *)nameWithStatus;
 - (NSString *)nameWithStatus;
 
 
+- (GHTestStatus)status;
+- (NSString *)statusString;
+- (NSString *)stackTrace;
+- (NSString *)log;
+- (BOOL)isRunning;
+- (BOOL)isDisabled;
+- (BOOL)isEnded;
+- (BOOL)isGroupTest; // YES if test has "sub tests"
+
+- (BOOL)isSelected;
+- (void)setSelected:(BOOL)selected;
+
 - (BOOL)hasChildren;
 - (BOOL)hasChildren;
 - (BOOL)failed;
 - (BOOL)failed;
 
 

@@ -35,4 +35,6 @@
 
 
 @property (retain, nonatomic) IBOutlet GHTestViewController *viewController;
 @property (retain, nonatomic) IBOutlet GHTestViewController *viewController;
 
 
+- (IBAction)runTests:(id)sender;
+- (IBAction)edit:(id)sender;
 @end
 @end

@@ -46,6 +46,8 @@
 //  the License.
 //  the License.
 //
 //
 
 
+extern NSString *GHUStackTraceFromException(NSException *e);
+
 // GTM_BEGIN
 // GTM_BEGIN
 BOOL isTestFixtureOfClass(Class aClass, Class testCaseClass);
 BOOL isTestFixtureOfClass(Class aClass, Class testCaseClass);
 // GTM_END
 // GTM_END
@@ -102,3 +104,6 @@ BOOL isTestFixtureOfClass(Class aClass, Class testCaseClass);
 
 
 @end
 @end
 
 
+@protocol GHSenTestCase 
+- (void)raiseAfterFailure;
+@end

@@ -34,7 +34,9 @@
 #import "GHTestRunner.h"
 #import "GHTestRunner.h"
 
 
 #ifdef DEBUG
 #ifdef DEBUG
-#define GHUDebug(fmt, ...) NSLog(fmt, ##__VA_ARGS__)
+#define GHUDebug(fmt, ...) do { \
+fputs([[[NSString stringWithFormat:fmt, ##__VA_ARGS__] stringByAppendingString:@"\n"] UTF8String], stdout); \
+} while(0)
 #else
 #else
 #define GHUDebug(fmt, ...) do {} while(0)
 #define GHUDebug(fmt, ...) do {} while(0)
 #endif
 #endif

+//
+//  GTMStackTrace.h
+//
+//  Copyright 2007-2008 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+//
+
+#include <CoreFoundation/CoreFoundation.h>
+#import "GTMDefines.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct GHU_GTMAddressDescriptor {
+  const void *address;  // address
+  const char *symbol;  // nearest symbol to address
+  const char *class_name;  // if it is an obj-c method, the method's class
+  BOOL is_class_method;  // if it is an obj-c method, type of method
+  const char *filename;  // file that the method came from.
+};
+
+// Returns a string containing a nicely formatted stack trace.
+// 
+// This function gets the stack trace for the current thread. It will
+// be from the caller of GTMStackTrace upwards to the top the calling stack.
+// Typically this function will be used along with some logging, 
+// as in the following:
+//
+//   MyAppLogger(@"Should never get here:\n%@", GTMStackTrace());
+//
+// Here is a sample stack trace returned from this function:
+//
+// #0  0x00002d92 D ()  [/Users/me/./StackLog]
+// #1  0x00002e45 C ()  [/Users/me/./StackLog]
+// #2  0x00002e53 B ()  [/Users/me/./StackLog]
+// #3  0x00002e61 A ()  [/Users/me/./StackLog]
+// #4  0x00002e6f main ()  [/Users/me/./StackLog]
+// #5  0x00002692 tart ()  [/Users/me/./StackLog]
+// #6  0x000025b9 tart ()  [/Users/me/./StackLog]
+//
+
+NSString *GHU_GTMStackTrace(void);
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+// Returns a string containing a nicely formatted stack trace from the
+// exception.  Only available on 10.5 or later, uses 
+// -[NSException callStackReturnAddresses].
+//
+NSString *GHU_GTMStackTraceFromException(NSException *e);
+#endif
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+// Returns an array of program counters from the current thread's stack.
+// *** You should probably use GTMStackTrace() instead of this function ***
+// However, if you actually want all the PCs in "void *" form, then this
+// funtion is more convenient. This will include PCs of GTMStaceTrace and
+// its inner utility functions that you may want to strip out.
+//
+// You can use +[NSThread callStackReturnAddresses] in 10.5 or later.
+//
+// Args:
+//   outPcs - an array of "void *" pointers to the program counters found on the
+//            current thread's stack.
+//   count - the number of entries in the outPcs array
+//
+// Returns:
+//   The number of program counters actually added to outPcs.
+//
+NSUInteger GHU_GTMGetStackProgramCounters(void *outPcs[], NSUInteger count);
+#endif  // MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+
+// Returns an array of GTMAddressDescriptors from the current thread's stack.
+// *** You should probably use GTMStackTrace() instead of this function ***
+// However, if you actually want all the PCs with symbols, this is the way
+// to get them. There is no memory allocations done, so no clean up is required
+// except for the caller to free outDescs if they allocated it themselves.
+// This will include PCs of GTMStaceTrace and its inner utility functions that 
+// you may want to strip out.
+//
+// Args:
+//   outDescs - an array of "struct GTMAddressDescriptor" pointers corresponding
+//              to the program counters found on the current thread's stack.
+//   count - the number of entries in the outDescs array
+//
+// Returns:
+//   The number of program counters actually added to outPcs.
+//
+NSUInteger GHU_GTMGetStackAddressDescriptors(struct GHU_GTMAddressDescriptor outDescs[], 
+                                         NSUInteger count);
+
+#ifdef __cplusplus
+}
+#endif

+//
+//  NSException+GHTestFailureExceptions.h
+//
+//  Created by Johannes Rudolph on 23.09.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.
+//
+
+//
+// Portions of this file fall under the following license, marked with:
+// GTM_BEGIN : GTM_END
+//
+//  Copyright 2008 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+//
+
+// GTM_BEGIN
+
+#import <Foundation/Foundation.h>
+
+@interface NSException (GHUTestFailureExceptions)
++ (NSException *)ghu_failureInFile:(NSString *)filename 
+                        atLine:(int)lineNumber 
+               withDescription:(NSString *)formatString, ...;
++ (NSException *)ghu_failureInCondition:(NSString *)condition 
+                             isTrue:(BOOL)isTrue 
+                             inFile:(NSString *)filename 
+                             atLine:(int)lineNumber 
+                    withDescription:(NSString *)formatString, ...;
++ (NSException *)ghu_failureInEqualityBetweenObject:(id)left
+                                      andObject:(id)right
+                                         inFile:(NSString *)filename
+                                         atLine:(int)lineNumber
+                                withDescription:(NSString *)formatString, ...;
++ (NSException *)ghu_failureInEqualityBetweenValue:(NSValue *)left 
+                                      andValue:(NSValue *)right 
+                                  withAccuracy:(NSValue *)accuracy 
+                                        inFile:(NSString *)filename 
+                                        atLine:(int) ineNumber
+                               withDescription:(NSString *)formatString, ...;
++ (NSException *)ghu_failureInRaise:(NSString *)expression 
+                         inFile:(NSString *)filename 
+                         atLine:(int)lineNumber
+                withDescription:(NSString *)formatString, ...;
++ (NSException *)ghu_failureInRaise:(NSString *)expression 
+                      exception:(NSException *)exception 
+                         inFile:(NSString *)filename 
+                         atLine:(int)lineNumber 
+                withDescription:(NSString *)formatString, ...;
+@end
+
+// GTM_END

+//
+//  NSValue+GHValueFormatter.h
+//
+//  Created by Johannes Rudolph on 23.9.2009.
+//  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.
+//
+
+//
+// Portions of this file fall under the following license, marked with
+// SENTE_BEGIN - SENTE_END
+//
+// Copyright (c) 1997-2005, Sen:te (Sente SA).  All rights reserved.
+//
+// Use of this source code is governed by the following license:
+// 
+// Redistribution and use in source and binary forms, with or without modification, 
+// are permitted provided that the following conditions are met:
+// 
+// (1) Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer.
+// 
+// (2) Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' 
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+// IN NO EVENT SHALL Sente SA OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+// OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+// Note: this license is equivalent to the FreeBSD license.
+// 
+// This notice may not be removed from this file.
+
+#import <Foundation/Foundation.h>
+
+// SENTE_BEGIN
+@interface NSValue (GHValueFormatter)
+- (NSString *)ghu_contentDescription;
+@end
+// SENTE_END

@@ -17,6 +17,6 @@
 	<key>CFBundleSignature</key>
 	<key>CFBundleSignature</key>
 	<string>GABE</string>
 	<string>GABE</string>
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>
-	<string>0.4.4</string>
+	<string>0.4.14</string>
 </dict>
 </dict>
 </plist>
 </plist>

@@ -63,7 +63,7 @@ typedef struct {
  */
  */
 extern GHTestStats GHTestStatsMake(NSInteger succeedCount, NSInteger failureCount, NSInteger cancelCount, NSInteger testCount);
 extern GHTestStats GHTestStatsMake(NSInteger succeedCount, NSInteger failureCount, NSInteger cancelCount, NSInteger testCount);
 
 
-const GHTestStats GHTestStatsEmpty;
+extern const GHTestStats GHTestStatsEmpty;
 
 
 extern NSString *NSStringFromGHTestStats(GHTestStats stats);
 extern NSString *NSStringFromGHTestStats(GHTestStats stats);
 
 

@@ -83,7 +83,7 @@
  - (void)testB { }
  - (void)testB { }
  
  
  // Override any exceptions; By default exceptions are raised, causing a test failure
  // Override any exceptions; By default exceptions are raised, causing a test failure
- - (void)failWithException:(NSException*)exception { }
+ - (void)failWithException:(NSException *)exception { }
  
  
  @end
  @end
  @endcode
  @endcode

@@ -143,6 +143,11 @@
 
 
 - (void)cancel;
 - (void)cancel;
 
 
+/*!
+ Write message to console.
+ */
+- (void)log:(NSString *)message;
+
 @end
 @end
 
 
 
 

@@ -85,6 +85,13 @@ extern NSString *GHUnitTest;
 + (GHTestSuite *)suiteWithTestFilter:(NSString *)testFilter;
 + (GHTestSuite *)suiteWithTestFilter:(NSString *)testFilter;
 
 
 /*!
 /*!
+ Create suite of tests that start with prefix.
+ @param prefix If test case class starts with the prefix; If nil or empty string, returns all tests
+ @param options Compare options
+ */
++ (GHTestSuite *)suiteWithPrefix:(NSString *)prefix options:(NSStringCompareOptions)options;
+
+/*!
  Suite for a single test/method.
  Suite for a single test/method.
  @param testCaseClass
  @param testCaseClass
  @param method
  @param method

@@ -46,6 +46,8 @@
 //  the License.
 //  the License.
 //
 //
 
 
+extern NSString *GHUStackTraceFromException(NSException *e);
+
 // GTM_BEGIN
 // GTM_BEGIN
 BOOL isTestFixtureOfClass(Class aClass, Class testCaseClass);
 BOOL isTestFixtureOfClass(Class aClass, Class testCaseClass);
 // GTM_END
 // GTM_END
@@ -102,3 +104,6 @@ BOOL isTestFixtureOfClass(Class aClass, Class testCaseClass);
 
 
 @end
 @end
 
 
+@protocol GHSenTestCase 
+- (void)raiseAfterFailure;
+@end

@@ -34,7 +34,9 @@
 #import "GHTestRunner.h"
 #import "GHTestRunner.h"
 
 
 #ifdef DEBUG
 #ifdef DEBUG
-#define GHUDebug(fmt, ...) NSLog(fmt, ##__VA_ARGS__)
+#define GHUDebug(fmt, ...) do { \
+fputs([[[NSString stringWithFormat:fmt, ##__VA_ARGS__] stringByAppendingString:@"\n"] UTF8String], stdout); \
+} while(0)
 #else
 #else
 #define GHUDebug(fmt, ...) do {} while(0)
 #define GHUDebug(fmt, ...) do {} while(0)
 #endif
 #endif

+//
+//  GHUnitIPhoneAppDelegate.h
+//  GHUnitIPhone
+//
+//  Created by Gabriel Handford on 1/25/09.
+//  Copyright 2009. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface GHUnitIPhoneAppDelegate : NSObject <UIApplicationDelegate> {
+	UIWindow *window_;
+	
+	UINavigationController *navigationController_;	
+}
+
+@end
+

@@ -9,18 +9,37 @@
 #import <UIKit/UIKit.h>
 #import <UIKit/UIKit.h>
 
 
 #import "GHUnit.h"
 #import "GHUnit.h"
+#import "GHTesting.h"
 
 
-extern BOOL NSDebugEnabled;
-extern BOOL NSZombieEnabled;
-extern BOOL NSDeallocateZombies;
-extern BOOL NSHangOnUncaughtException;
+// Default exception handler
+void exceptionHandler(NSException *exception) {	
+	NSLog(@"%@\n%@", [exception reason], GHUStackTraceFromException(exception));
+}
 
 
 int main(int argc, char *argv[]) {
 int main(int argc, char *argv[]) {
 	
 	
-	NSDebugEnabled = YES;
-	NSZombieEnabled = YES;
-	NSDeallocateZombies = NO;
-	NSHangOnUncaughtException = YES;
+	/*!
+	 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];
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	
 	

+
+TEST_TARGET=Tests
+SDK=iphonesimulator3.0
+COMMAND=xcodebuild
+
+default:
+	# Set default make action here
+
+# If you need to clean a specific target/configuration: $(COMMAND) -target $(TARGET) -configuration DebugOrRelease -sdk $(SDK) clean
+clean:
+	-rm -rf build/*
+
+test:
+	GHUNIT_CLI=1 $(COMMAND) -target $(TEST_TARGET) -configuration Debug -sdk $(SDK) build
+	

+//
+//  NSException+GHTestFailureExceptions.h
+//
+//  Created by Johannes Rudolph on 23.09.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.
+//
+
+//
+// Portions of this file fall under the following license, marked with:
+// GTM_BEGIN : GTM_END
+//
+//  Copyright 2008 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+//
+
+// GTM_BEGIN
+
+#import <Foundation/Foundation.h>
+
+@interface NSException (GHUTestFailureExceptions)
++ (NSException *)ghu_failureInFile:(NSString *)filename 
+                        atLine:(int)lineNumber 
+               withDescription:(NSString *)formatString, ...;
++ (NSException *)ghu_failureInCondition:(NSString *)condition 
+                             isTrue:(BOOL)isTrue 
+                             inFile:(NSString *)filename 
+                             atLine:(int)lineNumber 
+                    withDescription:(NSString *)formatString, ...;
++ (NSException *)ghu_failureInEqualityBetweenObject:(id)left
+                                      andObject:(id)right
+                                         inFile:(NSString *)filename
+                                         atLine:(int)lineNumber
+                                withDescription:(NSString *)formatString, ...;
++ (NSException *)ghu_failureInEqualityBetweenValue:(NSValue *)left 
+                                      andValue:(NSValue *)right 
+                                  withAccuracy:(NSValue *)accuracy 
+                                        inFile:(NSString *)filename 
+                                        atLine:(int) ineNumber
+                               withDescription:(NSString *)formatString, ...;
++ (NSException *)ghu_failureInRaise:(NSString *)expression 
+                         inFile:(NSString *)filename 
+                         atLine:(int)lineNumber
+                withDescription:(NSString *)formatString, ...;
++ (NSException *)ghu_failureInRaise:(NSString *)expression 
+                      exception:(NSException *)exception 
+                         inFile:(NSString *)filename 
+                         atLine:(int)lineNumber 
+                withDescription:(NSString *)formatString, ...;
+@end
+
+// GTM_END

+//
+//  NSValue+GHValueFormatter.h
+//
+//  Created by Johannes Rudolph on 23.9.2009.
+//  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.
+//
+
+//
+// Portions of this file fall under the following license, marked with
+// SENTE_BEGIN - SENTE_END
+//
+// Copyright (c) 1997-2005, Sen:te (Sente SA).  All rights reserved.
+//
+// Use of this source code is governed by the following license:
+// 
+// Redistribution and use in source and binary forms, with or without modification, 
+// are permitted provided that the following conditions are met:
+// 
+// (1) Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer.
+// 
+// (2) Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' 
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+// IN NO EVENT SHALL Sente SA OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+// OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+// Note: this license is equivalent to the FreeBSD license.
+// 
+// This notice may not be removed from this file.
+
+#import <Foundation/Foundation.h>
+
+// SENTE_BEGIN
+@interface NSValue (GHValueFormatter)
+- (NSString *)ghu_contentDescription;
+@end
+// SENTE_END

@@ -20,7 +20,5 @@
 	<string>????</string>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<string>1.0</string>
-	<key>NSMainNibFile</key>
-	<string>GHUnitIPhone</string>
 </dict>
 </dict>
 </plist>
 </plist>