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 /chart2 | |
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 'chart2')
-rw-r--r-- | chart2/qa/extras/chart2export.cxx | 2 | ||||
-rw-r--r-- | chart2/qa/extras/chart2import.cxx | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index b77aeda6755b..c43433d690a9 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -271,7 +271,7 @@ void testErrorBar( Reference< XPropertySet > const & xErrorBar ) sal_Int32 nErrorBarStyle; CPPUNIT_ASSERT( xErrorBar->getPropertyValue("ErrorBarStyle") >>= nErrorBarStyle); - CPPUNIT_ASSERT_EQUAL(nErrorBarStyle, chart::ErrorBarStyle::RELATIVE); + CPPUNIT_ASSERT_EQUAL(chart::ErrorBarStyle::RELATIVE, nErrorBarStyle); bool bShowPositive = bool(), bShowNegative = bool(); CPPUNIT_ASSERT( xErrorBar->getPropertyValue("ShowPositiveError") >>= bShowPositive); diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 04d66e259993..4f065d27161e 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -245,11 +245,11 @@ void Chart2ImportTest::Fdo60083() bool bVal; CPPUNIT_ASSERT( xErrorBarYProps->getPropertyValue("ShowPositiveError") >>= bVal); - CPPUNIT_ASSERT_EQUAL(bVal, true); + CPPUNIT_ASSERT_EQUAL(true, bVal); CPPUNIT_ASSERT( xErrorBarYProps->getPropertyValue("ShowNegativeError") >>= bVal); - CPPUNIT_ASSERT_EQUAL(bVal, true); + CPPUNIT_ASSERT_EQUAL(true, bVal); } // test that x error bars are not imported @@ -285,7 +285,7 @@ void Chart2ImportTest::testErrorBarRange() OUString aRangePos; CPPUNIT_ASSERT(xErrorBarYProps->getPropertyValue("ErrorBarRangePositive") >>= aRangePos); - CPPUNIT_ASSERT_EQUAL(aRangePos, OUString("$Sheet1.$C$2:$C$4")); + CPPUNIT_ASSERT_EQUAL(OUString("$Sheet1.$C$2:$C$4"), aRangePos); } void Chart2ImportTest::testErrorBarFormatting() @@ -696,7 +696,7 @@ void Chart2ImportTest::testBnc889755() uno::Reference< chart2::XInternalDataProvider > xDataProvider( xChartDoc->getDataProvider(), uno::UNO_QUERY_THROW ); uno::Reference< chart::XChartDataArray > xChartDataArray(xDataProvider, uno::UNO_QUERY_THROW); uno::Sequence< OUString > aRowLabels = xChartDataArray->getRowDescriptions(); - CPPUNIT_ASSERT_EQUAL( aRowLabels.getLength(), sal_Int32(16) ); + CPPUNIT_ASSERT_EQUAL(sal_Int32(16), aRowLabels.getLength()); CPPUNIT_ASSERT_EQUAL(OUString("Oct-12"), aRowLabels[0]); CPPUNIT_ASSERT_EQUAL(OUString("Nov-12"), aRowLabels[1]); CPPUNIT_ASSERT_EQUAL(OUString("Dec-12"), aRowLabels[2]); @@ -807,14 +807,14 @@ void Chart2ImportTest::testTdf105517() long lineColor; xPropSet1->getPropertyValue("Color") >>= lineColor; // incorrect line color was 0x4a7ebb due to not handling themeOverride - CPPUNIT_ASSERT_EQUAL(lineColor, long(0xeaa700)); + CPPUNIT_ASSERT_EQUAL(long(0xeaa700), lineColor); Reference<beans::XPropertySet> xPropSet2(xDSContainer->getDataSeries()[1], uno::UNO_QUERY); CPPUNIT_ASSERT(xPropSet2.is()); xPropSet2->getPropertyValue("Color") >>= lineColor; // incorrect line color was 0x98b855 - CPPUNIT_ASSERT_EQUAL(lineColor, long(0x1e69a8)); + CPPUNIT_ASSERT_EQUAL(long(0x1e69a8), lineColor); } void Chart2ImportTest::testTdf106217() @@ -829,14 +829,14 @@ void Chart2ImportTest::testTdf106217() CPPUNIT_ASSERT(xCircle.is()); uno::Reference<container::XNamed> xNamedShape(xCircle, uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(xNamedShape->getName(), OUString("Oval 1")); + CPPUNIT_ASSERT_EQUAL(OUString("Oval 1"), xNamedShape->getName()); awt::Point aPosition = xCircle->getPosition(); - CPPUNIT_ASSERT_EQUAL(aPosition.X, sal_Int32(6870)); - CPPUNIT_ASSERT_EQUAL(aPosition.Y, sal_Int32(7261)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(6870), aPosition.X); + CPPUNIT_ASSERT_EQUAL(sal_Int32(7261), aPosition.Y); awt::Size aSize = xCircle->getSize(); - CPPUNIT_ASSERT_EQUAL(aSize.Width, sal_Int32(2701)); - CPPUNIT_ASSERT_EQUAL(aSize.Height, sal_Int32(2700)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2701), aSize.Width); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2700), aSize.Height); } void Chart2ImportTest::testTransparentBackground(OUString const & filename) @@ -1054,7 +1054,7 @@ void Chart2ImportTest::testSmoothDefaultValue2007XLSX() chart2::CurveStyle eCurveStyle; xPropSet->getPropertyValue("CurveStyle") >>= eCurveStyle; - CPPUNIT_ASSERT_EQUAL(eCurveStyle, chart2::CurveStyle_LINES); + CPPUNIT_ASSERT_EQUAL(chart2::CurveStyle_LINES, eCurveStyle); } void Chart2ImportTest::testSmoothDefaultValue2013XLSX() |