Rectangle & Size tests: use toString where possible for comparisons.

This commit is contained in:
Jonathan Puckey 2011-05-21 21:11:53 +02:00
parent 473804ad60
commit 06bc50bb57
2 changed files with 31 additions and 34 deletions

View file

@ -1,27 +1,27 @@
module('Rectangle'); module('Rectangle');
test('new Rectangle(new Point(10, 20), new Size(30, 40));', function() { test('new Rectangle(new Point(10, 20), new Size(30, 40));', function() {
var rect = new Rectangle(new Point(10, 20), new Size(30, 40)); var rect = new Rectangle(new Point(10, 20), new Size(30, 40));
compareRectangles(rect, { x: 10, y: 20, width: 30, height: 40 }); equals(rect.toString(), '{ x: 10, y: 20, width: 30, height: 40 }');
}); });
test('new Rectangle([10, 20], [30, 40]);', function() { test('new Rectangle([10, 20], [30, 40]);', function() {
var rect = new Rectangle([10, 20], [30, 40]); var rect = new Rectangle([10, 20], [30, 40]);
compareRectangles(rect, { x: 10, y: 20, width: 30, height: 40 }); equals(rect.toString(), '{ x: 10, y: 20, width: 30, height: 40 }');
}); });
test('new Rectangle(new Point(10, 20), new Point(30, 40));', function() { test('new Rectangle(new Point(10, 20), new Point(30, 40));', function() {
var rect = new Rectangle(new Point(10, 20), new Point(30, 40)); var rect = new Rectangle(new Point(10, 20), new Point(30, 40));
compareRectangles(rect, { x: 10, y: 20, width: 20, height: 20 }); equals(rect.toString(), '{ x: 10, y: 20, width: 20, height: 20 }');
}); });
test('new Rectangle(10, 20, 30, 40);', function() { test('new Rectangle(10, 20, 30, 40);', function() {
var rect = new Rectangle(10, 20, 30, 40); var rect = new Rectangle(10, 20, 30, 40);
compareRectangles(rect, { x: 10, y: 20, width: 30, height: 40 }); equals(rect.toString(), '{ x: 10, y: 20, width: 30, height: 40 }');
}); });
test('new Rectangle({x: 10, y: 20, width: 30, height: 40});', function() { test('new Rectangle({x: 10, y: 20, width: 30, height: 40});', function() {
var rect = new Rectangle({x: 10, y: 20, width: 30, height: 40}); var rect = new Rectangle({x: 10, y: 20, width: 30, height: 40});
compareRectangles(rect, { x: 10, y: 20, width: 30, height: 40 }); equals(rect.toString(), '{ x: 10, y: 20, width: 30, height: 40 }');
}); });
test('get size', function() { test('get size', function() {
@ -34,111 +34,111 @@ test('get size', function() {
test('set size', function() { test('set size', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
rect.size = new Size(30, 30); rect.size = new Size(30, 30);
compareRectangles(rect, { x: 10, y: 10, width: 30, height: 30 }); equals(rect.toString(), '{ x: 10, y: 10, width: 30, height: 30 }');
}); });
test('topLeft', function() { test('topLeft', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
var point = rect.topLeft; var point = rect.topLeft;
comparePoints(point, { x: 10, y: 10 }); equals(point.toString(), '{ x: 10, y: 10 }');
}); });
test('set topLeft', function() { test('set topLeft', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
rect.topLeft = [10, 15]; rect.topLeft = [10, 15];
var point = rect.topLeft; var point = rect.topLeft;
comparePoints(point, { x: 10, y: 15 }); equals(point.toString(), '{ x: 10, y: 15 }');
}); });
test('get topRight', function() { test('get topRight', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
var point = rect.topRight; var point = rect.topRight;
comparePoints(point, { x: 30, y: 10 }); equals(point.toString(), '{ x: 30, y: 10 }');
}); });
test('set topRight', function() { test('set topRight', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
rect.topRight = [10, 15]; rect.topRight = [10, 15];
var point = rect.topRight; var point = rect.topRight;
comparePoints(point, { x: 10, y: 15 }); equals(point.toString(), '{ x: 10, y: 15 }');
}); });
test('get bottomLeft', function() { test('get bottomLeft', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
var point = rect.bottomLeft; var point = rect.bottomLeft;
comparePoints(point, { x: 10, y: 30 }); equals(point.toString(), '{ x: 10, y: 30 }');
}); });
test('set bottomLeft', function() { test('set bottomLeft', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
rect.bottomLeft = [10, 15]; rect.bottomLeft = [10, 15];
var point = rect.bottomLeft; var point = rect.bottomLeft;
comparePoints(point, { x: 10, y: 15 }); equals(point.toString(), '{ x: 10, y: 15 }');
}); });
test('get bottomRight', function() { test('get bottomRight', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
var point = rect.bottomRight; var point = rect.bottomRight;
comparePoints(point, { x: 30, y: 30 }); equals(point.toString(), '{ x: 30, y: 30 }');
}); });
test('set bottomRight', function() { test('set bottomRight', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
rect.bottomRight = [10, 15]; rect.bottomRight = [10, 15];
var point = rect.bottomRight; var point = rect.bottomRight;
comparePoints(point, { x: 10, y: 15 }); equals(point.toString(), '{ x: 10, y: 15 }');
}); });
test('get bottomCenter', function() { test('get bottomCenter', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
var point = rect.bottomCenter; var point = rect.bottomCenter;
comparePoints(point, { x: 20, y: 30 }); equals(point.toString(), '{ x: 20, y: 30 }');
}); });
test('set bottomCenter', function() { test('set bottomCenter', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
rect.bottomCenter = [10, 15]; rect.bottomCenter = [10, 15];
var point = rect.bottomCenter; var point = rect.bottomCenter;
comparePoints(point, { x: 10, y: 15 }); equals(point.toString(), '{ x: 10, y: 15 }');
}); });
test('get topCenter', function() { test('get topCenter', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
var point = rect.topCenter; var point = rect.topCenter;
comparePoints(point, { x: 20, y: 10 }); equals(point.toString(), '{ x: 20, y: 10 }');
}); });
test('set topCenter', function() { test('set topCenter', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
rect.topCenter = [10, 15]; rect.topCenter = [10, 15];
var point = rect.topCenter; var point = rect.topCenter;
comparePoints(point, { x: 10, y: 15 }); equals(point.toString(), '{ x: 10, y: 15 }');
}); });
test('get leftCenter', function() { test('get leftCenter', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
var point = rect.leftCenter; var point = rect.leftCenter;
comparePoints(point, { x: 10, y: 20 }); equals(point.toString(), '{ x: 10, y: 20 }');
}); });
test('set leftCenter', function() { test('set leftCenter', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
rect.leftCenter = [10, 15]; rect.leftCenter = [10, 15];
var point = rect.leftCenter; var point = rect.leftCenter;
comparePoints(point, { x: 10, y: 15 }); equals(point.toString(), '{ x: 10, y: 15 }');
}); });
test('get rightCenter', function() { test('get rightCenter', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
var point = rect.rightCenter; var point = rect.rightCenter;
comparePoints(point, { x: 30, y: 20 }); equals(point.toString(), '{ x: 30, y: 20 }');
}); });
test('set rightCenter', function() { test('set rightCenter', function() {
var rect = new Rectangle(10, 10, 20, 20); var rect = new Rectangle(10, 10, 20, 20);
rect.rightCenter = [10, 15]; rect.rightCenter = [10, 15];
var point = rect.rightCenter; var point = rect.rightCenter;
comparePoints(point, { x: 10, y: 15 }); equals(point.toString(), '{ x: 10, y: 15 }');
}); });
test('intersects(rect)', function() { test('intersects(rect)', function() {
@ -173,7 +173,8 @@ test('contains(rect)', function() {
}, true); }, true);
equals(function() { equals(function() {
return rect2.contains(rect1); return rect2.contains(rect1);
}, false);}); }, false);
});
test('contains(point)', function() { test('contains(point)', function() {
var rect = new Rectangle({ x: 160, y: 270, width: 20, height: 20 }); var rect = new Rectangle({ x: 160, y: 270, width: 20, height: 20 });
@ -184,7 +185,8 @@ test('contains(point)', function() {
var point = new Point(30, 30); var point = new Point(30, 30);
equals(function() { equals(function() {
return rect.contains(point); return rect.contains(point);
}, false);}); }, false);
});
test('intersect(rect)', function() { test('intersect(rect)', function() {
var rect1 = new Rectangle({ x: 160, y: 270, width: 20, height: 20 }); var rect1 = new Rectangle({ x: 160, y: 270, width: 20, height: 20 });

View file

@ -1,30 +1,25 @@
module('Size'); module('Size');
test('new Size(10, 20)', function() { test('new Size(10, 20)', function() {
var size = new Size(10, 20); var size = new Size(10, 20);
equals(size.width, 10); equals(size.toString(), '{ width: 10, height: 20 }');
equals(size.height, 20);
}); });
test('new Size([10, 20])', function() { test('new Size([10, 20])', function() {
var size = new Size([10, 20]); var size = new Size([10, 20]);
equals(size.width, 10); equals(size.toString(), '{ width: 10, height: 20 }');
equals(size.height, 20);
}); });
test('new Size({width: 10, height: 20})', function() { test('new Size({width: 10, height: 20})', function() {
var size = new Size({width: 10, height: 20}); var size = new Size({width: 10, height: 20});
equals(size.width, 10); equals(size.toString(), '{ width: 10, height: 20 }');
equals(size.height, 20);
}); });
test('new Size(new Point(10, 20))', function() { test('new Size(new Point(10, 20))', function() {
var size = new Size(new Point(10, 20)); var size = new Size(new Point(10, 20));
equals(size.width, 10); equals(size.toString(), '{ width: 10, height: 20 }');
equals(size.height, 20);
}); });
test('new Size({ x: 10, y: 20})', function() { test('new Size({ x: 10, y: 20})', function() {
var size = new Size({x: 10, y: 20}); var size = new Size({x: 10, y: 20});
equals(size.width, 10); equals(size.toString(), '{ width: 10, height: 20 }');
equals(size.height, 20);
}); });