From a7fc11be3083b61a70e7a55e0436032771e37f20 Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Tue, 3 Apr 2018 03:46:14 +0000 Subject: tdf#45904 Move _XCellRangeFormula Java tests to C++ Change-Id: Iff5ca30e47a3a3eee704ad9aefdf61b3fcd72f5d Reviewed-on: https://gerrit.libreoffice.org/52286 Tested-by: Jenkins Reviewed-by: Jens Carl --- sc/qa/extras/sccellcursorobj.cxx | 11 ++++++++--- sc/qa/extras/sccellrangeobj.cxx | 37 +++++++++++++++++++++---------------- sc/qa/extras/sctablesheetobj.cxx | 7 +++++++ 3 files changed, 36 insertions(+), 19 deletions(-) (limited to 'sc') diff --git a/sc/qa/extras/sccellcursorobj.cxx b/sc/qa/extras/sccellcursorobj.cxx index 4cab6702901e..8e3b0ca43b08 100644 --- a/sc/qa/extras/sccellcursorobj.cxx +++ b/sc/qa/extras/sccellcursorobj.cxx @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -35,6 +36,7 @@ class ScCellCursorObj : public CalcUnoApiTest, public apitest::SheetCellRange, public apitest::XArrayFormulaRange, public apitest::XCellFormatRangesSupplier, public apitest::XCellRangeAddressable, + public apitest::XCellRangeFormula, public apitest::XCellSeries, public apitest::XMultipleOperation, public apitest::XSheetCellRange, @@ -61,19 +63,22 @@ public: // XArrayFormulaRange CPPUNIT_TEST(testGetSetArrayFormula); - // XMultipleOperation - CPPUNIT_TEST(testSetTableOperation); - // XCellFormatRangesSupplier CPPUNIT_TEST(testGetCellFormatRanges); // XCellRangeAddressable CPPUNIT_TEST(testGetRangeAddress); + // XCellRangeFormula + CPPUNIT_TEST(testGetSetFormulaArray); + // XCellSeries CPPUNIT_TEST(testFillAuto); CPPUNIT_TEST(testFillSeries); + // XMultipleOperation + CPPUNIT_TEST(testSetTableOperation); + // XSheetCellRange CPPUNIT_TEST(testGetSpreadsheet); diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index 6267eb47faba..80ae6f8b664b 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -54,6 +55,7 @@ class ScCellRangeObj : public CalcUnoApiTest, public apitest::CellProperties, public apitest::XCellFormatRangesSupplier, public apitest::XCellRangeAddressable, public apitest::XCellRangeData, + public apitest::XCellRangeFormula, public apitest::XCellRangesQuery, public apitest::XCellSeries, public apitest::XMultipleOperation, @@ -91,10 +93,6 @@ public: // XCellFormatRangesSupplier CPPUNIT_TEST(testGetCellFormatRanges); - // XCellSeries - CPPUNIT_TEST(testFillAuto); - CPPUNIT_TEST(testFillSeries); - // XCellRangeAddressable CPPUNIT_TEST(testGetRangeAddress); @@ -102,6 +100,9 @@ public: CPPUNIT_TEST(testGetDataArray); CPPUNIT_TEST(testSetDataArray); + // XCellRangeFormula + CPPUNIT_TEST(testGetSetFormulaArray); + // XCellRangesQuery CPPUNIT_TEST(testQueryColumnDifference); CPPUNIT_TEST(testQueryContentDifference); @@ -111,22 +112,27 @@ public: CPPUNIT_TEST(testQueryRowDifference); CPPUNIT_TEST(testQueryVisibleCells); - // XSearchable - CPPUNIT_TEST(testFindAll); - CPPUNIT_TEST(testFindFirst); + // XCellSeries + CPPUNIT_TEST(testFillAuto); + CPPUNIT_TEST(testFillSeries); // XMultipleOperation CPPUNIT_TEST(testSetTableOperation); - // XSheetCellRange - CPPUNIT_TEST(testGetSpreadsheet); - // XReplaceable CPPUNIT_TEST(testReplaceAll); CPPUNIT_TEST(testCreateReplaceDescriptor); - // XUniqueCellFormatRangesSupplier - CPPUNIT_TEST(testGetUniqueCellFormatRanges); + // XSearchable + CPPUNIT_TEST(testFindAll); + CPPUNIT_TEST(testFindFirst); + + // XSheetCellRange + CPPUNIT_TEST(testGetSpreadsheet); + + // XSheetFilterable + CPPUNIT_TEST(testCreateFilterDescriptor); + CPPUNIT_TEST(testFilter); // XSheetFilterableEx CPPUNIT_TEST(testCreateFilterDescriptorByObject); @@ -139,11 +145,10 @@ public: CPPUNIT_TEST(testCreateSubTotalDescriptor); CPPUNIT_TEST(testApplyRemoveSubTotals); - CPPUNIT_TEST(testSortOOB); + // XUniqueCellFormatRangesSupplier + CPPUNIT_TEST(testGetUniqueCellFormatRanges); - // XSheetFilterable (has to be last tests; otherwise it'll crash) - CPPUNIT_TEST(testCreateFilterDescriptor); - CPPUNIT_TEST(testFilter); + CPPUNIT_TEST(testSortOOB); CPPUNIT_TEST_SUITE_END(); diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index 3ea088d48249..8e712f26422a 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -51,6 +52,7 @@ class ScTableSheetObj : public CalcUnoApiTest, public apitest::Scenario, public apitest::XArrayFormulaRange, public apitest::XCellFormatRangesSupplier, public apitest::XCellRangeAddressable, + public apitest::XCellRangeFormula, public apitest::XCellSeries, public apitest::XDataPilotTablesSupplier, public apitest::XMultipleOperation, @@ -106,6 +108,11 @@ public: // XCellRangeAddressable CPPUNIT_TEST(testGetRangeAddress); + // XCellRangeFormula +#if 0 // disable, because it makes no sense to set an FormulaArray over the whole sheet + CPPUNIT_TEST(testGetSetFormulaArray); +#endif + // XCellSeries CPPUNIT_TEST(testFillAuto); CPPUNIT_TEST(testFillSeries); -- cgit