diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | platform/darwin/test/MGLGeometryTests.mm | 30 | ||||
| -rw-r--r-- | platform/darwin/test/MGLOfflineStorageTests.m | 4 |
3 files changed, 19 insertions, 19 deletions
@@ -56,13 +56,13 @@ iproj: $(IOS_PROJ_PATH) open $(IOS_WORK_PATH) test-ios: ios + ios-sim start + ios-sim launch build/ios-all/$(BUILDTYPE)-iphonesimulator/ios-test.app --verbose set -o pipefail && xcodebuild \ ARCHS=i386 ONLY_ACTIVE_ARCH=YES \ -configuration $(BUILDTYPE) -sdk iphonesimulator \ -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \ -workspace $(IOS_WORK_PATH) -scheme CI test | xcpretty - ios-sim start - ios-sim launch build/ios-all/$(BUILDTYPE)-iphonesimulator/ios-test.app --verbose ipackage: $(IOS_PROJ_PATH) BITCODE=$(BITCODE) FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \ diff --git a/platform/darwin/test/MGLGeometryTests.mm b/platform/darwin/test/MGLGeometryTests.mm index e6e7c4b45c..709353da2b 100644 --- a/platform/darwin/test/MGLGeometryTests.mm +++ b/platform/darwin/test/MGLGeometryTests.mm @@ -17,23 +17,23 @@ } - (void)testAngleConversions { - XCTAssertEqual(-180, MGLDegreesFromRadians(-M_PI)); + XCTAssertEqualWithAccuracy(-180, MGLDegreesFromRadians(-M_PI), 5); XCTAssertEqual(0, MGLDegreesFromRadians(0)); - XCTAssertEqual(45, MGLDegreesFromRadians(M_PI_4)); - XCTAssertEqual(90, MGLDegreesFromRadians(M_PI_2)); - XCTAssertEqual(180, MGLDegreesFromRadians(M_PI)); - XCTAssertEqual(360, MGLDegreesFromRadians(2 * M_PI)); - XCTAssertEqual(720, MGLDegreesFromRadians(4 * M_PI)); + XCTAssertEqualWithAccuracy(45, MGLDegreesFromRadians(M_PI_4), 5); + XCTAssertEqualWithAccuracy(90, MGLDegreesFromRadians(M_PI_2), 5); + XCTAssertEqualWithAccuracy(180, MGLDegreesFromRadians(M_PI), 5); + XCTAssertEqualWithAccuracy(360, MGLDegreesFromRadians(2 * M_PI), 5); + XCTAssertEqualWithAccuracy(720, MGLDegreesFromRadians(4 * M_PI), 5); - XCTAssertEqual(-360, MGLDegreesFromRadians(MGLRadiansFromDegrees(-360))); - XCTAssertEqual(-180, MGLDegreesFromRadians(MGLRadiansFromDegrees(-180))); - XCTAssertEqual(-90, MGLDegreesFromRadians(MGLRadiansFromDegrees(-90))); - XCTAssertEqual(-45, MGLDegreesFromRadians(MGLRadiansFromDegrees(-45))); - XCTAssertEqual(0, MGLDegreesFromRadians(MGLRadiansFromDegrees(0))); - XCTAssertEqual(45, MGLDegreesFromRadians(MGLRadiansFromDegrees(45))); - XCTAssertEqual(90, MGLDegreesFromRadians(MGLRadiansFromDegrees(90))); - XCTAssertEqual(180, MGLDegreesFromRadians(MGLRadiansFromDegrees(180))); - XCTAssertEqual(360, MGLDegreesFromRadians(MGLRadiansFromDegrees(360))); + XCTAssertEqualWithAccuracy(-360, MGLDegreesFromRadians(MGLRadiansFromDegrees(-360)), 4); + XCTAssertEqualWithAccuracy(-180, MGLDegreesFromRadians(MGLRadiansFromDegrees(-180)), 5); + XCTAssertEqualWithAccuracy(-90, MGLDegreesFromRadians(MGLRadiansFromDegrees(-90)), 5); + XCTAssertEqualWithAccuracy(-45, MGLDegreesFromRadians(MGLRadiansFromDegrees(-45)), 5); + XCTAssertEqualWithAccuracy(0, MGLDegreesFromRadians(MGLRadiansFromDegrees(0)), 5); + XCTAssertEqualWithAccuracy(45, MGLDegreesFromRadians(MGLRadiansFromDegrees(45)), 5); + XCTAssertEqualWithAccuracy(90, MGLDegreesFromRadians(MGLRadiansFromDegrees(90)), 5); + XCTAssertEqualWithAccuracy(180, MGLDegreesFromRadians(MGLRadiansFromDegrees(180)), 5); + XCTAssertEqualWithAccuracy(360, MGLDegreesFromRadians(MGLRadiansFromDegrees(360)), 4); } - (void)testAltitudeConversions { diff --git a/platform/darwin/test/MGLOfflineStorageTests.m b/platform/darwin/test/MGLOfflineStorageTests.m index 8ffa1207ce..0f928712a8 100644 --- a/platform/darwin/test/MGLOfflineStorageTests.m +++ b/platform/darwin/test/MGLOfflineStorageTests.m @@ -17,7 +17,7 @@ // This test needs to come first so it can test the initial loading of packs. - (void)testAAALoadPacks { - XCTestExpectation *kvoExpectation = [self keyValueObservingExpectationForObject:[MGLOfflineStorage sharedOfflineStorage] keyPath:@"packs" handler:^BOOL(id _Nonnull observedObject, NSDictionary * _Nonnull change) { + [self keyValueObservingExpectationForObject:[MGLOfflineStorage sharedOfflineStorage] keyPath:@"packs" handler:^BOOL(id _Nonnull observedObject, NSDictionary * _Nonnull change) { NSKeyValueChange changeKind = [change[NSKeyValueChangeKindKey] unsignedIntegerValue]; return changeKind = NSKeyValueChangeSetting; }]; @@ -106,7 +106,7 @@ MGLOfflinePack *pack = [MGLOfflineStorage sharedOfflineStorage].packs.lastObject; XCTAssertNotNil(pack, @"Added pack should still exist."); - XCTestExpectation *kvoExpectation = [self keyValueObservingExpectationForObject:[MGLOfflineStorage sharedOfflineStorage] keyPath:@"packs" handler:^BOOL(id _Nonnull observedObject, NSDictionary * _Nonnull change) { + [self keyValueObservingExpectationForObject:[MGLOfflineStorage sharedOfflineStorage] keyPath:@"packs" handler:^BOOL(id _Nonnull observedObject, NSDictionary * _Nonnull change) { NSKeyValueChange changeKind = [change[NSKeyValueChangeKindKey] unsignedIntegerValue]; NSIndexSet *indices = change[NSKeyValueChangeIndexesKey]; return changeKind = NSKeyValueChangeRemoval && indices.count == 1; |