diff --git a/test/expect-0.2.0-ol3/expect.js b/test/expect-0.2.0-ol3/expect.js index 5d2d57b184..7b268b63dc 100644 --- a/test/expect-0.2.0-ol3/expect.js +++ b/test/expect-0.2.0-ol3/expect.js @@ -492,6 +492,23 @@ return this; }; + /** + * Assert that that objects intersect. + * FIXME this is ol3 specific + * + * @param {Object} other + * + * @api public + */ + Assertion.prototype.intersect = + Assertion.prototype.wentToSchoolWith = function(other) { + this.assert( + this.obj.intersects(other) + , function(){ return 'expected ' + i(this.obj) + ' to intersect ' + i(other) } + , function(){ return 'expected ' + i(this.obj) + ' not to intersect ' + i(other) }); + return this; + }; + /** * Assert a failure. * diff --git a/test/spec/ol/rectangle.test.js b/test/spec/ol/rectangle.test.js index 50bd9a4df5..0bfdc3cec7 100644 --- a/test/spec/ol/rectangle.test.js +++ b/test/spec/ol/rectangle.test.js @@ -11,7 +11,7 @@ describe('ol.Rectangle', function() { }); }); - describe('intersects', function() { + describe('intersect', function() { var rectangle1; @@ -20,48 +20,48 @@ describe('ol.Rectangle', function() { }); it('returns the expected value', function() { - expect(rectangle1).to.intersectWith(rectangle1); - expect(rectangle1).to.intersectWith(new ol.Rectangle(20, 20, 80, 80)); - expect(rectangle1).to.intersectWith(new ol.Rectangle(20, 50, 80, 100)); - expect(rectangle1).to.intersectWith(new ol.Rectangle(20, 80, 80, 120)); - expect(rectangle1).to.intersectWith(new ol.Rectangle(50, 20, 100, 80)); - expect(rectangle1).to.intersectWith(new ol.Rectangle(50, 80, 100, 120)); - expect(rectangle1).to.intersectWith(new ol.Rectangle(80, 20, 120, 80)); - expect(rectangle1).to.intersectWith(new ol.Rectangle(80, 50, 120, 100)); - expect(rectangle1).to.intersectWith(new ol.Rectangle(80, 80, 120, 120)); - expect(rectangle1).to.intersectWith(new ol.Rectangle(20, 20, 120, 120)); - expect(rectangle1).to.intersectWith(new ol.Rectangle(70, 70, 80, 80)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.intersect(rectangle1); + expect(rectangle1).to.intersect(new ol.Rectangle(20, 20, 80, 80)); + expect(rectangle1).to.intersect(new ol.Rectangle(20, 50, 80, 100)); + expect(rectangle1).to.intersect(new ol.Rectangle(20, 80, 80, 120)); + expect(rectangle1).to.intersect(new ol.Rectangle(50, 20, 100, 80)); + expect(rectangle1).to.intersect(new ol.Rectangle(50, 80, 100, 120)); + expect(rectangle1).to.intersect(new ol.Rectangle(80, 20, 120, 80)); + expect(rectangle1).to.intersect(new ol.Rectangle(80, 50, 120, 100)); + expect(rectangle1).to.intersect(new ol.Rectangle(80, 80, 120, 120)); + expect(rectangle1).to.intersect(new ol.Rectangle(20, 20, 120, 120)); + expect(rectangle1).to.intersect(new ol.Rectangle(70, 70, 80, 80)); + expect(rectangle1).to.not.intersect( new ol.Rectangle(10, 10, 30, 30)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(30, 10, 70, 30)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(50, 10, 100, 30)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(80, 10, 120, 30)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(120, 10, 140, 30)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(10, 30, 30, 70)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(120, 30, 140, 70)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(10, 50, 30, 100)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(120, 50, 140, 100)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(10, 80, 30, 120)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(120, 80, 140, 120)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(10, 120, 30, 140)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(30, 120, 70, 140)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(50, 120, 100, 140)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(80, 120, 120, 140)); - expect(rectangle1).to.not.intersectWith( + expect(rectangle1).to.not.intersect( new ol.Rectangle(120, 120, 140, 140)); }); }); diff --git a/test/test-extensions.js b/test/test-extensions.js index 22c3cab3a5..2cb2503e30 100644 --- a/test/test-extensions.js +++ b/test/test-extensions.js @@ -19,11 +19,6 @@ function waitsFor(condition, message, timeout, callback) { } -expect.Assertion.prototype.intersectWith = function(other) { - return this.obj.intersects(other); -}; - - expect.Assertion.prototype.equalArray = function(other) { return goog.array.equals(this.obj, other); };