sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit aea4812eb9e348abb45e65d396d3f55f494b5029
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Mon Jun 24 14:10:34 2019 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Mon Jun 24 15:06:06 2019 +0200
sw: reduce accuracy of double compares in testFDO74215 even more
This failed again on Mac in Jenkins.
- Expected: 12.1348314606742
- Actual : 12.15
- Delta : 0.01
Change-Id: Ic72f3f71f15e1b0d1547f836d2fa5ac6ce22ffd1
Reviewed-on: https://gerrit.libreoffice.org/74636
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 9405ff7e29bc..01824b36e8ac 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -357,7 +357,8 @@ DECLARE_OOXMLEXPORT_TEST(testFDO74215, "FDO74215.docx")
const double fWidth = sWidth.copy(6, sWidth.getLength() -
8).toDouble();
const double fXScaleFactor = 96.0 /
Application::GetDefaultDevice()->GetDPIX();
// note: used to fail on Mac with 14.7945205479452 vs. 14.8
- CPPUNIT_ASSERT_DOUBLES_EQUAL(11.25 * fXScaleFactor, fWidth, 0.01);
+ // note: used to fail on another Mac with 12.1348314606742 vs 12.15
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(11.25 * fXScaleFactor, fWidth, 0.1);
}
{
const OUString sHeight = sStyle.getToken(1, ';');
@@ -365,7 +366,7 @@ DECLARE_OOXMLEXPORT_TEST(testFDO74215, "FDO74215.docx")
CPPUNIT_ASSERT(sHeight.endsWith("pt"));
const double fHeight = sHeight.copy(7, sHeight.getLength() -
9).toDouble();
const double fYScaleFactor = 96.0 /
Application::GetDefaultDevice()->GetDPIY();
- CPPUNIT_ASSERT_DOUBLES_EQUAL(11.25 * fYScaleFactor, fHeight, 0.01);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(11.25 * fYScaleFactor, fHeight, 0.1);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
