tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ios, tests] Bump most waitForExpectationsWithTimeout's to 5s

Browse Source 
[skip firebase]

Bump MGLOfflineStorageTests timeouts to 5 seconds
This commit is contained in:
Jason Wray
2018-09-18 13:55:23 -07:00
parent 0a1b38e7f8
commit 737ebed7d5
10 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/darwin/test/MGLDocumentationExampleTests.swift
View File

@@ -34,7 +34,7 @@ class MGLDocumentationExampleTests: XCTestCase, MGLMapViewDelegate {
mapView = MGLMapView(frame: CGRect(x: 0, y: 0, width: 256, height: 256), styleURL: MGLDocumentationExampleTests.styleURL)
mapView.delegate = self
styleLoadingExpectation = expectation(description: "Map view should finish loading style")
waitForExpectations(timeout: 1, handler: nil)
waitForExpectations(timeout: 5, handler: nil)
}
override func tearDown() {

2
platform/darwin/test/MGLDocumentationGuideTests.swift
View File

@@ -37,7 +37,7 @@ class MGLDocumentationGuideTests: XCTestCase, MGLMapViewDelegate {
mapView = MGLMapView(frame: CGRect(x: 0, y: 0, width: 256, height: 256), styleURL: styleURL)
mapView.delegate = self
styleLoadingExpectation = expectation(description: "Map view should finish loading style")
waitForExpectations(timeout: 1, handler: nil)
waitForExpectations(timeout: 5, handler: nil)
}
override func tearDown() {

20
platform/darwin/test/MGLOfflineStorageTests.mm
View File

@@ -43,7 +43,7 @@
[expectation fulfill];
[self waitForExpectationsWithTimeout:0 handler:nil];
} else {
[self waitForExpectationsWithTimeout:2 handler:nil];
[self waitForExpectationsWithTimeout:5 handler:nil];
}
XCTAssertNotNil([MGLOfflineStorage sharedOfflineStorage].packs, @"Shared offline storage object should have a non-nil collection of packs by this point.");
@@ -86,7 +86,7 @@
pack = completionHandlerPack;
[additionCompletionHandlerExpectation fulfill];
}];
[self waitForExpectationsWithTimeout:2 handler:nil];
[self waitForExpectationsWithTimeout:5 handler:nil];
XCTAssertEqual([MGLOfflineStorage sharedOfflineStorage].packs.count, countOfPacks + 1, @"Added pack should have been added to the canonical collection of packs owned by the shared offline storage object. This assertion can fail if this test is run before -testAAALoadPacks.");
@@ -124,7 +124,7 @@
return notificationPack == pack && pack.state == MGLOfflinePackStateInactive;
}];
[pack requestProgress];
[self waitForExpectationsWithTimeout:1 handler:nil];
[self waitForExpectationsWithTimeout:5 handler:nil];
}
- (void)testAddPackForGeometry {
@@ -157,7 +157,7 @@
pack = completionHandlerPack;
[additionCompletionHandlerExpectation fulfill];
}];
[self waitForExpectationsWithTimeout:2 handler:nil];
[self waitForExpectationsWithTimeout:5 handler:nil];
XCTAssertEqual([MGLOfflineStorage sharedOfflineStorage].packs.count, countOfPacks + 1, @"Added pack should have been added to the canonical collection of packs owned by the shared offline storage object. This assertion can fail if this test is run before -testAAALoadPacks.");
@@ -195,7 +195,7 @@
return notificationPack == pack && pack.state == MGLOfflinePackStateInactive;
}];
[pack requestProgress];
[self waitForExpectationsWithTimeout:1 handler:nil];
[self waitForExpectationsWithTimeout:5 handler:nil];
pack = nil;
}
@@ -239,7 +239,7 @@
XCTAssertEqual(pack.state, MGLOfflinePackStateInvalid, @"Removed pack should be invalid in the completion handler.");
[completionHandlerExpectation fulfill];
}];
[self waitForExpectationsWithTimeout:1 handler:nil];
[self waitForExpectationsWithTimeout:5 handler:nil];
XCTAssertEqual(pack.state, MGLOfflinePackStateInvalid, @"Removed pack should have been invalidated synchronously.");
@@ -314,9 +314,9 @@
NSNumber *fileSizeNumber = [fileAttributes objectForKey:NSFileSize];
long long fileSize = [fileSizeNumber longLongValue];
long long dabaseFileSize = 32391168;
long long databaseFileSize = 32391168;
// Merging databases creates an empty file if the file does not exist at the given path.
XCTAssertEqual(fileSize, dabaseFileSize, @"The dabase file size must be:%lld actual size:%lld", dabaseFileSize, fileSize);
XCTAssertEqual(fileSize, databaseFileSize, @"The database file size must be:%lld actual size:%lld", databaseFileSize, fileSize);
NSUInteger countOfPacks = [MGLOfflineStorage sharedOfflineStorage].packs.count;
@@ -337,7 +337,7 @@
}
[fileAdditionCompletionHandlerExpectation fulfill];
}];
[self waitForExpectationsWithTimeout:2 handler:nil];
[self waitForExpectationsWithTimeout:5 handler:nil];
// Depending on the database it may update or add a pack. For this case specifically the offline database adds one pack.
XCTAssertEqual([MGLOfflineStorage sharedOfflineStorage].packs.count, countOfPacks + 1, @"Adding contents of barcelona.db should add one pack.");
}
@@ -364,7 +364,7 @@
XCTAssertNil(packs, @"Passing an invalid offline database file should not add packs to the offline database.");
[invalidFileCompletionHandlerExpectation fulfill];
}];
[self waitForExpectationsWithTimeout:2 handler:nil];
[self waitForExpectationsWithTimeout:5 handler:nil];
}
// File non existent
{

2
platform/darwin/test/MGLStyleTests.mm
View File

@@ -33,7 +33,7 @@
self.mapView.delegate = self;
if (!self.mapView.style) {
_styleLoadingExpectation = [self expectationWithDescription:@"Map view should finish loading style."];
[self waitForExpectationsWithTimeout:1 handler:nil];
[self waitForExpectationsWithTimeout:5 handler:nil];
}
}

