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

Justin Luth (via logerrit) logerrit at kemper.freedesktop.org
Thu Apr 25 09:37:17 UTC 2019


 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e43f2dddc29f2ed2c6ebed104ea69b19a88b168e
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Thu Apr 25 10:04:59 2019 +0300
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Apr 25 11:36:37 2019 +0200

    related tdf#123636: fix unit test for tinderbox
    
    Change-Id: Ia7dc9879aeaa978d1cb1b0573fb69bd63bd5d4e0
    Reviewed-on: https://gerrit.libreoffice.org/71278
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 41c04f56c687..5bf170249e1a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -98,7 +98,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123636_newlinePageBreak3, "tdf123636_newlinePage
     CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of Pages", 2, getPages() );
 
     xmlDocPtr pDump = parseLayoutDump();
-    assertXPath(pDump, "/root/page[1]/body/txt[3]", "Last line on page 1");
+    assertXPath(pDump, "/root/page[1]/body/txt[3]/Text[1]", "Portion", "Last line on page 1");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf123636_newlinePageBreak4, "tdf123636_newlinePageBreak4.docx")
@@ -109,7 +109,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123636_newlinePageBreak4, "tdf123636_newlinePage
     CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of Pages", 2, getPages() );
 
     xmlDocPtr pDump = parseLayoutDump();
-    assertXPath(pDump, "/root/page[2]/body/txt[1]", "");
+    assertXPath(pDump, "/root/page[2]/body/txt[1]/Text", 0);
 }
 
 DECLARE_OOXMLEXPORT_TEST(tdf123912_protectedForm, "tdf123912_protectedForm.odt")


More information about the Libreoffice-commits mailing list