diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-31 13:20:41 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-01 09:14:25 +0200 |
commit | 23b08449736ba825a9c582ba18b7a5fdba178e47 (patch) | |
tree | 8513c824f1964f84f957a41658f6d173a008c469 /vcl/qa | |
parent | 8e63d451b2aeb646ece98c4e219f92957f4482bd (diff) |
loplugin: look for CPPUNIT_ASSERT_EQUALS with params swapped
idea originally from either tml or moggi, can't remember which
Change-Id: Id78d75035036d3aa1666e33469c6eeb38f9e624d
Reviewed-on: https://gerrit.libreoffice.org/55126
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/qa')
-rw-r--r-- | vcl/qa/cppunit/bitmapcolor.cxx | 89 | ||||
-rw-r--r-- | vcl/qa/cppunit/fontmetric.cxx | 28 | ||||
-rw-r--r-- | vcl/qa/cppunit/timer.cxx | 4 |
3 files changed, 60 insertions, 61 deletions
diff --git a/vcl/qa/cppunit/bitmapcolor.cxx b/vcl/qa/cppunit/bitmapcolor.cxx index d4594fa22c02..2953c0d0eab8 100644 --- a/vcl/qa/cppunit/bitmapcolor.cxx +++ b/vcl/qa/cppunit/bitmapcolor.cxx @@ -55,10 +55,10 @@ void BitmapColorTest::defaultConstructor() { BitmapColor aBmpColor; - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(0), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(0), aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(0), aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } void BitmapColorTest::colorValueConstructor() @@ -66,33 +66,33 @@ void BitmapColorTest::colorValueConstructor() { BitmapColor aBmpColor(0, 0, 0); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), - static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(0), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(0), + aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(0), aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } { BitmapColor aBmpColor(128, 128, 128); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(128)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), - static_cast<sal_uInt8>(128)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), - static_cast<sal_uInt8>(128)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(128), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(128), + aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(128), + aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } { BitmapColor aBmpColor(255, 255, 255); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(255)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), - static_cast<sal_uInt8>(255)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), - static_cast<sal_uInt8>(255)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(255), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(255), + aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(255), + aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } } @@ -102,35 +102,35 @@ void BitmapColorTest::colorClassConstructor() Color aColor(0, 0, 0); BitmapColor aBmpColor(aColor); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), - static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(0), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(0), + aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(0), aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } { Color aColor(127, 127, 127); BitmapColor aBmpColor(aColor); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(127)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), - static_cast<sal_uInt8>(127)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), - static_cast<sal_uInt8>(127)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(127), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(127), + aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(127), + aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } { Color aColor(255, 255, 255); BitmapColor aBmpColor(aColor); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(255)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), - static_cast<sal_uInt8>(255)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), - static_cast<sal_uInt8>(255)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(255), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(255), + aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(255), + aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } } @@ -139,13 +139,13 @@ void BitmapColorTest::setValue() BitmapColor aBmpColor; aBmpColor.SetRed(127); - CPPUNIT_ASSERT_EQUAL(aBmpColor.GetRed(), static_cast<sal_uInt8>(127)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt8>(127), aBmpColor.GetRed()); aBmpColor.SetGreen(127); - CPPUNIT_ASSERT_EQUAL(aBmpColor.GetGreen(), static_cast<sal_uInt8>(127)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt8>(127), aBmpColor.GetGreen()); aBmpColor.SetBlue(127); - CPPUNIT_ASSERT_EQUAL(aBmpColor.GetBlue(), static_cast<sal_uInt8>(127)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt8>(127), aBmpColor.GetBlue()); } void BitmapColorTest::invert() @@ -153,10 +153,9 @@ void BitmapColorTest::invert() BitmapColor aBmpColor(255, 255, 255); BitmapColor aInvertedColor = aBmpColor.Invert(); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Inverted red wrong", aInvertedColor.GetRed(), - static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL(aInvertedColor.GetGreen(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL(aInvertedColor.GetBlue(), static_cast<sal_uInt8>(0)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt8>(0), aInvertedColor.GetRed()); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt8>(0), aInvertedColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt8>(0), aInvertedColor.GetBlue()); } void BitmapColorTest::getLuminance() diff --git a/vcl/qa/cppunit/fontmetric.cxx b/vcl/qa/cppunit/fontmetric.cxx index 4b4b53899a3e..ac28f34ce51d 100644 --- a/vcl/qa/cppunit/fontmetric.cxx +++ b/vcl/qa/cppunit/fontmetric.cxx @@ -55,27 +55,27 @@ void VclFontMetricTest::testSpacings() // default constructor should set scalable flag to false FontMetric aFontMetric; - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetAscent(), 0L ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetDescent(), 0L ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetExternalLeading(), 0L ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetInternalLeading(), 0L ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetLineHeight(), 0L ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetAscent() ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetDescent() ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetExternalLeading() ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetInternalLeading() ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetLineHeight() ); aFontMetric.SetAscent( 100 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetAscent(), 100L ); + CPPUNIT_ASSERT_EQUAL( 100L, aFontMetric.GetAscent() ); aFontMetric.SetDescent( 100 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetDescent(), 100L ); + CPPUNIT_ASSERT_EQUAL( 100L, aFontMetric.GetDescent() ); aFontMetric.SetExternalLeading( 100 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetExternalLeading(), 100L ); + CPPUNIT_ASSERT_EQUAL( 100L, aFontMetric.GetExternalLeading() ); aFontMetric.SetInternalLeading( 100 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetInternalLeading(), 100L ); + CPPUNIT_ASSERT_EQUAL( 100L, aFontMetric.GetInternalLeading() ); aFontMetric.SetLineHeight( 100 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetLineHeight(), 100L ); + CPPUNIT_ASSERT_EQUAL( 100L, aFontMetric.GetLineHeight() ); } void VclFontMetricTest::testSlant() @@ -83,10 +83,10 @@ void VclFontMetricTest::testSlant() // default constructor should set scalable flag to false FontMetric aFontMetric; - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetSlant(), 0L ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetSlant() ); aFontMetric.SetSlant( 45 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetSlant(), 45L ); + CPPUNIT_ASSERT_EQUAL( 45L, aFontMetric.GetSlant() ); } void VclFontMetricTest::testBulletOffset() @@ -94,10 +94,10 @@ void VclFontMetricTest::testBulletOffset() // default constructor should set scalable flag to false FontMetric aFontMetric; - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetBulletOffset(), 0L ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetBulletOffset() ); aFontMetric.SetBulletOffset( 45 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetBulletOffset(), 45L ); + CPPUNIT_ASSERT_EQUAL( 45L, aFontMetric.GetBulletOffset() ); } void VclFontMetricTest::testEqualityOperator() diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx index aaaf9ec8d86e..1e57f27884bd 100644 --- a/vcl/qa/cppunit/timer.cxx +++ b/vcl/qa/cppunit/timer.cxx @@ -444,7 +444,7 @@ void TimerTest::testInvokedReStart() sal_Int32 nCount = 0; IdleInvokedReStart aIdle( nCount ); Scheduler::ProcessEventsToIdle(); - CPPUNIT_ASSERT_EQUAL( nCount, sal_Int32(2) ); + CPPUNIT_ASSERT_EQUAL( sal_Int32(2), nCount ); } @@ -507,7 +507,7 @@ public: : AutoIdle( pDebugName ) , mrCount( rCount ) { - CPPUNIT_ASSERT_EQUAL( mrCount, sal_uInt32(0) ); + CPPUNIT_ASSERT_EQUAL( sal_uInt32(0), mrCount ); SetInvokeHandler( LINK( this, TestAutoIdleRR, IdleRRHdl ) ); Start(); } |