Completed aliases and tests

This commit is contained in:
Vladimir Shevchenko committed 2012-07-13 01:52:06 +07:00
1 parent d6b9daf7ca
commit 28b48edf02
2 files changed
+285 -182

No files matched your search

+35 -182
View File
@@ -20,15 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@import "CGGeometry.j"
@import <AppKit/CoreGraphics/CGGeometry.j>
CPMinXEdge = 0;
CPMinYEdge = 1;
CPMaxXEdge = 2;
CPMaxYEdge = 3;
// FIXME: the rest!
/*!
Makes a CGPoint object out of two numbers provided as arguments
@group CGPoint
@@ -113,22 +106,14 @@ CPRectContainsRect = CGRectContainsRect;
*/
CPRectIntersection = CGRectIntersection;
/*!
@addtogroup appkit
@{
*/
/*!
Makes a CGPoint object out of two numbers provided as arguments
@group CGPoint
@param x the x-coordinate of the CGPoint
@param y the y-coordinate of the CGPoint
@return CGPoint a CGPoint with an X and Y coordinate equal to the function arguments
*/
function CPPointMake(x, y)
{
return { x: x, y: y };
}
*/
CPPointMake = CGPointMake;
/*!
Makes a CGRect with an origin and size equal to \c aRect less the \c dX/dY insets specified.
@@ -137,11 +122,7 @@ function CPPointMake(x, y)
@group CGRect
@return CGRect a rectangle like \c aRect with an inset
*/
function CPRectInset(aRect, dX, dY)
{
return CPRectMake( aRect.origin.x + dX, aRect.origin.y + dY,
aRect.size.width - 2 * dX, aRect.size.height - 2 * dY);
}
CPRectInset = CGRectInset;
/*!
@group CGRect
@@ -149,11 +130,7 @@ function CPRectInset(aRect, dX, dY)
@return void
@deprecated
*/
function CPRectIntegral(aRect)
{
// FIXME!!!
alert("CPRectIntegral unimplemented");
}
CPRectIntegral = CGRectIntegral;
/*!
Creates a copy of the provided rectangle
@@ -161,10 +138,7 @@ function CPRectIntegral(aRect)
@param aRect the CGRect that will be copied
@return CGRect the rectangle copy
*/
function CPRectCreateCopy(aRect)
{
return { origin: CPPointCreateCopy(aRect.origin), size: CPSizeCreateCopy(aRect.size) };
}
CPRectCreateCopy = CGRectCreateCopy;
/*!
Returns a CGRect made of the specified arguments
@@ -175,10 +149,7 @@ function CPRectCreateCopy(aRect)
@param height the height of the new rectangle
@return CGRect the new rectangle
*/
function CPRectMake(x, y, width, height)
{
return { origin: CPPointMake(x, y), size: CPSizeMake(width, height) };
}
CPRectMake = CGRectMake;
/*!
Creates a new rectangle with its origin offset by \c dX and \c dY.
@@ -188,36 +159,14 @@ function CPRectMake(x, y, width, height)
@param dY the amount added to the y-size of the new rectangle
@return CGRect the new rectangle with modified size
*/
function CPRectOffset(aRect, dX, dY)
{
return CPRectMake(aRect.origin.x + dX, aRect.origin.y + dY, aRect.size.width, aRect.size.height);
}
CPRectOffset = CGRectOffset;
/*!
@group CGRect
@param aRect a CGRect
@return CGRect
*/
function CPRectStandardize(aRect)
{
var width = CPRectGetWidth(aRect),
height = CPRectGetHeight(aRect),
standardized = CPRectCreateCopy(aRect);
if (width < 0.0)
{
standardized.origin.x += width;
standardized.size.width = -width;
}
if (height < 0.0)
{
standardized.origin.y += height;
standardized.size.height = -height;
}
return standardized;
}
CPRectStandardize = CGRectStandardize;
/*!
Returns the smallest rectangle that can contain the two argument \c CGRects.
@@ -226,15 +175,7 @@ function CPRectStandardize(aRect)
@param rhsRect the second CGRect to use for the union calculation
@return CGRect the union rectangle
*/
function CPRectUnion(lhsRect, rhsRect)
{
var minX = MIN(CPRectGetMinX(lhsRect), CPRectGetMinX(rhsRect)),
minY = MIN(CPRectGetMinY(lhsRect), CPRectGetMinY(rhsRect)),
maxX = MAX(CPRectGetMaxX(lhsRect), CPRectGetMaxX(rhsRect)),
maxY = MAX(CPRectGetMaxY(lhsRect), CPRectGetMaxY(rhsRect));
return CPRectMake(minX, minY, maxX - minX, maxY - minY);
}
CPRectUnion = CGRectUnion;
/*!
Creates and returns a copy of the provided CGSize
@@ -242,10 +183,7 @@ function CPRectUnion(lhsRect, rhsRect)
@param aSize the CGSize to copy
@return CGSize the copy of the CGSize
*/
function CPSizeCreateCopy(aSize)
{
return { width: aSize.width, height: aSize.height };
}
CPSizeCreateCopy = CGSizeCreateCopy;
/*!
Creates and returns a new CGSize object from the provided dimensions.
@@ -254,10 +192,7 @@ function CPSizeCreateCopy(aSize)
@param height the height for the new CGSize
@return CGSize the new CGSize
*/
function CPSizeMake(width, height)
{
return { width: width, height: height };
}
CPSizeMake = CGSizeMake;
/*!
Returns \c YES if the CGRect, \c aRect, contains
@@ -267,93 +202,63 @@ function CPSizeMake(width, height)
@group CGRect
@return BOOL \c YES if the rectangle contains the point, \c NO otherwise.
*/
function CPRectContainsPoint(aRect, aPoint)
{
return aPoint.x >= CPRectGetMinX(aRect) &&
aPoint.y >= CPRectGetMinY(aRect) &&
aPoint.x < CPRectGetMaxX(aRect) &&
aPoint.y < CPRectGetMaxY(aRect);
}
CPRectContainsPoint = CGRectContainsPoint;
/*!
@group CGRect
@param aRect a CGRect
@return int
*/
function CPRectGetHeight(aRect)
{
return aRect.size.height;
}
CPRectGetHeight = CGRectGetHeight;
/*!
@group CGRect
@param aRect a CGRect
@return int
*/
function CPRectGetMaxX(aRect)
{
return aRect.origin.x + aRect.size.width;
}
CPRectGetMaxX = CGRectGetMaxX;
/*!
@group CGRect
@param aRect a CGRect
@return int
*/
function CPRectGetMaxY(aRect)
{
return aRect.origin.y + aRect.size.height;
}
CPRectGetMaxY = CGRectGetMaxY;
/*!
@group CGRect
@param aRect a CGRect
@return float
*/
function CPRectGetMidX(aRect)
{
return aRect.origin.x + (aRect.size.width) / 2.0;
}
CPRectGetMidX = CGRectGetMidX;
/*!
@group CGRect
@param aRect a CGRect
@return float
*/
function CPRectGetMidY(aRect)
{
return aRect.origin.y + (aRect.size.height) / 2.0;
}
CPRectGetMidY = CGRectGetMidY;
/*!
@group CGRect
@param aRect a CGRect
@return int
*/
function CPRectGetMinX(aRect)
{
return aRect.origin.x;
}
CPRectGetMinX = CGRectGetMinX;
/*!
@group CGRect
@param aRect a CGRect
@return int
*/
function CPRectGetMinY(aRect)
{
return aRect.origin.y;
}
CPRectGetMinY = CGRectGetMinY;
/*!
@group CGRect
@param aRect a CGRect
@return int
*/
function CPRectGetWidth(aRect)
{
return aRect.size.width;
}
CPRectGetWidth = CGRectGetWidth;
/*!
Returns \c YES if the two rectangles intersect
@@ -362,10 +267,7 @@ function CPRectGetWidth(aRect)
@param rhsRect the second CGRect
@return BOOL \c YES if the two rectangles have any common spaces, and \c NO, otherwise.
*/
function CPRectIntersectsRect(lhsRect, rhsRect)
{
return !CPRectIsEmpty(CPRectIntersection(lhsRect, rhsRect));
}
CPRectIntersectsRect = CGRectIntersectsRect;
/*!
Returns \c YES if the CGRect has no area.
@@ -373,10 +275,7 @@ function CPRectIntersectsRect(lhsRect, rhsRect)
@group CGRect
@return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
*/
function CPRectIsNull(aRect)
{
return aRect.size.width <= 0.0 || aRect.size.height <= 0.0;
}
CPRectIsNull = CGRectIsNull;
/*!
Creates two rectangles -- slice and rem -- from inRect, by dividing inRect
@@ -387,10 +286,7 @@ function CPRectIsNull(aRect)
@group CGRect
*/
function CPDivideRect(inRect, slice, rem, amount, edge)
{
CGRectDivide(inRect, slice, rem, amount, edge);
}
CPDivideRect = CGRectDivide;
/*!
Returns \c YES if the two CGSizes are identical.
@@ -399,10 +295,7 @@ function CPDivideRect(inRect, slice, rem, amount, edge)
@param rhsSize the second CGSize to compare
@return BOOL \c YES if the two sizes are identical. \c NO, otherwise.
*/
function CPSizeEqualToSize(lhsSize, rhsSize)
{
return lhsSize.width == rhsSize.width && lhsSize.height == rhsSize.height;
}
CPSizeEqualToSize = CGSizeEqualToSize;
/*!
Returns a human readable string of the provided CGPoint.
@@ -410,10 +303,7 @@ function CPSizeEqualToSize(lhsSize, rhsSize)
@param aPoint the point to represent
@return CGPoint a string representation of the CGPoint
*/
function CPStringFromPoint(aPoint)
{
return "{" + aPoint.x + ", " + aPoint.y + "}";
}
CPStringFromPoint = CGStringFromPoint;
/*!
Returns a human readable string of the provided CGSize.
@@ -421,10 +311,7 @@ function CPStringFromPoint(aPoint)
@param aSize the size to represent
@return CGSize a string representation of the CGSize
*/
function CPStringFromSize(aSize)
{
return "{" + aSize.width + ", " + aSize.height + "}";
}
CPStringFromSize = CGStringFromSize;
/*!
Returns a human readable string of the provided CGRect.
@@ -432,10 +319,7 @@ function CPStringFromSize(aSize)
@param aRect the rectangle to represent
@return CGString the string representation of the rectangle
*/
function CPStringFromRect(aRect)
{
return "{" + CPStringFromPoint(aRect.origin) + ", " + CPStringFromSize(aRect.size) + "}";
}
CPStringFromRect = CGStringFromRect;
/*!
Returns a CGPoint from a string with a comma separated pair of integers.
@@ -443,12 +327,7 @@ function CPStringFromRect(aRect)
@param aString a string containing two comma separated integers
@return CGPoint the point object created from the string
*/
function CPPointFromString(aString)
{
var comma = aString.indexOf(',');
return { x:parseFloat(aString.substr(1, comma - 1), 10), y:parseFloat(aString.substring(comma + 1, aString.length), 10) };
}
CPPointFromString = CGPointFromString;
/*!
Returns a CGSize from a string containing a pair of comma separated integers.
@@ -456,12 +335,7 @@ function CPPointFromString(aString)
@param aString a string containing two comma separated integers
@return CGSize the size object created from the string
*/
function CPSizeFromString(aString)
{
var comma = aString.indexOf(',');
return { width:parseFloat(aString.substr(1, comma - 1), 10), height:parseFloat(aString.substring(comma + 1, aString.length), 10) };
}
CPSizeFromString = CGSizeFromString;
/*!
Returns a CGRect created from a string.
@@ -469,53 +343,32 @@ function CPSizeFromString(aString)
@param aString a string in the form generated by \c CPStringFromRect
@return CGRect the rectangle created from the string
*/
function CPRectFromString(aString)
{
var comma = aString.indexOf(',', aString.indexOf(',') + 1);
return { origin:CPPointFromString(aString.substr(1, comma - 1)), size:CPSizeFromString(aString.substring(comma + 2, aString.length)) };
}
CPRectFromString = CGRectFromString;
/*!
@group CGPoint
@param anEvent
@return CGPoint
*/
function CPPointFromEvent(anEvent)
{
return CPPointMake(anEvent.clientX, anEvent.clientY, 0);
}
CPPointFromEvent = CGPointFromEvent;
/*!
Returns a zero sized CGSize.
@group CGSize
@return CGSize a size object with zeros for \c width and \c height
*/
function CPSizeMakeZero()
{
return CPSizeMake(0, 0);
}
CPSizeMakeZero = CGSizeMakeZero;
/*!
Returns a rectangle at origin \c (0,0) and size of \c (0,0).
@group CGRect
@return CGRect a zeroed out CGRect
*/
function CPRectMakeZero()
{
return CPRectMake(0, 0, 0, 0);
}
CPRectMakeZero = CGRectMakeZero;
/*!
Returns a point located at \c (0, 0).
@group CGPoint
@return CGPoint a point located at \c (0, 0)
*/
function CPPointMakeZero()
{
return CPPointMake(0, 0, 0);
}
/*!
@}
*/
CPPointMakeZero = CGPointMakeZero;
+250
View File
@@ -64,4 +64,254 @@
[self assertFalse:CPPointEqualToPoint(CPPointCreateCopy(point), CGPointMake(0,1))];
}
- (void)testCPPointMake
{
var testPoint = CPPointMake(1,2);
[self assert:1 equals:testPoint.x message:"point x coordinate failed"];
[self assert:2 equals:testPoint.y message:"point y coordinate failed"];
}
- (void)testCPRectInset
{
var testRect = CGRectMake(0, 0, 100, 100);
[self assertTrue:CGRectEqualToRect(CGRectMake(10, 10, 80, 80), CPRectInset(testRect, 10, 10))];
}
- (void)testCPRectIntegral
{
var rect = CGRectMake(0.1, 0.2, 10.3, 10.4);
[self assertTrue:CGRectEqualToRect(CGRectMake(0, 0, 11, 11), CPRectIntegral(rect))];
}
- (void)testCPRectCreateCopy
{
var rect = CGRectMake(0, 0, 100, 100);
[self assertTrue:CGRectEqualToRect(rect, CPRectCreateCopy(rect))];
}
- (void)testCPRectMake
{
var rect = CPRectMake(10, 20, 30, 40);
[self assert:10 equals:rect.origin.x message:"Rect x coordinate failed"];
[self assert:20 equals:rect.origin.y message:"Rect x coordinate failed"];
[self assert:30 equals:rect.size.width message:"Rect width failed"];
[self assert:40 equals:rect.size.height message:"Rect height failed"];
}
- (void)testCPRectOffset
{
var initialRect = CGRectMake(10, 10, 100, 100),
offsetRect = CGRectMake(20, 20, 100, 100);
[self assertTrue:CGRectEqualToRect(offsetRect, CPRectOffset(initialRect, 10, 10))];
[self assertFalse:CGRectEqualToRect(initialRect, CPRectOffset(initialRect, 10, 10))];
}
- (void)testCPRectStandardize
{
var initialRect = CGRectMake(10, 10, -10, -10),
standardizedRect = CGRectMake(0, 0, 10, 10);
[self assertTrue:CGRectEqualToRect(standardizedRect,CPRectStandardize(initialRect))];
[self assertFalse:CGRectEqualToRect(initialRect,CPRectStandardize(initialRect))];
}
- (void)testCPRectUnion
{
var firstRect = CGRectMake(0, 0, 10, 10),
secondRect = CGRectMake(20, 20, 10, 10),
unitedRect = CGRectMake(0, 0, 30, 30);
[self assertTrue:CGRectEqualToRect(unitedRect, CPRectUnion(firstRect, secondRect))];
[self assertFalse:CGRectEqualToRect(firstRect, CPRectUnion(firstRect, secondRect))];
}
- (void)testCPSizeCreateCopy
{
var initialSize = CGSizeMake(100, 200);
[self assertTrue:CGSizeEqualToSize(initialSize, CPSizeCreateCopy(initialSize))];
[self assertFalse:CGSizeEqualToSize(CGSizeMake(100, 10), CPSizeCreateCopy(initialSize))];
}
- (void)testCPSizeMake
{
var size = CPSizeMake(10, 20);
[self assert:10 equals:size.width message:"Size width failed"];
[self assert:20 equals:size.height message:"Size height failed"];
}
- (void)testCPRectContainsPoint
{
var rect = CGRectMake(10, 10, 10, 10);
[self assertTrue:CPRectContainsPoint(rect, CGPointMake(15, 15))];
[self assertFalse:CPRectContainsPoint(rect, CGPointMake(5, 5))];
[self assertFalse:CPRectContainsPoint(rect, CGPointMake(15, 5))];
[self assertFalse:CPRectContainsPoint(rect, CGPointMake(25, 5))];
[self assertFalse:CPRectContainsPoint(rect, CGPointMake(5, 15))];
[self assertFalse:CPRectContainsPoint(rect, CGPointMake(5, 25))];
[self assertFalse:CPRectContainsPoint(rect, CGPointMake(15, 25))];
[self assertFalse:CPRectContainsPoint(rect, CGPointMake(25, 15))];
[self assertFalse:CPRectContainsPoint(rect, CGPointMake(25, 25))];
}
- (void)testCPRectGetHeight
{
var rect = CGRectMake(10, 20, 30, 40);
[self assert:40 equals:CPRectGetHeight(rect)];
}
- (void)testCPRectGetMaxX
{
var rect = CGRectMake(10, 20, 40, 80);
[self assert:50 equals:CPRectGetMaxX(rect)];
}
- (void)testCPRectGetMaxY
{
var rect = CGRectMake(10, 20, 40, 80);
[self assert:100 equals:CPRectGetMaxY(rect)];
}
- (void)testCPRectGetMidX
{
var rect = CGRectMake(10, 20, 40, 80);
[self assert:30 equals:CPRectGetMidX(rect)];
}
- (void)testCPRectGetMidY
{
var rect = CGRectMake(10, 20, 40, 80);
[self assert:60 equals:CPRectGetMidY(rect)];
}
- (void)testCPRectGetMinX
{
var rect = CGRectMake(10, 20, 40, 80);
[self assert:10 equals:CPRectGetMinX(rect)];
}
- (void)testCPRectGetMinY
{
var rect = CGRectMake(10, 20, 40, 80);
[self assert:20 equals:CPRectGetMinY(rect)];
}
- (void)testCPRectGetWidth
{
var rect = CGRectMake(10, 20, 40, 80);
[self assert:40 equals:CPRectGetWidth(rect)];
}
- (void)testCPRectIntersectsRect
{
var firstRect = CGRectMake(10, 10, 10, 10),
secondRect = CGRectMake(15, 15, 10, 10);
[self assertTrue:CPRectIntersectsRect(firstRect, secondRect)];
secondRect.origin = CGPointMake(25, 25);
[self assertFalse:CPRectIntersectsRect(firstRect, secondRect)];
}
- (void)testCPRectIsNull
{
[self assertTrue:CPRectIsNull(CGRectMake(0, 0, 0, 10))];
[self assertTrue:CPRectIsNull(CGRectMake(0, 0, 10, 0))];
[self assertTrue:CPRectIsNull(CGRectMake(0, 0, -10, 10))];
[self assertTrue:CPRectIsNull(CGRectMake(0, 0, 10, -10))];
[self assertFalse:CPRectIsNull(CGRectMake(0, 0, 10, 10))];
}
- (void)testCPDivideRect
{
var initialRect = CGRectMake(0, 0, 10, 10),
slice = CGRectMake(0, 0, 0, 0),
rem = CGRectMake(0, 0, 0, 0);
CPDivideRect(initialRect, slice, rem, 3, CGMinXEdge);
[self assertTrue:CGRectEqualToRect(slice, CGRectMake(0, 0, 3, 10))];
[self assertTrue:CGRectEqualToRect(rem, CGRectMake(3, 0, 7, 10))];
CPDivideRect(initialRect, slice, rem, 3, CGMinYEdge);
[self assertTrue:CGRectEqualToRect(slice, CGRectMake(0, 0, 10, 3))];
[self assertTrue:CGRectEqualToRect(rem, CGRectMake(0, 3, 10, 7))];
CPDivideRect(initialRect, slice, rem, 3, CGMaxXEdge);
[self assertTrue:CGRectEqualToRect(slice, CGRectMake(7, 0, 3, 10))];
[self assertTrue:CGRectEqualToRect(rem, CGRectMake(0, 0, 7, 10))];
CPDivideRect(initialRect, slice, rem, 3, CGMaxYEdge);
[self assertTrue:CGRectEqualToRect(slice, CGRectMake(0, 7, 10, 3))];
[self assertTrue:CGRectEqualToRect(rem, CGRectMake(0, 0, 10, 7))];
}
- (void)testCPSizeEqualToSize
{
[self assertTrue:CPSizeEqualToSize(CGSizeMake(10, 10), CGSizeMake(10, 10))];
[self assertFalse:CPSizeEqualToSize(CGSizeMake(0, 10), CGSizeMake(10, 10))];
[self assertFalse:CPSizeEqualToSize(CGSizeMake(10, 10), CGSizeMake(0, 10))];
[self assertFalse:CPSizeEqualToSize(CGSizeMake(10, 0), CGSizeMake(10, 10))];
[self assertFalse:CPSizeEqualToSize(CGSizeMake(10, 10), CGSizeMake(10, 0))];
}
- (void)testCPStringFromPoint
{
var point = CGPointMake(0, 1);
[self assert:"{0, 1}" equals: CPStringFromPoint(point)];
}
- (void)testCPStringFromSize
{
var size = CGSizeMake(10, 20);
[self assert:"{10, 20}" equals: CPStringFromSize(size)];
}
- (void)testCPStringFromRect
{
var rect = CGRectMake(10, 20, 30, 40);
[self assert:"{{10, 20}, {30, 40}}" equals:CPStringFromRect(rect)];
}
- (void)testCPPointFromString
{
var point = CGPointMake(0,1);
[self assertTrue:CGPointEqualToPoint(point , CPPointFromString("{0, 1}"))];
}
- (void)testCPSizeFromString
{
var size = CGSizeMake(10, 20);
[self assertTrue:CGSizeEqualToSize(size, CPSizeFromString("{10, 20}"))];
}
- (void)testCPRectFromString
{
var rect = CGRectMake(10, 20, 30, 40);
[self assertTrue:CGRectEqualToRect(rect, CPRectFromString("{{10, 20}, {30, 40}}"))];
}
- (void)testCPSizeMakeZero
{
var size = CGSizeMake(10, 20);
[self assertTrue:CGSizeEqualToSize(CGSizeMake(0, 0), CPSizeMakeZero(size))];
}
- (void)testCPRectMakeZero
{
var rect = CGRectMake(10, 20, 30, 40);
[self assertTrue:CGRectEqualToRect(CGRectMake(0, 0, 0, 0), CPRectMakeZero(rect))];
}
- (void)testCPPointMakeZero
{
var point = CGPointMake(10, 20);
[self assertTrue:CGPointEqualToPoint(CGPointMake(0, 0), CPPointMakeZero(0, 0))];
}
- (void)testCPPointFromEvent
{
var anEvent = [CPEvent mouseEventWithType:CPLeftMouseDownMask location:CGPointMake(5.0, 5.0) modifierFlags:0
timestamp:0 windowNumber:0 context:nil eventNumber:0 clickCount:1 pressure:1];
anEvent.clientX = 1.0;
anEvent.clientY = 2.0;
var point = CPPointFromEvent(anEvent);
[self assert:1.0 equals:point.x message:"Point x coordinate failed"];
[self assert:2.0 equals:point.y message:"Point y coordinate failed"];
}
@end