[Libreoffice-commits] core.git: chart2/qa

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Tue Jan 7 09:56:58 UTC 2020


 chart2/qa/extras/chart2import.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ab42dbf7e3072fa71af282d38bc751b5494d4718
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Dec 30 01:11:24 2019 +0300
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Tue Jan 7 10:56:27 2020 +0100

    Fix Chart2ImportTest::testAxisTitlePositionDOCX test for 150% UI scaling
    
    On Windows, with 150% UI scaling, the four values for which tolerance
    were added are 10638, 7159, 389, and 6631 respectively.
    
    Change-Id: I4467cd465f55f9f6efe58c54c37cf8563bb42a30
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85967
    Tested-by: Jenkins
    Reviewed-by: László Németh <nemeth at numbertext.org>
    Tested-by: László Németh <nemeth at numbertext.org>

diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index ccb75649a3f1..c2f8e2a0afee 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -1567,8 +1567,8 @@ void Chart2ImportTest::testAxisTitlePositionDOCX()
     CPPUNIT_ASSERT(xAxisTitle.is());
 
     awt::Point aPos = xAxisTitle->getPosition();
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(10640), static_cast<sal_Int32>(aPos.X));
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(7157), static_cast<sal_Int32>(aPos.Y));
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(10640, aPos.X, 2);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(7157, aPos.Y, 2);
 
     // test Y Axis title position
     uno::Reference< chart::XAxisYSupplier > xAxisYSupp(mxDiagram, uno::UNO_QUERY);
@@ -1578,8 +1578,8 @@ void Chart2ImportTest::testAxisTitlePositionDOCX()
     CPPUNIT_ASSERT(xAxisTitle.is());
 
     aPos = xAxisTitle->getPosition();
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(387), static_cast<sal_Int32>(aPos.X));
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(6378), static_cast<sal_Int32>(aPos.Y));
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(387, aPos.X, 2);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(6378, aPos.Y, 300);
 }
 
 void Chart2ImportTest::testCombinedChartAttachedAxisXLSX()


More information about the Libreoffice-commits mailing list