Stop using APIs marked as depracated in Snow Leopard

Update NTLM test ready to apply fix

@@ -258,12 +258,19 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 			[self setPostBodyWriteStream:nil];
 			[self setPostBodyWriteStream:nil];
 		}
 		}
 
 
+		NSError *err = nil;
+		NSString *path;
 		if ([self shouldCompressRequestBody]) {
 		if ([self shouldCompressRequestBody]) {
 			[self setCompressedPostBodyFilePath:[NSTemporaryDirectory() stringByAppendingPathComponent:[[NSProcessInfo processInfo] globallyUniqueString]]];
 			[self setCompressedPostBodyFilePath:[NSTemporaryDirectory() stringByAppendingPathComponent:[[NSProcessInfo processInfo] globallyUniqueString]]];
 			[ASIHTTPRequest compressDataFromFile:[self postBodyFilePath] toFile:[self compressedPostBodyFilePath]];
 			[ASIHTTPRequest compressDataFromFile:[self postBodyFilePath] toFile:[self compressedPostBodyFilePath]];
-			[self setPostLength:[[[NSFileManager defaultManager] fileAttributesAtPath:[self compressedPostBodyFilePath] traverseLink:NO] fileSize]];
+			path = [self compressedPostBodyFilePath];
 		} else {
 		} else {
-			[self setPostLength:[[[NSFileManager defaultManager] fileAttributesAtPath:[self postBodyFilePath] traverseLink:NO] fileSize]];
+			path = [self postBodyFilePath];
+		}
+		[self setPostLength:[[[NSFileManager defaultManager] attributesOfItemAtPath:path error:&err] fileSize]];
+		if (err) {
+			[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIFileManagementError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Failed to get attributes for file at path '@%'",path],NSLocalizedDescriptionKey,error,NSUnderlyingErrorKey,nil]]];
+			return;
 		}
 		}
 		
 		
 	// Otherwise, we have an in-memory request body
 	// Otherwise, we have an in-memory request body
@@ -482,7 +489,12 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 	
 	
 	// Should this request resume an existing download?
 	// Should this request resume an existing download?
 	if ([self allowResumeForFileDownloads] && [self downloadDestinationPath] && [self temporaryFileDownloadPath] && [[NSFileManager defaultManager] fileExistsAtPath:[self temporaryFileDownloadPath]]) {
 	if ([self allowResumeForFileDownloads] && [self downloadDestinationPath] && [self temporaryFileDownloadPath] && [[NSFileManager defaultManager] fileExistsAtPath:[self temporaryFileDownloadPath]]) {
-		[self setPartialDownloadSize:[[[NSFileManager defaultManager] fileAttributesAtPath:[self temporaryFileDownloadPath] traverseLink:NO] fileSize]];
+		NSError *err = nil;
+		[self setPartialDownloadSize:[[[NSFileManager defaultManager] attributesOfItemAtPath:[self temporaryFileDownloadPath] error:&err] fileSize]];
+		if (err) {
+			[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIFileManagementError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Failed to get attributes for file at path '@%'",temporaryFileDownloadPath],NSLocalizedDescriptionKey,error,NSUnderlyingErrorKey,nil]]];
+			return;
+		}
 		[self addRequestHeader:@"Range" value:[NSString stringWithFormat:@"bytes=%llu-",[self partialDownloadSize]]];
 		[self addRequestHeader:@"Range" value:[NSString stringWithFormat:@"bytes=%llu-",[self partialDownloadSize]]];
 	}
 	}
 	
 	
@@ -770,7 +782,12 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 		
 		
 		// If we haven't said we might want to resume, let's remove the temporary file too
 		// If we haven't said we might want to resume, let's remove the temporary file too
 		if (![self allowResumeForFileDownloads]) {
 		if (![self allowResumeForFileDownloads]) {
-			[[NSFileManager defaultManager] removeItemAtPath:temporaryFileDownloadPath error:NULL];
+			NSError *err = nil;
+			[[NSFileManager defaultManager] removeItemAtPath:temporaryFileDownloadPath error:&err];
+			if (err) {
+				[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIFileManagementError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Failed to remove temporary file at path '@%'",temporaryFileDownloadPath],NSLocalizedDescriptionKey,error,NSUnderlyingErrorKey,nil]]];
+				return;
+			}
 		}
 		}
 	}
 	}
 	
 	
@@ -791,7 +808,7 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 		NSError *removeError = nil;
 		NSError *removeError = nil;
 		[[NSFileManager defaultManager] removeItemAtPath:temporaryFileDownloadPath error:&removeError];
 		[[NSFileManager defaultManager] removeItemAtPath:temporaryFileDownloadPath error:&removeError];
 		if (removeError) {
 		if (removeError) {
-			[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIFileManagementError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Failed to delete file at %@ with error: %@",temporaryFileDownloadPath,removeError],NSLocalizedDescriptionKey,removeError,NSUnderlyingErrorKey,nil]]];
+			[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIFileManagementError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Failed to delete file at path '%@'",temporaryFileDownloadPath],NSLocalizedDescriptionKey,removeError,NSUnderlyingErrorKey,nil]]];
 		}
 		}
 		[self setTemporaryFileDownloadPath:nil];
 		[self setTemporaryFileDownloadPath:nil];
 	}
 	}
@@ -803,7 +820,7 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 		NSError *removeError = nil;
 		NSError *removeError = nil;
 		[[NSFileManager defaultManager] removeItemAtPath:[self postBodyFilePath] error:&removeError];
 		[[NSFileManager defaultManager] removeItemAtPath:[self postBodyFilePath] error:&removeError];
 		if (removeError) {
 		if (removeError) {
-			[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIFileManagementError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Failed to delete file at %@ with error: %@",[self postBodyFilePath],removeError],NSLocalizedDescriptionKey,removeError,NSUnderlyingErrorKey,nil]]];
+			[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIFileManagementError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Failed to delete file at path '%@'",[self postBodyFilePath]],NSLocalizedDescriptionKey,removeError,NSUnderlyingErrorKey,nil]]];
 		}
 		}
 		[self setPostBodyFilePath:nil];
 		[self setPostBodyFilePath:nil];
 	}
 	}
@@ -811,7 +828,7 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 		NSError *removeError = nil;
 		NSError *removeError = nil;
 		[[NSFileManager defaultManager] removeItemAtPath:[self compressedPostBodyFilePath] error:&removeError];
 		[[NSFileManager defaultManager] removeItemAtPath:[self compressedPostBodyFilePath] error:&removeError];
 		if (removeError) {
 		if (removeError) {
-			[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIFileManagementError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Failed to delete file at %@ with error: %@",[self compressedPostBodyFilePath],removeError],NSLocalizedDescriptionKey,removeError,NSUnderlyingErrorKey,nil]]];
+			[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIFileManagementError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Failed to delete file at path '%@'",[self compressedPostBodyFilePath]],NSLocalizedDescriptionKey,removeError,NSUnderlyingErrorKey,nil]]];
 		}
 		}
 		[self setCompressedPostBodyFilePath:nil];
 		[self setCompressedPostBodyFilePath:nil];
 	}
 	}

@@ -21,7 +21,7 @@ typedef enum _ASIS3ErrorType {
 	
 	
 } ASIS3ErrorType;
 } ASIS3ErrorType;
 
 
