From 67391eedfe2ee0f39d35834e91e476872a6c1fc4 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Wed, 26 Sep 2012 10:16:59 +0200 Subject: [PATCH] Test: Enable tst_QWMatrix::operator_star_qwmatrix MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Expecting results were not correct. The test is passing. Task-number: QTBUG-22362 Change-Id: Ie41c262019f76aace9062d7897d7934dc7437c3a Reviewed-by: Sergio Ahumada Reviewed-by: Samuel Rødal --- tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp index 31508bc..e863aa6 100644 --- a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp +++ b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp @@ -299,22 +299,17 @@ void tst_QWMatrix::mapRect() void tst_QWMatrix::operator_star_qwmatrix() { -#if 0 - // Left out until the matrix multiply operator behaves properly.. QMatrix m1( 2, 3, 4, 5, 6, 7 ); QMatrix m2( 3, 4, 5, 6, 7, 8 ); - QMatrix result1x2( 21, 26, 37, 46, 44, 75 ); - QMatrix result2x1( 22, 29, 34, 45, 53, 80); + QMatrix result1x2( 21, 26, 37, 46, 60, 74 ); + QMatrix result2x1( 22, 29, 34, 45, 52, 68); QMatrix product12 = m1*m2; QMatrix product21 = m2*m1; QVERIFY( product12==result1x2 ); QVERIFY( product21==result2x1 ); -#else - QSKIP( "Not tested with Qt versions since the operator is broken.." ); -#endif } -- 2.7.4