summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Arato (NISZ) <arato.daniel@nisz.hu>2020-08-31 13:30:26 +0200
committerMike Kaganski <mike.kaganski@collabora.com>2020-09-03 19:35:50 +0200
commit0be6e21857f868d85049fca2c8e02fc5e8802120 (patch)
treedbf45703fd6e2ef996898a9105327b53587aaebe
parent77829e5310350afe5d5e66f8abc3adbcc988ba39 (diff)
tdf#129423 sw: export-only tests, part 10
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: I0edb7988431b9e8cf5959dcb5753301fa4a0c210 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101721 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport6.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index fa09ebbfbc27..120a8db1d3bb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -119,13 +119,10 @@ DECLARE_OOXMLEXPORT_TEST(testDmlTextshape, "dml-textshape.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(-4727), xShape->getPosition().Y);
}
-DECLARE_OOXMLEXPORT_TEST(testDmlTextshapeB, "dml-textshapeB.docx")
+// testDmlTextshapeB was only made export-only because as an import-export test it failed for an unknown reason
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testDmlTextshapeB, "dml-textshapeB.docx")
{
uno::Reference<container::XIndexAccess> xGroup(getShape(1), uno::UNO_QUERY);
- xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml");
- if (!pXmlDocument)
- return;
-
uno::Reference<drawing::XShape> xShape(xGroup->getByIndex(3), uno::UNO_QUERY);
// Connector was incorrectly shifted towards the top left corner, X was 192, Y was -5743.
CPPUNIT_ASSERT_EQUAL(sal_Int32(3778), xShape->getPosition().X);