-@interface ASIS3Request : ASIHTTPRequest {
+@interface ASIS3Request : ASIHTTPRequest <NSXMLParserDelegate> {
 
 
 	// Your S3 access key. Set it on the request, or set it globally using [ASIS3Request setSharedAccessKey:]
 	// Your S3 access key. Set it on the request, or set it globally using [ASIS3Request setSharedAccessKey:]
 	NSString *accessKey;
 	NSString *accessKey;

@@ -25,7 +25,7 @@
 - (void)testCookies;
 - (void)testCookies;
 - (void)testBasicAuthentication;
 - (void)testBasicAuthentication;
 - (void)testDigestAuthentication;
 - (void)testDigestAuthentication;
-//- (void)testNTLMAuthentication;
+- (void)testNTLMHandshake;
 - (void)testCharacterEncoding;
 - (void)testCharacterEncoding;
 - (void)testCompressedResponse;
 - (void)testCompressedResponse;
 - (void)testCompressedResponseDownloadToFile;
 - (void)testCompressedResponseDownloadToFile;

@@ -11,6 +11,7 @@
 #import "ASINSStringAdditions.h"
 #import "ASINSStringAdditions.h"
 #import "ASINetworkQueue.h"
 #import "ASINetworkQueue.h"
 #import "ASIFormDataRequest.h"
 #import "ASIFormDataRequest.h"
+#import <SystemConfiguration/SystemConfiguration.h>
 
 
 // Used for subclass test
 // Used for subclass test
 @interface ASIHTTPRequestSubclass : ASIHTTPRequest {}
 @interface ASIHTTPRequestSubclass : ASIHTTPRequest {}
@@ -252,7 +253,7 @@
 	//BOOL success = (![[NSFileManager defaultManager] fileExistsAtPath:tempPath]);
 	//BOOL success = (![[NSFileManager defaultManager] fileExistsAtPath:tempPath]);
 	//GHAssertTrue(success,@"Failed to remove file from temporary location");	
 	//GHAssertTrue(success,@"Failed to remove file from temporary location");	
 	
 	
-	BOOL success = [[NSString stringWithContentsOfURL:[NSURL fileURLWithPath:path]] isEqualToString:@"This is the expected content for the first string"];
+	BOOL success = [[NSString stringWithContentsOfURL:[NSURL fileURLWithPath:path] encoding:NSUTF8StringEncoding error:NULL] isEqualToString:@"This is the expected content for the first string"];
 	GHAssertTrue(success,@"Failed to download data to a file");
 	GHAssertTrue(success,@"Failed to download data to a file");
 	
 	
 }
 }
