sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 33 +++++++------------------------ 1 file changed, 8 insertions(+), 25 deletions(-)
New commits: commit 3b8007d4270c5453a65dabef984ed6c24a5a2b4a Author: ayhanyalcinsoy <ayhanyalcin...@pisilinux.org> AuthorDate: Sat Dec 28 08:24:08 2019 +0300 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Fri Dec 27 13:51:37 2019 +0100 tdf#129423: Make export tests export-only where applicable Change-Id: Ib2ec1a6a3af553b416211180a3dc13862ef69665 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85858 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 10cb4292ef90..50f1b33fff47 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -62,11 +62,9 @@ DECLARE_OOXMLEXPORT_TEST(testfdo81381, "fdo81381.docx") assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:object[1]/o:OLEObject[1]", "DrawAspect", "Icon"); } -DECLARE_OOXMLEXPORT_TEST(testSdtAlias, "sdt-alias.docx") +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testSdtAlias, "sdt-alias.docx") { xmlDocPtr pXmlDoc = parseExport(); - if (!pXmlDoc) - return; // <w:alias> was completely missing. assertXPath(pXmlDoc, "/w:document/w:body/w:sdt/w:sdtPr/w:alias", "val", "Subtitle"); @@ -157,11 +155,9 @@ DECLARE_OOXMLEXPORT_TEST(testUnwantedSectionBreak, "unwanted-section-break.docx" assertXPath(pXmlDoc, "//w:sectPr", 1); } -DECLARE_OOXMLEXPORT_TEST(testfdo80897 , "fdo80897.docx") +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testfdo80897 , "fdo80897.docx") { xmlDocPtr pXmlDoc = parseExport(); - if (!pXmlDoc) - return; assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:bodyPr/a:prstTxWarp", "prst", "textTriangle"); } @@ -173,12 +169,10 @@ DECLARE_OOXMLEXPORT_TEST(testFdo80997, "fdo80997.docx") uno::Reference< text::XTextRange > xText = getRun( xParagraph, 1, " text"); } -DECLARE_OOXMLEXPORT_TEST(testFdo80902, "fdo80902.docx") +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFdo80902, "fdo80902.docx") { // The problem was that the docGrid type was set as default so fix it for other grid type xmlDocPtr pXmlDoc = parseExport("word/document.xml"); - if (!pXmlDoc) - return; assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:docGrid", "type", "lines"); } @@ -213,13 +207,10 @@ DECLARE_OOXMLEXPORT_TEST(testFirstHeaderFooter, "first-header-footer.docx") CPPUNIT_ASSERT_EQUAL(OUString("Even page footer 2"), parseDump("/root/page[6]/footer/txt/text()")); } -DECLARE_OOXMLEXPORT_TEST(testFDO83044, "fdo83044.docx") +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFDO83044, "fdo83044.docx") { xmlDocPtr pXmlDoc = parseExport("word/document.xml"); - if (!pXmlDoc) - return; - assertXPath(pXmlDoc, "/w:document/w:body/w:sdt/w:sdtPr/w:text", 1); } @@ -717,29 +708,23 @@ DECLARE_OOXMLEXPORT_TEST(testOoxmlSymbolChicagoList, "symbol_chicago_list.docx") CPPUNIT_ASSERT_EQUAL(style::NumberingType::SYMBOL_CHICAGO, numFormat); } -DECLARE_OOXMLEXPORT_TEST(testOoxmlNumListZHTW, "numlist-zhtw.odt") +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testOoxmlNumListZHTW, "numlist-zhtw.odt") { xmlDocPtr pXmlDoc = parseExport("word/numbering.xml"); - if (!pXmlDoc) - return; assertXPath ( pXmlDoc, "/w:numbering/w:abstractNum[1]/w:lvl[1]/w:numFmt","val","taiwaneseCountingThousand" ); } -DECLARE_OOXMLEXPORT_TEST(testOoxmlNumListZHCN, "numlist-zhcn.odt") +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testOoxmlNumListZHCN, "numlist-zhcn.odt") { xmlDocPtr pXmlDoc = parseExport("word/numbering.xml"); - if (!pXmlDoc) - return; assertXPath ( pXmlDoc, "/w:numbering/w:abstractNum[1]/w:lvl[1]/w:numFmt","val","chineseCountingThousand" ); } -DECLARE_OOXMLEXPORT_TEST(testOOxmlOutlineNumberTypes, "outline-number-types.odt") +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testOOxmlOutlineNumberTypes, "outline-number-types.odt") { xmlDocPtr pXmlDoc = parseExport("word/numbering.xml"); - if (!pXmlDoc) - return; assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[1]/w:lvl[1]/w:pStyle", "val", "Heading1"); assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[1]/w:lvl[1]/w:numFmt", "val", "none"); @@ -949,12 +934,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf106953, "tdf106953.docx") CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), comphelper::SequenceAsHashMap(xRules->getByIndex(0))["FirstLineIndent"].get<sal_Int32>()); } -DECLARE_OOXMLEXPORT_TEST(testTdf115094v3, "tdf115094v3.docx") +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf115094v3, "tdf115094v3.docx") { // floating table is now exported directly without surrounding frame xmlDocPtr pXmlDoc = parseExport("word/document.xml"); - if (!pXmlDoc) - return; assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblPr/w:tblpPr", "tblpX", "1996"); assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblPr/w:tblpPr", "tblpY", "1064"); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits