diff --git a/ExSwift/NSDate.swift b/ExSwift/NSDate.swift index 6d05460..b070a6b 100644 --- a/ExSwift/NSDate.swift +++ b/ExSwift/NSDate.swift @@ -224,6 +224,7 @@ public extension NSDate{ public func getComponent (component : NSCalendarUnit) -> Int { let calendar = NSCalendar.currentCalendar() let components = calendar.components(component, fromDate: self) + return components.valueForComponent(component) } } @@ -239,7 +240,7 @@ public func <(lhs: NSDate, rhs: NSDate) -> Bool { } public func >(lhs: NSDate, rhs: NSDate) -> Bool { - return !(lhs < rhs) + return !(lhs <= rhs) } public func <=(lhs: NSDate, rhs: NSDate) -> Bool { diff --git a/ExSwiftTests/ExSwiftNSDateTests.swift b/ExSwiftTests/ExSwiftNSDateTests.swift index 3d9cb5c..e781d0b 100644 --- a/ExSwiftTests/ExSwiftNSDateTests.swift +++ b/ExSwiftTests/ExSwiftNSDateTests.swift @@ -206,9 +206,11 @@ class ExSwiftNSDataTests: XCTestCase { XCTAssertTrue(startDate > date, "Date should be greater") XCTAssertFalse(startDate > anotherDate, "Date shouldn't be greater") + XCTAssertFalse(startDate > shouldBeTheSameDate, "Date shouldn't be greater") XCTAssertTrue(startDate < anotherDate, "Date should be lower") XCTAssertFalse(startDate < date, "Date shouldn't be lower") + XCTAssertFalse(startDate < shouldBeTheSameDate, "Date shouldn't be lower") XCTAssertTrue(startDate >= shouldBeTheSameDate, "Date should be greater or equal") XCTAssertTrue(startDate >= date, "Date should be greater or equal")