@@ -190,7 +190,7 @@ class TestNSGeometry : XCTestCase {
190
190
let r2 = NSOffsetRect ( r1, CGFloat ( 2.0 ) , CGFloat ( - 5.0 ) )
191
191
let expectedRect = NSMakeRect ( CGFloat ( 3.2 ) , CGFloat ( - 1.9 ) , CGFloat ( 10.0 ) , CGFloat ( 10.0 ) )
192
192
193
- XCTAssertTrue ( NSEqualRects ( r2 , expectedRect ) )
193
+ XCTAssertTrue ( _NSRect ( expectedRect , equalsToRect : r2 ) )
194
194
}
195
195
196
196
func test_NSPointInRect( ) {
@@ -608,23 +608,23 @@ class TestNSGeometry : XCTestCase {
608
608
609
609
// MARK: Private
610
610
611
- func _NSRect( _ rect: NSRect , equalsToRect rect2: NSRect , withPrecision precision: Double = DBL_EPSILON ) -> Bool {
611
+ func _NSRect( _ rect: NSRect , equalsToRect rect2: NSRect , withPrecision precision: CGFloat . NativeType = . ulpOfOne ) -> Bool {
612
612
return _NSPoint ( rect. origin, equalsToPoint: rect2. origin, withPrecision: precision)
613
613
&& _NSSize ( rect. size, equalsToSize: rect2. size, withPrecision: precision)
614
614
}
615
615
616
- func _NSSize( _ size: NSSize , equalsToSize size2: NSSize , withPrecision precision: Double = DBL_EPSILON ) -> Bool {
616
+ func _NSSize( _ size: NSSize , equalsToSize size2: NSSize , withPrecision precision: CGFloat . NativeType = . ulpOfOne ) -> Bool {
617
617
return _CGFloat ( size. width, equalsToCGFloat: size2. width, withPrecision: precision)
618
618
&& _CGFloat ( size. height, equalsToCGFloat: size2. height, withPrecision: precision)
619
619
}
620
620
621
- func _NSPoint( _ point: NSPoint , equalsToPoint point2: NSPoint , withPrecision precision: Double = DBL_EPSILON ) -> Bool {
621
+ func _NSPoint( _ point: NSPoint , equalsToPoint point2: NSPoint , withPrecision precision: CGFloat . NativeType = . ulpOfOne ) -> Bool {
622
622
return _CGFloat ( point. x, equalsToCGFloat: point2. x, withPrecision: precision)
623
623
&& _CGFloat ( point. y, equalsToCGFloat: point2. y, withPrecision: precision)
624
624
}
625
625
626
- func _CGFloat( _ float: CGFloat , equalsToCGFloat float2: CGFloat , withPrecision precision: Double = DBL_EPSILON ) -> Bool {
627
- return fabs ( float. native - float2. native) < precision
626
+ func _CGFloat( _ float: CGFloat , equalsToCGFloat float2: CGFloat , withPrecision precision: CGFloat . NativeType = . ulpOfOne ) -> Bool {
627
+ return fabs ( float. native - float2. native) <= precision
628
628
}
629
629
630
630
}
0 commit comments