[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - oox/qa

Jan-Marek Glogowski (via logerrit) logerrit at kemper.freedesktop.org
Wed May 26 18:05:02 UTC 2021


 oox/qa/unit/vml.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c3dc12c4c66bfec6c9d29603f9707d55fbb11d94
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Wed May 26 14:31:27 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed May 26 20:04:27 2021 +0200

    tdf137314 Add margin to CppunitTest assertions
    
    The test had multiple failures on Windows with:
    
    oox/qa/unit/vml.cxx(79) : error : Assertion
    Test name: tdf137314_vml_rotation_unit_fd::TestBody
    equality assertion failed
    - Expected: 1490
    - Actual  : 1491
    
    So add a 1px margin to all value checks.
    
    Change-Id: I70298db253299a57cc37eed482c0816d902fbeab
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116192
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit 60b98189281524c85b559ee3b6adc1381b793b9d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116154

diff --git a/oox/qa/unit/vml.cxx b/oox/qa/unit/vml.cxx
index 94e73459d995..d75372da39ae 100644
--- a/oox/qa/unit/vml.cxx
+++ b/oox/qa/unit/vml.cxx
@@ -73,9 +73,9 @@ CPPUNIT_TEST_FIXTURE(OoxVmlTest, tdf137314_vml_rotation_unit_fd)
     // Without fix in place, the vector was -1441|1490.
     // [1] and [2] are Bezier-curve control points.
     sal_Int32 nDiffX = aPolygon[3].X - aPolygon[0].X;
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(1490), nDiffX);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(1490), nDiffX, 1);
     sal_Int32 nDiffY = aPolygon[3].Y - aPolygon[0].Y;
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(1441), nDiffY);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(1441), nDiffY, 1);
 }
 
 CPPUNIT_TEST_FIXTURE(OoxVmlTest, testSpt202ShapeType)


More information about the Libreoffice-commits mailing list