Update GHUnit iPhone (Still won't build for device as Xcode has a hissy fit)

Give up trying to protect url, and make it public setable to fix error

@@ -407,7 +407,7 @@ extern NSString* const NetworkRequestErrorDomain;
 @property (retain) NSString *password;
 @property (retain) NSString *password;
 @property (retain) NSString *domain;
 @property (retain) NSString *domain;
 
 
-@property (retain,readonly) NSURL *url;
+@property (retain,setter=setURL:) NSURL *url;
 @property (assign) id delegate;
 @property (assign) id delegate;
 @property (assign) id queue;
 @property (assign) id queue;
 @property (assign) id uploadProgressDelegate;
 @property (assign) id uploadProgressDelegate;

@@ -46,7 +46,6 @@ static NSError *ASITooMuchRedirectionError;
 
 
 // Private stuff
 // Private stuff
 @interface ASIHTTPRequest ()
 @interface ASIHTTPRequest ()
-	@property (retain,setter=setURL:) NSURL *url;
 	@property (assign) BOOL complete;
 	@property (assign) BOOL complete;
 	@property (retain) NSDictionary *responseHeaders;
 	@property (retain) NSDictionary *responseHeaders;
 	@property (retain) NSArray *responseCookies;
 	@property (retain) NSArray *responseCookies;

@@ -13,7 +13,6 @@ static NSDateFormatter *dateFormatter = nil;
 
 
 // Private stuff
 // Private stuff
 @interface ASIS3ListRequest ()
 @interface ASIS3ListRequest ()
-	@property (retain,setter=setURL:) NSURL *url;
 	@property (retain, nonatomic) NSString *currentContent;
 	@property (retain, nonatomic) NSString *currentContent;
 	@property (retain, nonatomic) NSString *currentElement;
 	@property (retain, nonatomic) NSString *currentElement;
 	@property (retain, nonatomic) ASIS3BucketObject *currentObject;
 	@property (retain, nonatomic) ASIS3BucketObject *currentObject;
@@ -133,5 +132,4 @@ static NSDateFormatter *dateFormatter = nil;
 @synthesize marker;
 @synthesize marker;
 @synthesize maxResultCount;
 @synthesize maxResultCount;
 @synthesize delimiter;
 @synthesize delimiter;
-@synthesize url;
 @end
 @end

@@ -50,7 +50,7 @@ enum {
 	 // Do asynchronous task here
 	 // Do asynchronous task here
 	 [self performSelector:@selector(_succeed) withObject:nil afterDelay:0.1];
 	 [self performSelector:@selector(_succeed) withObject:nil afterDelay:0.1];
 	 
 	 
-	 [self waitFor:kGHUnitWaitStatusSuccess timeout:1.0];
+	 [self waitForStatus:kGHUnitWaitStatusSuccess timeout:1.0];
  }
  }
  
  
  - (void)_succeed {
  - (void)_succeed {
@@ -65,14 +65,14 @@ enum {
 	NSInteger waitForStatus_;
 	NSInteger waitForStatus_;
 	NSInteger notifiedStatus_;
 	NSInteger notifiedStatus_;
 	
 	
-	BOOL prepared_; // Whether prepared was called before waitFor:timeout:
+	BOOL prepared_; // Whether prepared was called before waitForStatus:timeout:
 	NSRecursiveLock *lock_; // Lock to synchronize on
 	NSRecursiveLock *lock_; // Lock to synchronize on
 	SEL waitSelector_; // The selector we are waiting on
 	SEL waitSelector_; // The selector we are waiting on
 		
 		
 	NSArray *_runLoopModes; // Run loop modes to run while waiting; Defaults to NSDefaultRunLoopMode, NSRunLoopCommonModes, NSConnectionReplyMode
 	NSArray *_runLoopModes; // Run loop modes to run while waiting; Defaults to NSDefaultRunLoopMode, NSRunLoopCommonModes, NSConnectionReplyMode
 }
 }
 
 
-@property (retain) NSArray *runLoopModes;
+@property (retain, nonatomic) NSArray *runLoopModes;
 
 
 /*!
 /*!
  Prepare before calling the asynchronous method. 
  Prepare before calling the asynchronous method. 
@@ -96,13 +96,16 @@ enum {
 	- (void)testFoo {
 	- (void)testFoo {
 		[self prepare];
 		[self prepare];
 		// Do asynchronous task here
 		// Do asynchronous task here
-		[self waitFor:kGHUnitWaitStatusSuccess timeout:1.0];
+		[self waitForStatus:kGHUnitWaitStatusSuccess timeout:1.0];
 	}
 	}
  @endcode
  @endcode
  
  
  @param status kGHUnitWaitStatusSuccess, kGHUnitWaitStatusFailure or custom status 
  @param status kGHUnitWaitStatusSuccess, kGHUnitWaitStatusFailure or custom status 
  @param timeout Timeout in seconds
  @param timeout Timeout in seconds
  */
  */
+- (void)waitForStatus:(NSInteger)status timeout:(NSTimeInterval)timeout;
+
+// Deprecated
 - (void)waitFor:(NSInteger)status timeout:(NSTimeInterval)timeout;
 - (void)waitFor:(NSInteger)status timeout:(NSTimeInterval)timeout;
 
 
 /*!
 /*!
@@ -113,11 +116,17 @@ enum {
 - (void)waitForTimeout:(NSTimeInterval)timeout;
 - (void)waitForTimeout:(NSTimeInterval)timeout;
 
 
 /*!
 /*!
- Notify of status for test selector.
- @param status For example, kGHUnitWaitStatusSuccess
+ Notify waiting of status for test selector.
+ @param status Status, for example, kGHUnitWaitStatusSuccess
  @param selector If not NULL, then will verify this selector is where we are waiting.
  @param selector If not NULL, then will verify this selector is where we are waiting.
 					This prevents stray asynchronous callbacks to fail a later test
 					This prevents stray asynchronous callbacks to fail a later test
  */
  */
 - (void)notify:(NSInteger)status forSelector:(SEL)selector;
 - (void)notify:(NSInteger)status forSelector:(SEL)selector;
 
 
+/*!
+ Notify waiting of status for any selector.
+ @param status Status, for example, kGHUnitWaitStatusSuccess
+ */
+- (void)notify:(NSInteger)status;
+
 @end
 @end

-//
-//  GHMockNSHTTPURLResponse.h
-//  GHUnit
-//
-//  Created by Gabriel Handford on 4/9/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 <Foundation/Foundation.h>
-
-/*!
- NSHTTPURLResponse for use with mocking.
- Allows us to manually set the status code and headers in the response.
- */
-@interface GHMockNSHTTPURLResponse : NSHTTPURLResponse {
-	NSInteger statusCode_;
-	NSDictionary *headers_;
-}
-
-- (id)initWithStatusCode:(NSInteger)statusCode headers:(NSDictionary *)headers;
-
-- (void)setStatusCode:(NSInteger)code;
-- (void)setHeaders:(NSDictionary *)headers;
-
-@end

-//
-//  GHMockNSURLConnection.h
-//  GHUnit
-//
-//  Created by Gabriel Handford on 4/9/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 <Foundation/Foundation.h>
-
-extern NSString *const GHMockNSURLConnectionException;
-
-/*!
- NSURLConnection for mocking.
- 
- Use with GHAsyncTestCase to mock out connections.
- 
- @code
- 
- @interface GHNSURLConnectionMockTest : GHAsyncTestCase {}
- @end
- 
- @implementation GHNSURLConnectionMockTest
- 
- - (void)testMock {
-	 [self prepare];
-	 GHMockNSURLConnection *connection = [[GHMockNSURLConnection alloc] initWithRequest:nil delegate:self];	
-	 [connection receiveHTTPResponseWithStatusCode:204 headers:testHeaders_ afterDelay:0.1];
-	 [connection receiveData:testData_ afterDelay:0.2];
-	 [connection finishAfterDelay:0.3];
-	 [self waitFor:kGHUnitWaitStatusSuccess timeout:1.0];
- }
- 
- - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response {
-	 GHAssertEquals([(NSHTTPURLResponse *)response statusCode], 204, nil);
-	 GHAssertEqualObjects([(NSHTTPURLResponse *)response allHeaderFields], testHeaders_, nil);
- }
- 
- - (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data {
-	GHAssertEqualObjects(data, testData_, nil);
- }
- 
- - (void)connectionDidFinishLoading:(NSURLConnection *)connection {
-	 [self notify:kGHUnitWaitStatusSuccess forSelector:@selector(testMock)];
- }
- @end
- 
- @endcode
- */
-@interface GHMockNSURLConnection : NSObject {
-	NSURLRequest *request_;
-	id delegate_; // weak
-	
-	BOOL cancelled_;	
-	BOOL started_;
-}
-
-@property (readonly, nonatomic, getter=isStarted) BOOL started;
-@property (readonly, nonatomic, getter=isCancelled) BOOL cancelled;
-
-// Mocked version of NSURLConnection#initWithRequest:delegate:
-- (id)initWithRequest:(NSURLRequest *)request delegate:(id)delegate;
-
-// Mocked version of NSURLConnection#initWithRequest:delegate:startImmediately:
-- (id)initWithRequest:(NSURLRequest *)request delegate:(id)delegate startImmediately:(BOOL)startImmediately;
-
-// Mocked version of NSURLConnection#scheduleInRunLoop:forMode: (NOOP)
-- (void)scheduleInRunLoop:(NSRunLoop *)aRunLoop forMode:(NSString *)mode;
-
-// Mocked version of NSURLConnection#start (NOOP)
-- (void)start;
-
-/*!
- Send generic response to delegate after delay.
- (For asynchronous requests)
- @param delay Delay in seconds (if < 0, there is no delay)
- */
-- (void)receiveResponse:(NSURLResponse *)response afterDelay:(NSTimeInterval)delay;
-
-/*!
- Send HTTP response to delegate with status code, headers, after delay.
- This is only the HTTP response (and not data or finished).
- (For asynchronous requests)
- @param statusCode HTTP status code
- @param headers Headers
- @param delay Delay in seconds (if < 0, there is no delay)
- */
-- (void)receiveHTTPResponseWithStatusCode:(int)statusCode headers:(NSDictionary *)headers afterDelay:(NSTimeInterval)delay;
-
-/*!
- Send data to connection delegate after delay.
- @param data Data to send
- @param delay Delay in seconds
- */
-- (void)receiveData:(NSData *)data afterDelay:(NSTimeInterval)delay;
-
-/*!
- Send data (from file in bundle resource) to connection delegate after delay.
- (For asynchronous requests)
- @param path Path to file
- @param delay Delay in seconds
- */
-- (void)receiveDataFromPath:(NSString *)path afterDelay:(NSTimeInterval)delay;
-
-/*!
- Calls connectionDidFinish: delegate after delay.
- (For asynchronous requests)
- @param delay Delay in seconds (if < 0, there is no delay)
- */
-- (void)finishAfterDelay:(NSTimeInterval)delay;
-
-/*!
- Sends mock response, sends data, and then calls finish.
- (For asynchronous requests)
- @param path Data to load path from. File should be available in Test target (bundle)
- @param statusCode Status code for response
- @param MIMEType Content type for response header
- @param afterDelay Delay before responding (if < 0, there is no delay)
- */
-- (void)receiveFromPath:(NSString *)path statusCode:(NSInteger)statusCode MIMEType:(NSString *)MIMEType afterDelay:(NSTimeInterval)delay;
-
-@end

-//
-//  GHMockNSLocale.h
-//  GHUnitIPhone
-//
-//  Created by Gabriel Handford on 4/13/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.
-//
-
-/*!
- Category for overriding the current locale at runtime.
-
- @code
- #import "GHNSLocale+Mock.h"
- // This aliases the currentLocale method and with the specified locale identifier
- [NSLocale gh_setLocaleIdentifier:@"en_GB"];
-  
- [[NSLocale currentLocale] localeIdentifier] == "en_GB"
- @endcode
- */
-@interface NSLocale (GHMock)
-
-+ (void)gh_setLocaleIdentifier:(NSString *)localeIdentifier;
-
-/*!
- Aliases to currentLocale with locale set from gh_setLocaleIdentifier.
- If not set, defaults to NSLocale with identifier en_US.
- */
-+ (NSLocale *)gh_currentLocale;
-
-+ (void)gh_setPreferredLanguages:(NSArray *)preferredLanguages;
-
-/*!
- Aliases to preferredLanguages set from gh_setPreferredLanguages.
- If not set, defaults to [@"en"].
- */
-+ (NSArray *)gh_preferredLanguages;
-
-@end

@@ -31,34 +31,41 @@
  Test status.
  Test status.
  */
  */
 typedef enum {
 typedef enum {
-	GHTestStatusNone = 0,	
-	GHTestStatusRunning,
-	GHTestStatusFinished,
-	GHTestStatusIgnored
+	GHTestStatusNone = 0,
+	GHTestStatusRunning, // Test is running
+	GHTestStatusCancelling, // Test is being cancelled
+	GHTestStatusCancelled, // Test was cancelled
+	GHTestStatusSucceeded, // Test finished and succeeded
+	GHTestStatusErrored, // Test finished and errored
 } GHTestStatus;
 } GHTestStatus;
 
 
 /*!
 /*!
  Generate string from GHTestStatus
  Generate string from GHTestStatus
  @param status
  @param status
  */
  */
-NSString* NSStringFromGHTestStatus(GHTestStatus status);
+extern NSString* NSStringFromGHTestStatus(GHTestStatus status);
+
+extern BOOL GHTestStatusIsRunning(GHTestStatus status);
+extern BOOL GHTestStatusEnded(GHTestStatus status);
 
 
 /*!
 /*!
  Test stats.
  Test stats.
  */
  */
 typedef struct {
 typedef struct {
-	NSInteger runCount;
-	NSInteger failureCount;
-	NSInteger ignoreCount;
-	NSInteger testCount;
+	NSInteger succeedCount; // Number of succeeded tests
+	NSInteger failureCount; // Number of failed tests
+	NSInteger cancelCount; // Number of aborted tests
+	NSInteger testCount; // Total number of tests 
 } GHTestStats;
 } GHTestStats;
 
 
 /*!
 /*!
  Create GHTestStats.
  Create GHTestStats.
  */
  */
-GHTestStats GHTestStatsMake(NSInteger runCount, NSInteger failureCount, NSInteger ignoreCount, NSInteger testCount);
+extern GHTestStats GHTestStatsMake(NSInteger succeedCount, NSInteger failureCount, NSInteger cancelCount, NSInteger testCount);
+
+const GHTestStats GHTestStatsEmpty;
 
 
-#define NSStringFromGHTestStats(stats) [NSString stringWithFormat:@"%d/%d/%d", stats.runCount, stats.testCount, stats.failureCount]
+extern NSString *NSStringFromGHTestStats(GHTestStats stats);
 
 
 @protocol GHTestDelegate;
 @protocol GHTestDelegate;
 
 
@@ -80,11 +87,16 @@ GHTestStats GHTestStatsMake(NSInteger runCount, NSInteger failureCount, NSIntege
 - (void)setDelegate:(id<GHTestDelegate>)delegate;
 - (void)setDelegate:(id<GHTestDelegate>)delegate;
 
 
 - (NSException *)exception;
 - (NSException *)exception;
+- (void)setException:(NSException *)exception;
 
 
 - (NSArray *)log;
 - (NSArray *)log;
 
 
-- (BOOL)ignore;
-- (void)setIgnore:(BOOL)ignore;
+- (void)reset;
+- (void)cancel;
+
+- (void)setDisabled:(BOOL)disabled;
+- (BOOL)isDisabled;
+- (NSInteger)disabledCount;
 
 
 @end
 @end
 
 
@@ -92,29 +104,34 @@ GHTestStats GHTestStatsMake(NSInteger runCount, NSInteger failureCount, NSIntege
  Test delegate for notification when a test starts and ends.
  Test delegate for notification when a test starts and ends.
  */
  */
 @protocol GHTestDelegate <NSObject>
 @protocol GHTestDelegate <NSObject>
-- (void)testDidStart:(id<GHTest>)test;
-- (void)testDidFinish:(id<GHTest>)test;
-- (void)test:(id<GHTest>)test didLog:(NSString *)message;
-- (void)testDidIgnore:(id<GHTest>)test;
+- (void)testDidStart:(id<GHTest>)test source:(id<GHTest>)source;
+- (void)testDidUpdate:(id<GHTest>)test source:(id<GHTest>)source;
+- (void)testDidEnd:(id<GHTest>)test source:(id<GHTest>)source;
+- (void)test:(id<GHTest>)test didLog:(NSString *)message source:(id<GHTest>)source;
 @end
 @end
 
 
 /*!
 /*!
  Delegate which is notified of log messages from inside GHTestCase.
  Delegate which is notified of log messages from inside GHTestCase.
  */
  */
-@protocol GHTestCaseLogDelegate <NSObject>
-- (void)testCase:(id)testCase didLog:(NSString *)message;
+@protocol GHTestCaseLogWriter <NSObject>
+- (void)log:(NSString *)message testCase:(id)testCase;
+@end
+
+@interface GHTestOperation : NSOperation { 
+	id<GHTest> test_;
+}
 @end
 @end
 
 
 /*!
 /*!
- Default test implementation target with a target/selector pair.
+ Default test implementation with a target/selector pair.
  - Consists of a target/selector
  - Consists of a target/selector
  - Notifies a test delegate
  - Notifies a test delegate
  - Keeps track of status, running time and failures
  - Keeps track of status, running time and failures
  - Stores any test specific logging
  - Stores any test specific logging
  */
  */
-@interface GHTest : NSObject <GHTest, GHTestCaseLogDelegate> {
+@interface GHTest : NSObject <GHTest, GHTestCaseLogWriter> {
 	
 	
-	id<GHTestDelegate> delegate_; // weak
+	NSObject<GHTestDelegate> *delegate_; // weak
 	
 	
 	id target_;
 	id target_;
 	SEL selector_;
 	SEL selector_;
@@ -123,16 +140,24 @@ GHTestStats GHTestStatsMake(NSInteger runCount, NSInteger failureCount, NSIntege
 	NSString *name_;	
 	NSString *name_;	
 	GHTestStatus status_;
 	GHTestStatus status_;
 	NSTimeInterval interval_;
 	NSTimeInterval interval_;
-	BOOL failed_;
+	BOOL disabled_;
 	NSException *exception_; // If failed
 	NSException *exception_; // If failed
-	
-	GHTestStats stats_;
 		
 		
 	NSMutableArray *log_;
 	NSMutableArray *log_;
-	
-	BOOL ignore_;
 }
 }
 
 
+@property (readonly, nonatomic) id target;
+@property (readonly, nonatomic) SEL selector;
+@property (readonly, nonatomic) NSString *identifier; // Unique identifier for test
+@property (readonly, nonatomic) NSString *name;
+@property (readonly, nonatomic) NSTimeInterval interval;
+@property (retain, nonatomic) NSException *exception;
+@property (readonly, nonatomic) GHTestStatus status;
+@property (assign, nonatomic, getter=isDisabled) BOOL disabled;
+@property (readonly, nonatomic) NSArray *log;
+
+@property (assign, nonatomic) NSObject<GHTestDelegate> *delegate;
+
 /*!
 /*!
  Create test with target/selector.
  Create test with target/selector.
  @param target Target (usually a test case)
  @param target Target (usually a test case)
@@ -147,25 +172,4 @@ GHTestStats GHTestStatsMake(NSInteger runCount, NSInteger failureCount, NSIntege
  */
  */
 + (id)testWithTarget:(id)target selector:(SEL)selector;
 + (id)testWithTarget:(id)target selector:(SEL)selector;
 
 
-@property (readonly, nonatomic) id target;
-@property (readonly, nonatomic) SEL selector;
-@property (readonly, nonatomic) NSString *identifier; // Unique identifier for test
-@property (readonly, nonatomic) NSString *name;
-@property (readonly, nonatomic) NSTimeInterval interval;
-@property (readonly, nonatomic) NSException *exception;
-@property (readonly, nonatomic) GHTestStatus status;
-@property (readonly, nonatomic) BOOL failed;
-@property (readonly, nonatomic) GHTestStats stats;
-@property (readonly, nonatomic) NSArray *log;
-
-@property (assign, nonatomic) id<GHTestDelegate> delegate;
-@property (assign, nonatomic) BOOL ignore;
-
-/*!
- Run the test.
- After running, the interval and exception properties may be set.
- @result YES if passed, NO otherwise
- */
-- (void)run;
-
 @end
 @end

@@ -54,8 +54,8 @@
 #define GHTestLog(...) [self log:[NSString stringWithFormat:__VA_ARGS__, nil]]
 #define GHTestLog(...) [self log:[NSString stringWithFormat:__VA_ARGS__, nil]]
 
 
 /*!
 /*!
- @brief The base class for a test case.
-
+ The base class for a test case. 
+ 
  @code
  @code
  @interface MyTest : GHTestCase {}
  @interface MyTest : GHTestCase {}
  @end
  @end
@@ -90,14 +90,14 @@
 
 
  */
  */
 @interface GHTestCase : NSObject {
 @interface GHTestCase : NSObject {
-	id<GHTestCaseLogDelegate> logDelegate_; // weak
+	id<GHTestCaseLogWriter> logWriter_; // weak
 	
 	
 	SEL currentSelector_;
 	SEL currentSelector_;
 }
 }
 
 
 //! The current test selector
 //! The current test selector
 @property (assign, nonatomic) SEL currentSelector; 
 @property (assign, nonatomic) SEL currentSelector; 
-@property (assign, nonatomic) id<GHTestCaseLogDelegate> logDelegate;
+@property (assign, nonatomic) id<GHTestCaseLogWriter> logWriter;
 
 
 // GTM_BEGIN
 // GTM_BEGIN
 //! Run before each test method
 //! Run before each test method
@@ -120,6 +120,14 @@
 //! Run after the tests (once per test case)
 //! Run after the tests (once per test case)
 - (void)tearDownClass;
 - (void)tearDownClass;
 
 
+/*!
+ Whether to run the tests on a separate thread. Override this method in your
+ test case to override the default.
+ Default is NO, tests are run on a separate thread by default.
+ @result If YES runs on the main thread
+ */
+- (BOOL)shouldRunOnMainThread;
+
 //! Any special handling of exceptions after they are thrown; By default logs stack trace to standard out.
 //! Any special handling of exceptions after they are thrown; By default logs stack trace to standard out.
 - (void)handleException:(NSException *)exception;
 - (void)handleException:(NSException *)exception;
 
 

@@ -81,7 +81,7 @@
  */
  */
 @interface GHTestGroup : NSObject <GHTestDelegate, GHTestGroup> {
 @interface GHTestGroup : NSObject <GHTestDelegate, GHTestGroup> {
 	
 	
-	id<GHTestDelegate> delegate_; // weak
+	NSObject<GHTestDelegate> *delegate_; // weak
 	id<GHTestGroup> parent_; // weak
 	id<GHTestGroup> parent_; // weak
 	
 	
 	NSMutableArray *children_; // of id<GHTest>
 	NSMutableArray *children_; // of id<GHTest>
@@ -91,16 +91,17 @@
 	GHTestStatus status_; // Current status of the group (current status of running or completed child tests)
 	GHTestStatus status_; // Current status of the group (current status of running or completed child tests)
 	GHTestStats stats_; // Current stats for the group (aggregate of child test stats)
 	GHTestStats stats_; // Current stats for the group (aggregate of child test stats)
 	
 	
-	id testCase_; // Is set if test is created from initWithTestCase:delegate:
-	id<GHTest> currentTest_; // weak
+	BOOL didSetUpClass_;
 	
 	
-	NSException *exception_; // If exception happens in group setUpClass/tearDownClass
+	// Set if test is created from initWithTestCase:delegate:
+	// Allows use to perform setUpClass and tearDownClass (once per test case run)
+	id testCase_; 
 	
 	
-	BOOL ignore_;
+	NSException *exception_; // If exception happens in group setUpClass/tearDownClass
 }
 }
 
 
-@property (readonly, nonatomic) NSArray *children;
-@property (assign, nonatomic) id<GHTestDelegate> delegate;
+@property (readonly, nonatomic) NSArray */*of id<GHTest>*/children;
+@property (assign, nonatomic) NSObject<GHTestDelegate> *delegate;
 @property (assign, nonatomic) id<GHTestGroup> parent;
 @property (assign, nonatomic) id<GHTestGroup> parent;
 @property (readonly, nonatomic) id testCase;
 @property (readonly, nonatomic) id testCase;
 
 
@@ -110,8 +111,7 @@
 
 
 @property (readonly, nonatomic) NSTimeInterval interval;
 @property (readonly, nonatomic) NSTimeInterval interval;
 @property (readonly, nonatomic) GHTestStats stats;
 @property (readonly, nonatomic) GHTestStats stats;
-
-@property (assign, nonatomic) BOOL ignore;
+@property (readonly, nonatomic) NSException *exception;
 
 
 /*!
 /*!
  Create an empty test group.
  Create an empty test group.
@@ -134,7 +134,7 @@
 /*!
 /*!
  Create test group from a single test.
  Create test group from a single test.
  @param testCase
  @param testCase
- @param selector Test to run
+ @param selector Test to run 
  @param delegate
  @param delegate
  */
  */
 - (id)initWithTestCase:(id)testCase selector:(SEL)selector delegate:(id<GHTestDelegate>)delegate;
 - (id)initWithTestCase:(id)testCase selector:(SEL)selector delegate:(id<GHTestDelegate>)delegate;
@@ -155,10 +155,13 @@
 
 
 - (void)addTestGroup:(GHTestGroup *)testGroup;
 - (void)addTestGroup:(GHTestGroup *)testGroup;
 
 
+- (BOOL)shouldRunOnMainThread;
+
 /*!
 /*!
- Run the test group.
- Will notify delegate as tests are run.
+ Run in operation queue.
+ Tests from the group are added and will block until they have completed.
+ @param operationQueue If nil, then runs as is
  */
  */
-- (void)run;
+- (void)runInOperationQueue:(NSOperationQueue *)operationQueue;
 
 
 @end
 @end

@@ -54,12 +54,14 @@
 @protocol GHTestRunnerDelegate <NSObject>
 @protocol GHTestRunnerDelegate <NSObject>
 @optional
 @optional
 - (void)testRunnerDidStart:(GHTestRunner *)runner;
 - (void)testRunnerDidStart:(GHTestRunner *)runner;
-- (void)testRunner:(GHTestRunner *)runner didStartTest:(id<GHTest>)test;
-- (void)testRunner:(GHTestRunner *)runner didFinishTest:(id<GHTest>)test;
-- (void)testRunnerDidFinish:(GHTestRunner *)runner;
-
-- (void)testRunner:(GHTestRunner *)runner didLog:(NSString *)message;
-- (void)testRunner:(GHTestRunner *)runner test:(id<GHTest>)test didLog:(NSString *)message;
+- (void)testRunner:(GHTestRunner *)runner didStartTest:(id<GHTest>)test; // Test started
+- (void)testRunner:(GHTestRunner *)runner didUpdateTest:(id<GHTest>)test; // Test changed
+- (void)testRunner:(GHTestRunner *)runner didEndTest:(id<GHTest>)test; // Test finished
+- (void)testRunnerDidCancel:(GHTestRunner *)runner;
+- (void)testRunnerDidEnd:(GHTestRunner *)runner;
+
+- (void)testRunner:(GHTestRunner *)runner didLog:(NSString *)message; // Runner logged message
+- (void)testRunner:(GHTestRunner *)runner test:(id<GHTest>)test didLog:(NSString *)message; // Test logged message
 @end
 @end
 
 
 /*!
 /*!
@@ -71,22 +73,24 @@
 	
 	
 	id<GHTest> test_; // The test to run; Could be a GHTestGroup (suite), GHTestGroup (test case), or GHTest (target/selector)
 	id<GHTest> test_; // The test to run; Could be a GHTestGroup (suite), GHTestGroup (test case), or GHTest (target/selector)
 	
 	
-	id<GHTestRunnerDelegate> delegate_; // weak
+	NSObject<GHTestRunnerDelegate> *delegate_; // weak
 	
 	
 	// If YES, will allow exceptions to be raised (so you can trigger the debugger)
 	// If YES, will allow exceptions to be raised (so you can trigger the debugger)
-	BOOL raiseExceptions_;
+	BOOL raiseExceptions_;	
 	
 	
-	// If yes, delegate calls will occur on the main thread
-	// Defaults to YES.
-	BOOL delegateOnMainThread_;
-
+	BOOL running_;
+	BOOL cancelling_;
+	
+	NSOperationQueue *operationQueue_; //! If running a suite in operation queue
 }
 }
 
 
 @property (retain) id<GHTest> test;
 @property (retain) id<GHTest> test;
-@property (assign) id<GHTestRunnerDelegate> delegate;
+@property (assign) NSObject<GHTestRunnerDelegate> *delegate;
 @property (assign) BOOL raiseExceptions;
 @property (assign) BOOL raiseExceptions;
-@property (assign) BOOL delegateOnMainThread;
 @property (readonly) GHTestStats stats;
 @property (readonly) GHTestStats stats;
+@property (readonly, getter=isRunning) BOOL running;
+@property (readonly, getter=isCancelling) BOOL cancelling;
+@property (retain, nonatomic) NSOperationQueue *operationQueue;
 
 
 /*!
 /*!
  Create runner for test.
  Create runner for test.
@@ -109,6 +113,14 @@
 + (GHTestRunner *)runnerForSuite:(GHTestSuite *)suite;
 + (GHTestRunner *)runnerForSuite:(GHTestSuite *)suite;
 
 
 /*!
 /*!
+ Create runner for class and method.
+ @param testClassName
+ @param methodName
+ @result Runner
+ */
++ (GHTestRunner *)runnerForTestClassName:(NSString *)testClassName methodName:(NSString *)methodName;
+
+/*!
  Get the runner from the environment.
  Get the runner from the environment.
  If the TEST env is set, then we will only run that test case or test method.
  If the TEST env is set, then we will only run that test case or test method.
  */
  */
@@ -117,14 +129,19 @@
 /*!
 /*!
  Run the test runner. Usually called from the test main.
  Run the test runner. Usually called from the test main.
  Reads the TEST environment variable and filters on that; or all tests are run.
  Reads the TEST environment variable and filters on that; or all tests are run.
- @result Return value, 0 is success, otherwise the failure count
+ @result 0 is success, otherwise the failure count
  */
  */
 + (int)run;
 + (int)run;
 
 
+- (void)runInBackground;
+
 /*!
 /*!
  Start the test runner.
  Start the test runner.
+ @result 0 is success, otherwise the failure count
  */
  */
-- (void)run;
+- (int)runTests;
+
+- (void)cancel;
 
 
 @end
 @end
 
 

@@ -30,6 +30,12 @@
 #import "GHTestGroup.h"
 #import "GHTestGroup.h"
 
 
 /*!
 /*!
+ If set, will run it as a "test filter" like the env variable TEST.
+ */
+extern NSString *GHUnitTest;
+
+
+/*!
  Test suite is an alias for test group.
  Test suite is an alias for test group.
  
  
  A test case is an instance of a test case class with test methods.
  A test case is an instance of a test case class with test methods.
@@ -48,9 +54,7 @@
 		- (void)testB2; (GHTest with target GHTestCase2 + testB2)  
 		- (void)testB2; (GHTest with target GHTestCase2 + testB2)  
  
  
  */
  */
-@interface GHTestSuite : GHTestGroup {
-
-}
+@interface GHTestSuite : GHTestGroup { }
 
 
 /*! 
 /*! 
  Create test suite with test cases.
  Create test suite with test cases.
@@ -63,6 +67,7 @@
 /*!
 /*!
  Creates a suite of all tests.
  Creates a suite of all tests.
  Will load all classes that subclass from GHTestCase, SenTestCase or GTMTestCase (or register test case class).
  Will load all classes that subclass from GHTestCase, SenTestCase or GTMTestCase (or register test case class).
+ @result Suite
  */
  */
 + (GHTestSuite *)allTests;
 + (GHTestSuite *)allTests;
 
 
@@ -80,6 +85,14 @@
 + (GHTestSuite *)suiteWithTestFilter:(NSString *)testFilter;
 + (GHTestSuite *)suiteWithTestFilter:(NSString *)testFilter;
 
 
 /*!
 /*!
+ Suite for a single test/method.
+ @param testCaseClass
+ @param method
+ @result Suite
+ */
++ (GHTestSuite *)suiteWithTestCaseClass:(Class)testCaseClass method:(SEL)method;
+
+/*!
  Return test suite based on environment (TEST=TestFoo/foo)
  Return test suite based on environment (TEST=TestFoo/foo)
  @result Suite
  @result Suite
  */
  */

@@ -67,7 +67,7 @@ BOOL isTestFixtureOfClass(Class aClass, Class testCaseClass);
 
 
 /*!
 /*!
  Load all test classes that we can "see".
  Load all test classes that we can "see".
- @return Array of initialized (and autoreleased) test case classes in an autoreleased array.
+ @result Array of initialized (and autoreleased) test case classes in an autoreleased array.
  */
  */
 - (NSArray *)loadAllTestCases;
 - (NSArray *)loadAllTestCases;
 
 
@@ -98,7 +98,7 @@ BOOL isTestFixtureOfClass(Class aClass, Class testCaseClass);
  Run test.
  Run test.
  Exception if set is retained and should be released by the caller.
  Exception if set is retained and should be released by the caller.
  */
  */
-- (BOOL)runTest:(id)target selector:(SEL)selector exception:(NSException **)exception interval:(NSTimeInterval *)interval;
++ (BOOL)runTest:(id)target selector:(SEL)selector withObject:(id)obj exception:(NSException **)exception interval:(NSTimeInterval *)interval;
 
 
 @end
 @end
 
 

@@ -32,3 +32,9 @@
 #import "GHTestSuite.h"
 #import "GHTestSuite.h"
 #import "GHTestMacros.h"
 #import "GHTestMacros.h"
 #import "GHTestRunner.h"
 #import "GHTestRunner.h"
+
+#ifdef DEBUG
+#define GHUDebug(fmt, ...) NSLog(fmt, ##__VA_ARGS__)
+#else
+#define GHUDebug(fmt, ...) do {} while(0)
+#endif

@@ -7,10 +7,20 @@
 //
 //
 
 
 #import <UIKit/UIKit.h>
 #import <UIKit/UIKit.h>
+
 #import "GHUnit.h"
 #import "GHUnit.h"
 
 
+extern BOOL NSDebugEnabled;
+extern BOOL NSZombieEnabled;
+extern BOOL NSDeallocateZombies;
+extern BOOL NSHangOnUncaughtException;
+
 int main(int argc, char *argv[]) {
 int main(int argc, char *argv[]) {
-	setenv("NSAutoreleaseFreedObjectCheckEnabled", "1", 1);
+	
+	NSDebugEnabled = YES;
+	NSZombieEnabled = YES;
+	NSDeallocateZombies = NO;
+	NSHangOnUncaughtException = YES;
 	
 	
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	
 	

@@ -7,6 +7,17 @@ fi
 
 
 export DYLD_ROOT_PATH="$SDKROOT"
 export DYLD_ROOT_PATH="$SDKROOT"
 export DYLD_FRAMEWORK_PATH="$CONFIGURATION_BUILD_DIR"
 export DYLD_FRAMEWORK_PATH="$CONFIGURATION_BUILD_DIR"
+export IPHONE_SIMULATOR_ROOT="$SDKROOT"
+
+export MallocScribble=YES
+export MallocPreScribble=YES
+export MallocGuardEdges=YES
+export MallocStackLogging=YES
+export MallocStackLoggingNoCompact=YES
+export NSAutoreleaseFreedObjectCheckEnabled=YES
+  
+export CFZombieLevel=3
+export NSZombieEnabled=YES
 
 
 "$TARGET_BUILD_DIR/$EXECUTABLE_PATH" -RegisterForSystemEvents
 "$TARGET_BUILD_DIR/$EXECUTABLE_PATH" -RegisterForSystemEvents
 RETVAL=$?
 RETVAL=$?

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
+	<string>com.allseeinginteractive.trailsnetwork.tests</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
 	<key>CFBundlePackageType</key>