* Update submodule * [ios] Ignore patches * Use new FileSourceManager interface * Remove filesource-files.json * Update submodule * Remove http_file_source.mm from this repo for clarity. * Adds set of MGLNativeNetworkManager (via MGLMapView and MGLOfflineStorage); includes tests. * - Create testing methods, so that we don't need to export MGLNativeNetworkManager in GL - Singleton accessors now set the delegate with each call; tests modified accordingly. * Add test for expected properties * [ios] Update MGLResourceTests for SKU changes Co-authored-by: Alexander Shalamov <alexander.shalamov@mapbox.com> Co-authored-by: Jordan Kiley <jmkiley@users.noreply.github.com>
108 lines
4.2 KiB
Plaintext
108 lines
4.2 KiB
Plaintext
#import <Mapbox/Mapbox.h>
|
|
#import <XCTest/XCTest.h>
|
|
#import <mbgl/storage/resource.hpp>
|
|
|
|
namespace mbgl {
|
|
extern NSURL *resourceURLWithAccountType(const Resource& resource, NSInteger accountType);
|
|
extern BOOL isValidMapboxEndpoint(NSURL *url);
|
|
}
|
|
|
|
@interface MGLResourceTests : XCTestCase
|
|
@end
|
|
|
|
@implementation MGLResourceTests
|
|
|
|
- (void)testValidEndpoints {
|
|
using namespace mbgl;
|
|
|
|
XCTAssertTrue(isValidMapboxEndpoint([NSURL URLWithString:@"https://mapbox.com"]));
|
|
XCTAssertTrue(isValidMapboxEndpoint([NSURL URLWithString:@"https://mapbox.cn"]));
|
|
XCTAssertTrue(isValidMapboxEndpoint([NSURL URLWithString:@"https://example.mapbox.com"]));
|
|
XCTAssertTrue(isValidMapboxEndpoint([NSURL URLWithString:@"https://example.mapbox.cn"]));
|
|
|
|
XCTAssertFalse(isValidMapboxEndpoint([NSURL URLWithString:@"https://example.com"]));
|
|
XCTAssertFalse(isValidMapboxEndpoint([NSURL URLWithString:@"https://example.cn"]));
|
|
XCTAssertFalse(isValidMapboxEndpoint([NSURL URLWithString:@"https://examplemapbox.com"]));
|
|
XCTAssertFalse(isValidMapboxEndpoint([NSURL URLWithString:@"https://examplemapbox.cn"]));
|
|
}
|
|
|
|
- (void)internalTestOfflineQueryParameterIsAddedForOfflineResource:(std::string)testURL {
|
|
|
|
using namespace mbgl;
|
|
|
|
// Is our test URL "correct" for subsequent checks?
|
|
{
|
|
NSURL *url = [NSURL URLWithString:@(testURL.c_str())];
|
|
NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO];
|
|
NSArray<NSURLQueryItem *> *items = components.queryItems;
|
|
XCTAssert(items.count == 2);
|
|
}
|
|
|
|
Resource resource(Resource::Kind::Unknown, testURL);
|
|
|
|
// By default, resources are NOT offline
|
|
{
|
|
bool skuTokenQueryItemFound;
|
|
NSURL *url = resourceURLWithAccountType(resource, 0);
|
|
NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO];
|
|
for (NSURLQueryItem *item in components.queryItems) {
|
|
XCTAssertFalse([item.name isEqualToString:@"offline"]);
|
|
if ([item.name isEqualToString:@"sku"]) {
|
|
skuTokenQueryItemFound = YES;
|
|
}
|
|
}
|
|
|
|
#if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR
|
|
XCTAssertTrue(skuTokenQueryItemFound, "Default resource URL should have SKU token query item");
|
|
#else
|
|
XCTAssertFalse(skuTokenQueryItemFound, "Non-iOS platforms should not have a SKU token query item");
|
|
#endif
|
|
}
|
|
|
|
// Now check offline
|
|
resource.setUsage(Resource::Usage::Offline);
|
|
|
|
{
|
|
NSURL *url = resourceURLWithAccountType(resource, 0);
|
|
NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO];
|
|
|
|
// For offline, we expect a single offline query item
|
|
NSInteger foundCount = 0;
|
|
|
|
#if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR
|
|
for (NSURLQueryItem *item in components.queryItems) {
|
|
if (([item.name isEqualToString:@"offline"] && [item.value isEqualToString:@"true"]) ||
|
|
([item.name isEqualToString:@"a"] && [item.value isEqualToString:@"one"]) ||
|
|
([item.name isEqualToString:@"b"] && [item.value isEqualToString:@"two"]) || [item.name isEqualToString:@"sku"]) {
|
|
foundCount++;
|
|
}
|
|
}
|
|
|
|
XCTAssert(foundCount == 4);
|
|
#else
|
|
// NOTE: Currently the macOS SDK does 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"])) {
|
|
foundCount++;
|
|
}
|
|
XCTAssertFalse([item.name isEqualToString:@"sku"]);
|
|
}
|
|
|
|
XCTAssert(foundCount == 2);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
- (void)testOfflineQueryParameterIsAddedForOfflineResource {
|
|
std::string testURL = "test://mapbox.com/testing_offline_query?a=one&b=two";
|
|
[self internalTestOfflineQueryParameterIsAddedForOfflineResource:testURL];
|
|
}
|
|
|
|
- (void)testOfflineQueryParameterIsAddedForOfflineResourceForChina {
|
|
std::string testURL = "test://mapbox.cn/testing_offline_query?a=one&b=two";
|
|
[self internalTestOfflineQueryParameterIsAddedForOfflineResource:testURL];
|
|
}
|
|
|
|
@end
|