[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/qa

Vasily Melenchuk Vasily.Melenchuk at cib.de
Fri Nov 17 00:41:22 UTC 2017


Rebased ref, commits from common ancestor:
commit d95abd98d6f4740af24b957ee315bbb1d9715996
Author: Vasily Melenchuk <Vasily.Melenchuk at cib.de>
Date:   Thu Nov 16 20:55:03 2017 +0300

    tdf#43017: Fix unittest failure after backport
    
    This testcase works fine in master but for some reasons fails
    in 5.2. Testcase behavior was modified because:
    
    1. tdf#76163 case is verified and is not reproducing with
       or without tdf#43017 fix.
    
    2. After saving document there are no visual differences after reopen in
       LO.
    
    3. Same story as p. 2 but with MS Word
    
    4. So let's adjust the XPath query to find the right element
    
    Change-Id: I5710395e8c029fa9f75789a7aa1512da26612aac

diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index 35525460b678..0c6fcf2d917f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -432,7 +432,7 @@ DECLARE_OOXMLEXPORT_TEST(testFDO76163 , "fdo76163.docx")
     if (!pXmlDoc)
         return;
     //docx file after RT is getting corrupted.
-    assertXPath ( pXmlDoc, "/w:document/w:body/w:p[2]/w:hyperlink/w:r[11]/w:fldChar", "fldCharType", "end" );
+    assertXPath ( pXmlDoc, "/w:document/w:body/w:p[2]/w:hyperlink/w:r[13]/w:fldChar", "fldCharType", "end" );
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFDO78659, "fdo78659.docx")


More information about the Libreoffice-commits mailing list