diff options
| author | Julian Rex <julian.rex@gmail.com> | 2018-05-24 00:43:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-24 00:43:29 -0400 |
| commit | 5e65cb7812727b6c0625e4fbde538ddb5ff4ba13 (patch) | |
| tree | 1a182eea520b172d13e1c5b87d65e447902b0088 /platform/ios/Integration Tests | |
| parent | 3ea1a7062ffcfd05c6e5e6fe2a9a96537ba8630a (diff) | |
| download | qtlocation-mapboxgl-5e65cb7812727b6c0625e4fbde538ddb5ff4ba13.tar.gz | |
[ios, macos] Added macro to handle pending iOS tests (rather than disabling via scheme) (#11806)
Diffstat (limited to 'platform/ios/Integration Tests')
| -rw-r--r-- | platform/ios/Integration Tests/MGLCameraTransitionTests.mm | 9 | ||||
| -rw-r--r-- | platform/ios/Integration Tests/MGLMapViewIntegrationTest.h | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/platform/ios/Integration Tests/MGLCameraTransitionTests.mm b/platform/ios/Integration Tests/MGLCameraTransitionTests.mm index d5c288fbb9..4a9db60982 100644 --- a/platform/ios/Integration Tests/MGLCameraTransitionTests.mm +++ b/platform/ios/Integration Tests/MGLCameraTransitionTests.mm @@ -1,4 +1,5 @@ #import "MGLMapViewIntegrationTest.h" +#import "MGLTestUtility.h" #import "../../darwin/src/MGLGeometry_Private.h" @interface MBCameraTransitionTests : MGLMapViewIntegrationTest @@ -336,7 +337,8 @@ #pragma mark - Pending tests -- (void)disabled_testContinuallyResettingNorthInIsChangingPENDING { +- (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 @@ -369,8 +371,9 @@ XCTAssertEqualWithAccuracy(self.mapView.direction, 0.0, 0.001, @"Camera should have reset to north. %0.3f", self.mapView.direction); } -- (void)disabled_testContinuallySettingCoordinateInIsChangingPENDING { - // See above comment in `-disabled_testContinuallyResettingNorthInIsChangingPENDING` +- (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.h b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.h index 6c04ed9f84..3ceec8f04a 100644 --- a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.h +++ b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.h @@ -1,5 +1,6 @@ #import <XCTest/XCTest.h> #import <Mapbox/Mapbox.h> +#import "MGLTestUtility.h" #define MGLTestFail(myself, ...) \ _XCTPrimitiveFail(myself, __VA_ARGS__) |