2
platform/ios/Integration Tests/Annotation Tests/MGLAnnotationViewIntegrationTests.m
View File

@@ -102,7 +102,7 @@
[timerExpired fulfill];
});
[self waitForExpectations:@[timerExpired, self.renderFinishedExpectation] timeout:1.0];
[self waitForExpectations:@[timerExpired, self.renderFinishedExpectation] timeout:5];
}
@end

2
platform/ios/Integration Tests/MBGLIntegrationTests.m
View File

@@ -186,7 +186,7 @@
XCTAssertNil(mapView2.style);
self.styleLoadingExpectation = [self expectationWithDescription:@"Map view should finish loading style."];
[self waitForExpectationsWithTimeout:1 handler:nil];
[self waitForExpectationsWithTimeout:5 handler:nil];
MGLOpenGLStyleLayer *layer = [[MGLOpenGLStyleLayer alloc] initWithIdentifier:@"gl-layer"];
weakLayer = layer;

14
platform/ios/Integration Tests/MGLCameraTransitionTests.mm
View File

@@ -34,7 +34,7 @@
[self.mapView setDirection:90 animated:YES];
// loop, render, and wait
[self waitForExpectations:@[expectation] timeout:1.5];
[self waitForExpectations:@[expectation] timeout:5];
}
@@ -62,7 +62,7 @@
};
[self.mapView setDirection:90 animated:YES];
[self waitForExpectations:@[expectation] timeout:1.5];
[self waitForExpectations:@[expectation] timeout:5];
}
- (void)testInterruptingAndResetNorthOnlyOnceInIsChanging {
@@ -106,7 +106,7 @@
};
[self.mapView setDirection:90 animated:YES];
[self waitForExpectations:@[expectation] timeout:1.5];
[self waitForExpectations:@[expectation] timeout:5];
XCTAssertEqualWithAccuracy(self.mapView.direction, 0.0, 0.001, @"Camera should have reset to north. %0.3f", self.mapView.direction);
}
@@ -222,7 +222,7 @@
// Should take MGLAnimationDuration seconds (0.3)
[self.mapView setCenterCoordinate:target zoomLevel:15.0 animated:YES];
[self waitForExpectations:@[expectation] timeout:1.5];
[self waitForExpectations:@[expectation] timeout:5];
}
- (void)testFlyToCameraInDelegateMethod {
@@ -323,7 +323,7 @@
// Should take MGLAnimationDuration
[self.mapView setCenterCoordinate:target zoomLevel:zoomLevel animated:YES];
[self waitForExpectations:@[expectation] timeout:2.0];
[self waitForExpectations:@[expectation] timeout:5];
NSLog(@"setCenterCoordinate: %0.4fs", stop1 - stop0);
NSLog(@"flyToCamera: %0.4fs", stop2 - stop1);
@@ -362,7 +362,7 @@
};
[self.mapView setDirection:90 animated:YES];
[self waitForExpectations:@[expectation] timeout:1.5];
[self waitForExpectations:@[expectation] timeout:5];
XCTAssertEqualWithAccuracy(self.mapView.direction, 0.0, 0.001, @"Camera should have reset to north. %0.3f", self.mapView.direction);
}
@@ -389,7 +389,7 @@
};
[self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(40.0, 40.0) animated:YES];
[self waitForExpectations:@[expectation] timeout:1.5];
[self waitForExpectations:@[expectation] timeout:5];
XCTAssertEqualWithAccuracy(self.mapView.direction, 0.0, 0.001, @"Camera should have reset to north. %0.3f", self.mapView.direction);
}

2
platform/ios/Integration Tests/MGLMapViewIntegrationTest.m
View File

@@ -33,7 +33,7 @@
[window makeKeyAndVisible];
if (!self.mapView.style) {
[self waitForMapViewToFinishLoadingStyleWithTimeout:1];
[self waitForMapViewToFinishLoadingStyleWithTimeout:5];
}
}

2
platform/ios/test/MGLAnnotationViewTests.m
View File

@@ -85,7 +85,7 @@ static NSString * const MGLTestAnnotationReuseIdentifer = @"MGLTestAnnotationReu
MGLTestAnnotation *annotation = [[MGLTestAnnotation alloc] init];
[_mapView addAnnotation:annotation];
[self waitForExpectationsWithTimeout:1 handler:nil];
[self waitForExpectationsWithTimeout:5 handler:nil];
XCTAssert(_mapView.annotations.count == 1, @"number of annotations should be 1");
XCTAssertNotNil(_annotationView.annotation, @"annotation property should not be nil");

2
platform/ios/test/MGLMapViewLayoutTests.m
View File

@@ -35,7 +35,7 @@
[self.superView addConstraints:[verticalConstraints arrayByAddingObjectsFromArray:horizonatalConstraints]];
self.styleLoadingExpectation = [self expectationWithDescription:@"Map view should finish loading style."];
[self waitForExpectationsWithTimeout:1 handler:nil];
[self waitForExpectationsWithTimeout:5 handler:nil];
self.mapView.showsScale = YES;