diff --git a/Foundation/_CGGeometry.j b/Foundation/_CGGeometry.j index 480e814ab..cdc8919c4 100644 --- a/Foundation/_CGGeometry.j +++ b/Foundation/_CGGeometry.j @@ -112,7 +112,6 @@ function CGStringFromRect(aRect) return "{" + CGStringFromPoint(aRect.origin) + ", " + CGStringFromSize(aRect.size) + "}"; } - function CGRectOffset(aRect, dX, dY) { return { origin:{ x:aRect.origin.x + dX, y:aRect.origin.y + dY }, size:{ width:aRect.size.width, height:aRect.size.height } }; diff --git a/Tests/AppKit/CGGeometryTest.j b/Tests/AppKit/CGGeometryTest.j new file mode 100644 index 000000000..540491e8d --- /dev/null +++ b/Tests/AppKit/CGGeometryTest.j @@ -0,0 +1,27 @@ +@import + + +@implementation CGGeometryTest : OJTestCase + +- (void)testCGStringFromPoint +{ + [self assert:@"{0, 0}" equals:CGStringFromPoint(CGPointMakeZero())]; + [self assert:@"{123, 234}" equals:CGStringFromPoint(CGPointMake(123, 234))]; + [self assert:@"{-123.45, -234}" equals:CGStringFromPoint(CGPointMake(-123.45, -234.))]; +} + +- (void)testCGStringFromSize +{ + [self assert:@"{0, 0}" equals:CGStringFromSize(CGSizeMakeZero())]; + [self assert:@"{123, 234}" equals:CGStringFromSize(CGSizeMake(123, 234))]; + [self assert:@"{-123.45, -234}" equals:CGStringFromSize(CGSizeMake(-123.45, -234.))]; +} + +- (void)testCGStringFromRect +{ + [self assert:@"{{0, 0}, {0, 0}}" equals:CGStringFromRect(CGRectMakeZero())]; + [self assert:@"{{123, 234}, {345, 456}}" equals:CGStringFromRect(CGRectMake(123, 234, 345, 456))]; + [self assert:@"{{-123.45, -234}, {345.5, 456}}" equals:CGStringFromRect(CGRectMake(-123.45, -234, 345.5, 456.))]; +} + +@end