summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-08-19 09:04:40 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-08-19 10:18:31 +0200
commit92d1b0d10ec04f17d116bc54aada652f1c2cac4a (patch)
tree6f22d3b3de331b4f53ffa0b1af55357c9943ec3f /stoc
parent7f3e33420abdf6a13a14a1208bda6294a10b0e5b (diff)
Improve test failure output
Change-Id: Ie0dd5b4d0b994ce6e1687bdb21749cb6cafc2366 Reviewed-on: https://gerrit.libreoffice.org/77700 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'stoc')
-rw-r--r--stoc/test/uriproc/test_uriproc.cxx14
1 files changed, 8 insertions, 6 deletions
diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx
index dbf095a3bd04..c1ab0f0d89e3 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -195,7 +195,9 @@ void Test::testParse() {
css::uno::Reference< css::uri::XUriReference > uriRef(
m_uriFactory->parse(
OUString::createFromAscii(data[i].uriReference)));
- CPPUNIT_ASSERT_EQUAL(data[i].schemeSpecificPart != nullptr, uriRef.is());
+ TEST_ASSERT_EQUAL(
+ "testParse", i, data[i].uriReference, data[i].schemeSpecificPart != nullptr,
+ uriRef.is());
if (uriRef.is()) {
TEST_ASSERT_EQUAL(
"testParse", i, data[i].uriReference,
@@ -587,11 +589,11 @@ void Test::testMakeAbsolute() {
css::uno::Reference< css::uri::XUriReference > baseUriRef(
m_uriFactory->parse(
OUString::createFromAscii(data[i].baseUriReference)));
- CPPUNIT_ASSERT(baseUriRef.is());
+ TEST_ASSERT_EQUAL("testMakeAbsolute", i, data[i].baseUriReference, true, baseUriRef.is());
css::uno::Reference< css::uri::XUriReference > uriRef(
m_uriFactory->parse(
OUString::createFromAscii(data[i].uriReference)));
- CPPUNIT_ASSERT(uriRef.is());
+ TEST_ASSERT_EQUAL("testMakeAbsolute", i, data[i].uriReference, true, uriRef.is());
css::uno::Reference< css::uri::XUriReference > absolute(
m_uriFactory->makeAbsolute(
baseUriRef, uriRef, data[i].processSpecialBaseSegments,
@@ -692,11 +694,11 @@ void Test::testMakeRelative() {
css::uno::Reference< css::uri::XUriReference > baseUriRef(
m_uriFactory->parse(
OUString::createFromAscii(data[i].baseUriReference)));
- CPPUNIT_ASSERT(baseUriRef.is());
+ TEST_ASSERT_EQUAL("testMakeRelative", i, data[i].baseUriReference, true, baseUriRef.is());
css::uno::Reference< css::uri::XUriReference > uriRef(
m_uriFactory->parse(
OUString::createFromAscii(data[i].uriReference)));
- CPPUNIT_ASSERT(uriRef.is());
+ TEST_ASSERT_EQUAL("testMakeRelative", i, data[i].uriReference, true, uriRef.is());
css::uno::Reference< css::uri::XUriReference > relative(
m_uriFactory->makeRelative(
baseUriRef, uriRef, data[i].preferAuthorityOverRelativePath,
@@ -714,7 +716,7 @@ void Test::testMakeRelative() {
m_uriFactory->makeAbsolute(
baseUriRef, relative, true,
css::uri::RelativeUriExcessParentSegments_ERROR));
- CPPUNIT_ASSERT(absolute.is());
+ TEST_ASSERT_EQUAL("testMakeRelative", i, data[i].uriReference, true, absolute.is());
TEST_ASSERT_EQUAL(
"testMakeRelative", i, data[i].uriReference,
OUString::createFromAscii(