From a6b1767b2b9f7abc5739d47cd746afb8d260e688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Lehni?= Date: Mon, 24 Feb 2014 12:19:03 +0100 Subject: [PATCH] Apply Matrix test fix from ea0147fe85c6f70eda31f358cb0f9e26f8eacc9d in all tests. --- test/tests/Matrix.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/test/tests/Matrix.js b/test/tests/Matrix.js index e6058f3c..1ee5dd09 100644 --- a/test/tests/Matrix.js +++ b/test/tests/Matrix.js @@ -41,11 +41,12 @@ test('Decomposition: scale()', function() { function testScale(sx, sy, ex, ey, ea) { var m = new Matrix().scale(sx, sy), s = 'new Matrix().scale(' + sx + ', ' + sy + ')'; - equals(m.getScaling(), new Point(Base.pick(ex, sx), Base.pick(ey, sy)), - s + '.getScaling()'); equals(m.getRotation(), ea || 0, - s + '.getRotation()', - Numerical.TOLERANCE); + s + '.getRotation()', + Numerical.TOLERANCE); + comparePoints(m.getScaling(), new Point(Base.pick(ex, sx), + Base.pick(ey, sy)), + s + '.getScaling()'); } testScale(1, 1); @@ -63,11 +64,12 @@ test('Decomposition: rotate() & scale()', function() { function testAngleAndScale(sx, sy, a, ex, ey, ea) { var m = new Matrix().scale(sx, sy).rotate(a), s = 'new Matrix().scale(' + sx + ', ' + sy + ').rotate(' + a + ')'; - equals(m.getScaling(), new Point(Base.pick(ex, sx), Base.pick(ey, sy)), - s + '.getScaling()'); equals(m.getRotation(), ea || a, - s + '.getRotation()', - Numerical.TOLERANCE); + s + '.getRotation()', + Numerical.TOLERANCE); + comparePoints(m.getScaling(), new Point(Base.pick(ex, sx), + Base.pick(ey, sy)), + s + '.getScaling()'); } testAngleAndScale(2, 4, 45);