From d7cfb680f9c6f0f6aba2dab34bbd153a8f0cc8c4 Mon Sep 17 00:00:00 2001 From: rauhul-varma Date: Fri, 14 Sep 2018 17:56:14 -0700 Subject: [PATCH 1/4] replace functions with swift constructors, replace NSZeroPoint/Size/Rect with .zero --- Foundation/NSGeometry.swift | 96 ++++---- TestFoundation/TestAffineTransform.swift | 30 +-- TestFoundation/TestNSGeometry.swift | 282 +++++++++++------------ 3 files changed, 204 insertions(+), 204 deletions(-) diff --git a/Foundation/NSGeometry.swift b/Foundation/NSGeometry.swift index 4cddeacc3b..43875a4ac3 100644 --- a/Foundation/NSGeometry.swift +++ b/Foundation/NSGeometry.swift @@ -686,12 +686,12 @@ public func NSInsetRect(_ aRect: NSRect, _ dX: CGFloat, _ dY: CGFloat) -> NSRect let y = CGFloat(aRect.origin.y.native + dY.native) let w = CGFloat(aRect.size.width.native - (dX.native * 2)) let h = CGFloat(aRect.size.height.native - (dY.native * 2)) - return NSMakeRect(x, y, w, h) + return NSRect(x: x, y: y, width: w, height: h) } public func NSIntegralRect(_ aRect: NSRect) -> NSRect { if aRect.size.height.native <= 0 || aRect.size.width.native <= 0 { - return NSZeroRect + return .zero } return NSIntegralRectWithOptions(aRect, [.alignMinXOutward, .alignMaxXOutward, .alignMinYOutward, .alignMaxYOutward]) @@ -840,7 +840,7 @@ public func NSIntegralRectWithOptions(_ aRect: NSRect, _ opts: AlignmentOptions) fatalError(listOfOptionsIsInconsistentErrorMessage) } - var result = NSZeroRect + var result = NSRect.zero result.origin.x.native = resultOriginX result.origin.y.native = resultOriginY result.size.width.native = resultWidth @@ -850,31 +850,31 @@ public func NSIntegralRectWithOptions(_ aRect: NSRect, _ opts: AlignmentOptions) } public func NSUnionRect(_ aRect: NSRect, _ bRect: NSRect) -> NSRect { - let isEmptyFirstRect = NSIsEmptyRect(aRect) - let isEmptySecondRect = NSIsEmptyRect(bRect) + let isEmptyFirstRect = aRect.isEmpty + let isEmptySecondRect = bRect.isEmpty if isEmptyFirstRect && isEmptySecondRect { - return NSZeroRect + return .zero } else if isEmptyFirstRect { return bRect } else if isEmptySecondRect { return aRect } - let x = min(NSMinX(aRect), NSMinX(bRect)) - let y = min(NSMinY(aRect), NSMinY(bRect)) - let width = max(NSMaxX(aRect), NSMaxX(bRect)) - x - let height = max(NSMaxY(aRect), NSMaxY(bRect)) - y - return NSMakeRect(x, y, width, height) + let x = min(aRect.minX, bRect.minX) + let y = min(aRect.minY, bRect.minY) + let width = max(aRect.maxX, bRect.maxX) - x + let height = max(aRect.maxY, bRect.maxY) - y + return NSRect(x: x, y: y, width: width, height: height) } public func NSIntersectionRect(_ aRect: NSRect, _ bRect: NSRect) -> NSRect { - if NSMaxX(aRect) <= NSMinX(bRect) || NSMaxX(bRect) <= NSMinX(aRect) || NSMaxY(aRect) <= NSMinY(bRect) || NSMaxY(bRect) <= NSMinY(aRect) { - return NSZeroRect - } - let x = max(NSMinX(aRect), NSMinX(bRect)) - let y = max(NSMinY(aRect), NSMinY(bRect)) - let width = min(NSMaxX(aRect), NSMaxX(bRect)) - x - let height = min(NSMaxY(aRect), NSMaxY(bRect)) - y - return NSMakeRect(x, y, width, height) + if aRect.maxX <= bRect.minX || bRect.maxX <= aRect.minX || aRect.maxY <= bRect.minY || bRect.maxY <= aRect.minY { + return .zero + } + let x = max(aRect.minX, bRect.minX) + let y = max(aRect.minY, bRect.minY) + let width = min(aRect.maxX, bRect.maxX) - x + let height = min(aRect.maxY, bRect.maxY) - y + return NSRect(x: x, y: y, width: width, height: height) } public func NSOffsetRect(_ aRect: NSRect, _ dX: CGFloat, _ dY: CGFloat) -> NSRect { @@ -885,47 +885,47 @@ public func NSOffsetRect(_ aRect: NSRect, _ dX: CGFloat, _ dY: CGFloat) -> NSRec } public func NSDivideRect(_ inRect: NSRect, _ slice: UnsafeMutablePointer, _ rem: UnsafeMutablePointer, _ amount: CGFloat, _ edge: NSRectEdge) { - if NSIsEmptyRect(inRect) { - slice.pointee = NSZeroRect - rem.pointee = NSZeroRect + if inRect.isEmpty { + slice.pointee = .zero + rem.pointee = .zero return } - let width = NSWidth(inRect) - let height = NSHeight(inRect) + let width = inRect.width + let height = inRect.height switch (edge, amount) { case (.minX, let amount) where amount > width: slice.pointee = inRect - rem.pointee = NSMakeRect(NSMaxX(inRect), NSMinY(inRect), CGFloat(0.0), height) + rem.pointee = NSRect(x: inRect.maxX, y: inRect.minY, width: CGFloat(0.0), height: height) case (.minX, _): - slice.pointee = NSMakeRect(NSMinX(inRect), NSMinY(inRect), amount, height) - rem.pointee = NSMakeRect(NSMaxX(slice.pointee), NSMinY(inRect), NSMaxX(inRect) - NSMaxX(slice.pointee), height) + slice.pointee = NSRect(x: inRect.minX, y: inRect.minY, width: amount, height: height) + rem.pointee = NSRect(x: NSMaxX(slice.pointee), y: inRect.minY, width: inRect.maxX - NSMaxX(slice.pointee), height: height) case (.minY, let amount) where amount > height: slice.pointee = inRect - rem.pointee = NSMakeRect(NSMinX(inRect), NSMaxY(inRect), width, CGFloat(0.0)) + rem.pointee = NSRect(x: inRect.minX, y: inRect.maxY, width: width, height: CGFloat(0.0)) case (.minY, _): - slice.pointee = NSMakeRect(NSMinX(inRect), NSMinY(inRect), width, amount) - rem.pointee = NSMakeRect(NSMinX(inRect), NSMaxY(slice.pointee), width, NSMaxY(inRect) - NSMaxY(slice.pointee)) + slice.pointee = NSRect(x: inRect.minX, y: inRect.minY, width: width, height: amount) + rem.pointee = NSRect(x: inRect.minX, y: NSMaxY(slice.pointee), width: width, height: inRect.maxY - NSMaxY(slice.pointee)) case (.maxX, let amount) where amount > width: slice.pointee = inRect - rem.pointee = NSMakeRect(NSMinX(inRect), NSMinY(inRect), CGFloat(0.0), height) + rem.pointee = NSRect(x: inRect.minX, y: inRect.minY, width: CGFloat(0.0), height: height) case (.maxX, _): - slice.pointee = NSMakeRect(NSMaxX(inRect) - amount, NSMinY(inRect), amount, height) - rem.pointee = NSMakeRect(NSMinX(inRect), NSMinY(inRect), NSMinX(slice.pointee) - NSMinX(inRect), height) + slice.pointee = NSRect(x: inRect.maxX - amount, y: inRect.minY, width: amount, height: height) + rem.pointee = NSRect(x: inRect.minX, y: inRect.minY, width: NSMinX(slice.pointee) - inRect.minX, height: height) case (.maxY, let amount) where amount > height: slice.pointee = inRect - rem.pointee = NSMakeRect(NSMinX(inRect), NSMinY(inRect), width, CGFloat(0.0)) + rem.pointee = NSRect(x: inRect.minX, y: inRect.minY, width: width, height: CGFloat(0.0)) case (.maxY, _): - slice.pointee = NSMakeRect(NSMinX(inRect), NSMaxY(inRect) - amount, width, amount) - rem.pointee = NSMakeRect(NSMinX(inRect), NSMinY(inRect), width, NSMinY(slice.pointee) - NSMinY(inRect)) + slice.pointee = NSRect(x: inRect.minX, y: inRect.maxY - amount, width: width, height: amount) + rem.pointee = NSRect(x: inRect.minX, y: inRect.minY, width: width, height: NSMinY(slice.pointee) - inRect.minY) } } @@ -935,19 +935,19 @@ public func NSPointInRect(_ aPoint: NSPoint, _ aRect: NSRect) -> Bool { public func NSMouseInRect(_ aPoint: NSPoint, _ aRect: NSRect, _ flipped: Bool) -> Bool { if flipped { - return aPoint.x >= NSMinX(aRect) && aPoint.y >= NSMinX(aRect) && aPoint.x < NSMaxX(aRect) && aPoint.y < NSMaxY(aRect) + return aPoint.x >= aRect.minX && aPoint.y >= aRect.minX && aPoint.x < aRect.maxX && aPoint.y < aRect.maxY } - return aPoint.x >= NSMinX(aRect) && aPoint.y > NSMinY(aRect) && aPoint.x < NSMaxX(aRect) && aPoint.y <= NSMaxY(aRect) + return aPoint.x >= aRect.minX && aPoint.y > aRect.minY && aPoint.x < aRect.maxX && aPoint.y <= aRect.maxY } public func NSContainsRect(_ aRect: NSRect, _ bRect: NSRect) -> Bool { - return !NSIsEmptyRect(bRect) && NSMaxX(bRect) <= NSMaxX(aRect) && NSMinX(bRect) >= NSMinX(aRect) && - NSMaxY(bRect) <= NSMaxY(aRect) && NSMinY(bRect) >= NSMinY(aRect) + return !bRect.isEmpty && bRect.maxX <= aRect.maxX && bRect.minX >= aRect.minX && + bRect.maxY <= aRect.maxY && bRect.minY >= aRect.minY } public func NSIntersectsRect(_ aRect: NSRect, _ bRect: NSRect) -> Bool { - return !(NSIsEmptyRect(aRect) || NSIsEmptyRect(bRect) || - NSMaxX(aRect) <= NSMinX(bRect) || NSMaxX(bRect) <= NSMinX(aRect) || NSMaxY(aRect) <= NSMinY(bRect) || NSMaxY(bRect) <= NSMinY(aRect)) + return !(aRect.isEmpty || bRect.isEmpty || + aRect.maxX <= bRect.minX || bRect.maxX <= aRect.minX || aRect.maxY <= bRect.minY || bRect.maxY <= aRect.minY) } public func NSStringFromPoint(_ aPoint: NSPoint) -> String { @@ -986,34 +986,34 @@ private func _scanDoublesFromString(_ aString: String, number: Int) -> [Double] public func NSPointFromString(_ aString: String) -> NSPoint { if aString.isEmpty { - return NSZeroPoint + return .zero } let parsedNumbers = _scanDoublesFromString(aString, number: 2) let x = parsedNumbers[0] let y = parsedNumbers[1] - let result = NSMakePoint(CGFloat(x), CGFloat(y)) + let result = NSPoint(x: CGFloat(x), y: CGFloat(y)) return result } public func NSSizeFromString(_ aString: String) -> NSSize { if aString.isEmpty { - return NSZeroSize + return .zero } let parsedNumbers = _scanDoublesFromString(aString, number: 2) let w = parsedNumbers[0] let h = parsedNumbers[1] - let result = NSMakeSize(CGFloat(w), CGFloat(h)) + let result = NSSize(width: CGFloat(w), height: CGFloat(h)) return result } public func NSRectFromString(_ aString: String) -> NSRect { if aString.isEmpty { - return NSZeroRect + return .zero } let parsedNumbers = _scanDoublesFromString(aString, number: 4) @@ -1023,7 +1023,7 @@ public func NSRectFromString(_ aString: String) -> NSRect { let w = parsedNumbers[2] let h = parsedNumbers[3] - let result = NSMakeRect(CGFloat(x), CGFloat(y), CGFloat(w), CGFloat(h)) + let result = NSRect(x: CGFloat(x), y: CGFloat(y), width: CGFloat(w), height: CGFloat(h)) return result } diff --git a/TestFoundation/TestAffineTransform.swift b/TestFoundation/TestAffineTransform.swift index abc4c8518e..1c2a55cc7a 100644 --- a/TestFoundation/TestAffineTransform.swift +++ b/TestFoundation/TestAffineTransform.swift @@ -84,16 +84,16 @@ class TestAffineTransform : XCTestCase { } checkIdentityPointTransformation(NSPoint()) - checkIdentityPointTransformation(NSMakePoint(CGFloat(24.5), CGFloat(10.0))) - checkIdentityPointTransformation(NSMakePoint(CGFloat(-7.5), CGFloat(2.0))) + checkIdentityPointTransformation(NSPoint(x: CGFloat(24.5), y: CGFloat(10.0))) + checkIdentityPointTransformation(NSPoint(x: CGFloat(-7.5), y: CGFloat(2.0))) func checkIdentitySizeTransformation(_ size: NSSize) { checkSizeTransformation(identityTransform, size: size, expectedSize: size) } checkIdentitySizeTransformation(NSSize()) - checkIdentitySizeTransformation(NSMakeSize(CGFloat(13.0), CGFloat(12.5))) - checkIdentitySizeTransformation(NSMakeSize(CGFloat(100.0), CGFloat(-100.0))) + checkIdentitySizeTransformation(NSSize(width: CGFloat(13.0), height: CGFloat(12.5))) + checkIdentitySizeTransformation(NSSize(width: CGFloat(100.0), height: CGFloat(-100.0))) } func test_Translation() { @@ -221,22 +221,22 @@ class TestAffineTransform : XCTestCase { xyPlus5.translateX(by: CGFloat(2.0), yBy: CGFloat(3.0)) xyPlus5.translateX(by: CGFloat(3.0), yBy: CGFloat(2.0)) - checkPointTransformation(xyPlus5, point: NSMakePoint(CGFloat(-2.0), CGFloat(-3.0)), - expectedPoint: NSMakePoint(CGFloat(3.0), CGFloat(2.0))) + checkPointTransformation(xyPlus5, point: NSPoint(x: CGFloat(-2.0), y: CGFloat(-3.0)), + expectedPoint: NSPoint(x: CGFloat(3.0), y: CGFloat(2.0))) } func test_Scaling() { let xyTimes5 = NSAffineTransform() xyTimes5.scale(by: CGFloat(5.0)) - checkPointTransformation(xyTimes5, point: NSMakePoint(CGFloat(-2.0), CGFloat(3.0)), - expectedPoint: NSMakePoint(CGFloat(-10.0), CGFloat(15.0))) + checkPointTransformation(xyTimes5, point: NSPoint(x: CGFloat(-2.0), y: CGFloat(3.0)), + expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(15.0))) let xTimes2YTimes3 = NSAffineTransform() xTimes2YTimes3.scaleX(by: CGFloat(2.0), yBy: CGFloat(-3.0)) - checkPointTransformation(xTimes2YTimes3, point: NSMakePoint(CGFloat(-1.0), CGFloat(3.5)), - expectedPoint: NSMakePoint(CGFloat(-2.0), CGFloat(-10.5))) + checkPointTransformation(xTimes2YTimes3, point: NSPoint(x: CGFloat(-1.0), y: CGFloat(3.5)), + expectedPoint: NSPoint(x: CGFloat(-2.0), y: CGFloat(-10.5))) } func test_TranslationScaling() { @@ -244,8 +244,8 @@ class TestAffineTransform : XCTestCase { xPlus2XYTimes5.translateX(by: CGFloat(2.0), yBy: CGFloat()) xPlus2XYTimes5.scaleX(by: CGFloat(5.0), yBy: CGFloat(-5.0)) - checkPointTransformation(xPlus2XYTimes5, point: NSMakePoint(CGFloat(1.0), CGFloat(2.0)), - expectedPoint: NSMakePoint(CGFloat(7.0), CGFloat(-10.0))) + checkPointTransformation(xPlus2XYTimes5, point: NSPoint(x: CGFloat(1.0), y: CGFloat(2.0)), + expectedPoint: NSPoint(x: CGFloat(7.0), y: CGFloat(-10.0))) } func test_ScalingTranslation() { @@ -253,8 +253,8 @@ class TestAffineTransform : XCTestCase { xyTimes5XPlus3.scale(by: CGFloat(5.0)) xyTimes5XPlus3.translateX(by: CGFloat(3.0), yBy: CGFloat()) - checkPointTransformation(xyTimes5XPlus3, point: NSMakePoint(CGFloat(1.0), CGFloat(2.0)), - expectedPoint: NSMakePoint(CGFloat(20.0), CGFloat(10.0))) + checkPointTransformation(xyTimes5XPlus3, point: NSPoint(x: CGFloat(1.0), y: CGFloat(2.0)), + expectedPoint: NSPoint(x: CGFloat(20.0), y: CGFloat(10.0))) } func test_AppendTransform() { @@ -298,7 +298,7 @@ class TestAffineTransform : XCTestCase { let origin = NSPoint(x: CGFloat(10.0), y: CGFloat(10.0)) let size = NSSize(width: CGFloat(40.0), height: CGFloat(20.0)) let rect = NSRect(origin: origin, size: size) - let center = NSPoint(x: NSMidX(rect), y: NSMidY(rect)) + let center = NSPoint(x: rect.midX, y: rect.midY) let rotate = NSAffineTransform() rotate.rotate(byDegrees: CGFloat(90.0)) diff --git a/TestFoundation/TestNSGeometry.swift b/TestFoundation/TestNSGeometry.swift index 977f398144..9d77a044dd 100644 --- a/TestFoundation/TestNSGeometry.swift +++ b/TestFoundation/TestNSGeometry.swift @@ -929,19 +929,19 @@ class TestNSGeometry : XCTestCase { } func test_NSMakePoint() { - let p2 = NSMakePoint(CGFloat(3.6), CGFloat(4.5)) + let p2 = NSPoint(x: CGFloat(3.6), y: CGFloat(4.5)) XCTAssertEqual(p2.x, CGFloat(3.6)) XCTAssertEqual(p2.y, CGFloat(4.5)) } func test_NSMakeSize() { - let s2 = NSMakeSize(CGFloat(3.6), CGFloat(4.5)) + let s2 = NSSize(width: CGFloat(3.6), height: CGFloat(4.5)) XCTAssertEqual(s2.width, CGFloat(3.6)) XCTAssertEqual(s2.height, CGFloat(4.5)) } func test_NSMakeRect() { - let r2 = NSMakeRect(CGFloat(2.2), CGFloat(3.0), CGFloat(5.0), CGFloat(5.0)) + let r2 = NSRect(x: CGFloat(2.2), y: CGFloat(3.0), width: CGFloat(5.0), height: CGFloat(5.0)) XCTAssertEqual(r2.origin.x, CGFloat(2.2)) XCTAssertEqual(r2.origin.y, CGFloat(3.0)) XCTAssertEqual(r2.size.width, CGFloat(5.0)) @@ -949,7 +949,7 @@ class TestNSGeometry : XCTestCase { } func test_NSEdgeInsetsMake() { - let i2 = NSEdgeInsetsMake(CGFloat(2.2), CGFloat(3.0), CGFloat(5.0), CGFloat(5.0)) + let i2 = NSEdgeInsets(top: CGFloat(2.2), left: CGFloat(3.0), bottom: CGFloat(5.0), right: CGFloat(5.0)) XCTAssertEqual(i2.top, CGFloat(2.2)) XCTAssertEqual(i2.left, CGFloat(3.0)) XCTAssertEqual(i2.bottom, CGFloat(5.0)) @@ -957,14 +957,14 @@ class TestNSGeometry : XCTestCase { } func test_NSUnionRect() { - let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) - let r2 = NSMakeRect(CGFloat(10.2), CGFloat(2.5), CGFloat(5.0), CGFloat(5.0)) + let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) + let r2 = NSRect(x: CGFloat(10.2), y: CGFloat(2.5), width: CGFloat(5.0), height: CGFloat(5.0)) - XCTAssertTrue(NSIsEmptyRect(NSUnionRect(NSZeroRect, NSZeroRect))) - XCTAssertTrue(NSEqualRects(r1, NSUnionRect(r1, NSZeroRect))) - XCTAssertTrue(NSEqualRects(r2, NSUnionRect(NSZeroRect, r2))) + XCTAssertTrue(NSIsEmptyRect(NSRect.zero.union(NSRect.zero))) + XCTAssertTrue(NSEqualRects(r1, r1.union(NSRect.zero))) + XCTAssertTrue(NSEqualRects(r2, NSRect.zero.union(r2))) - let r3 = NSUnionRect(r1, r2) + let r3 = r1.union(r2) XCTAssertEqual(r3.origin.x, CGFloat(1.2)) XCTAssertEqual(r3.origin.y, CGFloat(2.5)) XCTAssertEqual(r3.size.width, CGFloat(14.0)) @@ -972,13 +972,13 @@ class TestNSGeometry : XCTestCase { } func test_NSIntersectionRect() { - let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) - let r2 = NSMakeRect(CGFloat(-2.3), CGFloat(-1.5), CGFloat(1.0), CGFloat(1.0)) - let r3 = NSMakeRect(CGFloat(10.2), CGFloat(2.5), CGFloat(5.0), CGFloat(5.0)) + let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) + let r2 = NSRect(x: CGFloat(-2.3), y: CGFloat(-1.5), width: CGFloat(1.0), height: CGFloat(1.0)) + let r3 = NSRect(x: CGFloat(10.2), y: CGFloat(2.5), width: CGFloat(5.0), height: CGFloat(5.0)) - XCTAssertTrue(NSIsEmptyRect(NSIntersectionRect(r1, r2))) + XCTAssertTrue(NSIsEmptyRect(r1.intersection(r2))) - let r4 = NSIntersectionRect(r1, r3) + let r4 = r1.intersection(r3) XCTAssertEqual(r4.origin.x, CGFloat(10.2)) XCTAssertEqual(r4.origin.y, CGFloat(3.1)) XCTAssertEqual(r4.size.width, CGFloat(1.0)) @@ -986,177 +986,177 @@ class TestNSGeometry : XCTestCase { } func test_NSOffsetRect() { - let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) + let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) let r2 = NSOffsetRect(r1, CGFloat(2.0), CGFloat(-5.0)) - let expectedRect = NSMakeRect(CGFloat(3.2), CGFloat(-1.9), CGFloat(10.0), CGFloat(10.0)) + let expectedRect = NSRect(x: CGFloat(3.2), y: CGFloat(-1.9), width: CGFloat(10.0), height: CGFloat(10.0)) XCTAssertTrue(_NSRect(expectedRect, equalsToRect: r2)) } func test_NSPointInRect() { - let p1 = NSMakePoint(CGFloat(2.2), CGFloat(5.3)) - let p2 = NSMakePoint(CGFloat(1.2), CGFloat(3.1)) - let p3 = NSMakePoint(CGFloat(1.2), CGFloat(5.3)) - let p4 = NSMakePoint(CGFloat(5.2), CGFloat(3.1)) - let p5 = NSMakePoint(CGFloat(11.2), CGFloat(13.1)) - let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) - let r2 = NSMakeRect(CGFloat(-2.3), CGFloat(-1.5), CGFloat(1.0), CGFloat(1.0)) - - XCTAssertFalse(NSPointInRect(NSZeroPoint, NSZeroRect)) - XCTAssertFalse(NSPointInRect(p1, r2)) - XCTAssertTrue(NSPointInRect(p1, r1)) - XCTAssertTrue(NSPointInRect(p2, r1)) - XCTAssertTrue(NSPointInRect(p3, r1)) - XCTAssertTrue(NSPointInRect(p4, r1)) - XCTAssertFalse(NSPointInRect(p5, r1)) + let p1 = NSPoint(x: CGFloat(2.2), y: CGFloat(5.3)) + let p2 = NSPoint(x: CGFloat(1.2), y: CGFloat(3.1)) + let p3 = NSPoint(x: CGFloat(1.2), y: CGFloat(5.3)) + let p4 = NSPoint(x: CGFloat(5.2), y: CGFloat(3.1)) + let p5 = NSPoint(x: CGFloat(11.2), y: CGFloat(13.1)) + let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) + let r2 = NSRect(x: CGFloat(-2.3), y: CGFloat(-1.5), width: CGFloat(1.0), height: CGFloat(1.0)) + + XCTAssertFalse(NSRect.zero.contains(NSPoint.zero)) + XCTAssertFalse(r2.contains(p1)) + XCTAssertTrue(r1.contains(p1)) + XCTAssertTrue(r1.contains(p2)) + XCTAssertTrue(r1.contains(p3)) + XCTAssertTrue(r1.contains(p4)) + XCTAssertFalse(r1.contains(p5)) } func test_NSMouseInRect() { - let p1 = NSMakePoint(CGFloat(2.2), CGFloat(5.3)) - let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) - let r2 = NSMakeRect(CGFloat(-2.3), CGFloat(-1.5), CGFloat(1.0), CGFloat(1.0)) + let p1 = NSPoint(x: CGFloat(2.2), y: CGFloat(5.3)) + let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) + let r2 = NSRect(x: CGFloat(-2.3), y: CGFloat(-1.5), width: CGFloat(1.0), height: CGFloat(1.0)) - XCTAssertFalse(NSMouseInRect(NSZeroPoint, NSZeroRect, true)) + XCTAssertFalse(NSMouseInRect(NSPoint.zero, NSRect.zero, true)) XCTAssertFalse(NSMouseInRect(p1, r2, true)) XCTAssertTrue(NSMouseInRect(p1, r1, true)) - let p2 = NSMakePoint(NSMinX(r1), NSMaxY(r1)) + let p2 = NSPoint(x: r1.minX, y: r1.maxY) XCTAssertFalse(NSMouseInRect(p2, r1, true)) XCTAssertTrue(NSMouseInRect(p2, r1, false)) - let p3 = NSMakePoint(NSMinX(r1), NSMinY(r1)) + let p3 = NSPoint(x: r1.minX, y: r1.minY) XCTAssertFalse(NSMouseInRect(p3, r1, false)) XCTAssertTrue(NSMouseInRect(p3, r1, true)) } func test_NSContainsRect() { - let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) - let r2 = NSMakeRect(CGFloat(-2.3), CGFloat(-1.5), CGFloat(1.0), CGFloat(1.0)) - let r3 = NSMakeRect(CGFloat(10.2), CGFloat(5.5), CGFloat(0.5), CGFloat(5.0)) - - XCTAssertFalse(NSContainsRect(r1, NSZeroRect)) - XCTAssertFalse(NSContainsRect(r1, r2)) - XCTAssertFalse(NSContainsRect(r2, r1)) - XCTAssertTrue(NSContainsRect(r1, r3)) + let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) + let r2 = NSRect(x: CGFloat(-2.3), y: CGFloat(-1.5), width: CGFloat(1.0), height: CGFloat(1.0)) + let r3 = NSRect(x: CGFloat(10.2), y: CGFloat(5.5), width: CGFloat(0.5), height: CGFloat(5.0)) + + XCTAssertFalse(r1.contains(NSRect.zero)) + XCTAssertFalse(r1.contains(r2)) + XCTAssertFalse(r2.contains(r1)) + XCTAssertTrue(r1.contains(r3)) } func test_NSIntersectsRect() { - let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) - let r2 = NSMakeRect(CGFloat(-2.3), CGFloat(-1.5), CGFloat(1.0), CGFloat(1.0)) - let r3 = NSMakeRect(CGFloat(10.2), CGFloat(2.5), CGFloat(5.0), CGFloat(5.0)) - - XCTAssertFalse(NSIntersectsRect(NSZeroRect, NSZeroRect)) - XCTAssertFalse(NSIntersectsRect(r1, NSZeroRect)) - XCTAssertFalse(NSIntersectsRect(NSZeroRect, r2)) - XCTAssertFalse(NSIntersectsRect(r1, r2)) - XCTAssertTrue(NSIntersectsRect(r1, r3)) + let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) + let r2 = NSRect(x: CGFloat(-2.3), y: CGFloat(-1.5), width: CGFloat(1.0), height: CGFloat(1.0)) + let r3 = NSRect(x: CGFloat(10.2), y: CGFloat(2.5), width: CGFloat(5.0), height: CGFloat(5.0)) + + XCTAssertFalse(NSRect.zero.intersects(NSRect.zero)) + XCTAssertFalse(r1.intersects(NSRect.zero)) + XCTAssertFalse(NSRect.zero.intersects(r2)) + XCTAssertFalse(r1.intersects(r2)) + XCTAssertTrue(r1.intersects(r3)) } func test_NSIntegralRect() { - let referenceNegativeRect = NSMakeRect(CGFloat(-0.6), CGFloat(-5.4), CGFloat(-105.7), CGFloat(-24.3)) - XCTAssertEqual(NSIntegralRect(referenceNegativeRect), NSZeroRect) + let referenceNegativeRect = NSRect(x: CGFloat(-0.6), y: CGFloat(-5.4), width: CGFloat(-105.7), height: CGFloat(-24.3)) + XCTAssertEqual(referenceNegativeRect.integral, NSRect.zero) - let referenceRect = NSMakeRect(CGFloat(0.6), CGFloat(5.4), CGFloat(105.7), CGFloat(24.3)) - let referenceNegativeOriginRect = NSMakeRect(CGFloat(-0.6), CGFloat(-5.4), CGFloat(105.7), CGFloat(24.3)) + let referenceRect = NSRect(x: CGFloat(0.6), y: CGFloat(5.4), width: CGFloat(105.7), height: CGFloat(24.3)) + let referenceNegativeOriginRect = NSRect(x: CGFloat(-0.6), y: CGFloat(-5.4), width: CGFloat(105.7), height: CGFloat(24.3)) - var expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(5.0), CGFloat(107.0), CGFloat(25.0)) - var result = NSIntegralRect(referenceRect) + var expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(5.0), width: CGFloat(107.0), height: CGFloat(25.0)) + var result = referenceRect.integral XCTAssertEqual(result, expectedResult) - expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-6.0), CGFloat(107.0), CGFloat(25.0)) - result = NSIntegralRect(referenceNegativeOriginRect) + expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-6.0), width: CGFloat(107.0), height: CGFloat(25.0)) + result = referenceNegativeOriginRect.integral XCTAssertEqual(result, expectedResult) } func test_NSIntegralRectWithOptions() { - let referenceRect = NSMakeRect(CGFloat(0.6), CGFloat(5.4), CGFloat(105.7), CGFloat(24.3)) - let referenceNegativeRect = NSMakeRect(CGFloat(-0.6), CGFloat(-5.4), CGFloat(-105.7), CGFloat(-24.3)) - let referenceNegativeOriginRect = NSMakeRect(CGFloat(-0.6), CGFloat(-5.4), CGFloat(105.7), CGFloat(24.3)) + let referenceRect = NSRect(x: CGFloat(0.6), y: CGFloat(5.4), width: CGFloat(105.7), height: CGFloat(24.3)) + let referenceNegativeRect = NSRect(x: CGFloat(-0.6), y: CGFloat(-5.4), width: CGFloat(-105.7), height: CGFloat(-24.3)) + let referenceNegativeOriginRect = NSRect(x: CGFloat(-0.6), y: CGFloat(-5.4), width: CGFloat(105.7), height: CGFloat(24.3)) var options: AlignmentOptions = [.alignMinXInward, .alignMinYInward, .alignHeightInward, .alignWidthInward] - var expectedResult = NSMakeRect(CGFloat(1.0), CGFloat(6.0), CGFloat(105.0), CGFloat(24.0)) + var expectedResult = NSRect(x: CGFloat(1.0), y: CGFloat(6.0), width: CGFloat(105.0), height: CGFloat(24.0)) var result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXOutward, .alignMinYOutward, .alignHeightOutward, .alignWidthOutward] - expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(5.0), CGFloat(106.0), CGFloat(25.0)) + expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(5.0), width: CGFloat(106.0), height: CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXInward, .alignMinYInward, .alignHeightInward, .alignWidthInward] - expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(0.0), CGFloat(0.0)) + expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(0.0), height: CGFloat(0.0)) result = NSIntegralRectWithOptions(referenceNegativeRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXInward, .alignMinYInward, .alignHeightInward, .alignWidthInward] - expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(105.0), CGFloat(24.0)) + expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(105.0), height: CGFloat(24.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXOutward, .alignMinYOutward, .alignHeightOutward, .alignWidthOutward] - expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-6.0), CGFloat(106.0), CGFloat(25.0)) + expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-6.0), width: CGFloat(106.0), height: CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMaxXOutward, .alignMaxYOutward, .alignHeightOutward, .alignWidthOutward] - expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(-6.0), CGFloat(106.0), CGFloat(25.0)) + expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(-6.0), width: CGFloat(106.0), height: CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXOutward, .alignMaxXOutward, .alignMinYOutward, .alignMaxYOutward] - expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-6.0), CGFloat(107.0), CGFloat(25.0)) + expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-6.0), width: CGFloat(107.0), height: CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMaxXOutward, .alignMaxYOutward, .alignHeightOutward, .alignWidthOutward] - expectedResult = NSMakeRect(CGFloat(1.0), CGFloat(5.0), CGFloat(106.0), CGFloat(25.0)) + expectedResult = NSRect(x: CGFloat(1.0), y: CGFloat(5.0), width: CGFloat(106.0), height: CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMaxXInward, .alignMaxYInward, .alignHeightOutward, .alignWidthOutward] - expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-7.0), CGFloat(106.0), CGFloat(25.0)) + expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-7.0), width: CGFloat(106.0), height: CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMaxXInward, .alignMaxYInward, .alignHeightOutward, .alignWidthOutward] - expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(4.0), CGFloat(106.0), CGFloat(25.0)) + expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(4.0), width: CGFloat(106.0), height: CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXNearest, .alignMinYNearest, .alignHeightNearest, .alignWidthNearest] - expectedResult = NSMakeRect(CGFloat(1.0), CGFloat(5.0), CGFloat(106.0), CGFloat(24.0)) + expectedResult = NSRect(x: CGFloat(1.0), y: CGFloat(5.0), width: CGFloat(106.0), height: CGFloat(24.0)) result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXNearest, .alignMinYNearest, .alignHeightNearest, .alignWidthNearest] - expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-5.0), CGFloat(106.0), CGFloat(24.0)) + expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-5.0), width: CGFloat(106.0), height: CGFloat(24.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMaxXNearest, .alignMaxYNearest, .alignHeightNearest, .alignWidthNearest] - expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(6.0), CGFloat(106.0), CGFloat(24.0)) + expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(6.0), width: CGFloat(106.0), height: CGFloat(24.0)) result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMaxXNearest, .alignMaxYNearest, .alignHeightNearest, .alignWidthNearest] - expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-5.0), CGFloat(106.0), CGFloat(24.0)) + expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-5.0), width: CGFloat(106.0), height: CGFloat(24.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXInward, .alignMaxXInward, .alignMinYInward, .alignMaxYInward] - expectedResult = NSMakeRect(CGFloat(1.0), CGFloat(6.0), CGFloat(105.0), CGFloat(23.0)) + expectedResult = NSRect(x: CGFloat(1.0), y: CGFloat(6.0), width: CGFloat(105.0), height: CGFloat(23.0)) result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXInward, .alignMaxXInward, .alignMinYInward, .alignMaxYInward] - expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(105.0), CGFloat(23.0)) + expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(105.0), height: CGFloat(23.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXNearest, .alignMaxXInward, .alignMinYInward, .alignMaxYNearest] - expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-5.0), CGFloat(106.0), CGFloat(24.0)) + expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-5.0), width: CGFloat(106.0), height: CGFloat(24.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) } @@ -1164,98 +1164,98 @@ class TestNSGeometry : XCTestCase { func test_NSDivideRect() { // divide empty rect - var inRect = NSZeroRect - var slice = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) - var remainder = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) + var inRect = NSRect.zero + var slice = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) + var remainder = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) NSDivideRect(inRect, &slice, &remainder, CGFloat(0.0), .maxX) - var expectedSlice = NSZeroRect - var expectedRemainder = NSZeroRect + var expectedSlice = NSRect.zero + var expectedRemainder = NSRect.zero XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MinX edge - inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) - slice = NSZeroRect - remainder = NSZeroRect + inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) + slice = NSRect.zero + remainder = NSRect.zero NSDivideRect(inRect, &slice, &remainder, CGFloat(10.0), .minX) - expectedSlice = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(10.0), CGFloat(35.0)) - expectedRemainder = NSMakeRect(CGFloat(10.0), CGFloat(-5.0), CGFloat(15.0), CGFloat(35.0)) + expectedSlice = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(10.0), height: CGFloat(35.0)) + expectedRemainder = NSRect(x: CGFloat(10.0), y: CGFloat(-5.0), width: CGFloat(15.0), height: CGFloat(35.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MinX edge with amount > width - inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) - slice = NSZeroRect - remainder = NSZeroRect - NSDivideRect(inRect, &slice, &remainder, NSWidth(inRect) + CGFloat(1.0), .minX) + inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) + slice = NSRect.zero + remainder = NSRect.zero + NSDivideRect(inRect, &slice, &remainder, inRect.width + CGFloat(1.0), .minX) expectedSlice = inRect - expectedRemainder = NSMakeRect(CGFloat(25.0), CGFloat(-5.0), CGFloat(0.0), CGFloat(35.0)) + expectedRemainder = NSRect(x: CGFloat(25.0), y: CGFloat(-5.0), width: CGFloat(0.0), height: CGFloat(35.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MinY edge - inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) - slice = NSZeroRect - remainder = NSZeroRect + inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) + slice = NSRect.zero + remainder = NSRect.zero NSDivideRect(inRect, &slice, &remainder, CGFloat(10.0), .minY) - expectedSlice = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(10.0)) - expectedRemainder = NSMakeRect(CGFloat(0.0), CGFloat(5.0), CGFloat(25.0), CGFloat(25.0)) + expectedSlice = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(10.0)) + expectedRemainder = NSRect(x: CGFloat(0.0), y: CGFloat(5.0), width: CGFloat(25.0), height: CGFloat(25.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MinY edge with amount > height - inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) - slice = NSZeroRect - remainder = NSZeroRect - NSDivideRect(inRect, &slice, &remainder, NSHeight(inRect) + CGFloat(1.0), .minY) + inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) + slice = NSRect.zero + remainder = NSRect.zero + NSDivideRect(inRect, &slice, &remainder, inRect.height + CGFloat(1.0), .minY) expectedSlice = inRect - expectedRemainder = NSMakeRect(CGFloat(0.0), CGFloat(30.0), CGFloat(25.0), CGFloat(0.0)) + expectedRemainder = NSRect(x: CGFloat(0.0), y: CGFloat(30.0), width: CGFloat(25.0), height: CGFloat(0.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MaxX edge - inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) - slice = NSZeroRect - remainder = NSZeroRect + inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) + slice = NSRect.zero + remainder = NSRect.zero NSDivideRect(inRect, &slice, &remainder, CGFloat(10.0), .maxX) - expectedSlice = NSMakeRect(CGFloat(15.0), CGFloat(-5.0), CGFloat(10.0), CGFloat(35.0)) - expectedRemainder = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(15.0), CGFloat(35.0)) + expectedSlice = NSRect(x: CGFloat(15.0), y: CGFloat(-5.0), width: CGFloat(10.0), height: CGFloat(35.0)) + expectedRemainder = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(15.0), height: CGFloat(35.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MaxX edge with amount > width - inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) - slice = NSZeroRect - remainder = NSZeroRect - NSDivideRect(inRect, &slice, &remainder, NSWidth(inRect) + CGFloat(1.0), .maxX) + inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) + slice = NSRect.zero + remainder = NSRect.zero + NSDivideRect(inRect, &slice, &remainder, inRect.width + CGFloat(1.0), .maxX) expectedSlice = inRect - expectedRemainder = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(0.0), CGFloat(35.0)) + expectedRemainder = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(0.0), height: CGFloat(35.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MaxY edge - inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) - slice = NSZeroRect - remainder = NSZeroRect + inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) + slice = NSRect.zero + remainder = NSRect.zero NSDivideRect(inRect, &slice, &remainder, CGFloat(10.0), .maxY) - expectedSlice = NSMakeRect(CGFloat(0.0), CGFloat(20.0), CGFloat(25.0), CGFloat(10.0)) - expectedRemainder = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(25.0)) + expectedSlice = NSRect(x: CGFloat(0.0), y: CGFloat(20.0), width: CGFloat(25.0), height: CGFloat(10.0)) + expectedRemainder = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(25.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MaxY edge with amount > height - inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) - slice = NSZeroRect - remainder = NSZeroRect - NSDivideRect(inRect, &slice, &remainder, NSHeight(inRect) + CGFloat(1.0), .maxY) + inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) + slice = NSRect.zero + remainder = NSRect.zero + NSDivideRect(inRect, &slice, &remainder, inRect.height + CGFloat(1.0), .maxY) expectedSlice = inRect - expectedRemainder = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(0.0)) + expectedRemainder = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(0.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) } func test_EncodeToNSString() { - let referenceRect = NSMakeRect(CGFloat(0.6), CGFloat(5.4), CGFloat(105.7), CGFloat(24.3)) + let referenceRect = NSRect(x: CGFloat(0.6), y: CGFloat(5.4), width: CGFloat(105.7), height: CGFloat(24.3)) var expectedString = "{0.6, 5.4}" var string = NSStringFromPoint(referenceRect.origin) @@ -1274,7 +1274,7 @@ class TestNSGeometry : XCTestCase { } func test_EncodeNegativeToNSString() { - let referenceNegativeRect = NSMakeRect(CGFloat(-0.6), CGFloat(-5.4), CGFloat(-105.7), CGFloat(-24.3)) + let referenceNegativeRect = NSRect(x: CGFloat(-0.6), y: CGFloat(-5.4), width: CGFloat(-105.7), height: CGFloat(-24.3)) var expectedString = "{-0.6, -5.4}" var string = NSStringFromPoint(referenceNegativeRect.origin) @@ -1297,17 +1297,17 @@ class TestNSGeometry : XCTestCase { var stringSize = "{105.7, 24.3}" var stringRect = "{{0.6, 5.4}, {105.7, 24.3}}" - let expectedPoint = NSMakePoint(CGFloat(0.6), CGFloat(5.4)) + let expectedPoint = NSPoint(x: CGFloat(0.6), y: CGFloat(5.4)) var point = NSPointFromString(stringPoint) XCTAssertTrue(_NSPoint(expectedPoint, equalsToPoint: point), "\(NSStringFromPoint(point)) is not equal to expected \(NSStringFromPoint(expectedPoint))") - let expectedSize = NSMakeSize(CGFloat(105.7), CGFloat(24.3)) + let expectedSize = NSSize(width: CGFloat(105.7), height: CGFloat(24.3)) var size = NSSizeFromString(stringSize) XCTAssertTrue(_NSSize(expectedSize, equalsToSize: size), "\(NSStringFromSize(size)) is not equal to expected \(NSStringFromSize(expectedSize))") - let expectedRect = NSMakeRect(CGFloat(0.6), CGFloat(5.4), CGFloat(105.7), CGFloat(24.3)) + let expectedRect = NSRect(x: CGFloat(0.6), y: CGFloat(5.4), width: CGFloat(105.7), height: CGFloat(24.3)) var rect = NSRectFromString(stringRect) XCTAssertTrue(_NSRect(expectedRect, equalsToRect: rect), "\(NSStringFromRect(rect)) is not equal to expected \(NSStringFromRect(expectedRect))") @@ -1353,17 +1353,17 @@ class TestNSGeometry : XCTestCase { let stringSize = "" let stringRect = "" - let expectedPoint = NSZeroPoint + let expectedPoint = NSPoint.zero let point = NSPointFromString(stringPoint) XCTAssertTrue(_NSPoint(expectedPoint, equalsToPoint: point), "\(NSStringFromPoint(point)) is not equal to expected \(NSStringFromPoint(expectedPoint))") - let expectedSize = NSZeroSize + let expectedSize = NSSize.zero let size = NSSizeFromString(stringSize) XCTAssertTrue(_NSSize(expectedSize, equalsToSize: size), "\(NSStringFromSize(size)) is not equal to expected \(NSStringFromSize(expectedSize))") - let expectedRect = NSZeroRect + let expectedRect = NSRect.zero let rect = NSRectFromString(stringRect) XCTAssertTrue(_NSRect(expectedRect, equalsToRect: rect), "\(NSStringFromRect(rect)) is not equal to expected \(NSStringFromRect(expectedRect))") @@ -1374,17 +1374,17 @@ class TestNSGeometry : XCTestCase { let stringSize = "{-105.7, -24.3}" let stringRect = "{{-0.6, -5.4}, {-105.7, -24.3}}" - let expectedPoint = NSMakePoint(CGFloat(-0.6), CGFloat(-5.4)) + let expectedPoint = NSPoint(x: CGFloat(-0.6), y: CGFloat(-5.4)) let point = NSPointFromString(stringPoint) XCTAssertTrue(_NSPoint(expectedPoint, equalsToPoint: point), "\(NSStringFromPoint(point)) is not equal to expected \(NSStringFromPoint(expectedPoint))") - let expectedSize = NSMakeSize(CGFloat(-105.7), CGFloat(-24.3)) + let expectedSize = NSSize(width: CGFloat(-105.7), height: CGFloat(-24.3)) let size = NSSizeFromString(stringSize) XCTAssertTrue(_NSSize(expectedSize, equalsToSize: size), "\(NSStringFromSize(size)) is not equal to expected \(NSStringFromSize(expectedSize))") - let expectedRect = NSMakeRect(CGFloat(-0.6), CGFloat(-5.4), CGFloat(-105.7), CGFloat(-24.3)) + let expectedRect = NSRect(x: CGFloat(-0.6), y: CGFloat(-5.4), width: CGFloat(-105.7), height: CGFloat(-24.3)) let rect = NSRectFromString(stringRect) XCTAssertTrue(_NSRect(expectedRect, equalsToRect: rect), "\(NSStringFromRect(rect)) is not equal to expected \(NSStringFromRect(expectedRect))") @@ -1393,13 +1393,13 @@ class TestNSGeometry : XCTestCase { func test_DecodeGarbageFromNSString() { var stringRect = "-0.6a5.4das-105.7bfh24.3dfas;hk312}}" - var expectedRect = NSMakeRect(CGFloat(-0.6), CGFloat(5.4), CGFloat(-105.7), CGFloat(24.3)) + var expectedRect = NSRect(x: CGFloat(-0.6), y: CGFloat(5.4), width: CGFloat(-105.7), height: CGFloat(24.3)) var rect = NSRectFromString(stringRect) XCTAssertTrue(_NSRect(expectedRect, equalsToRect: rect), "\(NSStringFromRect(rect)) is not equal to expected \(NSStringFromRect(expectedRect))") stringRect = "-0.6a5.4da}}" - expectedRect = NSMakeRect(CGFloat(-0.6), CGFloat(5.4), CGFloat(0.0), CGFloat(0.0)) + expectedRect = NSRect(x: CGFloat(-0.6), y: CGFloat(5.4), width: CGFloat(0.0), height: CGFloat(0.0)) rect = NSRectFromString(stringRect) XCTAssertTrue(_NSRect(expectedRect, equalsToRect: rect), "\(NSStringFromRect(rect)) is not equal to expected \(NSStringFromRect(expectedRect))") From b6e7aefee728924b6a5e56bc6019dc16ddddb3f9 Mon Sep 17 00:00:00 2001 From: rauhul-varma Date: Sat, 6 Oct 2018 00:08:20 -0400 Subject: [PATCH 2/4] clean up unneccesary casts in TestAffineTransform --- TestFoundation/TestAffineTransform.swift | 90 ++++++++++++------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/TestFoundation/TestAffineTransform.swift b/TestFoundation/TestAffineTransform.swift index 1c2a55cc7a..0a26d54231 100644 --- a/TestFoundation/TestAffineTransform.swift +++ b/TestFoundation/TestAffineTransform.swift @@ -83,21 +83,21 @@ class TestAffineTransform : XCTestCase { checkPointTransformation(identityTransform, point: point, expectedPoint: point) } - checkIdentityPointTransformation(NSPoint()) - checkIdentityPointTransformation(NSPoint(x: CGFloat(24.5), y: CGFloat(10.0))) - checkIdentityPointTransformation(NSPoint(x: CGFloat(-7.5), y: CGFloat(2.0))) + checkIdentityPointTransformation(NSPoint.zero) + checkIdentityPointTransformation(NSPoint(x: 24.5, y: 10.0)) + checkIdentityPointTransformation(NSPoint(x: -7.5, y: 2.0)) func checkIdentitySizeTransformation(_ size: NSSize) { checkSizeTransformation(identityTransform, size: size, expectedSize: size) } - checkIdentitySizeTransformation(NSSize()) - checkIdentitySizeTransformation(NSSize(width: CGFloat(13.0), height: CGFloat(12.5))) - checkIdentitySizeTransformation(NSSize(width: CGFloat(100.0), height: CGFloat(-100.0))) + checkIdentitySizeTransformation(NSSize.zero) + checkIdentitySizeTransformation(NSSize(width: 13.0, height: 12.5)) + checkIdentitySizeTransformation(NSSize(width: 100.0, height: -100.0)) } func test_Translation() { - let point = NSPoint(x: CGFloat(0.0), y: CGFloat(0.0)) + let point = NSPoint.zero let noop = NSAffineTransform() noop.translateX(by: CGFloat(), yBy: CGFloat()) @@ -105,19 +105,19 @@ class TestAffineTransform : XCTestCase { let translateH = NSAffineTransform() translateH.translateX(by: CGFloat(10.0), yBy: CGFloat()) - checkPointTransformation(translateH, point: point, expectedPoint: NSPoint(x: CGFloat(10.0), y: CGFloat())) + checkPointTransformation(translateH, point: point, expectedPoint: NSPoint(x: 10.0, y: 0.0)) let translateV = NSAffineTransform() translateV.translateX(by: CGFloat(), yBy: CGFloat(20.0)) - checkPointTransformation(translateV, point: point, expectedPoint: NSPoint(x: CGFloat(), y: CGFloat(20.0))) + checkPointTransformation(translateV, point: point, expectedPoint: NSPoint(x: 0.0, y: 20.0)) let translate = NSAffineTransform() translate.translateX(by: CGFloat(-30.0), yBy: CGFloat(40.0)) - checkPointTransformation(translate, point: point, expectedPoint: NSPoint(x: CGFloat(-30.0), y: CGFloat(40.0))) + checkPointTransformation(translate, point: point, expectedPoint: NSPoint(x: -30.0, y: 40.0)) } func test_Scale() { - let size = NSSize(width: CGFloat(10.0), height: CGFloat(10.0)) + let size = NSSize(width: 10.0, height: 10.0) let noop = NSAffineTransform() noop.scale(by: CGFloat(1.0)) @@ -125,20 +125,20 @@ class TestAffineTransform : XCTestCase { let shrink = NSAffineTransform() shrink.scale(by: CGFloat(0.5)) - checkSizeTransformation(shrink, size: size, expectedSize: NSSize(width: CGFloat(5.0), height: CGFloat(5.0))) + checkSizeTransformation(shrink, size: size, expectedSize: NSSize(width: 5.0, height: 5.0)) let grow = NSAffineTransform() grow.scale(by: CGFloat(3.0)) - checkSizeTransformation(grow, size: size, expectedSize: NSSize(width: CGFloat(30.0), height: CGFloat(30.0))) + checkSizeTransformation(grow, size: size, expectedSize: NSSize(width: 30.0, height: 30.0)) let stretch = NSAffineTransform() stretch.scaleX(by: CGFloat(2.0), yBy: CGFloat(0.5)) - checkSizeTransformation(stretch, size: size, expectedSize: NSSize(width: CGFloat(20.0), height: CGFloat(5.0))) + checkSizeTransformation(stretch, size: size, expectedSize: NSSize(width: 20.0, height: 5.0)) } func test_Rotation_Degrees() { - let point = NSPoint(x: CGFloat(10.0), y: CGFloat(10.0)) - + let point = NSPoint(x: 10.0, y: 10.0) + let noop = NSAffineTransform() noop.rotate(byDegrees: CGFloat()) checkPointTransformation(noop, point: point, expectedPoint: point) @@ -149,20 +149,20 @@ class TestAffineTransform : XCTestCase { let rotateCounterClockwise = NSAffineTransform() rotateCounterClockwise.rotate(byDegrees: CGFloat(90.0)) - checkPointTransformation(rotateCounterClockwise, point: point, expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(10.0))) + checkPointTransformation(rotateCounterClockwise, point: point, expectedPoint: NSPoint(x: -10.0, y: 10.0)) let rotateClockwise = NSAffineTransform() rotateClockwise.rotate(byDegrees: CGFloat(-90.0)) - checkPointTransformation(rotateClockwise, point: point, expectedPoint: NSPoint(x: CGFloat(10.0), y: CGFloat(-10.0))) + checkPointTransformation(rotateClockwise, point: point, expectedPoint: NSPoint(x: 10.0, y: -10.0)) let reflectAboutOrigin = NSAffineTransform() reflectAboutOrigin.rotate(byDegrees: CGFloat(180.0)) - checkPointTransformation(reflectAboutOrigin, point: point, expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(-10.0))) + checkPointTransformation(reflectAboutOrigin, point: point, expectedPoint: NSPoint(x: -10.0, y: -10.0)) } func test_Rotation_Radians() { - let point = NSPoint(x: CGFloat(10.0), y: CGFloat(10.0)) - + let point = NSPoint(x: 10.0, y: 10.0) + let noop = NSAffineTransform() noop.rotate(byRadians: CGFloat()) checkPointTransformation(noop, point: point, expectedPoint: point) @@ -173,20 +173,20 @@ class TestAffineTransform : XCTestCase { let rotateCounterClockwise = NSAffineTransform() rotateCounterClockwise.rotate(byRadians: .pi / 2) - checkPointTransformation(rotateCounterClockwise, point: point, expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(10.0))) + checkPointTransformation(rotateCounterClockwise, point: point, expectedPoint: NSPoint(x: -10.0, y: 10.0)) let rotateClockwise = NSAffineTransform() rotateClockwise.rotate(byRadians: -.pi / 2) - checkPointTransformation(rotateClockwise, point: point, expectedPoint: NSPoint(x: CGFloat(10.0), y: CGFloat(-10.0))) + checkPointTransformation(rotateClockwise, point: point, expectedPoint: NSPoint(x: 10.0, y: -10.0)) let reflectAboutOrigin = NSAffineTransform() reflectAboutOrigin.rotate(byRadians: .pi) - checkPointTransformation(reflectAboutOrigin, point: point, expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(-10.0))) + checkPointTransformation(reflectAboutOrigin, point: point, expectedPoint: NSPoint(x: -10.0, y: -10.0)) } func test_Inversion() { - let point = NSPoint(x: CGFloat(10.0), y: CGFloat(10.0)) - + let point = NSPoint(x: 10.0, y: 10.0) + var translate = AffineTransform() translate.translate(x: CGFloat(-30.0), y: CGFloat(40.0)) @@ -221,22 +221,22 @@ class TestAffineTransform : XCTestCase { xyPlus5.translateX(by: CGFloat(2.0), yBy: CGFloat(3.0)) xyPlus5.translateX(by: CGFloat(3.0), yBy: CGFloat(2.0)) - checkPointTransformation(xyPlus5, point: NSPoint(x: CGFloat(-2.0), y: CGFloat(-3.0)), - expectedPoint: NSPoint(x: CGFloat(3.0), y: CGFloat(2.0))) + checkPointTransformation(xyPlus5, point: NSPoint(x: -2.0, y: -3.0), + expectedPoint: NSPoint(x: 3.0, y: 2.0)) } func test_Scaling() { let xyTimes5 = NSAffineTransform() xyTimes5.scale(by: CGFloat(5.0)) - checkPointTransformation(xyTimes5, point: NSPoint(x: CGFloat(-2.0), y: CGFloat(3.0)), - expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(15.0))) + checkPointTransformation(xyTimes5, point: NSPoint(x: -2.0, y: 3.0), + expectedPoint: NSPoint(x: -10.0, y: 15.0)) let xTimes2YTimes3 = NSAffineTransform() xTimes2YTimes3.scaleX(by: CGFloat(2.0), yBy: CGFloat(-3.0)) - checkPointTransformation(xTimes2YTimes3, point: NSPoint(x: CGFloat(-1.0), y: CGFloat(3.5)), - expectedPoint: NSPoint(x: CGFloat(-2.0), y: CGFloat(-10.5))) + checkPointTransformation(xTimes2YTimes3, point: NSPoint(x: -1.0, y: 3.5), + expectedPoint: NSPoint(x: -2.0, y: -10.5)) } func test_TranslationScaling() { @@ -244,8 +244,8 @@ class TestAffineTransform : XCTestCase { xPlus2XYTimes5.translateX(by: CGFloat(2.0), yBy: CGFloat()) xPlus2XYTimes5.scaleX(by: CGFloat(5.0), yBy: CGFloat(-5.0)) - checkPointTransformation(xPlus2XYTimes5, point: NSPoint(x: CGFloat(1.0), y: CGFloat(2.0)), - expectedPoint: NSPoint(x: CGFloat(7.0), y: CGFloat(-10.0))) + checkPointTransformation(xPlus2XYTimes5, point: NSPoint(x: 1.0, y: 2.0), + expectedPoint: NSPoint(x: 7.0, y: -10.0)) } func test_ScalingTranslation() { @@ -253,13 +253,13 @@ class TestAffineTransform : XCTestCase { xyTimes5XPlus3.scale(by: CGFloat(5.0)) xyTimes5XPlus3.translateX(by: CGFloat(3.0), yBy: CGFloat()) - checkPointTransformation(xyTimes5XPlus3, point: NSPoint(x: CGFloat(1.0), y: CGFloat(2.0)), - expectedPoint: NSPoint(x: CGFloat(20.0), y: CGFloat(10.0))) + checkPointTransformation(xyTimes5XPlus3, point: NSPoint(x: 1.0, y: 2.0), + expectedPoint: NSPoint(x: 20.0, y: 10.0)) } func test_AppendTransform() { - let point = NSPoint(x: CGFloat(10.0), y: CGFloat(10.0)) - + let point = NSPoint(x: 10.0, y: 10.0) + var identityTransform = AffineTransform() identityTransform.append(identityTransform) checkPointTransformation(NSAffineTransform(transform: identityTransform), point: point, expectedPoint: point) @@ -272,11 +272,11 @@ class TestAffineTransform : XCTestCase { let translateThenScale = NSAffineTransform(transform: translate) translateThenScale.append(scale) - checkPointTransformation(translateThenScale, point: point, expectedPoint: NSPoint(x: CGFloat(40.0), y: CGFloat(20.0))) + checkPointTransformation(translateThenScale, point: point, expectedPoint: NSPoint(x: 40.0, y: 20.0)) } func test_PrependTransform() { - let point = NSPoint(x: CGFloat(10.0), y: CGFloat(10.0)) + let point = NSPoint(x: 10.0, y: 10.0) var identityTransform = AffineTransform() identityTransform.prepend(identityTransform) @@ -290,13 +290,13 @@ class TestAffineTransform : XCTestCase { let scaleThenTranslate = NSAffineTransform(transform: translate) scaleThenTranslate.prepend(scale) - checkPointTransformation(scaleThenTranslate, point: point, expectedPoint: NSPoint(x: CGFloat(30.0), y: CGFloat(20.0))) + checkPointTransformation(scaleThenTranslate, point: point, expectedPoint: NSPoint(x: 30.0, y: 20.0)) } func test_TransformComposition() { - let origin = NSPoint(x: CGFloat(10.0), y: CGFloat(10.0)) - let size = NSSize(width: CGFloat(40.0), height: CGFloat(20.0)) + let origin = NSPoint(x: 10.0, y: 10.0) + let size = NSSize(width: 40.0, height: 20.0) let rect = NSRect(origin: origin, size: size) let center = NSPoint(x: rect.midX, y: rect.midY) @@ -350,10 +350,10 @@ class TestAffineTransform : XCTestCase { } func test_translation_and_rotation() { - let point = NSPoint(x: CGFloat(10), y: CGFloat(10)) + let point = NSPoint(x: 10, y: 10) var translateThenRotate = AffineTransform(translationByX: 20, byY: -30) translateThenRotate.rotate(byRadians: .pi / 2) - checkPointTransformation(NSAffineTransform(transform: translateThenRotate), point: point, expectedPoint: NSPoint(x: CGFloat(10), y: CGFloat(-20))) + checkPointTransformation(NSAffineTransform(transform: translateThenRotate), point: point, expectedPoint: NSPoint(x: 10, y: -20)) } func test_Equal() { From 036b98c61b69ec1f1d361180fdac70f9928a1ef5 Mon Sep 17 00:00:00 2001 From: rauhul-varma Date: Sun, 7 Oct 2018 22:53:16 -0400 Subject: [PATCH 3/4] revert TestNSGeometry --- TestFoundation/TestNSGeometry.swift | 282 ++++++++++++++-------------- 1 file changed, 141 insertions(+), 141 deletions(-) diff --git a/TestFoundation/TestNSGeometry.swift b/TestFoundation/TestNSGeometry.swift index 9d77a044dd..977f398144 100644 --- a/TestFoundation/TestNSGeometry.swift +++ b/TestFoundation/TestNSGeometry.swift @@ -929,19 +929,19 @@ class TestNSGeometry : XCTestCase { } func test_NSMakePoint() { - let p2 = NSPoint(x: CGFloat(3.6), y: CGFloat(4.5)) + let p2 = NSMakePoint(CGFloat(3.6), CGFloat(4.5)) XCTAssertEqual(p2.x, CGFloat(3.6)) XCTAssertEqual(p2.y, CGFloat(4.5)) } func test_NSMakeSize() { - let s2 = NSSize(width: CGFloat(3.6), height: CGFloat(4.5)) + let s2 = NSMakeSize(CGFloat(3.6), CGFloat(4.5)) XCTAssertEqual(s2.width, CGFloat(3.6)) XCTAssertEqual(s2.height, CGFloat(4.5)) } func test_NSMakeRect() { - let r2 = NSRect(x: CGFloat(2.2), y: CGFloat(3.0), width: CGFloat(5.0), height: CGFloat(5.0)) + let r2 = NSMakeRect(CGFloat(2.2), CGFloat(3.0), CGFloat(5.0), CGFloat(5.0)) XCTAssertEqual(r2.origin.x, CGFloat(2.2)) XCTAssertEqual(r2.origin.y, CGFloat(3.0)) XCTAssertEqual(r2.size.width, CGFloat(5.0)) @@ -949,7 +949,7 @@ class TestNSGeometry : XCTestCase { } func test_NSEdgeInsetsMake() { - let i2 = NSEdgeInsets(top: CGFloat(2.2), left: CGFloat(3.0), bottom: CGFloat(5.0), right: CGFloat(5.0)) + let i2 = NSEdgeInsetsMake(CGFloat(2.2), CGFloat(3.0), CGFloat(5.0), CGFloat(5.0)) XCTAssertEqual(i2.top, CGFloat(2.2)) XCTAssertEqual(i2.left, CGFloat(3.0)) XCTAssertEqual(i2.bottom, CGFloat(5.0)) @@ -957,14 +957,14 @@ class TestNSGeometry : XCTestCase { } func test_NSUnionRect() { - let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) - let r2 = NSRect(x: CGFloat(10.2), y: CGFloat(2.5), width: CGFloat(5.0), height: CGFloat(5.0)) + let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) + let r2 = NSMakeRect(CGFloat(10.2), CGFloat(2.5), CGFloat(5.0), CGFloat(5.0)) - XCTAssertTrue(NSIsEmptyRect(NSRect.zero.union(NSRect.zero))) - XCTAssertTrue(NSEqualRects(r1, r1.union(NSRect.zero))) - XCTAssertTrue(NSEqualRects(r2, NSRect.zero.union(r2))) + XCTAssertTrue(NSIsEmptyRect(NSUnionRect(NSZeroRect, NSZeroRect))) + XCTAssertTrue(NSEqualRects(r1, NSUnionRect(r1, NSZeroRect))) + XCTAssertTrue(NSEqualRects(r2, NSUnionRect(NSZeroRect, r2))) - let r3 = r1.union(r2) + let r3 = NSUnionRect(r1, r2) XCTAssertEqual(r3.origin.x, CGFloat(1.2)) XCTAssertEqual(r3.origin.y, CGFloat(2.5)) XCTAssertEqual(r3.size.width, CGFloat(14.0)) @@ -972,13 +972,13 @@ class TestNSGeometry : XCTestCase { } func test_NSIntersectionRect() { - let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) - let r2 = NSRect(x: CGFloat(-2.3), y: CGFloat(-1.5), width: CGFloat(1.0), height: CGFloat(1.0)) - let r3 = NSRect(x: CGFloat(10.2), y: CGFloat(2.5), width: CGFloat(5.0), height: CGFloat(5.0)) + let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) + let r2 = NSMakeRect(CGFloat(-2.3), CGFloat(-1.5), CGFloat(1.0), CGFloat(1.0)) + let r3 = NSMakeRect(CGFloat(10.2), CGFloat(2.5), CGFloat(5.0), CGFloat(5.0)) - XCTAssertTrue(NSIsEmptyRect(r1.intersection(r2))) + XCTAssertTrue(NSIsEmptyRect(NSIntersectionRect(r1, r2))) - let r4 = r1.intersection(r3) + let r4 = NSIntersectionRect(r1, r3) XCTAssertEqual(r4.origin.x, CGFloat(10.2)) XCTAssertEqual(r4.origin.y, CGFloat(3.1)) XCTAssertEqual(r4.size.width, CGFloat(1.0)) @@ -986,177 +986,177 @@ class TestNSGeometry : XCTestCase { } func test_NSOffsetRect() { - let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) + let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) let r2 = NSOffsetRect(r1, CGFloat(2.0), CGFloat(-5.0)) - let expectedRect = NSRect(x: CGFloat(3.2), y: CGFloat(-1.9), width: CGFloat(10.0), height: CGFloat(10.0)) + let expectedRect = NSMakeRect(CGFloat(3.2), CGFloat(-1.9), CGFloat(10.0), CGFloat(10.0)) XCTAssertTrue(_NSRect(expectedRect, equalsToRect: r2)) } func test_NSPointInRect() { - let p1 = NSPoint(x: CGFloat(2.2), y: CGFloat(5.3)) - let p2 = NSPoint(x: CGFloat(1.2), y: CGFloat(3.1)) - let p3 = NSPoint(x: CGFloat(1.2), y: CGFloat(5.3)) - let p4 = NSPoint(x: CGFloat(5.2), y: CGFloat(3.1)) - let p5 = NSPoint(x: CGFloat(11.2), y: CGFloat(13.1)) - let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) - let r2 = NSRect(x: CGFloat(-2.3), y: CGFloat(-1.5), width: CGFloat(1.0), height: CGFloat(1.0)) - - XCTAssertFalse(NSRect.zero.contains(NSPoint.zero)) - XCTAssertFalse(r2.contains(p1)) - XCTAssertTrue(r1.contains(p1)) - XCTAssertTrue(r1.contains(p2)) - XCTAssertTrue(r1.contains(p3)) - XCTAssertTrue(r1.contains(p4)) - XCTAssertFalse(r1.contains(p5)) + let p1 = NSMakePoint(CGFloat(2.2), CGFloat(5.3)) + let p2 = NSMakePoint(CGFloat(1.2), CGFloat(3.1)) + let p3 = NSMakePoint(CGFloat(1.2), CGFloat(5.3)) + let p4 = NSMakePoint(CGFloat(5.2), CGFloat(3.1)) + let p5 = NSMakePoint(CGFloat(11.2), CGFloat(13.1)) + let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) + let r2 = NSMakeRect(CGFloat(-2.3), CGFloat(-1.5), CGFloat(1.0), CGFloat(1.0)) + + XCTAssertFalse(NSPointInRect(NSZeroPoint, NSZeroRect)) + XCTAssertFalse(NSPointInRect(p1, r2)) + XCTAssertTrue(NSPointInRect(p1, r1)) + XCTAssertTrue(NSPointInRect(p2, r1)) + XCTAssertTrue(NSPointInRect(p3, r1)) + XCTAssertTrue(NSPointInRect(p4, r1)) + XCTAssertFalse(NSPointInRect(p5, r1)) } func test_NSMouseInRect() { - let p1 = NSPoint(x: CGFloat(2.2), y: CGFloat(5.3)) - let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) - let r2 = NSRect(x: CGFloat(-2.3), y: CGFloat(-1.5), width: CGFloat(1.0), height: CGFloat(1.0)) + let p1 = NSMakePoint(CGFloat(2.2), CGFloat(5.3)) + let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) + let r2 = NSMakeRect(CGFloat(-2.3), CGFloat(-1.5), CGFloat(1.0), CGFloat(1.0)) - XCTAssertFalse(NSMouseInRect(NSPoint.zero, NSRect.zero, true)) + XCTAssertFalse(NSMouseInRect(NSZeroPoint, NSZeroRect, true)) XCTAssertFalse(NSMouseInRect(p1, r2, true)) XCTAssertTrue(NSMouseInRect(p1, r1, true)) - let p2 = NSPoint(x: r1.minX, y: r1.maxY) + let p2 = NSMakePoint(NSMinX(r1), NSMaxY(r1)) XCTAssertFalse(NSMouseInRect(p2, r1, true)) XCTAssertTrue(NSMouseInRect(p2, r1, false)) - let p3 = NSPoint(x: r1.minX, y: r1.minY) + let p3 = NSMakePoint(NSMinX(r1), NSMinY(r1)) XCTAssertFalse(NSMouseInRect(p3, r1, false)) XCTAssertTrue(NSMouseInRect(p3, r1, true)) } func test_NSContainsRect() { - let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) - let r2 = NSRect(x: CGFloat(-2.3), y: CGFloat(-1.5), width: CGFloat(1.0), height: CGFloat(1.0)) - let r3 = NSRect(x: CGFloat(10.2), y: CGFloat(5.5), width: CGFloat(0.5), height: CGFloat(5.0)) - - XCTAssertFalse(r1.contains(NSRect.zero)) - XCTAssertFalse(r1.contains(r2)) - XCTAssertFalse(r2.contains(r1)) - XCTAssertTrue(r1.contains(r3)) + let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) + let r2 = NSMakeRect(CGFloat(-2.3), CGFloat(-1.5), CGFloat(1.0), CGFloat(1.0)) + let r3 = NSMakeRect(CGFloat(10.2), CGFloat(5.5), CGFloat(0.5), CGFloat(5.0)) + + XCTAssertFalse(NSContainsRect(r1, NSZeroRect)) + XCTAssertFalse(NSContainsRect(r1, r2)) + XCTAssertFalse(NSContainsRect(r2, r1)) + XCTAssertTrue(NSContainsRect(r1, r3)) } func test_NSIntersectsRect() { - let r1 = NSRect(x: CGFloat(1.2), y: CGFloat(3.1), width: CGFloat(10.0), height: CGFloat(10.0)) - let r2 = NSRect(x: CGFloat(-2.3), y: CGFloat(-1.5), width: CGFloat(1.0), height: CGFloat(1.0)) - let r3 = NSRect(x: CGFloat(10.2), y: CGFloat(2.5), width: CGFloat(5.0), height: CGFloat(5.0)) - - XCTAssertFalse(NSRect.zero.intersects(NSRect.zero)) - XCTAssertFalse(r1.intersects(NSRect.zero)) - XCTAssertFalse(NSRect.zero.intersects(r2)) - XCTAssertFalse(r1.intersects(r2)) - XCTAssertTrue(r1.intersects(r3)) + let r1 = NSMakeRect(CGFloat(1.2), CGFloat(3.1), CGFloat(10.0), CGFloat(10.0)) + let r2 = NSMakeRect(CGFloat(-2.3), CGFloat(-1.5), CGFloat(1.0), CGFloat(1.0)) + let r3 = NSMakeRect(CGFloat(10.2), CGFloat(2.5), CGFloat(5.0), CGFloat(5.0)) + + XCTAssertFalse(NSIntersectsRect(NSZeroRect, NSZeroRect)) + XCTAssertFalse(NSIntersectsRect(r1, NSZeroRect)) + XCTAssertFalse(NSIntersectsRect(NSZeroRect, r2)) + XCTAssertFalse(NSIntersectsRect(r1, r2)) + XCTAssertTrue(NSIntersectsRect(r1, r3)) } func test_NSIntegralRect() { - let referenceNegativeRect = NSRect(x: CGFloat(-0.6), y: CGFloat(-5.4), width: CGFloat(-105.7), height: CGFloat(-24.3)) - XCTAssertEqual(referenceNegativeRect.integral, NSRect.zero) + let referenceNegativeRect = NSMakeRect(CGFloat(-0.6), CGFloat(-5.4), CGFloat(-105.7), CGFloat(-24.3)) + XCTAssertEqual(NSIntegralRect(referenceNegativeRect), NSZeroRect) - let referenceRect = NSRect(x: CGFloat(0.6), y: CGFloat(5.4), width: CGFloat(105.7), height: CGFloat(24.3)) - let referenceNegativeOriginRect = NSRect(x: CGFloat(-0.6), y: CGFloat(-5.4), width: CGFloat(105.7), height: CGFloat(24.3)) + let referenceRect = NSMakeRect(CGFloat(0.6), CGFloat(5.4), CGFloat(105.7), CGFloat(24.3)) + let referenceNegativeOriginRect = NSMakeRect(CGFloat(-0.6), CGFloat(-5.4), CGFloat(105.7), CGFloat(24.3)) - var expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(5.0), width: CGFloat(107.0), height: CGFloat(25.0)) - var result = referenceRect.integral + var expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(5.0), CGFloat(107.0), CGFloat(25.0)) + var result = NSIntegralRect(referenceRect) XCTAssertEqual(result, expectedResult) - expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-6.0), width: CGFloat(107.0), height: CGFloat(25.0)) - result = referenceNegativeOriginRect.integral + expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-6.0), CGFloat(107.0), CGFloat(25.0)) + result = NSIntegralRect(referenceNegativeOriginRect) XCTAssertEqual(result, expectedResult) } func test_NSIntegralRectWithOptions() { - let referenceRect = NSRect(x: CGFloat(0.6), y: CGFloat(5.4), width: CGFloat(105.7), height: CGFloat(24.3)) - let referenceNegativeRect = NSRect(x: CGFloat(-0.6), y: CGFloat(-5.4), width: CGFloat(-105.7), height: CGFloat(-24.3)) - let referenceNegativeOriginRect = NSRect(x: CGFloat(-0.6), y: CGFloat(-5.4), width: CGFloat(105.7), height: CGFloat(24.3)) + let referenceRect = NSMakeRect(CGFloat(0.6), CGFloat(5.4), CGFloat(105.7), CGFloat(24.3)) + let referenceNegativeRect = NSMakeRect(CGFloat(-0.6), CGFloat(-5.4), CGFloat(-105.7), CGFloat(-24.3)) + let referenceNegativeOriginRect = NSMakeRect(CGFloat(-0.6), CGFloat(-5.4), CGFloat(105.7), CGFloat(24.3)) var options: AlignmentOptions = [.alignMinXInward, .alignMinYInward, .alignHeightInward, .alignWidthInward] - var expectedResult = NSRect(x: CGFloat(1.0), y: CGFloat(6.0), width: CGFloat(105.0), height: CGFloat(24.0)) + var expectedResult = NSMakeRect(CGFloat(1.0), CGFloat(6.0), CGFloat(105.0), CGFloat(24.0)) var result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXOutward, .alignMinYOutward, .alignHeightOutward, .alignWidthOutward] - expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(5.0), width: CGFloat(106.0), height: CGFloat(25.0)) + expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(5.0), CGFloat(106.0), CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXInward, .alignMinYInward, .alignHeightInward, .alignWidthInward] - expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(0.0), height: CGFloat(0.0)) + expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(0.0), CGFloat(0.0)) result = NSIntegralRectWithOptions(referenceNegativeRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXInward, .alignMinYInward, .alignHeightInward, .alignWidthInward] - expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(105.0), height: CGFloat(24.0)) + expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(105.0), CGFloat(24.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXOutward, .alignMinYOutward, .alignHeightOutward, .alignWidthOutward] - expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-6.0), width: CGFloat(106.0), height: CGFloat(25.0)) + expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-6.0), CGFloat(106.0), CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMaxXOutward, .alignMaxYOutward, .alignHeightOutward, .alignWidthOutward] - expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(-6.0), width: CGFloat(106.0), height: CGFloat(25.0)) + expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(-6.0), CGFloat(106.0), CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXOutward, .alignMaxXOutward, .alignMinYOutward, .alignMaxYOutward] - expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-6.0), width: CGFloat(107.0), height: CGFloat(25.0)) + expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-6.0), CGFloat(107.0), CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMaxXOutward, .alignMaxYOutward, .alignHeightOutward, .alignWidthOutward] - expectedResult = NSRect(x: CGFloat(1.0), y: CGFloat(5.0), width: CGFloat(106.0), height: CGFloat(25.0)) + expectedResult = NSMakeRect(CGFloat(1.0), CGFloat(5.0), CGFloat(106.0), CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMaxXInward, .alignMaxYInward, .alignHeightOutward, .alignWidthOutward] - expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-7.0), width: CGFloat(106.0), height: CGFloat(25.0)) + expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-7.0), CGFloat(106.0), CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMaxXInward, .alignMaxYInward, .alignHeightOutward, .alignWidthOutward] - expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(4.0), width: CGFloat(106.0), height: CGFloat(25.0)) + expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(4.0), CGFloat(106.0), CGFloat(25.0)) result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXNearest, .alignMinYNearest, .alignHeightNearest, .alignWidthNearest] - expectedResult = NSRect(x: CGFloat(1.0), y: CGFloat(5.0), width: CGFloat(106.0), height: CGFloat(24.0)) + expectedResult = NSMakeRect(CGFloat(1.0), CGFloat(5.0), CGFloat(106.0), CGFloat(24.0)) result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXNearest, .alignMinYNearest, .alignHeightNearest, .alignWidthNearest] - expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-5.0), width: CGFloat(106.0), height: CGFloat(24.0)) + expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-5.0), CGFloat(106.0), CGFloat(24.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMaxXNearest, .alignMaxYNearest, .alignHeightNearest, .alignWidthNearest] - expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(6.0), width: CGFloat(106.0), height: CGFloat(24.0)) + expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(6.0), CGFloat(106.0), CGFloat(24.0)) result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMaxXNearest, .alignMaxYNearest, .alignHeightNearest, .alignWidthNearest] - expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-5.0), width: CGFloat(106.0), height: CGFloat(24.0)) + expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-5.0), CGFloat(106.0), CGFloat(24.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXInward, .alignMaxXInward, .alignMinYInward, .alignMaxYInward] - expectedResult = NSRect(x: CGFloat(1.0), y: CGFloat(6.0), width: CGFloat(105.0), height: CGFloat(23.0)) + expectedResult = NSMakeRect(CGFloat(1.0), CGFloat(6.0), CGFloat(105.0), CGFloat(23.0)) result = NSIntegralRectWithOptions(referenceRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXInward, .alignMaxXInward, .alignMinYInward, .alignMaxYInward] - expectedResult = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(105.0), height: CGFloat(23.0)) + expectedResult = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(105.0), CGFloat(23.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) options = [.alignMinXNearest, .alignMaxXInward, .alignMinYInward, .alignMaxYNearest] - expectedResult = NSRect(x: CGFloat(-1.0), y: CGFloat(-5.0), width: CGFloat(106.0), height: CGFloat(24.0)) + expectedResult = NSMakeRect(CGFloat(-1.0), CGFloat(-5.0), CGFloat(106.0), CGFloat(24.0)) result = NSIntegralRectWithOptions(referenceNegativeOriginRect, options) XCTAssertEqual(result, expectedResult) } @@ -1164,98 +1164,98 @@ class TestNSGeometry : XCTestCase { func test_NSDivideRect() { // divide empty rect - var inRect = NSRect.zero - var slice = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) - var remainder = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) + var inRect = NSZeroRect + var slice = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) + var remainder = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) NSDivideRect(inRect, &slice, &remainder, CGFloat(0.0), .maxX) - var expectedSlice = NSRect.zero - var expectedRemainder = NSRect.zero + var expectedSlice = NSZeroRect + var expectedRemainder = NSZeroRect XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MinX edge - inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) - slice = NSRect.zero - remainder = NSRect.zero + inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) + slice = NSZeroRect + remainder = NSZeroRect NSDivideRect(inRect, &slice, &remainder, CGFloat(10.0), .minX) - expectedSlice = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(10.0), height: CGFloat(35.0)) - expectedRemainder = NSRect(x: CGFloat(10.0), y: CGFloat(-5.0), width: CGFloat(15.0), height: CGFloat(35.0)) + expectedSlice = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(10.0), CGFloat(35.0)) + expectedRemainder = NSMakeRect(CGFloat(10.0), CGFloat(-5.0), CGFloat(15.0), CGFloat(35.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MinX edge with amount > width - inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) - slice = NSRect.zero - remainder = NSRect.zero - NSDivideRect(inRect, &slice, &remainder, inRect.width + CGFloat(1.0), .minX) + inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) + slice = NSZeroRect + remainder = NSZeroRect + NSDivideRect(inRect, &slice, &remainder, NSWidth(inRect) + CGFloat(1.0), .minX) expectedSlice = inRect - expectedRemainder = NSRect(x: CGFloat(25.0), y: CGFloat(-5.0), width: CGFloat(0.0), height: CGFloat(35.0)) + expectedRemainder = NSMakeRect(CGFloat(25.0), CGFloat(-5.0), CGFloat(0.0), CGFloat(35.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MinY edge - inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) - slice = NSRect.zero - remainder = NSRect.zero + inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) + slice = NSZeroRect + remainder = NSZeroRect NSDivideRect(inRect, &slice, &remainder, CGFloat(10.0), .minY) - expectedSlice = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(10.0)) - expectedRemainder = NSRect(x: CGFloat(0.0), y: CGFloat(5.0), width: CGFloat(25.0), height: CGFloat(25.0)) + expectedSlice = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(10.0)) + expectedRemainder = NSMakeRect(CGFloat(0.0), CGFloat(5.0), CGFloat(25.0), CGFloat(25.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MinY edge with amount > height - inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) - slice = NSRect.zero - remainder = NSRect.zero - NSDivideRect(inRect, &slice, &remainder, inRect.height + CGFloat(1.0), .minY) + inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) + slice = NSZeroRect + remainder = NSZeroRect + NSDivideRect(inRect, &slice, &remainder, NSHeight(inRect) + CGFloat(1.0), .minY) expectedSlice = inRect - expectedRemainder = NSRect(x: CGFloat(0.0), y: CGFloat(30.0), width: CGFloat(25.0), height: CGFloat(0.0)) + expectedRemainder = NSMakeRect(CGFloat(0.0), CGFloat(30.0), CGFloat(25.0), CGFloat(0.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MaxX edge - inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) - slice = NSRect.zero - remainder = NSRect.zero + inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) + slice = NSZeroRect + remainder = NSZeroRect NSDivideRect(inRect, &slice, &remainder, CGFloat(10.0), .maxX) - expectedSlice = NSRect(x: CGFloat(15.0), y: CGFloat(-5.0), width: CGFloat(10.0), height: CGFloat(35.0)) - expectedRemainder = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(15.0), height: CGFloat(35.0)) + expectedSlice = NSMakeRect(CGFloat(15.0), CGFloat(-5.0), CGFloat(10.0), CGFloat(35.0)) + expectedRemainder = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(15.0), CGFloat(35.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MaxX edge with amount > width - inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) - slice = NSRect.zero - remainder = NSRect.zero - NSDivideRect(inRect, &slice, &remainder, inRect.width + CGFloat(1.0), .maxX) + inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) + slice = NSZeroRect + remainder = NSZeroRect + NSDivideRect(inRect, &slice, &remainder, NSWidth(inRect) + CGFloat(1.0), .maxX) expectedSlice = inRect - expectedRemainder = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(0.0), height: CGFloat(35.0)) + expectedRemainder = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(0.0), CGFloat(35.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MaxY edge - inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) - slice = NSRect.zero - remainder = NSRect.zero + inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) + slice = NSZeroRect + remainder = NSZeroRect NSDivideRect(inRect, &slice, &remainder, CGFloat(10.0), .maxY) - expectedSlice = NSRect(x: CGFloat(0.0), y: CGFloat(20.0), width: CGFloat(25.0), height: CGFloat(10.0)) - expectedRemainder = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(25.0)) + expectedSlice = NSMakeRect(CGFloat(0.0), CGFloat(20.0), CGFloat(25.0), CGFloat(10.0)) + expectedRemainder = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(25.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) // divide rect by MaxY edge with amount > height - inRect = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(35.0)) - slice = NSRect.zero - remainder = NSRect.zero - NSDivideRect(inRect, &slice, &remainder, inRect.height + CGFloat(1.0), .maxY) + inRect = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(35.0)) + slice = NSZeroRect + remainder = NSZeroRect + NSDivideRect(inRect, &slice, &remainder, NSHeight(inRect) + CGFloat(1.0), .maxY) expectedSlice = inRect - expectedRemainder = NSRect(x: CGFloat(0.0), y: CGFloat(-5.0), width: CGFloat(25.0), height: CGFloat(0.0)) + expectedRemainder = NSMakeRect(CGFloat(0.0), CGFloat(-5.0), CGFloat(25.0), CGFloat(0.0)) XCTAssertEqual(slice, expectedSlice) XCTAssertEqual(remainder, expectedRemainder) } func test_EncodeToNSString() { - let referenceRect = NSRect(x: CGFloat(0.6), y: CGFloat(5.4), width: CGFloat(105.7), height: CGFloat(24.3)) + let referenceRect = NSMakeRect(CGFloat(0.6), CGFloat(5.4), CGFloat(105.7), CGFloat(24.3)) var expectedString = "{0.6, 5.4}" var string = NSStringFromPoint(referenceRect.origin) @@ -1274,7 +1274,7 @@ class TestNSGeometry : XCTestCase { } func test_EncodeNegativeToNSString() { - let referenceNegativeRect = NSRect(x: CGFloat(-0.6), y: CGFloat(-5.4), width: CGFloat(-105.7), height: CGFloat(-24.3)) + let referenceNegativeRect = NSMakeRect(CGFloat(-0.6), CGFloat(-5.4), CGFloat(-105.7), CGFloat(-24.3)) var expectedString = "{-0.6, -5.4}" var string = NSStringFromPoint(referenceNegativeRect.origin) @@ -1297,17 +1297,17 @@ class TestNSGeometry : XCTestCase { var stringSize = "{105.7, 24.3}" var stringRect = "{{0.6, 5.4}, {105.7, 24.3}}" - let expectedPoint = NSPoint(x: CGFloat(0.6), y: CGFloat(5.4)) + let expectedPoint = NSMakePoint(CGFloat(0.6), CGFloat(5.4)) var point = NSPointFromString(stringPoint) XCTAssertTrue(_NSPoint(expectedPoint, equalsToPoint: point), "\(NSStringFromPoint(point)) is not equal to expected \(NSStringFromPoint(expectedPoint))") - let expectedSize = NSSize(width: CGFloat(105.7), height: CGFloat(24.3)) + let expectedSize = NSMakeSize(CGFloat(105.7), CGFloat(24.3)) var size = NSSizeFromString(stringSize) XCTAssertTrue(_NSSize(expectedSize, equalsToSize: size), "\(NSStringFromSize(size)) is not equal to expected \(NSStringFromSize(expectedSize))") - let expectedRect = NSRect(x: CGFloat(0.6), y: CGFloat(5.4), width: CGFloat(105.7), height: CGFloat(24.3)) + let expectedRect = NSMakeRect(CGFloat(0.6), CGFloat(5.4), CGFloat(105.7), CGFloat(24.3)) var rect = NSRectFromString(stringRect) XCTAssertTrue(_NSRect(expectedRect, equalsToRect: rect), "\(NSStringFromRect(rect)) is not equal to expected \(NSStringFromRect(expectedRect))") @@ -1353,17 +1353,17 @@ class TestNSGeometry : XCTestCase { let stringSize = "" let stringRect = "" - let expectedPoint = NSPoint.zero + let expectedPoint = NSZeroPoint let point = NSPointFromString(stringPoint) XCTAssertTrue(_NSPoint(expectedPoint, equalsToPoint: point), "\(NSStringFromPoint(point)) is not equal to expected \(NSStringFromPoint(expectedPoint))") - let expectedSize = NSSize.zero + let expectedSize = NSZeroSize let size = NSSizeFromString(stringSize) XCTAssertTrue(_NSSize(expectedSize, equalsToSize: size), "\(NSStringFromSize(size)) is not equal to expected \(NSStringFromSize(expectedSize))") - let expectedRect = NSRect.zero + let expectedRect = NSZeroRect let rect = NSRectFromString(stringRect) XCTAssertTrue(_NSRect(expectedRect, equalsToRect: rect), "\(NSStringFromRect(rect)) is not equal to expected \(NSStringFromRect(expectedRect))") @@ -1374,17 +1374,17 @@ class TestNSGeometry : XCTestCase { let stringSize = "{-105.7, -24.3}" let stringRect = "{{-0.6, -5.4}, {-105.7, -24.3}}" - let expectedPoint = NSPoint(x: CGFloat(-0.6), y: CGFloat(-5.4)) + let expectedPoint = NSMakePoint(CGFloat(-0.6), CGFloat(-5.4)) let point = NSPointFromString(stringPoint) XCTAssertTrue(_NSPoint(expectedPoint, equalsToPoint: point), "\(NSStringFromPoint(point)) is not equal to expected \(NSStringFromPoint(expectedPoint))") - let expectedSize = NSSize(width: CGFloat(-105.7), height: CGFloat(-24.3)) + let expectedSize = NSMakeSize(CGFloat(-105.7), CGFloat(-24.3)) let size = NSSizeFromString(stringSize) XCTAssertTrue(_NSSize(expectedSize, equalsToSize: size), "\(NSStringFromSize(size)) is not equal to expected \(NSStringFromSize(expectedSize))") - let expectedRect = NSRect(x: CGFloat(-0.6), y: CGFloat(-5.4), width: CGFloat(-105.7), height: CGFloat(-24.3)) + let expectedRect = NSMakeRect(CGFloat(-0.6), CGFloat(-5.4), CGFloat(-105.7), CGFloat(-24.3)) let rect = NSRectFromString(stringRect) XCTAssertTrue(_NSRect(expectedRect, equalsToRect: rect), "\(NSStringFromRect(rect)) is not equal to expected \(NSStringFromRect(expectedRect))") @@ -1393,13 +1393,13 @@ class TestNSGeometry : XCTestCase { func test_DecodeGarbageFromNSString() { var stringRect = "-0.6a5.4das-105.7bfh24.3dfas;hk312}}" - var expectedRect = NSRect(x: CGFloat(-0.6), y: CGFloat(5.4), width: CGFloat(-105.7), height: CGFloat(24.3)) + var expectedRect = NSMakeRect(CGFloat(-0.6), CGFloat(5.4), CGFloat(-105.7), CGFloat(24.3)) var rect = NSRectFromString(stringRect) XCTAssertTrue(_NSRect(expectedRect, equalsToRect: rect), "\(NSStringFromRect(rect)) is not equal to expected \(NSStringFromRect(expectedRect))") stringRect = "-0.6a5.4da}}" - expectedRect = NSRect(x: CGFloat(-0.6), y: CGFloat(5.4), width: CGFloat(0.0), height: CGFloat(0.0)) + expectedRect = NSMakeRect(CGFloat(-0.6), CGFloat(5.4), CGFloat(0.0), CGFloat(0.0)) rect = NSRectFromString(stringRect) XCTAssertTrue(_NSRect(expectedRect, equalsToRect: rect), "\(NSStringFromRect(rect)) is not equal to expected \(NSStringFromRect(expectedRect))") From 4900cc7e46181331a2db4e810404d28486fb1c73 Mon Sep 17 00:00:00 2001 From: rauhul-varma Date: Sun, 7 Oct 2018 23:13:26 -0400 Subject: [PATCH 4/4] remove uncessary CGFloat casts from NSGeometry --- Foundation/NSGeometry.swift | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/Foundation/NSGeometry.swift b/Foundation/NSGeometry.swift index 43875a4ac3..da860ff8b5 100644 --- a/Foundation/NSGeometry.swift +++ b/Foundation/NSGeometry.swift @@ -119,7 +119,7 @@ public struct CGSize { extension CGSize { public static var zero: CGSize { - return CGSize(width: CGFloat(0), height: CGFloat(0)) + return CGSize(width: 0, height: 0) } public init(width: Int, height: Int) { @@ -682,10 +682,10 @@ public func NSEdgeInsetsEqual(_ aInsets: NSEdgeInsets, _ bInsets: NSEdgeInsets) } public func NSInsetRect(_ aRect: NSRect, _ dX: CGFloat, _ dY: CGFloat) -> NSRect { - let x = CGFloat(aRect.origin.x.native + dX.native) - let y = CGFloat(aRect.origin.y.native + dY.native) - let w = CGFloat(aRect.size.width.native - (dX.native * 2)) - let h = CGFloat(aRect.size.height.native - (dY.native * 2)) + let x = aRect.origin.x.native + dX.native + let y = aRect.origin.y.native + dY.native + let w = aRect.size.width.native - (dX.native * 2) + let h = aRect.size.height.native - (dY.native * 2) return NSRect(x: x, y: y, width: w, height: h) } @@ -990,12 +990,9 @@ public func NSPointFromString(_ aString: String) -> NSPoint { } let parsedNumbers = _scanDoublesFromString(aString, number: 2) - let x = parsedNumbers[0] let y = parsedNumbers[1] - let result = NSPoint(x: CGFloat(x), y: CGFloat(y)) - - return result + return NSPoint(x: x, y: y) } public func NSSizeFromString(_ aString: String) -> NSSize { @@ -1003,12 +1000,9 @@ public func NSSizeFromString(_ aString: String) -> NSSize { return .zero } let parsedNumbers = _scanDoublesFromString(aString, number: 2) - let w = parsedNumbers[0] let h = parsedNumbers[1] - let result = NSSize(width: CGFloat(w), height: CGFloat(h)) - - return result + return NSSize(width: w, height: h) } public func NSRectFromString(_ aString: String) -> NSRect { @@ -1017,15 +1011,11 @@ public func NSRectFromString(_ aString: String) -> NSRect { } let parsedNumbers = _scanDoublesFromString(aString, number: 4) - let x = parsedNumbers[0] let y = parsedNumbers[1] let w = parsedNumbers[2] let h = parsedNumbers[3] - - let result = NSRect(x: CGFloat(x), y: CGFloat(y), width: CGFloat(w), height: CGFloat(h)) - - return result + return NSRect(x: x, y: y, width: w, height: h) } extension NSValue {