2 files changed, 0 insertions, 394 deletions
diff --git a/platform/ios/uitest/OHHTTPStubs b/platform/ios/uitest/OHHTTPStubs
new file mode 160000
+Subproject deed01a1592210a4c37f3f5c5f2b32fe0e41c60
diff --git a/platform/ios/uitest/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m b/platform/ios/uitest/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m
deleted file mode 100644
index 1321854169..0000000000
--- a/platform/ios/uitest/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m
+++ /dev/null
@@ -1,394 +0,0 @@
-/***********************************************************************************
- *
- * Copyright (c) 2012 Olivier Halligon
- *
- * 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 <XCTest/XCTest.h>
-#import <OHHTTPStubs/OHHTTPStubs.h>
-
-@interface NSURLConnectionDelegateTests : XCTestCase <NSURLConnectionDataDelegate> @end
-
-static const NSTimeInterval kResponseTimeTolerence = 0.2;
-
-@implementation NSURLConnectionDelegateTests
-{
-    NSMutableData* _data;
-    NSError* _error;
-    
-    NSURL* _redirectRequestURL;
-    NSInteger _redirectResponseStatusCode;
-    
-    XCTestExpectation* _connectionFinishedExpectation;
-}
-
-///////////////////////////////////////////////////////////////////////////////////
-#pragma mark Global Setup + NSURLConnectionDelegate implementation
-///////////////////////////////////////////////////////////////////////////////////
-
--(void)setUp
-{
-    [super setUp];
-    _data = [[NSMutableData alloc] init];
-    [OHHTTPStubs removeAllStubs];
-}
-
--(void)tearDown
-{
-    // in case the test timed out and finished before a running NSURLConnection ended,
-    // we may continue receive delegate messages anyway if we forgot to cancel.
-    // So avoid sending messages to deallocated object in this case by ensuring we reset it to nil
-    _data = nil;
-    _error = nil;
-    _connectionFinishedExpectation = nil;
-    [super tearDown];
-}
-
-- (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response
-{
-    _redirectRequestURL = request.URL;
-    if (response)
-    {
-        if ([response isKindOfClass:NSHTTPURLResponse.class])
-        {
-            _redirectResponseStatusCode = ((NSHTTPURLResponse *) response).statusCode;
-        }
-        else
-        {
-            _redirectResponseStatusCode = 0;
-        }
-    }
-    else
-    {
-        // we get a nil response when NSURLConnection canonicalizes the URL, we don't care about that.
-    }
-    return request;
-}
-
--(void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
-{
-    _data.length = 0U;
-}
-
--(void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
-{
-    [_data appendData:data];
-}
-
--(void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
-{
-    _error = error; // keep strong reference
-    [_connectionFinishedExpectation fulfill];
-}
-
--(void)connectionDidFinishLoading:(NSURLConnection *)connection
-{
-    [_connectionFinishedExpectation fulfill];
-}
-
-
-
-///////////////////////////////////////////////////////////////////////////////////
-#pragma mark NSURLConnection + Delegate
-///////////////////////////////////////////////////////////////////////////////////
-
--(void)test_NSURLConnectionDelegate_success
-{
-    static const NSTimeInterval kRequestTime = 0.1;
-    static const NSTimeInterval kResponseTime = 0.5;
-    NSData* testData = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
-    
-    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-        return YES;
-    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
-        return [[OHHTTPStubsResponse responseWithData:testData
-                                           statusCode:200
-                                              headers:nil]
-                requestTime:kRequestTime responseTime:kResponseTime];
-    }];
-    
-    _connectionFinishedExpectation = [self expectationWithDescription:@"NSURLConnection did finish (with error or success)"];
-    
-    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
-    NSDate* startDate = [NSDate date];
-    
-    NSURLConnection* cxn = [NSURLConnection connectionWithRequest:req delegate:self];
-    
-    [self waitForExpectationsWithTimeout:kRequestTime+kResponseTime+kResponseTimeTolerence handler:nil];
-    
-    XCTAssertEqualObjects(_data, testData, @"Invalid data response");
-    XCTAssertNil(_error, @"Received unexpected network error %@", _error);
-    XCTAssertEqualWithAccuracy(-[startDate timeIntervalSinceNow], kRequestTime+kResponseTime, kResponseTimeTolerence, @"Invalid response time");
-    
-    // in case we timed out before the end of the request (test failed), cancel the request to avoid further delegate method calls
-    [cxn cancel];
-}
-
--(void)test_NSURLConnectionDelegate_multiple_choices
-{
-    static const NSTimeInterval kRequestTime = 0.1;
-    static const NSTimeInterval kResponseTime = 0.5;
-    NSData* testData = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
-    
-    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-        return YES;
-    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
-        return [[OHHTTPStubsResponse responseWithData:testData
-                                           statusCode:300
-                                              headers:@{@"Location":@"http://www.iana.org/domains/another/example"}]
-                requestTime:kRequestTime responseTime:kResponseTime];
-    }];
-    
-    _connectionFinishedExpectation = [self expectationWithDescription:@"NSURLConnection did finish (with error or success)"];
-    
-    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
-    NSDate* startDate = [NSDate date];
-    
-    NSURLConnection* cxn = [NSURLConnection connectionWithRequest:req delegate:self];
-    
-    [self waitForExpectationsWithTimeout:kRequestTime+kResponseTime+kResponseTimeTolerence handler:nil];
-    
-    XCTAssertEqualObjects(_data, testData, @"Invalid data response");
-    XCTAssertNil(_error, @"Received unexpected network error %@", _error);
-    XCTAssertEqualWithAccuracy(-[startDate timeIntervalSinceNow], kRequestTime+kResponseTime, kResponseTimeTolerence, @"Invalid response time");
-    
-    // in case we timed out before the end of the request (test failed), cancel the request to avoid further delegate method calls
-    [cxn cancel];
-}
-
--(void)test_NSURLConnectionDelegate_error
-{
-    static const NSTimeInterval kResponseTime = 0.5;
-    NSError* expectedError = [NSError errorWithDomain:NSURLErrorDomain code:404 userInfo:nil];
-    
-    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-        return YES;
-    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
-        OHHTTPStubsResponse* resp = [OHHTTPStubsResponse responseWithError:expectedError];
-        resp.responseTime = kResponseTime;
-        return resp;
-    }];
-    
-    _connectionFinishedExpectation = [self expectationWithDescription:@"NSURLConnection did finish (with error or success)"];
-    
-    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
-    NSDate* startDate = [NSDate date];
-    
-    NSURLConnection* cxn = [NSURLConnection connectionWithRequest:req delegate:self];
-    
-    [self waitForExpectationsWithTimeout:kResponseTime+kResponseTimeTolerence handler:nil];
-    
-    XCTAssertEqual(_data.length, (NSUInteger)0, @"Received unexpected network data %@", _data);
-    XCTAssertEqualObjects(_error.domain, expectedError.domain, @"Invalid error response domain");
-    XCTAssertEqual(_error.code, expectedError.code, @"Invalid error response code");
-    XCTAssertEqualWithAccuracy(-[startDate timeIntervalSinceNow], kResponseTime, kResponseTimeTolerence, @"Invalid response time");
-    
-    // in case we timed out before the end of the request (test failed), cancel the request to avoid further delegate method calls
-    [cxn cancel];
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////
-#pragma mark Cancelling requests
-///////////////////////////////////////////////////////////////////////////////////
-
--(void)test_NSURLConnection_cancel
-{
-    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-        return YES;
-    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
-        return [[OHHTTPStubsResponse responseWithData:[@"<this data should never have time to arrive>" dataUsingEncoding:NSUTF8StringEncoding]
-                                           statusCode:500
-                                              headers:nil]
-                requestTime:0.0 responseTime:1.5];
-    }];
-    
-    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
-    NSURLConnection* cxn = [NSURLConnection connectionWithRequest:req delegate:self];
-    
-    XCTestExpectation* waitExpectation = [self expectationWithDescription:@"Waiting 2s, after cancelling in the middle"];
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [cxn cancel];
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [waitExpectation fulfill];
-        });
-    });
-
-    [self waitForExpectationsWithTimeout:5 handler:^(NSError *error) {
-        // in case we timed out before the end of the request (test failed), cancel the request to avoid further delegate method calls
-        [cxn cancel];
-    }];
-    
-    XCTAssertEqual(_data.length, (NSUInteger)0, @"Received unexpected data but the request should have been cancelled");
-    XCTAssertNil(_error, @"Received unexpected network error but the request should have been cancelled");
-    
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////
-#pragma mark Cancelling requests
-///////////////////////////////////////////////////////////////////////////////////
-
--(void)test_NSURLConnection_cookies
-{
-    NSString* const cookieName = @"SESSIONID";
-    NSString* const cookieValue = [NSProcessInfo.processInfo globallyUniqueString];
-    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-        return YES;
-    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
-        NSString* cookie = [NSString stringWithFormat:@"%@=%@;", cookieName, cookieValue];
-        NSDictionary* headers = @{@"Set-Cookie": cookie};
-        return [[OHHTTPStubsResponse responseWithData:[@"Yummy cookies" dataUsingEncoding:NSUTF8StringEncoding]
-                                           statusCode:200
-                                              headers:headers]
-                requestTime:0.0 responseTime:0.1];
-    }];
-    
-    _connectionFinishedExpectation = [self expectationWithDescription:@"NSURLConnection did finish (with error or success)"];
-    
-    // Set the cookie accept policy to accept all cookies from the main document domain
-    // (especially in case the previous policy was "NSHTTPCookieAcceptPolicyNever")
-    NSHTTPCookieStorage* cookieStorage = NSHTTPCookieStorage.sharedHTTPCookieStorage;
-    NSHTTPCookieAcceptPolicy previousAcceptPolicy = cookieStorage.cookieAcceptPolicy; // keep it to restore later
-    cookieStorage.cookieAcceptPolicy = NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
-    
-    // Send the request and wait for the response containing the Set-Cookie headers
-    NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.iana.org/domains/example/"]];
-    NSURLConnection* cxn = [NSURLConnection connectionWithRequest:req delegate:self];
-    [self waitForExpectationsWithTimeout:kResponseTimeTolerence handler:^(NSError *error) {
-        [cxn cancel]; // In case we timed out (test failed), cancel the request to avoid further delegate method calls
-    }];
-    
-    /* Check that the cookie has been properly stored */
-    NSArray* cookies = [cookieStorage cookiesForURL:req.URL];
-    BOOL cookieFound = NO;
-    for (NSHTTPCookie* cookie in cookies)
-    {
-        if ([cookie.name isEqualToString:cookieName])
-        {
-            cookieFound = YES;
-            XCTAssertEqualObjects(cookie.value, cookieValue, @"The cookie does not have the expected value");
-        }
-    }
-    XCTAssertTrue(cookieFound, @"The cookie was not stored as expected");
-    
-
-    // As a courtesy, restore previous policy before leaving
-    cookieStorage.cookieAcceptPolicy = previousAcceptPolicy;
-
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////
-#pragma mark Redirected requests
-///////////////////////////////////////////////////////////////////////////////////
-
-- (void)test_NSURLConnection_redirected
-{
-    static const NSTimeInterval kRequestTime = 0.1;
-    static const NSTimeInterval kResponseTime = 0.5;
-    NSData* redirectData = [[NSString stringWithFormat:@"%@ - redirect", NSStringFromSelector(_cmd)] dataUsingEncoding:NSUTF8StringEncoding];
-    NSData* testData = [NSStringFromSelector(_cmd) dataUsingEncoding:NSUTF8StringEncoding];
-    NSURL* redirectURL = [NSURL URLWithString:@"http://www.yahoo.com/"];
-    NSString* redirectCookieName = @"yahooCookie";
-    NSString* redirectCookieValue = [NSProcessInfo.processInfo globallyUniqueString];
-    
-    // Set the cookie accept policy to accept all cookies from the main document domain
-    // (especially in case the previous policy was "NSHTTPCookieAcceptPolicyNever")
-    NSHTTPCookieStorage* cookieStorage = NSHTTPCookieStorage.sharedHTTPCookieStorage;
-    NSHTTPCookieAcceptPolicy previousAcceptPolicy = cookieStorage.cookieAcceptPolicy; // keep it to restore later
-    cookieStorage.cookieAcceptPolicy = NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
-    
-    NSString* endCookieName = @"googleCookie";
-    NSString* endCookieValue = [NSProcessInfo.processInfo globallyUniqueString];
-    NSURL *endURL = [NSURL URLWithString:@"http://www.google.com/"];
-    
-    [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-        return YES;
-    } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
-        if ([request.URL isEqual:redirectURL]) {
-            NSString* redirectCookie = [NSString stringWithFormat:@"%@=%@;", redirectCookieName, redirectCookieValue];
-            NSDictionary* headers = @{ @"Location": endURL.absoluteString,
-                                       @"Set-Cookie": redirectCookie };
-            return [[OHHTTPStubsResponse responseWithData:redirectData
-                                               statusCode:311 // any 300-level request will do
-                                                  headers:headers]
-                    requestTime:kRequestTime responseTime:kResponseTime];
-        } else {
-            NSString* endCookie = [NSString stringWithFormat:@"%@=%@;", endCookieName, endCookieValue];
-            NSDictionary* headers = @{ @"Set-Cookie": endCookie };
-            return [[OHHTTPStubsResponse responseWithData:testData
-                                               statusCode:200
-                                                  headers:headers]
-                    requestTime:kRequestTime responseTime:kResponseTime];
-        }
-    }];
-    
-    _connectionFinishedExpectation = [self expectationWithDescription:@"NSURLConnection did finish (with error or success)"];
-    
-    NSURLRequest* req = [NSURLRequest requestWithURL:redirectURL];
-    NSDate* startDate = [NSDate date];
-    
-    NSURLConnection* cxn = [NSURLConnection connectionWithRequest:req delegate:self];
-    
-    [self waitForExpectationsWithTimeout:2 * (kRequestTime+kResponseTime+kResponseTimeTolerence) handler:^(NSError *error) {
-        // in case we timed out before the end of the request (test failed), cancel the request to avoid further delegate method calls
-        [cxn cancel];
-    }];
-    
-    XCTAssertEqualObjects(_redirectRequestURL, endURL, @"Invalid redirect request URL");
-    XCTAssertEqual(_redirectResponseStatusCode, (NSInteger)311, @"Invalid redirect response status code");
-    XCTAssertEqualObjects(_data, testData, @"Invalid data response");
-    XCTAssertNil(_error, @"Received unexpected network error %@", _error);
-    XCTAssertEqualWithAccuracy(-[startDate timeIntervalSinceNow], (2 * kRequestTime) + kResponseTime, 2 * kResponseTimeTolerence, @"Invalid response time");
-    
-    /* Check that the redirect cookie has been properly stored */
-    NSArray* redirectCookies = [cookieStorage cookiesForURL:req.URL];
-    BOOL redirectCookieFound = NO;
-    for (NSHTTPCookie* cookie in redirectCookies)
-    {
-        if ([cookie.name isEqualToString:redirectCookieName])
-        {
-            redirectCookieFound = YES;
-            XCTAssertEqualObjects(cookie.value, redirectCookieValue, @"The redirect cookie does not have the expected value");
-        }
-    }
-    XCTAssertTrue(redirectCookieFound, @"The redirect cookie was not stored as expected");
-    
-    /* Check that the end cookie has been properly stored */
-    NSArray* endCookies = [cookieStorage cookiesForURL:endURL];
-    BOOL endCookieFound = NO;
-    for (NSHTTPCookie* cookie in endCookies)
-    {
-        if ([cookie.name isEqualToString:endCookieName])
-        {
-            endCookieFound = YES;
-            XCTAssertEqualObjects(cookie.value, endCookieValue, @"The end cookie does not have the expected value");
-        }
-    }
-    XCTAssertTrue(endCookieFound, @"The end cookie was not stored as expected");
-    
-    
-    // As a courtesy, restore previous policy before leaving
-    cookieStorage.cookieAcceptPolicy = previousAcceptPolicy;
-}
-
-@end