diff options
Diffstat (limited to 'platform/darwin/test')
-rw-r--r-- | platform/darwin/test/MGLDocumentationExampleTests.swift | 6 | ||||
-rw-r--r-- | platform/darwin/test/MGLDocumentationGuideTests.swift | 6 | ||||
-rw-r--r-- | platform/darwin/test/MGLMapViewTests.m | 2 | ||||
-rw-r--r-- | platform/darwin/test/MGLResourceTests.mm | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/platform/darwin/test/MGLDocumentationExampleTests.swift b/platform/darwin/test/MGLDocumentationExampleTests.swift index 2a64fbc601..12cc76169c 100644 --- a/platform/darwin/test/MGLDocumentationExampleTests.swift +++ b/platform/darwin/test/MGLDocumentationExampleTests.swift @@ -1,9 +1,9 @@ import XCTest import Mapbox -#if os(iOS) - import UIKit -#else +#if os(macOS) import Cocoa +#else + import UIKit #endif /** diff --git a/platform/darwin/test/MGLDocumentationGuideTests.swift b/platform/darwin/test/MGLDocumentationGuideTests.swift index b1e2bb843f..2dbbc873e4 100644 --- a/platform/darwin/test/MGLDocumentationGuideTests.swift +++ b/platform/darwin/test/MGLDocumentationGuideTests.swift @@ -1,10 +1,10 @@ import XCTest import Foundation import Mapbox -#if os(iOS) - import UIKit -#else +#if os(macOS) import Cocoa +#else + import UIKit #endif /** diff --git a/platform/darwin/test/MGLMapViewTests.m b/platform/darwin/test/MGLMapViewTests.m index 9ad7016a61..4c8f3a443f 100644 --- a/platform/darwin/test/MGLMapViewTests.m +++ b/platform/darwin/test/MGLMapViewTests.m @@ -48,7 +48,7 @@ static MGLMapView *mapView; XCTAssertTrue(CGRectIntersectsRect(spanningBoundsRect, rightAntimeridianBoundsRect), @"Something"); } -#if TARGET_OS_IPHONE +#if TARGET_OS_IOS - (void)testUserTrackingModeCompletion { __block BOOL completed = NO; [mapView setUserTrackingMode:MGLUserTrackingModeNone animated:NO completionHandler:^{ diff --git a/platform/darwin/test/MGLResourceTests.mm b/platform/darwin/test/MGLResourceTests.mm index 0420997c39..c74197ca13 100644 --- a/platform/darwin/test/MGLResourceTests.mm +++ b/platform/darwin/test/MGLResourceTests.mm @@ -46,7 +46,7 @@ namespace mbgl { // For offline, we expect a single offline param and a sku param NSInteger foundCount = 0; -#if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR +#if TARGET_OS_IOS for (NSURLQueryItem *item in components.queryItems) { if (([item.name isEqualToString:@"offline"] && [item.value isEqualToString:@"true"]) || ([item.name isEqualToString:@"a"] && [item.value isEqualToString:@"one"]) || @@ -58,7 +58,7 @@ namespace mbgl { XCTAssert(foundCount == 4); #else - // NOTE: Currently the macOS SDK does not supply the sku or offline query parameters + // NOTE: Currently the macOS and tvOS SDKs do not supply the sku or offline query parameters for (NSURLQueryItem *item in components.queryItems) { if (([item.name isEqualToString:@"a"] && [item.value isEqualToString:@"one"]) || ([item.name isEqualToString:@"b"] && [item.value isEqualToString:@"two"])) { |