Added up to date GHUnit to project

Mac tests now rely on the GHUnit framework (now included with ASIHTTPRequest)
iPhone tests now rely on the GHUnit static library (also included)

.gitignore

@@ -2,4 +2,3 @@ build
 *.pbxuser
 *.mode1v3
 .DS_Store
-GHUnit

Classes/Tests/ASIFormDataRequestTests.h

@@ -6,7 +6,11 @@
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
 //
 
-#import "GHUnit.h"
+#if TARGET_OS_IPHONE
+	#import "GHUnit.h"
+#else
+	#import <GHUnit/GHUnit.h>
+#endif
 
 @interface ASIFormDataRequestTests : GHTestCase {
 	float progress;

Classes/Tests/ASIFormDataRequestTests.m

@@ -13,7 +13,7 @@ @implementation ASIFormDataRequestTests
 
 - (void)testPostWithFileUpload
 {
-	NSURL *url = [NSURL URLWithString:@"http://asi/ASIHTTPRequest/tests/post"];
+	NSURL *url = [NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/post"];
 
 	//Create a 32kb file
 	unsigned int size = 1024*32;

Classes/Tests/ASIHTTPRequestTests.h

@@ -6,7 +6,11 @@
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
 //
 
-#import "GHUnit.h"
+#if TARGET_OS_IPHONE
+	#import "GHUnit.h"
+#else
+	#import <GHUnit/GHUnit.h>
+#endif
 
 @interface ASIHTTPRequestTests : GHTestCase {
 	float progress;

Classes/Tests/ASINetworkQueueTests.h

@@ -6,7 +6,11 @@
 //  Copyright 2008 All-Seeing Interactive. All rights reserved.
 //
 
-#import "GHUnit.h"
+#if TARGET_OS_IPHONE
+	#import "GHUnit.h"
+#else
+	#import <GHUnit/GHUnit.h>
+#endif
 
 @class ASIHTTPRequest;
 @class ASINetworkQueue;

Classes/Tests/GHUnitTestMain.m

@@ -0,0 +1,66 @@
+//
+//  GHUnitTestMain.m
+//  GHUnit
+//
+//  Created by Gabriel Handford on 2/22/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>
+#import <Foundation/NSDebug.h>
+
+#import <GHUnit/GHUnit.h>
+#import <GHUnit/GHTestApp.h>
+#import <GHUnit/GHTesting.h>
+
+int main(int argc, char *argv[]) {
+	// Setup any NSDebug settings
+	NSDebugEnabled = YES;
+	NSZombieEnabled = YES;
+	NSDeallocateZombies = NO;
+	NSHangOnUncaughtException = YES;
+	setenv("NSAutoreleaseFreedObjectCheckEnabled", "1", 1);
+
+	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 {
+		// To run all tests (from ENV)
+		GHTestApp *app = [[GHTestApp alloc] init];
+		// To run a different test suite:
+		//GHTestSuite *suite = [GHTestSuite suiteWithTestFilter:@"GHSlowTest,GHAsyncTestCaseTest"];
+		//GHTestApp *app = [[GHTestApp alloc] initWithSuite:suite];
+		[NSApp run];
+		[app release];		
+	}
+	[pool release];
+	return retVal;
+}

Frameworks/GHUnit.framework/GHUnit

@@ -0,0 +1 @@
+Versions/Current/GHUnit

Frameworks/GHUnit.framework/Headers

@@ -0,0 +1 @@
+Versions/Current/Headers

Frameworks/GHUnit.framework/Resources

@@ -0,0 +1 @@
+Versions/Current/Resources

Frameworks/GHUnit.framework/Versions/A/Headers/GHAsyncTestCase.h

@@ -0,0 +1,123 @@
+//
+//  GHAsyncTestCase.h
+//  GHUnit
+//
+//  Created by Gabriel Handford on 4/8/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 "GHTestCase.h"
+
+// Some default statuses to use; Or define and use your own
+enum {
+	kGHUnitWaitStatusUnknown = 0,
+	kGHUnitWaitStatusSuccess,
+	kGHUnitWaitStatusFailure,
+	kGHUnitWaitStatusCancelled
+};
+
+/*!
+ Asynchronous test case with wait and notify.
+ 
+ Handles the case of notify occuring before wait has started (if it was a synchronous call).
+ Be sure to call prepare before the asynchronous method (otherwise an exception will raise).
+ 
+ @code
+ - (void)testSuccess {
+	 [self prepare];
+	 
+	 // Do asynchronous task here
+	 [self performSelector:@selector(_succeed) withObject:nil afterDelay:0.1];
+	 
+	 [self waitFor:kGHUnitWaitStatusSuccess timeout:1.0];
+ }
+ 
+ - (void)_succeed {
+   // Notice the forSelector points to the test above. This is so that
+   // stray notifies don't error or falsely succeed other tests.
+   [self notify:kGHUnitWaitStatusSuccess forSelector:@selector(testSuccess)];
+ }
+ @endcode
+ */
+@interface GHAsyncTestCase : GHTestCase {
+
+	NSInteger waitForStatus_;
+	NSInteger notifiedStatus_;
+
+	BOOL prepared_; // Whether prepared was called before waitFor:timeout:
+	NSRecursiveLock *lock_; // Lock to synchronize on
+	SEL waitSelector_; // The selector we are waiting on
+
+	NSArray *_runLoopModes; // Run loop modes to run while waiting; Defaults to NSDefaultRunLoopMode, NSRunLoopCommonModes, NSConnectionReplyMode
+}
+
+@property (retain, nonatomic) NSArray *runLoopModes;
+
+/*!
+ Prepare before calling the asynchronous method. 
+ */
+- (void)prepare;
+
+/*!
+ Prepare and specify the selector we will use in notify.
+
+ @param selector
+ */
+- (void)prepare:(SEL)selector;
+
+/*!
+ Wait for notification of status or timeout.
+ 
+ Be sure to prepare before calling your asynchronous method.
+ For example, 
+ 
+ @code
+	- (void)testFoo {
+		[self prepare];
+		// Do asynchronous task here
+		[self waitFor:kGHUnitWaitStatusSuccess timeout:1.0];
+	}
+ @endcode
+ 
+ @param status kGHUnitWaitStatusSuccess, kGHUnitWaitStatusFailure or custom status 
+ @param timeout Timeout in seconds
+ */
+- (void)waitFor:(NSInteger)status timeout:(NSTimeInterval)timeout;
+
+/*!
+ Wait for timeout to occur.
+ Fails if we did _NOT_ timeout.
+ @param timeout
+ */
+- (void)waitForTimeout:(NSTimeInterval)timeout;
+
+/*!
+ Notify of status for test selector.
+ @param status For example, kGHUnitWaitStatusSuccess
+ @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
+ */
+- (void)notify:(NSInteger)status forSelector:(SEL)selector;
+
+@end

Frameworks/GHUnit.framework/Versions/A/Headers/GHMockNSHTTPURLResponse.h

@@ -0,0 +1,46 @@
+//
+//  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