Merge pull request Quick#174 from abbeycode/closeTo-NSDate

Add beCloseTo support for NSDate

Author: jeffh

Nimble/Matchers/BeCloseTo.swift

@@ -2,14 +2,14 @@ import Foundation
 
 internal let DefaultDelta = 0.0001
 
-internal func isCloseTo(actualValue: Double?, expectedValue: Double, delta: Double, failureMessage: FailureMessage) -> Bool {
+internal func isCloseTo(actualValue: NMBDoubleConvertible?, expectedValue: NMBDoubleConvertible, delta: Double, failureMessage: FailureMessage) -> Bool {
     failureMessage.postfixMessage = "be close to <\(stringify(expectedValue))> (within \(stringify(delta)))"
     if actualValue != nil {
         failureMessage.actualValue = "<\(stringify(actualValue!))>"
     } else {
         failureMessage.actualValue = "<nil>"
     }
-    return actualValue != nil && abs(actualValue! - expectedValue) < delta
+    return actualValue != nil && abs(actualValue!.doubleValue - expectedValue.doubleValue) < delta
 }
 
 /// A Nimble matcher that succeeds when a value is close to another. This is used for floating
@@ -28,7 +28,7 @@ public func beCloseTo(expectedValue: Double, within delta: Double = DefaultDelta
 /// @see equal
 public func beCloseTo(expectedValue: NMBDoubleConvertible, within delta: Double = DefaultDelta) -> NonNilMatcherFunc<NMBDoubleConvertible> {
     return NonNilMatcherFunc { actualExpression, failureMessage in
-        return isCloseTo(try actualExpression.evaluate()?.doubleValue, expectedValue: expectedValue.doubleValue, delta: delta, failureMessage: failureMessage)
+        return isCloseTo(try actualExpression.evaluate(), expectedValue: expectedValue, delta: delta, failureMessage: failureMessage)
     }
 }
 

Nimble/Matchers/MatcherProtocols.swift

@@ -39,7 +39,45 @@ extension NSArray : NMBOrderedCollection {}
 @objc public protocol NMBDoubleConvertible {
     var doubleValue: CDouble { get }
 }
-extension NSNumber : NMBDoubleConvertible { }
+extension NSNumber : NMBDoubleConvertible {
+}
+
+private let dateFormatter: NSDateFormatter = {
+    let formatter = NSDateFormatter()
+    formatter.dateFormat = "yyyy-MM-dd HH:mm:ss.SSSS"
+    formatter.locale = NSLocale(localeIdentifier: "en_US_POSIX")
+    
+    return formatter
+    }()
+
+extension NSDate: NMBDoubleConvertible {
+    public var doubleValue: CDouble {
+        get {
+            return self.timeIntervalSinceReferenceDate
+        }
+    }
+}
+
+
+extension NMBDoubleConvertible {
+    public var stringRepresentation: String {
+        get {
+            if let date = self as? NSDate {
+                return dateFormatter.stringFromDate(date)
+            }
+            
+            if let debugStringConvertible = self as? CustomDebugStringConvertible {
+                return debugStringConvertible.debugDescription
+            }
+            
+            if let stringConvertible = self as? CustomStringConvertible {
+                return stringConvertible.description
+            }
+            
+            return ""
+        }
+    }
+}
 
 /// Protocol for types to support beLessThan(), beLessThanOrEqualTo(),
 ///  beGreaterThan(), beGreaterThanOrEqualTo(), and equal() matchers.

Nimble/Utils/Stringers.swift

@@ -47,6 +47,13 @@ internal func stringify<T>(value: T) -> String {
     return String(value)
 }
 
+internal func stringify(value: NMBDoubleConvertible) -> String {
+    if let value = value as? Double {
+        return NSString(format: "%.4f", (value)).description
+    }
+    return value.stringRepresentation
+}
+
 internal func stringify<T>(value: T?) -> String {
     if let unboxed = value {
        return stringify(unboxed)

NimbleTests/Helpers/utils.swift

@@ -75,3 +75,13 @@ public class NimbleHelper : NSObject {
         failsWithErrorMessageForNil(message as String, file: file, line: line, preferOriginalSourceLocation: true, closure: block)
     }
 }
+
+extension NSDate {
+    convenience init(dateTimeString:String) {
+        let dateFormatter = NSDateFormatter()
+        dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+        dateFormatter.locale = NSLocale(localeIdentifier: "en_US_POSIX")
+        let date = dateFormatter.dateFromString(dateTimeString)!
+        self.init(timeInterval:0, sinceDate:date)
+    }
+}

NimbleTests/Matchers/BeCloseToTest.swift

@@ -30,6 +30,16 @@ class BeCloseToTest: XCTestCase {
         }
     }
 
+    func testBeCloseToWithNSDate() {
+        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.0040), got <2015-08-26 11:43:00.0000>") {
+
+            let expectedDate = NSDate(dateTimeString: "2015-08-26 11:43:00").dateByAddingTimeInterval(0.005)
+            expect(NSDate(dateTimeString: "2015-08-26 11:43:00")).toNot(beCloseTo(expectedDate, within: 0.004))
+        }
+    }
+    
     func testBeCloseToOperator() {
         expect(1.2) ≈ 1.2001
         expect(1.2 as CDouble) ≈ 1.2001