ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

db04be037b follow-up: no new log area

Browse Source 
Change-Id: Ib0dc0240db4840d3e93f1816d4288644d9e308f0
Reviewed-on: https://gerrit.libreoffice.org/54660
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Mike Kaganski
2018-05-22 14:36:02 +02:00
parent 741d0e0b09
commit 99dd2aeaf5
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sal/log-areas.dox
-1
View File
@@ -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
sw/qa/extras/mailmerge/mailmerge.cxx
+16 -15
View File
@@ -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());
}