diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-06-02 18:46:56 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-06-03 09:17:21 +0200 |
commit | 263cc4325599493254713e8ada697c02069f7cb5 (patch) | |
tree | efb64c1cc35738a6eb20b0ba023216c772fcb05b /chart2 | |
parent | 2276f0b80552d9f7ba70e1273600d47b1693eb24 (diff) |
Upcoming loplugin:elidestringvar: chart2
Change-Id: Ibc668f42f2779d8f3542054c92338c9f4f3efe68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95375
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/qa/extras/PivotChartTest.cxx | 42 | ||||
-rw-r--r-- | chart2/qa/extras/chart2dump/chart2dump.cxx | 4 | ||||
-rw-r--r-- | chart2/qa/extras/chart2import.cxx | 6 |
3 files changed, 17 insertions, 35 deletions
diff --git a/chart2/qa/extras/PivotChartTest.cxx b/chart2/qa/extras/PivotChartTest.cxx index 91a43cf334ef..80bfcf14202b 100644 --- a/chart2/qa/extras/PivotChartTest.cxx +++ b/chart2/qa/extras/PivotChartTest.cxx @@ -313,10 +313,8 @@ void PivotChartTest::testRoundtrip() Reference<chart2::XChartDocument> xChartDoc; std::vector<double> aReference1 { 10162.033139, 16614.523063, 27944.146101 }; - OUString const aExpectedLabel1("Exp."); std::vector<double> aReference2 { 101879.458079, 178636.929704, 314626.484864 }; - OUString const aExpectedLabel2("Rev."); load("/chart2/qa/extras/data/ods/", "PivotChartRoundTrip.ods"); @@ -329,12 +327,12 @@ void PivotChartTest::testRoundtrip() { xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 0)->getData(); lclCheckSequence(aReference1, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel1, lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(OUString("Exp."), lclGetLabel(xChartDoc, 0)); } { xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 1)->getData(); lclCheckSequence(aReference2, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel2, lclGetLabel(xChartDoc, 1)); + CPPUNIT_ASSERT_EQUAL(OUString("Rev."), lclGetLabel(xChartDoc, 1)); } // Modify the pivot table @@ -399,23 +397,21 @@ void PivotChartTest::testChangePivotTable() // Check first data series { std::vector<double> aReference { 10162.033139, 16614.523063, 27944.146101 }; - OUString const aExpectedLabel("Exp."); xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel, lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(OUString("Exp."), lclGetLabel(xChartDoc, 0)); } // Check second data series { std::vector<double> aReference { 101879.458079, 178636.929704, 314626.484864 }; - OUString const aExpectedLabel("Rev."); xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 1)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel, lclGetLabel(xChartDoc, 1)); + CPPUNIT_ASSERT_EQUAL(OUString("Rev."), lclGetLabel(xChartDoc, 1)); } // Modify the pivot table, move "Group Segment" to Column fields, @@ -435,34 +431,31 @@ void PivotChartTest::testChangePivotTable() // Check the first data series { std::vector<double> aReference { 2855.559, 1780.326, 2208.713, 2130.064, 1187.371 }; - OUString const aExpectedLabel("Big"); xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel, lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(OUString("Big"), lclGetLabel(xChartDoc, 0)); } // Check the second data series { std::vector<double> aReference { 4098.908, 2527.286, 4299.716, 2362.225, 3326.389 }; - OUString const aExpectedLabel("Medium"); xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 1)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel, lclGetLabel(xChartDoc, 1)); + CPPUNIT_ASSERT_EQUAL(OUString("Medium"), lclGetLabel(xChartDoc, 1)); } // Check the third data series { std::vector<double> aReference { 4926.303, 5684.060, 4201.398, 7290.795, 5841.591 }; - OUString const aExpectedLabel("Small"); xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 2)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel, lclGetLabel(xChartDoc, 2)); + CPPUNIT_ASSERT_EQUAL(OUString("Small"), lclGetLabel(xChartDoc, 2)); } // Remove "Service Month" so row fields are empty - check we handle empty rows @@ -583,33 +576,30 @@ void PivotChartTest::testPivotChartWithOneColumnField() // Check data series 1 { std::vector<double> aReference { 1738.0 }; - OUString const aExpectedLabel("DE"); xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel, lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(OUString("DE"), lclGetLabel(xChartDoc, 0)); } // Check data series 2 { std::vector<double> aReference { 2003.0 }; - OUString const aExpectedLabel("EN"); xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 1)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel, lclGetLabel(xChartDoc, 1)); + CPPUNIT_ASSERT_EQUAL(OUString("EN"), lclGetLabel(xChartDoc, 1)); } // Check data series 3 { std::vector<double> aReference { 1936.0 }; - OUString const aExpectedLabel("FR"); xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 2)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel, lclGetLabel(xChartDoc, 2)); + CPPUNIT_ASSERT_EQUAL(OUString("FR"), lclGetLabel(xChartDoc, 2)); } } @@ -668,12 +658,11 @@ void PivotChartTest::testPivotChartWithOneRowField() // Check data series 1 { std::vector<double> aReference { 1738.0, 2003.0, 1936.0 }; - OUString const aExpectedLabel("Total"); xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel, lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); } } @@ -840,12 +829,11 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode() CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getNumberOfDataSeries(xChartDoc)); { std::vector<double> aReference { 1116.0, 622.0, 298.0, 562.0, 1143.0, 1168.0, 768.0 }; - OUString const aExpectedLabel("Total"); xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel, lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); } // Check the categories { @@ -873,12 +861,11 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode() CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getNumberOfDataSeries(xChartDoc)); { std::vector<double> aReference { 1116.0, 622.0, 298.0, 562.0, 1143.0, 1168.0, 768.0 }; - OUString const aExpectedLabel("Total"); xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel, lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); } // Check categories { @@ -903,12 +890,11 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode() CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getNumberOfDataSeries(xChartDoc)); { std::vector<double> aReference { 1116.0, 622.0, 298.0, 562.0, 1143.0, 1168.0, 768.0 }; - OUString const aExpectedLabel("Total"); xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(aExpectedLabel, lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); } // Check categories { diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx index 680744bab5a1..6defbf6fc866 100644 --- a/chart2/qa/extras/chart2dump/chart2dump.cxx +++ b/chart2/qa/extras/chart2dump/chart2dump.cxx @@ -1099,9 +1099,7 @@ DECLARE_DUMP_TEST(PointLineChartTest, Chart2DumpTest, false) DECLARE_DUMP_TEST( PivotChartDataButtonTest, Chart2DumpTest, false ) { - const OUString aTestFile = "pivotchart_data_button.ods"; - - setTestFileName( aTestFile ); + setTestFileName( "pivotchart_data_button.ods" ); load( getTestFileDirName(), getTestFileName() ); // Check that we have pivot chart in the document diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index e47f1234ef60..ca91d5084c50 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -1962,8 +1962,7 @@ void Chart2ImportTest::testTdf116163() uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xShapes.is()); - const OUString sXAxisName = "CID/D=0:CS=0:Axis=0,0"; - uno::Reference<drawing::XShape> xXAxis = getShapeByName(xShapes, sXAxisName, + uno::Reference<drawing::XShape> xXAxis = getShapeByName(xShapes, "CID/D=0:CS=0:Axis=0,0", // Axis occurs twice in chart xshape representation so need to get the one related to labels [](const uno::Reference<drawing::XShape>& rXShape) -> bool { @@ -2008,8 +2007,7 @@ void Chart2ImportTest::testTdf48041() uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xShapes.is()); - const OUString sYAxisName = "CID/D=0:CS=0:Axis=1,0"; // Y Axis - uno::Reference<drawing::XShape> xYAxisShape = getShapeByName(xShapes, sYAxisName, + uno::Reference<drawing::XShape> xYAxisShape = getShapeByName(xShapes, "CID/D=0:CS=0:Axis=1,0", // Y Axis // Axis occurs twice in chart xshape representation so need to get the one related to labels [](const uno::Reference<drawing::XShape>& rXShape) -> bool { |