sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
New commits:
commit 78bc1c3c0c71eb67046db5596eb8d442ad564310
Author: Daniel Arato (NISZ) <arato.dan...@nisz.hu>
AuthorDate: Mon Aug 31 13:26:53 2020 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Sep 3 07:21:56 2020 +0200
tdf#129423 sw: export-only tests, part 6
Convert some unit tests from "export" tests to "export only".
Remove nullptr checks on parseExport's return value to make
the tests fail if parsing fails for any reason.
Change-Id: Ie65ca79192e2996954e465bc4e8c5f9f47fbc87c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101717
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 1eff36be4eb6..48cf77e84f0b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -465,14 +465,12 @@ DECLARE_OOXMLIMPORT_TEST(TestTdf135653, "tdf135653.docx")
CPPUNIT_ASSERT_EQUAL_MESSAGE("OLE bg color does not match!",
aExpectedColor, aFillColor);
}
-DECLARE_OOXMLEXPORT_TEST(testAtPageShapeRelOrientation, "rotated_shape.fodt")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testAtPageShapeRelOrientation,
"rotated_shape.fodt")
{
// invalid combination of at-page anchor and horizontal-rel="paragraph"
// caused relativeFrom="column" instead of relativeFrom="page"
xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml");
- if (!pXmlDocument)
- return;
assertXPathContent(pXmlDocument,
"/w:document/w:body/w:p/w:r/mc:AlternateContent[1]/mc:Choice/w:drawing/wp:anchor"
"/wp:positionH/wp:posOffset", "-480060");
@@ -502,7 +500,7 @@ DECLARE_OOXMLEXPORT_TEST(testAtPageShapeRelOrientation,
"rotated_shape.fodt")
CPPUNIT_ASSERT(style.indexOf("v-text-anchor:middle") != -1);
}
-DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorHeightFromBottomMarginHasFooter,
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testRelativeAnchorHeightFromBottomMarginHasFooter,
"tdf133070_testRelativeAnchorHeightFromBottomMarginHasFooter.docx")
{
// tdf#133070 The height was set relative to page print area bottom,
@@ -510,8 +508,6 @@
DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorHeightFromBottomMarginHasFooter,
// Note: page print area bottom = margin + footer height.
// In this case the footer exists.
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
- if (!pXmlDoc)
- return;
assertXPath(pXmlDoc, "//SwAnchoredDrawObject/bounds", "height", "1147");
}
@@ -543,7 +539,7 @@ DECLARE_OOXMLIMPORT_TEST(TestTdf132483, "tdf132483.docx")
text::RelOrientation::PAGE_FRAME , nHRelPos);
}
-DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorHeightFromBottomMarginNoFooter,
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testRelativeAnchorHeightFromBottomMarginNoFooter,
"tdf133070_testRelativeAnchorHeightFromBottomMarginNoFooter.docx")
{
// tdf#133070 The height was set relative to page print area bottom,
@@ -551,17 +547,12 @@
DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorHeightFromBottomMarginNoFooter,
// Note: page print area bottom = margin + footer height.
// In this case the footer does not exist, so OpenDocument and OOXML
margins are the same.
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
- if (!pXmlDoc)
- return;
assertXPath(pXmlDoc, "//SwAnchoredDrawObject/bounds", "height", "1147");
}
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133702, "tdf133702.docx")
{
xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml");
- if (!pXmlDocument)
- return;
-
assertXPath(pXmlDocument, "/w:document/w:body/w:p[1]/w:pPr/w:framePr");
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
