[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/qa

[Mike Kaganski (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9bf161ea08e7432dcfb76feda4e57bebf91f8cf4
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Apr 11 23:35:13 2019 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Jun 19 04:16:11 2019 +0200

    f315fee54eee57e6e55e5fcacf2522534682c2ce follow-up: fix tdf#109310 unit test
    
    The test should guarantee presense of w:val attribute of w:rStyle element.
    Turns out we must not use w: namespace before attribute name; likely it
    is true when attribute namespace is the same as of its element.
    
    Change-Id: I28e2936b51f039473326c6debf4b5559e2baf24c
    Reviewed-on: https://gerrit.libreoffice.org/70612
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 735964c39097ff952fcaffee6b35c79e210c019c)
    Reviewed-on: https://gerrit.libreoffice.org/74326
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 4a3b1a0c412d..a44c8f78d9cf 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -488,7 +488,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf109310_endnoteStyleForMSO, "tdf109310_endnoteSty
     xmlDocPtr pXmlDoc = parseExport("word/endnotes.xml");
     if (!pXmlDoc)
         return;
-//    assertXPath(pXmlDoc, "/w:endnotes/w:endnote[@w:id='2']/w:p/w:r[1]/w:rPr/w:rStyle", "w:val"); // what does it test?
+    // Check w:rStyle element has w:val attribute - note that w: is not specified for attribute
+    assertXPath(pXmlDoc, "/w:endnotes/w:endnote[@w:id='2']/w:p/w:r[1]/w:rPr/w:rStyle", "val",
+                "EndnoteCharacters");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx")