diff options
| author | Julian Rex <julian.rex@mapbox.com> | 2019-08-21 14:23:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-21 14:23:33 -0400 |
| commit | c3cd9002f0f59ff6955c75410aaae62fb782935d (patch) | |
| tree | 5e2782dcb63e9fb9c897410a67dd50c73740a553 /platform/ios/Integration Tests/MGLMapViewIntegrationTest.m | |
| parent | ba2d80441ed825ab6725857d2fcb37e1a55ad76b (diff) | |
| download | qtlocation-mapboxgl-c3cd9002f0f59ff6955c75410aaae62fb782935d.tar.gz | |
[ios] Fix integration tests failing on iOS 9 (due to UIWindow deallocation), and random fails waiting for rendering. (#15433)
Diffstat (limited to 'platform/ios/Integration Tests/MGLMapViewIntegrationTest.m')
| -rw-r--r-- | platform/ios/Integration Tests/MGLMapViewIntegrationTest.m | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m index 62e038855d..3fa191dfcd 100644 --- a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m +++ b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m @@ -44,9 +44,9 @@ UIView *superView = [[UIView alloc] initWithFrame:UIScreen.mainScreen.bounds]; [superView addSubview:self.mapView]; - UIWindow *window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds]; - [window addSubview:superView]; - [window makeKeyAndVisible]; + self.window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds]; + [self.window addSubview:superView]; + [self.window makeKeyAndVisible]; if (!self.mapView.style) { [self waitForMapViewToFinishLoadingStyleWithTimeout:10]; @@ -58,6 +58,7 @@ self.renderFinishedExpectation = nil; self.mapView = nil; self.style = nil; + self.window = nil; [MGLAccountManager setAccessToken:nil]; [super tearDown]; @@ -137,6 +138,7 @@ [self.mapView setNeedsRerender]; self.renderFinishedExpectation = [self expectationWithDescription:@"Map view should be rendered"]; [self waitForExpectations:@[self.renderFinishedExpectation] timeout:timeout]; + self.renderFinishedExpectation = nil; } - (void)waitForExpectations:(NSArray<XCTestExpectation *> *)expectations timeout:(NSTimeInterval)seconds { |