diff options
| author | Fredrik Karlsson <bjorn.fredrik.karlsson@gmail.com> | 2017-09-25 13:19:21 +0200 |
|---|---|---|
| committer | Fredrik Karlsson <bjorn.fredrik.karlsson@gmail.com> | 2017-10-03 13:28:22 +0200 |
| commit | 1d714e1f35cd2c3b2d2acbb31164fb31110eb772 (patch) | |
| tree | 0b758518b3e9dd2d3c5e798177c1776726f89aa8 | |
| parent | 076af14b905a99f207db459fa9c7bbf826773082 (diff) | |
| download | qtlocation-mapboxgl-1d714e1f35cd2c3b2d2acbb31164fb31110eb772.tar.gz | |
[ios] Various Xcode 9 fixes
| -rw-r--r-- | platform/darwin/test/MGLSDKTestHelpers.swift | 3 | ||||
| -rw-r--r-- | platform/darwin/test/MGLStyleValueTests.swift | 32 |
2 files changed, 27 insertions, 8 deletions
diff --git a/platform/darwin/test/MGLSDKTestHelpers.swift b/platform/darwin/test/MGLSDKTestHelpers.swift index 82b5caa273..f21041782e 100644 --- a/platform/darwin/test/MGLSDKTestHelpers.swift +++ b/platform/darwin/test/MGLSDKTestHelpers.swift @@ -25,7 +25,8 @@ extension MGLSDKTestHelpers { let methodDescriptionList: UnsafeMutablePointer<objc_method_description>! = protocol_copyMethodDescriptionList(p, false, true, &methodCount) for i in 0..<Int(methodCount) { let description: objc_method_description = methodDescriptionList[i] - methods.insert(description.name.description) + XCTAssertNotNil(description.name?.description) + methods.insert(description.name!.description) } free(methodDescriptionList) return methods diff --git a/platform/darwin/test/MGLStyleValueTests.swift b/platform/darwin/test/MGLStyleValueTests.swift index 784b2fbaf1..05e0dc8953 100644 --- a/platform/darwin/test/MGLStyleValueTests.swift +++ b/platform/darwin/test/MGLStyleValueTests.swift @@ -6,16 +6,34 @@ typealias MGLColor = UIColor #elseif os(macOS) typealias MGLColor = NSColor #endif + +#if swift(>=3.2) +#else +func XCTAssertEqual<T: FloatingPoint>(_ lhs: @autoclosure () throws -> T, _ rhs: @autoclosure () throws -> T, accuracy: T) { + XCTAssertEqualWithAccuracy(lhs, rhs, accuracy: accuracy) +} +#endif extension MGLStyleValueTests { + + struct Color { + var red: CGFloat = 0 + var green: CGFloat = 0 + var blue: CGFloat = 0 + var alpha: CGFloat = 0 + } + func assertColorsEqualWithAccuracy(_ actual: MGLColor, _ expected: MGLColor, accuracy: Float = 1/255) { - var actualComponents : [CGFloat] = [0, 0, 0, 0] - var expectedComponents : [CGFloat] = [0, 0, 0, 0] - actual.getRed(&(actualComponents[0]), green: &(actualComponents[1]), blue: &(actualComponents[2]), alpha: &(actualComponents[3])) - expected.getRed(&(expectedComponents[0]), green: &(expectedComponents[1]), blue: &(expectedComponents[2]), alpha: &(expectedComponents[3])) - for (ac, ec) in zip(actualComponents, expectedComponents) { - XCTAssertEqualWithAccuracy(Float(ac), Float(ec), accuracy: accuracy) - } + var actualColor = Color() + var expectedColor = Color() + + actual.getRed(&actualColor.red, green: &actualColor.green, blue: &actualColor.blue, alpha: &actualColor.alpha) + expected.getRed(&expectedColor.red, green: &expectedColor.green, blue: &expectedColor.blue, alpha: &expectedColor.alpha) + + XCTAssertEqual(Float(actualColor.red), Float(expectedColor.red), accuracy: accuracy) + XCTAssertEqual(Float(actualColor.green), Float(expectedColor.green), accuracy: accuracy) + XCTAssertEqual(Float(actualColor.blue), Float(expectedColor.blue), accuracy: accuracy) + XCTAssertEqual(Float(actualColor.alpha), Float(expectedColor.alpha), accuracy: accuracy) } func assertColorValuesEqual(_ actual: MGLStyleValue<MGLColor>, _ expected: MGLStyleValue<MGLColor>) { |