Merge pull request #832 from Quick/fix-becloseto-swift-5.3-compatibility

[BREAKING] Make `beCloseTo` matcher generic to fix a build error when used with `allPass` matcher on Swift 5.3

Author: ikesyo

Sources/Nimble/Matchers/BeCloseTo.swift

@@ -19,17 +19,13 @@ internal func isCloseTo(_ actualValue: NMBDoubleConvertible?,
 /// point values which can have imprecise results when doing arithmetic on them.
 ///
 /// @see equal
-public func beCloseTo(_ expectedValue: Double, within delta: Double = DefaultDelta) -> Predicate<Double> {
+public func beCloseTo<Value: NMBDoubleConvertible>(_ expectedValue: Value, within delta: Double = DefaultDelta) -> Predicate<Value> {
     return Predicate.define { actualExpression in
         return isCloseTo(try actualExpression.evaluate(), expectedValue: expectedValue, delta: delta)
     }
 }
 
-/// A Nimble matcher that succeeds when a value is close to another. This is used for floating
-/// point values which can have imprecise results when doing arithmetic on them.
-///
-/// @see equal
-public func beCloseTo(_ expectedValue: NMBDoubleConvertible, within delta: Double = DefaultDelta) -> Predicate<NMBDoubleConvertible> {
+private func beCloseTo(_ expectedValue: NMBDoubleConvertible, within delta: Double = DefaultDelta) -> Predicate<NMBDoubleConvertible> {
     return Predicate.define { actualExpression in
         return isCloseTo(try actualExpression.evaluate(), expectedValue: expectedValue, delta: delta)
     }

Tests/NimbleTests/Matchers/BeCloseToTest.swift

@@ -53,7 +53,8 @@ final class BeCloseToTest: XCTestCase {
         expect(NSDate(dateTimeString: "2015-08-26 11:43:00")).to(beCloseTo(NSDate(dateTimeString: "2015-08-26 11:43:05"), within: 10))
 
         failsWithErrorMessage("expected to not be close to <2015-08-26 11:43:00.0050> (within 0.006), got <2015-08-26 11:43:00.0000>") {
-            let expectedDate = NSDate(dateTimeString: "2015-08-26 11:43:00").addingTimeInterval(0.005)
+            // Cast to NSDate is needed for Linux (swift-corelibs-foundation) compatibility.
+            let expectedDate = NSDate(dateTimeString: "2015-08-26 11:43:00").addingTimeInterval(0.005) as NSDate
             expect(NSDate(dateTimeString: "2015-08-26 11:43:00")).toNot(beCloseTo(expectedDate, within: 0.006))
         }
     }
@@ -139,4 +140,10 @@ final class BeCloseToTest: XCTestCase {
             expect([0.1, 1.2]).to(beCloseTo([0.3, 1.3], within: 0.1))
         }
     }
+
+    // https://github.com/Quick/Nimble/issues/831
+    func testCombinationWithAllPass() {
+        let values: [NSNumber] = [0]
+        expect(values).to(allPass(beCloseTo(0)))
+    }
 }