@@ -577,43 +578,38 @@
 	GHAssertTrue(success,@"Failed to clear credentials");
 	GHAssertTrue(success,@"Failed to clear credentials");
 }
 }
 
 
-// If you want to run this test, uncomment, and set your hostname, username, password and domain below.	
-//- (void)testNTLMAuthentication
-//{
-//	NSString *theURL = @"";
-//	NSString *username = @"";
-//	NSString *password = @"";
-//	NSString *domain = @"";
-//	
-//	if ([theURL isEqualToString:@""] || [username isEqualToString:@""] || [password isEqualToString:@""]) {
-//		GHAssertFalse(true,@"Skipping NTLM test because no server details were supplied");
-//	}
-//	
-//	[ASIHTTPRequest clearSession];
-//	
-//	NSURL *url = [[[NSURL alloc] initWithString:theURL] autorelease];
-//	ASIHTTPRequest *request;
-//	BOOL success;
-//	NSError *err;
-//	
-//	request = [[[ASIHTTPRequest alloc] initWithURL:url] autorelease];
-//	[request setUseKeychainPersistance:NO];
-//	[request setUseSessionPersistance:NO];
-//	[request start];
-//	success = [[request error] code] == ASIAuthenticationErrorType;
-//	GHAssertTrue(success,@"Failed to generate permission denied error with no credentials");
-//
-//
-//	request = [[[ASIHTTPRequest alloc] initWithURL:url] autorelease];
-//	[request setUseSessionPersistance:YES];
-//	[request setUseKeychainPersistance:NO];
-//	[request setUsername:username];
-//	[request setPassword:password];
-//	[request setDomain:domain];
-//	[request start];
-//	err = [request error];
-//	GHAssertNil(err,@"Got an error when correct credentials were supplied");
-//}
+- (void)testNTLMHandshake
+{
+	// This test connects to a script that masquerades as an NTLM server
+	// It tests that the handshake seems sane, but doesn't actually authenticate
+	
+	[ASIHTTPRequest clearSession];
+	
+	NSURL *url = [NSURL URLWithString:@"http://asi/ASIHTTPRequest/tests/pretend-ntlm-handshake"];
+	
+	ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:url];
+	[request setUseKeychainPersistance:NO];
+	[request setUseSessionPersistance:NO];
+	[request start];
+	BOOL success = [[request error] code] == ASIAuthenticationErrorType;
+	GHAssertTrue(success,@"Failed to generate permission denied error with no credentials");
+
+
+	request = [ASIHTTPRequest requestWithURL:url];
+	[request setUseSessionPersistance:YES];
+	[request setUseKeychainPersistance:NO];
+	[request setUsername:@"king"];
+	[request setPassword:@"fink"];
+	[request setDomain:@"Castle.Kingdom"];
+	[request start];
+
+	GHAssertNil([request error],@"Got an error when credentials were supplied");
+	
+	NSString *computerName = [(NSString *)SCDynamicStoreCopyComputerName(NULL,NULL) autorelease];
+	
+	success = [[request responseString] isEqualToString:[NSString stringWithFormat:@"You are %@ from %@/%@",@"king",@"Castle.Kingdom",computerName]];
+	GHAssertTrue(success,@"Failed to send credentials correctly?");
+}
 
 
 - (void)testCompressedResponse
 - (void)testCompressedResponse
 {
 {
@@ -660,7 +656,7 @@
 	BOOL success = ([request contentLength] == 68);
 	BOOL success = ([request contentLength] == 68);
 	GHAssertTrue(success,@"Failed to download a segment of the data");
 	GHAssertTrue(success,@"Failed to download a segment of the data");
 	
 	
-	NSString *content = [NSString stringWithContentsOfFile:downloadPath];
+	NSString *content = [NSString stringWithContentsOfFile:downloadPath encoding:NSUTF8StringEncoding error:NULL];
 	
 	
 	NSString *newPartialContent = [content substringFromIndex:95];
 	NSString *newPartialContent = [content substringFromIndex:95];
 	success = ([newPartialContent isEqualToString:@"This is the content we ought to be getting if we start from byte 95."]);
 	success = ([newPartialContent isEqualToString:@"This is the content we ought to be getting if we start from byte 95."]);

@@ -507,8 +507,12 @@ IMPORTANT
 	[networkQueue setQueueDidFinishSelector:@selector(queueFinished:)];	
 	[networkQueue setQueueDidFinishSelector:@selector(queueFinished:)];	
 	
 	
 	complete = NO;
 	complete = NO;
-	progress = 0;	
-	unsigned long long downloadedSoFar = [[[NSFileManager defaultManager] fileAttributesAtPath:temporaryPath traverseLink:NO] fileSize];
+	progress = 0;
+	
+	NSError *err = nil;
+	unsigned long long downloadedSoFar = [[[NSFileManager defaultManager] attributesOfItemAtPath:temporaryPath error:&err] fileSize];
+	GHAssertNil(err,@"Got an error obtaining attributes on the file, this shouldn't happen");
+	
 	BOOL success = (downloadedSoFar > 0);
 	BOOL success = (downloadedSoFar > 0);
 	GHAssertTrue(success,@"Failed to download part of the file, so we can't proceed with this test");
 	GHAssertTrue(success,@"Failed to download part of the file, so we can't proceed with this test");
 	
 	
@@ -525,7 +529,8 @@ IMPORTANT
 		[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.25]];
 		[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.25]];
 	}
 	}
 	
 	
-	unsigned long long amountDownloaded = [[[NSFileManager defaultManager] fileAttributesAtPath:downloadPath traverseLink:NO] fileSize];
+	unsigned long long amountDownloaded = [[[NSFileManager defaultManager] attributesOfItemAtPath:downloadPath error:&err] fileSize];
+	GHAssertNil(err,@"Got an error obtaining attributes on the file, this shouldn't happen");
 	success = (amountDownloaded == 9145357);
 	success = (amountDownloaded == 9145357);
 	GHAssertTrue(success,@"Failed to complete the download");
 	GHAssertTrue(success,@"Failed to complete the download");
 	
 	

@@ -15,7 +15,7 @@
 {
 {
 	NSString *path = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"ASIHTTPRequest Test Files"];
 	NSString *path = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"ASIHTTPRequest Test Files"];
 	if (![[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:NULL]) {
 	if (![[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:NULL]) {
-		[[NSFileManager defaultManager] createDirectoryAtPath:path attributes:nil];
+		[[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:NO attributes:nil error:NULL];
 	}
 	}
 	return path;
 	return path;
 }
 }