[Libreoffice-commits] core.git: filter/qa
Miklos Vajna
vmiklos at collabora.co.uk
Fri Sep 16 08:57:04 UTC 2016
filter/qa/cppunit/priority-test.cxx | 4 ++--
filter/qa/cppunit/xslt-test.cxx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 81ce0f37728295660a3b6a7a09920f16f3fc7663
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Sep 16 09:19:49 2016 +0200
filter: fix loplugin:cppunitassertequals warnings
Change-Id: Ibb80377a581d70501dbd243307e883057508e67f
diff --git a/filter/qa/cppunit/priority-test.cxx b/filter/qa/cppunit/priority-test.cxx
index 70093fb..9eff49f 100644
--- a/filter/qa/cppunit/priority-test.cxx
+++ b/filter/qa/cppunit/priority-test.cxx
@@ -69,9 +69,9 @@ void PriorityFilterTest::testPriority()
aMsg.append("' should be '");
aMsg.append(aFormatCorrect);
aMsg.append("'");
- CPPUNIT_ASSERT_MESSAGE(rtl::OUStringToOString(aMsg.makeStringAndClear(),
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(rtl::OUStringToOString(aMsg.makeStringAndClear(),
RTL_TEXTENCODING_UTF8).getStr(),
- aTypeName == aFormatCorrect);
+ aFormatCorrect, aTypeName);
}
catch (const uno::Exception &e)
{
diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx
index 01fe09d..a19a2a5 100644
--- a/filter/qa/cppunit/xslt-test.cxx
+++ b/filter/qa/cppunit/xslt-test.cxx
@@ -76,7 +76,7 @@ void XsltFilterTest::testXsltCopyNew()
oslFileHandle tempFile;
OUString tempURL;
osl::File::RC rc = osl::File::createTempFile(nullptr, &tempFile, &tempURL);
- CPPUNIT_ASSERT(osl::FileBase::E_None == rc);
+ CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, rc);
osl_closeFile(tempFile); // close it so xSFA can open it on WNT
OUString source(
@@ -133,7 +133,7 @@ void XsltFilterTest::testXsltCopyOld()
oslFileHandle tempFile;
OUString tempURL;
osl::File::RC rc = osl::File::createTempFile(nullptr, &tempFile, &tempURL);
- CPPUNIT_ASSERT(osl::FileBase::E_None == rc);
+ CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, rc);
osl_closeFile(tempFile); // close it so xSFA can open it on WNT
OUString source(
More information about the Libreoffice-commits
mailing list