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 /vcl/qa/cppunit/bitmaprender | |
| 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 'vcl/qa/cppunit/bitmaprender')
| -rw-r--r-- | vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx index bbf8a38da0f6..a4852438f6f3 100644 --- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx +++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx @@ -76,8 +76,8 @@ void BitmapRenderTest::testTdf104141() // Check drawing results: ensure that it contains transparent // (greenish) pixels const Color aColor = pVDev->GetPixel(Point(21, 21)); - CPPUNIT_ASSERT(aColor.GetGreen() > 10 * aColor.GetRed() - && aColor.GetGreen() > 10 * aColor.GetBlue()); + CPPUNIT_ASSERT(aColor.GetGreen() > 10 * aColor.GetRed()); + CPPUNIT_ASSERT(aColor.GetGreen() > 10 * aColor.GetBlue()); } void BitmapRenderTest::testTdf113918() @@ -101,7 +101,8 @@ void BitmapRenderTest::testTdf113918() // Ensure that image is drawn with gray text color from palette const Color aColor = pVDev->GetPixel(Point(1298, 1368)); - CPPUNIT_ASSERT(aColor.GetGreen() == aColor.GetRed() && aColor.GetGreen() == aColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL(aColor.GetGreen(), aColor.GetRed()); + CPPUNIT_ASSERT_EQUAL(aColor.GetGreen(), aColor.GetBlue()); CPPUNIT_ASSERT(aColor.GetGreen() > 100); } |