diff options
| author | Julian Rex <julian.rex@gmail.com> | 2018-09-25 13:31:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 13:31:47 -0400 |
| commit | 66e95ac2ab6260654ba09b26e83591e3d4334c02 (patch) | |
| tree | 784f736a003f26a04696f58a0b91bf93221f9c55 /platform/ios/Integration Tests | |
| parent | 125c628981bcc38a87498bf5f6c72e2c506dd99f (diff) | |
| download | qtlocation-mapboxgl-66e95ac2ab6260654ba09b26e83591e3d4334c02.tar.gz | |
[ios] Move pending test check into `invokeTest` (#12964)
Diffstat (limited to 'platform/ios/Integration Tests')
3 files changed, 16 insertions, 4 deletions
diff --git a/platform/ios/Integration Tests/MGLCameraTransitionTests.mm b/platform/ios/Integration Tests/MGLCameraTransitionTests.mm index f29fa5e64c..32acf6a1fe 100644 --- a/platform/ios/Integration Tests/MGLCameraTransitionTests.mm +++ b/platform/ios/Integration Tests/MGLCameraTransitionTests.mm @@ -334,8 +334,6 @@ #pragma mark - Pending tests - (void)testContinuallyResettingNorthInIsChangingPENDING { - MGL_CHECK_IF_PENDING_TEST_SHOULD_RUN(); - // See https://github.com/mapbox/mapbox-gl-native/pull/11614 // This test currently fails, unsurprisingly, since we're continually // setting the camera to the same parameters during its update. @@ -369,7 +367,6 @@ - (void)testContinuallySettingCoordinateInIsChangingPENDING { // See above comment in `-testContinuallyResettingNorthInIsChangingPENDING` - MGL_CHECK_IF_PENDING_TEST_SHOULD_RUN(); // Reset to non-zero, prior to testing [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(0.0, 0.0) animated:NO]; diff --git a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m index 8235945676..c427a7842f 100644 --- a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m +++ b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m @@ -6,6 +6,21 @@ @implementation MGLMapViewIntegrationTest +- (void)invokeTest { + NSString *selector = NSStringFromSelector(self.invocation.selector); + BOOL isPendingTest = [selector hasSuffix:@"PENDING"]; + + if (isPendingTest) { + NSString *runPendingTests = [[NSProcessInfo processInfo] environment][@"MAPBOX_RUN_PENDING_TESTS"]; + if (![runPendingTests boolValue]) { + printf("warning: '%s' is a pending test - skipping\n", selector.UTF8String); + return; + } + } + + [super invokeTest]; +} + - (NSString*)validAccessToken { NSString *accessToken = [[NSProcessInfo processInfo] environment][@"MAPBOX_ACCESS_TOKEN"]; if (!accessToken) { diff --git a/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m b/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m index fd5b3db978..ca7462f160 100644 --- a/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m +++ b/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m @@ -282,7 +282,7 @@ MGLMapSnapshotter* snapshotterWithCoordinates(CLLocationCoordinate2D coordinates } - (void)testMultipleSnapshottersPENDING { - MGL_CHECK_IF_PENDING_TEST_SHOULD_RUN(); + if (![self validAccessToken]) { return; } |