summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Rex <julian.rex@mapbox.com>2019-09-14 15:08:03 -0400
committerJulian Rex <julian.rex@mapbox.com>2019-09-14 15:08:03 -0400
commiteb777eaae0eb53ac56204b4cbfc77ecc6af7e806 (patch)
treec21a72458933b8bdf0283f3a830029156663ed91
parent99492ff5e733733cf4bf2bdd210cccf3ab4fc5ab (diff)
downloadqtlocation-mapboxgl-upstream/jrex/integration-test-tweak.tar.gz
Add support for running tests (that require an access token) individually.upstream/jrex/integration-test-tweak
-rw-r--r--platform/ios/Integration Tests/MGLMapViewIntegrationTest.h1
-rw-r--r--platform/ios/Integration Tests/MGLMapViewIntegrationTest.m17
2 files changed, 12 insertions, 6 deletions
diff --git a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.h b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.h
index dd1b3bc949..08576e884a 100644
--- a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.h
+++ b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.h
@@ -25,7 +25,6 @@
})
@interface MGLMapViewIntegrationTest : XCTestCase <MGLMapViewDelegate>
-@property (nonatomic) NSString *accessToken;
@property (nonatomic) MGLMapView *mapView;
@property (nonatomic) UIWindow *window;
@property (nonatomic) MGLStyle *style;
diff --git a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m
index 33b8e414cb..4095b4620b 100644
--- a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m
+++ b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m
@@ -31,10 +31,7 @@
// Check for tests that require a valid access token
if ([test.name containsString:@"🔒"]) {
- if (accessToken) {
- ((MGLMapViewIntegrationTest *)test).accessToken = accessToken;
- }
- else {
+ if (!accessToken) {
printf("warning: MAPBOX_ACCESS_TOKEN env var is required for test '%s' - skipping.\n", test.name.UTF8String);
continue;
}
@@ -53,7 +50,17 @@
- (void)setUp {
[super setUp];
- [MGLAccountManager setAccessToken:self.accessToken ?: @"pk.feedcafedeadbeefbadebede"];
+ NSString *accessToken;
+
+ if ([self.name containsString:@"🔒"]) {
+ accessToken = [[NSProcessInfo processInfo] environment][@"MAPBOX_ACCESS_TOKEN"];
+
+ if (!accessToken) {
+ printf("warning: MAPBOX_ACCESS_TOKEN env var is required for test '%s' - trying anyway.\n", self.name.UTF8String);
+ }
+ }
+
+ [MGLAccountManager setAccessToken:accessToken ?: @"pk.feedcafedeadbeefbadebede"];
NSURL *styleURL = [[NSBundle bundleForClass:[self class]] URLForResource:@"one-liner" withExtension:@"json"];