add proxy test

Author: longbai

QiniuSDK/QiniuSDK.h

@@ -13,3 +13,4 @@
 #import "QNUploadOption.h"
 #import "QNUploadManager.h"
 #import "QNFileRecorder.h"
+#import "QNConfiguration.h"

QiniuSDK/Storage/QNConfiguration.h

@@ -64,12 +64,11 @@ typedef void (^QNConfigurationBuilderBlock)(QNConfigurationBuilder *builder);
 @property (readonly) UInt32 timeoutInterval;
 
 
-@property (nonatomic, strong, readonly) id <QNRecorderDelegate> recorder;
+@property (nonatomic, readonly) id <QNRecorderDelegate> recorder;
 
-@property (nonatomic, strong, readonly) QNRecorderKeyGenerator recorderKeyGen;
-
-@property (nonatomic, strong, readonly)  NSDictionary *proxy;
+@property (nonatomic, readonly) QNRecorderKeyGenerator recorderKeyGen;
 
+@property (nonatomic, readonly)  NSDictionary *proxy;
 
 + (instancetype)build:(QNConfigurationBuilderBlock)block;
 

QiniuSDK/Storage/QNConfiguration.m

@@ -27,6 +27,11 @@ - (instancetype)initWithBuilder:(QNConfigurationBuilder *)builder {
 		_putThreshold = builder.putThreshold;
 		_retryMax = builder.retryMax;
 		_timeoutInterval = builder.timeoutInterval;
+
+		_recorder = builder.recorder;
+		_recorderKeyGen = builder.recorderKeyGen;
+
+		_proxy = builder.proxy;
 	}
 	return self;
 }

QiniuSDK/Storage/QNUploadManager.m

@@ -191,6 +191,8 @@ - (void)putFile:(NSString *)filePath
 			recorderKey = _config.recorderKeyGen(key, filePath);
 		}
 
+		NSLog(@"recorder %@", _config.recorder);
+
 		QNResumeUpload *up = [[QNResumeUpload alloc]
 		                      initWithData:data
 		                               withSize:fileSize

QiniuSDKTests/QNFileRecorderTest.m

@@ -76,7 +76,7 @@ - (void)template:(int)size pos:(float)pos {
 	info = nil;
 	__block BOOL failed = NO;
 	opt = [[QNUploadOption alloc] initWithMime:nil progressHandler: ^(NSString *key, float percent) {
-	    if (percent < pos - 256 * 1024 / (size * 1024.0)) {
+	    if (percent < pos - (256 * 1024.0) / (size * 1024.0)) {
 	        failed = YES;
 		}
 	    NSLog(@"continue progress %f", percent);

QiniuSDKTests/QNFormUploadTest.m

@@ -164,4 +164,38 @@ - (void)testNoKey {
 	XCTAssert([@"FgoKnypncpQlV6tTVddq9EL49l4B" isEqualToString:testResp[@"key"]], @"Pass");
 }
 
+- (void)testProxy {
+	__block QNResponseInfo *testInfo = nil;
+	__block NSDictionary *testResp = nil;
+	__block NSString *key = nil;
+
+	NSDictionary *proxyDict = @{
+		@"HTTPEnable"  : [NSNumber numberWithInt:1],
+		(NSString *)kCFStreamPropertyHTTPProxyHost  : @"183.136.139.16",
+		(NSString *)kCFStreamPropertyHTTPProxyPort  : @8888,
+	};
+
+	QNConfiguration *config = [QNConfiguration build: ^(QNConfigurationBuilder *builder) {
+	    builder.proxy = proxyDict;
+	    builder.zone = [[QNZone alloc] initWithUpHost:@"upnono.qiniu.com" upHostBackup:@"" upIp:@""];
+	}];
+
+	QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
+
+	NSData *data = [@"Hello, World!" dataUsingEncoding:NSUTF8StringEncoding];
+	[upManager putData:data key:nil token:g_token complete: ^(QNResponseInfo *info, NSString *k, NSDictionary *resp) {
+	    key = k;
+	    testInfo = info;
+	    testResp = resp;
+	} option:nil];
+
+	AGWW_WAIT_WHILE(testInfo == nil, 100.0);
+	NSLog(@"%@", testInfo);
+	NSLog(@"%@", testResp);
+	XCTAssert(key == nil, @"Pass");
+	XCTAssert(testInfo.isOK, @"Pass");
+	XCTAssert(testInfo.reqId, @"Pass");
+	XCTAssert([@"FgoKnypncpQlV6tTVddq9EL49l4B" isEqualToString:testResp[@"key"]], @"Pass");
+}
+
 @end

QiniuSDKTests/QNResumeUploadTest.m

@@ -133,5 +133,37 @@ - (void)test8M {
 	[self template:8 * 1024 + 1];
 }
 
+- (void)testProxy {
+	NSDictionary *proxyDict = @{
+		@"HTTPEnable"  : [NSNumber numberWithInt:1],
+		(NSString *)kCFStreamPropertyHTTPProxyHost  : @"183.136.139.16",
+		(NSString *)kCFStreamPropertyHTTPProxyPort  : @8888,
+	};
+
+	QNConfiguration *config = [QNConfiguration build: ^(QNConfigurationBuilder *builder) {
+	    builder.proxy = proxyDict;
+	    builder.zone = [[QNZone alloc] initWithUpHost:@"upnono.qiniu.com" upHostBackup:@"" upIp:@""];
+	}];
+
+	QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
+
+	int size = 6 * 1024;
+	NSURL *tempFile = [QNTempFile createTempfileWithSize:size * 1024];
+	NSString *keyUp = [NSString stringWithFormat:@"%dkproxy", size];
+	__block QNResponseInfo *info = nil;
+	__block NSString *key = nil;
+	[upManager putFile:tempFile.path key:keyUp token:g_token complete: ^(QNResponseInfo *i, NSString *k, NSDictionary *resp) {
+	    key = k;
+	    info = i;
+	} option:nil];
+
+	AGWW_WAIT_WHILE(key == nil, 60 * 30);
+	NSLog(@"info %@", info);
+	XCTAssert(info.isOK, @"Pass");
+	XCTAssert([keyUp isEqualToString:key], @"Pass");
+
+	[QNTempFile removeTempfile:tempFile];
+}
+
 #endif
 @end

QiniuSDKTests/QNSessionTest.m

@@ -83,6 +83,25 @@ - (void)testPost {
 	XCTAssert(testInfo.error != nil, @"Pass");
 }
 
+- (void)testProxy {
+	NSDictionary *proxyDict = @{
+		@"HTTPEnable"  : [NSNumber numberWithInt:1],
+		(NSString *)kCFStreamPropertyHTTPProxyHost  : @"183.136.139.16",
+		(NSString *)kCFStreamPropertyHTTPProxyPort  : @8888,
+	};
+
+	QNSessionManager *httpManager = [[QNSessionManager alloc] initWithProxy:proxyDict timeout:60];
+	NSData *data = [@"Hello, World!" dataUsingEncoding:NSUTF8StringEncoding];
+	__block QNResponseInfo *testInfo = nil;
+	[httpManager post:@"http://up123.qiniu.com" withData:data withParams:nil withHeaders:nil withCompleteBlock: ^(QNResponseInfo *info, NSDictionary *resp) {
+	    testInfo = info;
+	} withProgressBlock:nil withCancelBlock:nil];
+
+	AGWW_WAIT_WHILE(testInfo == nil, 100.0);
+	NSLog(@"%@", testInfo);
+	XCTAssert(testInfo.reqId, @"Pass");
+}
+
 @end
 
 #endif