diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2021-02-08 07:48:59 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2021-02-08 09:15:01 +0100 |
commit | 6b00d0576a310796590631d14c54d7d5ea6814ac (patch) | |
tree | 2e11a4454592be39cfeaa68458cae964d8cdef5e /tools/qa/cppunit/test_stream.cxx | |
parent | 17149f65f03a34e88bb4a10abcd20e6891f5d7ca (diff) |
Improve loplugin:cppunitassertequal for CPPUNIT_ASSERT(a && b)
...by re-enabling the code temporarily #if'ed-out in
a528392e71bc70136021be4e3d83732fccbb885e "Fixed/improved
loplugin:cppunitassertequals" (and which then triggers lots of other
lopglugin:cppunitassertequal CPPUNIT_ASSERT -> CPPUNIT_ASSERT_EQUAL warnings).
For two css::uno::Reference equality comparisons in cppu/qa/test_any.cxx, it
was more straightforward to rewrite them with an explicit call to operator ==
(which silences loplugin:cppunitassertequal) than to adapt them to
CPPUNIT_ASSERT_EQUAL's requirement for arguments of identical types.
In sc/qa/unit/ucalc_pivottable.cxx, ScDPItemData needs toString, which has been
implemented trivially for now, but might want to combine that with the
DEBUG_PIVOT_TABLE-only ScDPItemData::Dump.
Change-Id: Iae6d09cf69bd4e52fe4411bba9e50c48e696291c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110546
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'tools/qa/cppunit/test_stream.cxx')
-rw-r--r-- | tools/qa/cppunit/test_stream.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/qa/cppunit/test_stream.cxx b/tools/qa/cppunit/test_stream.cxx index d8e4d1ef71e1..4672af6c70c9 100644 --- a/tools/qa/cppunit/test_stream.cxx +++ b/tools/qa/cppunit/test_stream.cxx @@ -230,14 +230,16 @@ namespace aMemStream.Seek(0); bRet = aMemStream.ReadLine(aFoo); CPPUNIT_ASSERT(bRet); - CPPUNIT_ASSERT(aFoo.getLength() == 7 && aFoo[3] == 0); + CPPUNIT_ASSERT_EQUAL(sal_Int32(7), aFoo.getLength()); + CPPUNIT_ASSERT_EQUAL('\0', aFoo[3]); CPPUNIT_ASSERT(aMemStream.good()); std::string sStr(foo, RTL_CONSTASCII_LENGTH(foo)); std::istringstream iss(sStr, std::istringstream::in); std::getline(iss, sStr, '\n'); //embedded null read as expected - CPPUNIT_ASSERT(sStr.size() == 7 && sStr[3] == 0); + CPPUNIT_ASSERT_EQUAL(std::string::size_type(7), sStr.size()); + CPPUNIT_ASSERT_EQUAL('\0', sStr[3]); CPPUNIT_ASSERT(iss.good()); bRet = aMemStream.ReadLine(aFoo); @@ -252,11 +254,13 @@ namespace bRet = aMemStream.ReadLine(aFoo); CPPUNIT_ASSERT(!bRet); CPPUNIT_ASSERT(aFoo.isEmpty()); - CPPUNIT_ASSERT(aMemStream.eof() && !aMemStream.bad()); + CPPUNIT_ASSERT(aMemStream.eof()); + CPPUNIT_ASSERT(!aMemStream.bad()); std::getline(iss, sStr, '\n'); CPPUNIT_ASSERT(sStr.empty()); - CPPUNIT_ASSERT(iss.eof() && !iss.bad()); + CPPUNIT_ASSERT(iss.eof()); + CPPUNIT_ASSERT(!iss.bad()); char bar[] = "foo"; SvMemoryStream aMemStreamB(bar, SAL_N_ELEMENTS(bar)-1, StreamMode::READ); |