From eb358d77291eba677141bab113dc27d7aabb0f3e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 11:44:04 +0200 Subject: Merging upstream version 4:24.2.2. Signed-off-by: Daniel Baumann --- include/test/unoapixml_test.hxx | 7 +++++++ include/test/xmltesttools.hxx | 3 +++ 2 files changed, 10 insertions(+) (limited to 'include/test') diff --git a/include/test/unoapixml_test.hxx b/include/test/unoapixml_test.hxx index 660fda6c20..569be11790 100644 --- a/include/test/unoapixml_test.hxx +++ b/include/test/unoapixml_test.hxx @@ -23,6 +23,13 @@ public: UnoApiXmlTest(OUString path); xmlDocUniquePtr parseExport(OUString const& rStreamName); + + /** + * Returns an xml stream of an exported file. + * To be used when the exporter doesn't create zip archives, but single files + * (like Flat ODF Export) + */ + xmlDocUniquePtr parseExportedFile(); }; #endif // INCLUDED_TEST_UNOAPIXML_TEST_HXX diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx index d18b5d51e8..bf91c5b201 100644 --- a/include/test/xmltesttools.hxx +++ b/include/test/xmltesttools.hxx @@ -104,6 +104,9 @@ protected: * Assert that rXPath exists, has exactly 1 result set nodes and does *not* have an attribute named rAttribute. */ void assertXPathNoAttribute(const xmlDocUniquePtr& pXmlDoc, const OString& rXPath, const OString& rAttribute); + // Assert that the node name of the single node returned by an XPath is as specified, + // e.g. to check order of elements, where getXPathPosition is unapplicable + void assertXPathNodeName(const xmlDocUniquePtr& pXmlDoc, const OString& rXPath, const OString& rExpectedName); static void registerODFNamespaces(xmlXPathContextPtr& pXmlXpathCtx); static void registerOOXMLNamespaces(xmlXPathContextPtr& pXmlXpathCtx); -- cgit v1.2.3