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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Nov 28 16:08:13 UTC 2018


 vcl/qa/cppunit/pdfexport/pdfexport.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3bb64c0b26962f3c62dc82353b8ca13479c409be
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Nov 28 15:04:44 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Nov 28 17:07:50 2018 +0100

    Check against concrete expected values in PdfExportTest::testTdf115262
    
    With d464d505fbf6e53a38afdd3661d320fac8c760d6 "Refactor calc non-linear
    ViewToDevice transform", the problems with my macOS build that I described in
    the commit message of (abandoned) <https://gerrit.libreoffice.org/#/c/61651/>
    "Omit 'Calc adjust to grid hack' when not rendering for the screen" are
    apparently solved:  `make CppunitTest_vcl_pdfexport test` succeeds, and opening
    vcl/qa/cppunit/pdfexport/data/tdf115262.ods and exporting it to PDF while the
    on-screen Calc document is displayed at varying zoom levels leads to effectively
    identical files now.
    
    Assuming that 232 is the universally correct value for nFirstImageTop now
    (nRowTop appears to have always evaluated to 199), it looks cleaner to me to
    have the expected values spelled out explicitly in the test code.
    
    Change-Id: Idb9f30f4ab9641b5b5325ddd90084e4112e1b572
    Reviewed-on: https://gerrit.libreoffice.org/64171
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 001b3de2f480..5075fef47a54 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -1577,8 +1577,8 @@ void PdfExportTest::testTdf115262()
     }
     // Make sure that the top of the "400" is below the top of the image (in
     // bottom-right-corner-based PDF coordinates).
-    // This was: expected less than 144, actual is 199.
-    CPPUNIT_ASSERT_LESS(nFirstImageTop, nRowTop);
+    CPPUNIT_ASSERT_EQUAL(232, nFirstImageTop);
+    CPPUNIT_ASSERT_EQUAL(199, nRowTop);
     FPDFText_ClosePage(pTextPage);
 }
 


More information about the Libreoffice-commits mailing list