CGRect.contains(_ point: CGPoint) fixed

Author: bubski

Foundation/NSGeometry.swift

@@ -295,7 +295,7 @@ extension CGRect {
     public func contains(_ point: CGPoint) -> Bool {
         if self.isNull || self.isEmpty { return false }
 
-        return (self.minX...self.maxX).contains(point.x) && (self.minY...self.maxY).contains(point.y)
+        return (self.minX..<self.maxX).contains(point.x) && (self.minY..<self.maxY).contains(point.y)
     }
 
     public func contains(_ rect2: CGRect) -> Bool {

TestFoundation/TestNSGeometry.swift

@@ -527,6 +527,7 @@ class TestNSGeometry : XCTestCase {
         XCTAssertFalse(r1.contains(CGPoint(x: 7, y: 2)))
         XCTAssertFalse(r1.contains(CGPoint(x: 2, y: 7)))
         XCTAssertFalse(r1.contains(CGPoint(x: -7, y: -7)))
+        XCTAssertFalse(r1.contains(CGPoint(x: 15, y: 15)))
         XCTAssertTrue(r1.contains(CGPoint(x: 7, y: 7)))
         XCTAssertTrue(r1.contains(CGPoint(x: 10, y: 10)))
         XCTAssertTrue(r1.contains(CGPoint(x: 5, y: 5)))
@@ -536,9 +537,10 @@ class TestNSGeometry : XCTestCase {
         XCTAssertFalse(r2.contains(CGPoint(x: -7, y: -2)))
         XCTAssertFalse(r2.contains(CGPoint(x: -2, y: -7)))
         XCTAssertFalse(r2.contains(CGPoint(x: 7, y: 7)))
+        XCTAssertFalse(r2.contains(CGPoint(x: -5, y: -5)))
         XCTAssertTrue(r2.contains(CGPoint(x: -7, y: -7)))
         XCTAssertTrue(r2.contains(CGPoint(x: -10, y: -10)))
-        XCTAssertTrue(r2.contains(CGPoint(x: -5, y: -5)))
+        XCTAssertTrue(r2.contains(CGPoint(x: -15, y: -15)))
 
         XCTAssertTrue(CGRect.infinite.contains(CGPoint()))
     }