diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-05-22 11:54:29 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-05-22 14:36:02 +0200 |
| commit | 99dd2aeaf5cd605c8af8fa6462cebe802d26221a (patch) | |
| tree | 74ec8a2e2946c81df92fa045ab770e6a21adc5da /sw/qa/extras | |
| parent | 741d0e0b0927c17bb8dad21835d9b38257166ef2 (diff) | |
db04be037b611e296ef9f2542322c52ed82d7a2b follow-up: no new log area
Change-Id: Ib0dc0240db4840d3e93f1816d4288644d9e308f0
Reviewed-on: https://gerrit.libreoffice.org/54660
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/qa/extras')
| -rw-r--r-- | sw/qa/extras/mailmerge/mailmerge.cxx | 31 |
1 files changed, 16 insertions, 15 deletions
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()); } |