diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-25 12:51:40 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-25 14:42:13 +0200 |
| commit | 3fef9fa3f5d260dd1264b67d8b42aad476332eea (patch) | |
| tree | 72b6f9ac1231df074f059fd97aaa52a18b589859 | |
| parent | 3157f70088c0c56c121f22d8687f3f7d01941978 (diff) | |
assertXPath: disallow passing rAttribute without rExpectedValue
Change-Id: I7fb59039429361dad04fb68507f40545f9c4dd6d
Reviewed-on: https://gerrit.libreoffice.org/71290
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | include/test/xmltesttools.hxx | 12 | ||||
| -rw-r--r-- | test/source/xmltesttools.cxx | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx index 4f725f5948c5..c24a81eb65d6 100644 --- a/include/test/xmltesttools.hxx +++ b/include/test/xmltesttools.hxx @@ -61,12 +61,14 @@ protected: int getXPathPosition(xmlDocPtr pXmlDoc, const OString& rXPath, const OUString& rChildName); /** * Assert that rXPath exists, and returns exactly one node. - * In case rAttribute is provided, the rXPath's attribute's value must - * equal to the rExpected value. */ - void assertXPath(xmlDocPtr pXmlDoc, const OString& rXPath, - const OString& rAttribute = OString(), - const OUString& rExpectedValue = OUString()); + void assertXPath(xmlDocPtr pXmlDoc, const OString& rXPath); + /** + * Assert that rXPath exists, returns exactly one node, and the rXPath's attribute's value + * equals to the rExpected value. + */ + void assertXPath(xmlDocPtr pXmlDoc, const OString& rXPath, const OString& rAttribute, + const OUString& rExpectedValue); void assertXPathAttrs(xmlDocPtr pXmlDoc, const OString& rXPath, const std::vector<std::pair<OString, OUString>>& aPairVector); /** diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx index 123af01b28db..20149cc03c37 100644 --- a/test/source/xmltesttools.cxx +++ b/test/source/xmltesttools.cxx @@ -135,6 +135,11 @@ OUString XmlTestTools::getXPathContent(xmlDocPtr pXmlDoc, const OString& rXPath) CPPUNIT_FAIL("Invalid XPath type"); } +void XmlTestTools::assertXPath(xmlDocPtr pXmlDoc, const OString& rXPath) +{ + getXPath(pXmlDoc, rXPath, ""); // it asserts that rXPath exists, and returns exactly one node +} + void XmlTestTools::assertXPath(xmlDocPtr pXmlDoc, const OString& rXPath, const OString& rAttribute, const OUString& rExpectedValue) { OUString aValue = getXPath(pXmlDoc, rXPath, rAttribute); |