include/sal/log-areas.dox | 1 -
sw/qa/extras/mailmerge/mailmerge.cxx | 31 ++++++++++++++++---------------
2 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 99dd2aeaf5cd605c8af8fa6462cebe802d26221a
Author: Mike Kaganski <mike.kagan...@collabora.com>
Date: Tue May 22 11:54:29 2018 +0300
db04be037b611e296ef9f2542322c52ed82d7a2b follow-up: no new log area
Change-Id: Ib0dc0240db4840d3e93f1816d4288644d9e308f0
Reviewed-on: https://gerrit.libreoffice.org/54660
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 8819bef136e0..88106232877b 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -520,7 +520,6 @@ certain functionality.
@li @c sw.level2
@li @c sw.mailmerge - Writer mail merge
@li @c sw.pageframe - debug lifecycle of SwPageFrame
-@li @c sw.qa - Writer unit tests
@li @c sw.rtf - .rtf export filter
@li @c sw.tiled
@li @c sw.ui
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx
b/sw/qa/extras/mailmerge/mailmerge.cxx
index ca1f3ec47b0e..b207547fffb5 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -729,10 +729,10 @@ DECLARE_FILE_MAILMERGE_TEST(testEmptyValuesLegacyODT,
"tdf35798-legacy.odt", "5-
for (int i = 0; i < 8; ++i)
{
auto xPara = getParagraph(i+1);
- SAL_WARN("sw.qa", "Testing doc " + OUString::number(doc) + "
paragraph "
- + OUString::number(i + 1));
-
CPPUNIT_ASSERT_EQUAL(OUString::createFromAscii(EmptyValuesLegacyData[doc][i]),
- xPara->getString());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(
+ OString("in doc " + OString::number(doc) + " paragraph " +
OString::number(i + 1))
+ .getStr(),
+ OUString::createFromAscii(EmptyValuesLegacyData[doc][i]),
xPara->getString());
}
CPPUNIT_ASSERT_EQUAL(8, getParagraphs());
}
@@ -757,10 +757,10 @@ DECLARE_FILE_MAILMERGE_TEST(testEmptyValuesNewODT,
"tdf35798-new.odt", "5-with-b
if (!pExpected)
break;
auto xPara = getParagraph(i + 1);
- SAL_WARN("sw.qa", "Testing doc " + OUString::number(doc) + "
paragraph "
- + OUString::number(i + 1));
- CPPUNIT_ASSERT_EQUAL(OUString::createFromAscii(pExpected),
- xPara->getString());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(
+ OString("in doc " + OString::number(doc) + " paragraph " +
OString::number(i + 1))
+ .getStr(),
+ OUString::createFromAscii(pExpected), xPara->getString());
}
CPPUNIT_ASSERT_EQUAL(i, getParagraphs());
}
@@ -781,10 +781,10 @@ DECLARE_FILE_MAILMERGE_TEST(testEmptyValuesLegacyFODT,
"tdf35798-legacy.fodt", "
for (int i = 0; i < 8; ++i)
{
auto xPara = getParagraph(i + 1);
- SAL_WARN("sw.qa", "Testing doc " + OUString::number(doc) + "
paragraph "
- + OUString::number(i + 1));
-
CPPUNIT_ASSERT_EQUAL(OUString::createFromAscii(EmptyValuesLegacyData[doc][i]),
- xPara->getString());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(
+ OString("in doc " + OString::number(doc) + " paragraph " +
OString::number(i + 1))
+ .getStr(),
+ OUString::createFromAscii(EmptyValuesLegacyData[doc][i]),
xPara->getString());
}
CPPUNIT_ASSERT_EQUAL(8, getParagraphs());
}
@@ -809,9 +809,10 @@ DECLARE_FILE_MAILMERGE_TEST(testEmptyValuesNewFODT,
"tdf35798-new.fodt", "5-with
if (!pExpected)
break;
auto xPara = getParagraph(i + 1);
- SAL_WARN("sw.qa", "Testing doc " + OUString::number(doc) + "
paragraph "
- + OUString::number(i + 1));
- CPPUNIT_ASSERT_EQUAL(OUString::createFromAscii(pExpected),
xPara->getString());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(
+ OString("in doc " + OString::number(doc) + " paragraph " +
OString::number(i + 1))
+ .getStr(),
+ OUString::createFromAscii(pExpected), xPara->getString());
}
CPPUNIT_ASSERT_EQUAL(i, getParagraphs());
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
