diff options
| author | Jason Wray <jason@kulturny.com> | 2015-08-26 11:03:34 -0700 |
|---|---|---|
| committer | Jason Wray <jason@kulturny.com> | 2015-08-26 11:03:34 -0700 |
| commit | d8ed33c7d48dbabe7e6f5e48f148ea2bec823a07 (patch) | |
| tree | 31ffe539697453a42d167fe3ee8c3c5040be61f6 /test | |
| parent | 0e456940b98f53624618f4e2a42bf025ce392a9e (diff) | |
| parent | 2f30dfe97d851f2a2bb4141dc234013b01f8afd3 (diff) | |
| download | qtlocation-mapboxgl-d8ed33c7d48dbabe7e6f5e48f148ea2bec823a07.tar.gz | |
Merge remote-tracking branch 'upstream/master' into perspective-without-y-flip
Diffstat (limited to 'test')
| -rw-r--r-- | test/ios/MapViewTests.m | 4 | ||||
| -rw-r--r-- | test/ios/MetricsTests.m | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/ios/MapViewTests.m b/test/ios/MapViewTests.m index fadbbae601..f4ae501d7e 100644 --- a/test/ios/MapViewTests.m +++ b/test/ios/MapViewTests.m @@ -544,7 +544,7 @@ - (void)testUserTrackingModeFollow { tester.mapView.userTrackingMode = MGLUserTrackingModeFollow; - [tester waitForTimeInterval:1]; + [tester acknowledgeSystemAlert]; XCTAssertEqual(tester.mapView.userLocationVisible, YES, @@ -570,7 +570,7 @@ - (void)testUserTrackingModeFollowWithHeading { tester.mapView.userTrackingMode = MGLUserTrackingModeFollowWithHeading; - [tester waitForTimeInterval:1]; + [tester acknowledgeSystemAlert]; XCTAssertEqual(tester.mapView.userLocationVisible, YES, diff --git a/test/ios/MetricsTests.m b/test/ios/MetricsTests.m index cd02c2d52b..d3b99dc63b 100644 --- a/test/ios/MetricsTests.m +++ b/test/ios/MetricsTests.m @@ -119,7 +119,7 @@ const NSTimeInterval MGLFlushInterval = 60; [[MGLMapboxEvents sharedManager] flush]; - [self waitForExpectationsWithTimeout:1.0 handler:nil]; + [self waitForExpectationsWithTimeout:2.0 handler:nil]; XCTAssertNil([[MGLMapboxEvents sharedManager] timer]); } @@ -143,7 +143,7 @@ const NSTimeInterval MGLFlushInterval = 60; id eventsMock = [OCMockObject partialMockForObject:[MGLMapboxEvents sharedManager]]; [[[eventsMock expect] andForwardToRealObject] startTimer]; [self pushFakeEvent]; - [eventsMock verifyWithDelay:0.5]; + [eventsMock verifyWithDelay:2.0]; XCTAssertEqual([[[MGLMapboxEvents sharedManager] eventQueue] count], 1); XCTAssertNotNil([[MGLMapboxEvents sharedManager] timer]); @@ -164,7 +164,7 @@ const NSTimeInterval MGLFlushInterval = 60; [[MGLMapboxEvents sharedManager] flush]; - [self waitForExpectationsWithTimeout:1.0 handler:nil]; + [self waitForExpectationsWithTimeout:2.0 handler:nil]; [self pushFakeEvent]; id eventsMock = [OCMockObject partialMockForObject:[MGLMapboxEvents sharedManager]]; @@ -178,7 +178,7 @@ const NSTimeInterval MGLFlushInterval = 60; id eventsMock = [OCMockObject partialMockForObject:[MGLMapboxEvents sharedManager]]; [[eventsMock expect] postEvents:events]; [[MGLMapboxEvents sharedManager] flush]; - [eventsMock verifyWithDelay:1.0]; + [eventsMock verifyWithDelay:2.0]; XCTAssertTrue([[[MGLMapboxEvents sharedManager] eventQueue] count] == 0); } @@ -209,7 +209,7 @@ const NSTimeInterval MGLFlushInterval = 60; [self pushFakeEvent]; [MGLMapboxEvents flush]; - [self waitForExpectationsWithTimeout:1.0 handler:nil]; + [self waitForExpectationsWithTimeout:2.0 handler:nil]; } - (void)testPushEventAddsToEventQueue { |