ios: apply clang-format to Objective-C++ sources (#4060)
This commit is contained in:
Bart Louwers
@@ -1,314 +1,327 @@
|
||||
#import <XCTest/XCTest.h>
|
||||
@import Mapbox;
|
||||
#import "MLNFoundation_Private.h"
|
||||
#import "MLNMapViewIntegrationTest.h"
|
||||
#import "MLNNetworkConfiguration_Private.h"
|
||||
#import "MLNOfflineStorage_Private.h"
|
||||
#import "MLNFoundation_Private.h"
|
||||
|
||||
@interface MLNNetworkConfiguration (Testing)
|
||||
+ (void)testing_clearNativeNetworkManagerDelegate;
|
||||
+ (id)testing_nativeNetworkManagerDelegate;
|
||||
@end
|
||||
|
||||
@interface MLNNetworkConfigurationTestDelegate: NSObject <MLNNetworkConfigurationDelegate>
|
||||
@property (nonatomic) NSURLSession *(^handler)();
|
||||
@interface MLNNetworkConfigurationTestDelegate : NSObject <MLNNetworkConfigurationDelegate>
|
||||
@property (nonatomic) NSURLSession * (^handler)();
|
||||
@end
|
||||
|
||||
@interface MLNNetworkConfigurationSessionDelegate: NSObject <NSURLSessionDelegate>
|
||||
@interface MLNNetworkConfigurationSessionDelegate : NSObject <NSURLSessionDelegate>
|
||||
@property (nonatomic) dispatch_block_t authHandler;
|
||||
@end
|
||||
|
||||
@interface MLNNetworkConfigurationSessionDataDelegate: NSObject <NSURLSessionDataDelegate>
|
||||
@interface MLNNetworkConfigurationSessionDataDelegate : NSObject <NSURLSessionDataDelegate>
|
||||
@property (nonatomic) void (^dataHandler)(NSURLSessionDataTask *, NSData *);
|
||||
@end
|
||||
|
||||
|
||||
@interface MLNNetworkConfigurationIntegrationTests : MLNIntegrationTestCase
|
||||
@end
|
||||
|
||||
#define ASSERT_NATIVE_DELEGATE_IS_NIL() \
|
||||
XCTAssertNil([MLNNetworkConfiguration testing_nativeNetworkManagerDelegate])
|
||||
XCTAssertNil([MLNNetworkConfiguration testing_nativeNetworkManagerDelegate])
|
||||
|
||||
#define ASSERT_NATIVE_DELEGATE_IS_NOT_NIL() \
|
||||
XCTAssertNotNil([MLNNetworkConfiguration testing_nativeNetworkManagerDelegate])
|
||||
XCTAssertNotNil([MLNNetworkConfiguration testing_nativeNetworkManagerDelegate])
|
||||
|
||||
// NOTE: These tests are currently assumed to run in this specific order.
|
||||
@implementation MLNNetworkConfigurationIntegrationTests
|
||||
|
||||
- (void)setUp {
|
||||
[super setUp];
|
||||
[super setUp];
|
||||
|
||||
// Reset before each test
|
||||
[MLNNetworkConfiguration testing_clearNativeNetworkManagerDelegate];
|
||||
// Reset before each test
|
||||
[MLNNetworkConfiguration testing_clearNativeNetworkManagerDelegate];
|
||||
}
|
||||
|
||||
- (void)test0_NativeNetworkManagerDelegateIsSet
|
||||
{
|
||||
ASSERT_NATIVE_DELEGATE_IS_NIL();
|
||||
MLNNetworkConfiguration *config = [[MLNNetworkConfiguration alloc] init];
|
||||
[config resetNativeNetworkManagerDelegate];
|
||||
- (void)test0_NativeNetworkManagerDelegateIsSet {
|
||||
ASSERT_NATIVE_DELEGATE_IS_NIL();
|
||||
MLNNetworkConfiguration *config = [[MLNNetworkConfiguration alloc] init];
|
||||
[config resetNativeNetworkManagerDelegate];
|
||||
|
||||
id delegate = [MLNNetworkConfiguration testing_nativeNetworkManagerDelegate];
|
||||
id delegate = [MLNNetworkConfiguration testing_nativeNetworkManagerDelegate];
|
||||
|
||||
id<MLNNativeNetworkDelegate> manager = MLN_OBJC_DYNAMIC_CAST_AS_PROTOCOL(delegate, MLNNativeNetworkDelegate);
|
||||
XCTAssertNotNil(manager);
|
||||
id<MLNNativeNetworkDelegate> manager =
|
||||
MLN_OBJC_DYNAMIC_CAST_AS_PROTOCOL(delegate, MLNNativeNetworkDelegate);
|
||||
XCTAssertNotNil(manager);
|
||||
|
||||
// Expected properties
|
||||
XCTAssertNotNil([manager sessionConfiguration]);
|
||||
// Expected properties
|
||||
XCTAssertNotNil([manager sessionConfiguration]);
|
||||
|
||||
[MLNNetworkConfiguration sharedManager];
|
||||
id delegate2 = [MLNNetworkConfiguration testing_nativeNetworkManagerDelegate];
|
||||
XCTAssert(delegate != delegate2);
|
||||
[MLNNetworkConfiguration sharedManager];
|
||||
id delegate2 = [MLNNetworkConfiguration testing_nativeNetworkManagerDelegate];
|
||||
XCTAssert(delegate != delegate2);
|
||||
}
|
||||
|
||||
- (void)test1_NativeNetworkManagerDelegateIsSetBySharedManager
|
||||
{
|
||||
ASSERT_NATIVE_DELEGATE_IS_NIL();
|
||||
- (void)test1_NativeNetworkManagerDelegateIsSetBySharedManager {
|
||||
ASSERT_NATIVE_DELEGATE_IS_NIL();
|
||||
|
||||
// Just calling the shared manager is also sufficient (even though, it's a
|
||||
// singleton and created with a dispatch_once, the delegate is re-set for
|
||||
// each call.
|
||||
[MLNNetworkConfiguration sharedManager];
|
||||
ASSERT_NATIVE_DELEGATE_IS_NOT_NIL();
|
||||
// Just calling the shared manager is also sufficient (even though, it's a
|
||||
// singleton and created with a dispatch_once, the delegate is re-set for
|
||||
// each call.
|
||||
[MLNNetworkConfiguration sharedManager];
|
||||
ASSERT_NATIVE_DELEGATE_IS_NOT_NIL();
|
||||
|
||||
id delegate = [MLNNetworkConfiguration testing_nativeNetworkManagerDelegate];
|
||||
id<MLNNativeNetworkDelegate> manager = MLN_OBJC_DYNAMIC_CAST_AS_PROTOCOL(delegate, MLNNativeNetworkDelegate);
|
||||
XCTAssertNotNil(manager);
|
||||
id delegate = [MLNNetworkConfiguration testing_nativeNetworkManagerDelegate];
|
||||
id<MLNNativeNetworkDelegate> manager =
|
||||
MLN_OBJC_DYNAMIC_CAST_AS_PROTOCOL(delegate, MLNNativeNetworkDelegate);
|
||||
XCTAssertNotNil(manager);
|
||||
|
||||
// Expected properties
|
||||
XCTAssertNotNil([manager sessionConfiguration]);
|
||||
// Expected properties
|
||||
XCTAssertNotNil([manager sessionConfiguration]);
|
||||
}
|
||||
|
||||
- (void)test2_NativeNetworkManagerDelegateIsSet
|
||||
{
|
||||
ASSERT_NATIVE_DELEGATE_IS_NIL();
|
||||
[MLNNetworkConfiguration sharedManager];
|
||||
id delegate = [MLNNetworkConfiguration testing_nativeNetworkManagerDelegate];
|
||||
- (void)test2_NativeNetworkManagerDelegateIsSet {
|
||||
ASSERT_NATIVE_DELEGATE_IS_NIL();
|
||||
[MLNNetworkConfiguration sharedManager];
|
||||
id delegate = [MLNNetworkConfiguration testing_nativeNetworkManagerDelegate];
|
||||
|
||||
[[MLNNetworkConfiguration sharedManager] resetNativeNetworkManagerDelegate];
|
||||
id delegate2 = [MLNNetworkConfiguration testing_nativeNetworkManagerDelegate];
|
||||
XCTAssert(delegate == delegate2);
|
||||
[[MLNNetworkConfiguration sharedManager] resetNativeNetworkManagerDelegate];
|
||||
id delegate2 = [MLNNetworkConfiguration testing_nativeNetworkManagerDelegate];
|
||||
XCTAssert(delegate == delegate2);
|
||||
}
|
||||
|
||||
- (void)test3_NativeNetworkManagerDelegateIsSetBySharedOfflineStorage
|
||||
{
|
||||
ASSERT_NATIVE_DELEGATE_IS_NIL();
|
||||
- (void)test3_NativeNetworkManagerDelegateIsSetBySharedOfflineStorage {
|
||||
ASSERT_NATIVE_DELEGATE_IS_NIL();
|
||||
|
||||
// Similar to `[MLNNetworkConfiguration sharedManager]`,
|
||||
// `[MLNOfflineStorage sharedOfflineStorage]` also sets the delegate.
|
||||
[MLNOfflineStorage sharedOfflineStorage];
|
||||
ASSERT_NATIVE_DELEGATE_IS_NOT_NIL();
|
||||
// Similar to `[MLNNetworkConfiguration sharedManager]`,
|
||||
// `[MLNOfflineStorage sharedOfflineStorage]` also sets the delegate.
|
||||
[MLNOfflineStorage sharedOfflineStorage];
|
||||
ASSERT_NATIVE_DELEGATE_IS_NOT_NIL();
|
||||
}
|
||||
|
||||
- (void)test4_NativeNetworkManagerDelegateIsSetBySharedOfflineStorageASecondTime
|
||||
{
|
||||
// Testing a second time...
|
||||
ASSERT_NATIVE_DELEGATE_IS_NIL();
|
||||
[MLNOfflineStorage sharedOfflineStorage];
|
||||
ASSERT_NATIVE_DELEGATE_IS_NOT_NIL();
|
||||
- (void)test4_NativeNetworkManagerDelegateIsSetBySharedOfflineStorageASecondTime {
|
||||
// Testing a second time...
|
||||
ASSERT_NATIVE_DELEGATE_IS_NIL();
|
||||
[MLNOfflineStorage sharedOfflineStorage];
|
||||
ASSERT_NATIVE_DELEGATE_IS_NOT_NIL();
|
||||
}
|
||||
|
||||
- (void)test5_NativeNetworkManagerDelegateIsSetByMapViewInit
|
||||
{
|
||||
ASSERT_NATIVE_DELEGATE_IS_NIL();
|
||||
(void)[[MLNMapView alloc] init];
|
||||
ASSERT_NATIVE_DELEGATE_IS_NOT_NIL();
|
||||
- (void)test5_NativeNetworkManagerDelegateIsSetByMapViewInit {
|
||||
ASSERT_NATIVE_DELEGATE_IS_NIL();
|
||||
(void)[[MLNMapView alloc] init];
|
||||
ASSERT_NATIVE_DELEGATE_IS_NOT_NIL();
|
||||
}
|
||||
|
||||
- (void)testNetworkConfigurationDelegateIsNil
|
||||
{
|
||||
MLNNetworkConfiguration *manager = [MLNNetworkConfiguration sharedManager];
|
||||
XCTAssertNil(manager.delegate);
|
||||
- (void)testNetworkConfigurationDelegateIsNil {
|
||||
MLNNetworkConfiguration *manager = [MLNNetworkConfiguration sharedManager];
|
||||
XCTAssertNil(manager.delegate);
|
||||
}
|
||||
|
||||
- (void)internalTestNetworkConfigurationWithSession:(NSURLSession*)session shouldDownload:(BOOL)shouldDownload {
|
||||
- (void)internalTestNetworkConfigurationWithSession:(NSURLSession *)session
|
||||
shouldDownload:(BOOL)shouldDownload {
|
||||
__block BOOL didCallSessionDelegate = NO;
|
||||
__block BOOL isMainThread = YES;
|
||||
|
||||
__block BOOL didCallSessionDelegate = NO;
|
||||
__block BOOL isMainThread = YES;
|
||||
|
||||
// Setup delegate object that provides a NSURLSession
|
||||
MLNNetworkConfiguration *manager = [MLNNetworkConfiguration sharedManager];
|
||||
MLNNetworkConfigurationTestDelegate *delegate = [[MLNNetworkConfigurationTestDelegate alloc] init];
|
||||
delegate.handler = ^{
|
||||
NSURLSession *internalSession;
|
||||
@synchronized (self) {
|
||||
didCallSessionDelegate = YES;
|
||||
isMainThread = [NSThread isMainThread];
|
||||
internalSession = session;
|
||||
}
|
||||
return internalSession;
|
||||
};
|
||||
|
||||
manager.delegate = delegate;
|
||||
|
||||
// The following is modified/taken from MLNOfflineStorageTests as we do not yet have a
|
||||
// good mechanism to test FileSource (in this SDK)
|
||||
//
|
||||
// Want to ensure we download from the network; nuclear option
|
||||
{
|
||||
XCTestExpectation *expectation = [self expectationWithDescription:@"Expect database to be reset without an error."];
|
||||
[[MLNOfflineStorage sharedOfflineStorage] resetDatabaseWithCompletionHandler:^(NSError * _Nullable error) {
|
||||
XCTAssertNil(error);
|
||||
[expectation fulfill];
|
||||
}];
|
||||
[self waitForExpectationsWithTimeout:10 handler:nil];
|
||||
// Setup delegate object that provides a NSURLSession
|
||||
MLNNetworkConfiguration *manager = [MLNNetworkConfiguration sharedManager];
|
||||
MLNNetworkConfigurationTestDelegate *delegate =
|
||||
[[MLNNetworkConfigurationTestDelegate alloc] init];
|
||||
delegate.handler = ^{
|
||||
NSURLSession *internalSession;
|
||||
@synchronized(self) {
|
||||
didCallSessionDelegate = YES;
|
||||
isMainThread = [NSThread isMainThread];
|
||||
internalSession = session;
|
||||
}
|
||||
return internalSession;
|
||||
};
|
||||
|
||||
// Boston
|
||||
MLNCoordinateBounds bounds = {
|
||||
{ .latitude = 42.360, .longitude = -71.056 },
|
||||
{ .latitude = 42.358, .longitude = -71.053 },
|
||||
};
|
||||
NSURL *styleURL = [[MLNStyle predefinedStyle:@"Bright"] url];
|
||||
MLNTilePyramidOfflineRegion *region = [[MLNTilePyramidOfflineRegion alloc] initWithStyleURL:styleURL
|
||||
bounds:bounds
|
||||
fromZoomLevel:20
|
||||
toZoomLevel:20];
|
||||
manager.delegate = delegate;
|
||||
|
||||
NSData *context = [NSKeyedArchiver archivedDataWithRootObject:@{
|
||||
@"Name": @"Faneuil Hall"
|
||||
}];
|
||||
|
||||
__block MLNOfflinePack *pack = nil;
|
||||
|
||||
// Add pack
|
||||
{
|
||||
XCTestExpectation *additionCompletionHandlerExpectation = [self expectationWithDescription:@"add pack completion handler"];
|
||||
|
||||
[[MLNOfflineStorage sharedOfflineStorage] addPackForRegion:region
|
||||
withContext:context
|
||||
completionHandler:^(MLNOfflinePack * _Nullable completionHandlerPack, NSError * _Nullable error) {
|
||||
pack = completionHandlerPack;
|
||||
[additionCompletionHandlerExpectation fulfill];
|
||||
// The following is modified/taken from MLNOfflineStorageTests as we do not yet have a
|
||||
// good mechanism to test FileSource (in this SDK)
|
||||
//
|
||||
// Want to ensure we download from the network; nuclear option
|
||||
{
|
||||
XCTestExpectation *expectation =
|
||||
[self expectationWithDescription:@"Expect database to be reset without an error."];
|
||||
[[MLNOfflineStorage sharedOfflineStorage]
|
||||
resetDatabaseWithCompletionHandler:^(NSError *_Nullable error) {
|
||||
XCTAssertNil(error);
|
||||
[expectation fulfill];
|
||||
}];
|
||||
[self waitForExpectationsWithTimeout:5 handler:nil];
|
||||
}
|
||||
[self waitForExpectationsWithTimeout:10 handler:nil];
|
||||
}
|
||||
|
||||
XCTAssert(pack.state == MLNOfflinePackStateInactive);
|
||||
// Boston
|
||||
MLNCoordinateBounds bounds = {
|
||||
{.latitude = 42.360, .longitude = -71.056},
|
||||
{.latitude = 42.358, .longitude = -71.053},
|
||||
};
|
||||
NSURL *styleURL = [[MLNStyle predefinedStyle:@"Bright"] url];
|
||||
MLNTilePyramidOfflineRegion *region =
|
||||
[[MLNTilePyramidOfflineRegion alloc] initWithStyleURL:styleURL
|
||||
bounds:bounds
|
||||
fromZoomLevel:20
|
||||
toZoomLevel:20];
|
||||
|
||||
// Download
|
||||
{
|
||||
XCTestExpectation *expectation = [self expectationForNotification:MLNOfflinePackProgressChangedNotification object:pack handler:^BOOL(NSNotification * _Nonnull notification) {
|
||||
return pack.state == MLNOfflinePackStateComplete;
|
||||
NSData *context = [NSKeyedArchiver archivedDataWithRootObject:@{@"Name" : @"Faneuil Hall"}];
|
||||
|
||||
__block MLNOfflinePack *pack = nil;
|
||||
|
||||
// Add pack
|
||||
{
|
||||
XCTestExpectation *additionCompletionHandlerExpectation =
|
||||
[self expectationWithDescription:@"add pack completion handler"];
|
||||
|
||||
[[MLNOfflineStorage sharedOfflineStorage]
|
||||
addPackForRegion:region
|
||||
withContext:context
|
||||
completionHandler:^(MLNOfflinePack *_Nullable completionHandlerPack,
|
||||
NSError *_Nullable error) {
|
||||
pack = completionHandlerPack;
|
||||
[additionCompletionHandlerExpectation fulfill];
|
||||
}];
|
||||
[self waitForExpectationsWithTimeout:5 handler:nil];
|
||||
}
|
||||
|
||||
expectation.inverted = !shouldDownload;
|
||||
[pack resume];
|
||||
XCTAssert(pack.state == MLNOfflinePackStateInactive);
|
||||
|
||||
[self waitForExpectations:@[expectation] timeout:15];
|
||||
}
|
||||
// Download
|
||||
{
|
||||
XCTestExpectation *expectation =
|
||||
[self expectationForNotification:MLNOfflinePackProgressChangedNotification
|
||||
object:pack
|
||||
handler:^BOOL(NSNotification *_Nonnull notification) {
|
||||
return pack.state == MLNOfflinePackStateComplete;
|
||||
}];
|
||||
|
||||
XCTAssert(didCallSessionDelegate);
|
||||
XCTAssertFalse(isMainThread);
|
||||
expectation.inverted = !shouldDownload;
|
||||
[pack resume];
|
||||
|
||||
// Remove pack, so we don't affect other tests
|
||||
{
|
||||
XCTestExpectation *expectation = [self expectationWithDescription:@"remove pack completion handler"];
|
||||
[[MLNOfflineStorage sharedOfflineStorage] removePack:pack withCompletionHandler:^(NSError * _Nullable error) {
|
||||
[expectation fulfill];
|
||||
}];
|
||||
[self waitForExpectationsWithTimeout:5 handler:nil];
|
||||
}
|
||||
[self waitForExpectations:@[ expectation ] timeout:15];
|
||||
}
|
||||
|
||||
XCTAssert(didCallSessionDelegate);
|
||||
XCTAssertFalse(isMainThread);
|
||||
|
||||
// Remove pack, so we don't affect other tests
|
||||
{
|
||||
XCTestExpectation *expectation =
|
||||
[self expectationWithDescription:@"remove pack completion handler"];
|
||||
[[MLNOfflineStorage sharedOfflineStorage] removePack:pack
|
||||
withCompletionHandler:^(NSError *_Nullable error) {
|
||||
[expectation fulfill];
|
||||
}];
|
||||
[self waitForExpectationsWithTimeout:5 handler:nil];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)testNetworkConfigurationWithSharedSessionLOCKED {
|
||||
NSURLSession *session = [NSURLSession sharedSession];
|
||||
[self internalTestNetworkConfigurationWithSession:session shouldDownload:YES];
|
||||
NSURLSession *session = [NSURLSession sharedSession];
|
||||
[self internalTestNetworkConfigurationWithSession:session shouldDownload:YES];
|
||||
}
|
||||
|
||||
- (void)testNetworkConfigurationWithBackgroundSessionConfiguration {
|
||||
// Background session configurations are NOT supported, we expect this test
|
||||
// trigger an exception
|
||||
NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:NSStringFromSelector(_cmd)];
|
||||
NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig];
|
||||
// Background session configurations are NOT supported, we expect this test
|
||||
// trigger an exception
|
||||
NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration
|
||||
backgroundSessionConfigurationWithIdentifier:NSStringFromSelector(_cmd)];
|
||||
NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig];
|
||||
|
||||
XCTAssert([session isKindOfClass:NSClassFromString(@"__NSURLBackgroundSession")]);
|
||||
XCTAssert([session isKindOfClass:NSClassFromString(@"__NSURLBackgroundSession")]);
|
||||
|
||||
// We cannot do this yet, as it requires intecepting the exception in gl-native
|
||||
// It makes more sense to support background configs (requiring delegation
|
||||
// rather than blocks in gl-native)
|
||||
// [self internalTestNetworkConfigurationWithSession:session], NSException, NSInvalidArgumentException);
|
||||
// We cannot do this yet, as it requires intecepting the exception in gl-native
|
||||
// It makes more sense to support background configs (requiring delegation
|
||||
// rather than blocks in gl-native)
|
||||
// [self internalTestNetworkConfigurationWithSession:session], NSException,
|
||||
// NSInvalidArgumentException);
|
||||
}
|
||||
|
||||
- (void)testNetworkConfigurationWithDefaultSessionConfigurationLOCKED {
|
||||
NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
|
||||
NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig];
|
||||
[self internalTestNetworkConfigurationWithSession:session shouldDownload:YES];
|
||||
NSURLSessionConfiguration *sessionConfig =
|
||||
[NSURLSessionConfiguration defaultSessionConfiguration];
|
||||
NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig];
|
||||
[self internalTestNetworkConfigurationWithSession:session shouldDownload:YES];
|
||||
}
|
||||
|
||||
- (void)testNetworkConfigurationWithEmphemeralSessionConfigurationLOCKED {
|
||||
NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration ephemeralSessionConfiguration];
|
||||
NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig];
|
||||
[self internalTestNetworkConfigurationWithSession:session shouldDownload:YES];
|
||||
NSURLSessionConfiguration *sessionConfig =
|
||||
[NSURLSessionConfiguration ephemeralSessionConfiguration];
|
||||
NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig];
|
||||
[self internalTestNetworkConfigurationWithSession:session shouldDownload:YES];
|
||||
}
|
||||
|
||||
- (void)testNetworkConfigurationWithSessionConfigurationWithDelegateLOCKED {
|
||||
__block BOOL didCallAuthChallenge = NO;
|
||||
__block BOOL isMainThread = YES;
|
||||
__block BOOL didCallAuthChallenge = NO;
|
||||
__block BOOL isMainThread = YES;
|
||||
|
||||
NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
|
||||
MLNNetworkConfigurationSessionDelegate *delegate = [[MLNNetworkConfigurationSessionDelegate alloc] init];
|
||||
delegate.authHandler = ^{
|
||||
@synchronized (self) {
|
||||
didCallAuthChallenge = YES;
|
||||
isMainThread = [NSThread isMainThread];
|
||||
}
|
||||
};
|
||||
NSURLSessionConfiguration *sessionConfig =
|
||||
[NSURLSessionConfiguration defaultSessionConfiguration];
|
||||
MLNNetworkConfigurationSessionDelegate *delegate =
|
||||
[[MLNNetworkConfigurationSessionDelegate alloc] init];
|
||||
delegate.authHandler = ^{
|
||||
@synchronized(self) {
|
||||
didCallAuthChallenge = YES;
|
||||
isMainThread = [NSThread isMainThread];
|
||||
}
|
||||
};
|
||||
|
||||
NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig
|
||||
delegate:delegate
|
||||
delegateQueue:nil];
|
||||
[self internalTestNetworkConfigurationWithSession:session shouldDownload:NO];
|
||||
NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig
|
||||
delegate:delegate
|
||||
delegateQueue:nil];
|
||||
[self internalTestNetworkConfigurationWithSession:session shouldDownload:NO];
|
||||
|
||||
[session finishTasksAndInvalidate];
|
||||
[session finishTasksAndInvalidate];
|
||||
|
||||
XCTAssertFalse(isMainThread);
|
||||
XCTAssert(didCallAuthChallenge);
|
||||
XCTAssertFalse(isMainThread);
|
||||
XCTAssert(didCallAuthChallenge);
|
||||
}
|
||||
|
||||
- (void)testFailureForNetworkConfigurationWithSessionWithDataDelegateLOCKED {
|
||||
__block BOOL didCallReceiveData = NO;
|
||||
__block BOOL didCallReceiveData = NO;
|
||||
|
||||
NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
|
||||
MLNNetworkConfigurationSessionDataDelegate *delegate = [[MLNNetworkConfigurationSessionDataDelegate alloc] init];
|
||||
delegate.dataHandler = ^(NSURLSessionDataTask *task, NSData *data) {
|
||||
@synchronized (self) {
|
||||
didCallReceiveData = YES;
|
||||
}
|
||||
};
|
||||
|
||||
// NOTE: Sessions with a delegate that conforms to NSURLSessionDataDelegate
|
||||
// are NOT supported.
|
||||
NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig
|
||||
delegate:delegate
|
||||
delegateQueue:nil];
|
||||
|
||||
BOOL conforms = [session.delegate conformsToProtocol:@protocol(NSURLSessionDataDelegate)];
|
||||
XCTAssert(conforms);
|
||||
#ifdef DEBUG
|
||||
if (conforms) {
|
||||
NSLog(@"Session delegates conforming to NSURLSessionDataDelegate are not supported");
|
||||
NSURLSessionConfiguration *sessionConfig =
|
||||
[NSURLSessionConfiguration defaultSessionConfiguration];
|
||||
MLNNetworkConfigurationSessionDataDelegate *delegate =
|
||||
[[MLNNetworkConfigurationSessionDataDelegate alloc] init];
|
||||
delegate.dataHandler = ^(NSURLSessionDataTask *task, NSData *data) {
|
||||
@synchronized(self) {
|
||||
didCallReceiveData = YES;
|
||||
}
|
||||
#else
|
||||
[self internalTestNetworkConfigurationWithSession:session shouldDownload:YES];
|
||||
#endif
|
||||
[session finishTasksAndInvalidate];
|
||||
};
|
||||
|
||||
XCTAssertFalse(didCallReceiveData);
|
||||
// NOTE: Sessions with a delegate that conforms to NSURLSessionDataDelegate
|
||||
// are NOT supported.
|
||||
NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig
|
||||
delegate:delegate
|
||||
delegateQueue:nil];
|
||||
|
||||
BOOL conforms = [session.delegate conformsToProtocol:@protocol(NSURLSessionDataDelegate)];
|
||||
XCTAssert(conforms);
|
||||
#ifdef DEBUG
|
||||
if (conforms) {
|
||||
NSLog(@"Session delegates conforming to NSURLSessionDataDelegate are not supported");
|
||||
}
|
||||
#else
|
||||
[self internalTestNetworkConfigurationWithSession:session shouldDownload:YES];
|
||||
#endif
|
||||
[session finishTasksAndInvalidate];
|
||||
|
||||
XCTAssertFalse(didCallReceiveData);
|
||||
}
|
||||
|
||||
- (void)testNetworkConfigurationWithSessionConfigurationWithCustomHeadersLOCKED {
|
||||
// Custom session configuration, based on ``MLNNetworkConfiguration/defaultSessionConfiguration``
|
||||
NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
|
||||
sessionConfig.HTTPAdditionalHeaders = @{ @"testing" : @YES };
|
||||
sessionConfig.HTTPMaximumConnectionsPerHost = 1;
|
||||
sessionConfig.timeoutIntervalForResource = 30;
|
||||
sessionConfig.requestCachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
|
||||
sessionConfig.URLCache = nil;
|
||||
// Custom session configuration, based on ``MLNNetworkConfiguration/defaultSessionConfiguration``
|
||||
NSURLSessionConfiguration *sessionConfig =
|
||||
[NSURLSessionConfiguration defaultSessionConfiguration];
|
||||
sessionConfig.HTTPAdditionalHeaders = @{@"testing" : @YES};
|
||||
sessionConfig.HTTPMaximumConnectionsPerHost = 1;
|
||||
sessionConfig.timeoutIntervalForResource = 30;
|
||||
sessionConfig.requestCachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
|
||||
sessionConfig.URLCache = nil;
|
||||
|
||||
NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig];
|
||||
NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig];
|
||||
|
||||
[self internalTestNetworkConfigurationWithSession:session shouldDownload:YES];
|
||||
[self internalTestNetworkConfigurationWithSession:session shouldDownload:YES];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -317,33 +330,38 @@
|
||||
|
||||
@implementation MLNNetworkConfigurationTestDelegate
|
||||
- (NSURLSession *)sessionForNetworkConfiguration:(MLNNetworkConfiguration *)configuration {
|
||||
if (self.handler) {
|
||||
return self.handler();
|
||||
}
|
||||
if (self.handler) {
|
||||
return self.handler();
|
||||
}
|
||||
|
||||
return nil;
|
||||
return nil;
|
||||
}
|
||||
@end
|
||||
|
||||
// MARK: - NSURLSession delegate
|
||||
|
||||
@implementation MLNNetworkConfigurationSessionDelegate
|
||||
- (void)URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * _Nullable credential))completionHandler {
|
||||
if (self.authHandler) {
|
||||
self.authHandler();
|
||||
}
|
||||
- (void)URLSession:(NSURLSession *)session
|
||||
didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
|
||||
completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition,
|
||||
NSURLCredential *_Nullable credential))completionHandler {
|
||||
if (self.authHandler) {
|
||||
self.authHandler();
|
||||
}
|
||||
|
||||
// Cancel the challenge
|
||||
completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
|
||||
// Cancel the challenge
|
||||
completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
|
||||
}
|
||||
@end
|
||||
|
||||
// MARK: - NSURLSession data delegate
|
||||
|
||||
@implementation MLNNetworkConfigurationSessionDataDelegate
|
||||
- (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveData:(NSData *)data {
|
||||
if (self.dataHandler) {
|
||||
self.dataHandler(dataTask, data);
|
||||
}
|
||||
- (void)URLSession:(NSURLSession *)session
|
||||
dataTask:(NSURLSessionDataTask *)dataTask
|
||||
didReceiveData:(NSData *)data {
|
||||
if (self.dataHandler) {
|
||||
self.dataHandler(dataTask, data);
|
||||
}
|
||||
}
|
||||
@end
|
||||
|
||||
Reference in New Issue
Block a user