emfio/qa/cppunit/wmf/wmfimporttest.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 20a9b1ba01636b2b35b6cc2bc5c1c807055c5e8d Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Tue Jan 11 09:20:54 2022 +0100 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Tue Jan 11 11:55:26 2022 +0100 Adapt test value intervals to my Linux --without-system-fontconfig build Change-Id: Ie0867782b0925800cc094f43f8387fb9d1ff0c21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128272 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/emfio/qa/cppunit/wmf/wmfimporttest.cxx b/emfio/qa/cppunit/wmf/wmfimporttest.cxx index a967930ae5ab..db84998523fa 100644 --- a/emfio/qa/cppunit/wmf/wmfimporttest.cxx +++ b/emfio/qa/cppunit/wmf/wmfimporttest.cxx @@ -123,7 +123,7 @@ void WmfTest::testTdf88163NonPlaceableWmf() // Mac: With fix: 3230, without fix: ~ 8000 // Windows: With fix: 3303, without fix: ~ 8000 auto x = getXPath(pDoc, "/metafile/push[2]/font[1]", "height"); - CPPUNIT_ASSERT_GREATER(sal_Int32(3000), x.toInt32()); + CPPUNIT_ASSERT_GREATEREQUAL(sal_Int32(3000), x.toInt32()); CPPUNIT_ASSERT_LESS(sal_Int32(3500), x.toInt32()); // Fails without the fix: Expected: 7359, Actual: 7336 @@ -161,7 +161,7 @@ void WmfTest::testTdf88163PlaceableWmf() // The fix does not affect the font size // Linux: 300 - Mac: 309 - Windows: 316 auto x = getXPath(pDoc, "/metafile/push[2]/font[1]", "height"); - CPPUNIT_ASSERT_GREATER(sal_Int32(290), x.toInt32()); + CPPUNIT_ASSERT_GREATEREQUAL(sal_Int32(287), x.toInt32()); CPPUNIT_ASSERT_LESS(sal_Int32(320), x.toInt32()); // Fails without the fix: Expected: 1900, Actual: 19818