diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-06-24 14:10:34 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-06-25 18:14:30 +0200 |
| commit | 069033a6ef8902e84df9f8c90c501c7319f37a4e (patch) | |
| tree | 76fa6d4ef657d446efe72da9ed52ee2a8964d491 /sw | |
| parent | 85f61124eade5c9a06be8a693403af141461e18b (diff) | |
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.Stahl@cib.de>
(cherry picked from commit aea4812eb9e348abb45e65d396d3f55f494b5029)
Reviewed-on: https://gerrit.libreoffice.org/74642
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index f5367bbfcf08..7fea045659f8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -384,7 +384,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, ';'); @@ -392,7 +393,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); } } |