diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-08-23 07:35:01 +0000 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-23 23:41:40 +0200 |
commit | 4818ee60172b2c7d5d04e57499e345e1cfd7b430 (patch) | |
tree | 71dc5ea4660bed77085e787be171c6c058ab2457 /sc | |
parent | 40fdfea0ae994569fb0919c974fc2356dd4bb5c4 (diff) |
tdf#45904 Move Java _XUniqueCellFormatRangesSupplier test to C++
Change-Id: I66c62f1676515437197d1875600407408040ca74
Reviewed-on: https://gerrit.libreoffice.org/41445
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/qa/extras/sccellcursorobj.cxx | 8 | ||||
-rw-r--r-- | sc/qa/extras/sccellrangeobj.cxx | 30 | ||||
-rw-r--r-- | sc/qa/extras/sctablesheetobj.cxx | 19 |
3 files changed, 45 insertions, 12 deletions
diff --git a/sc/qa/extras/sccellcursorobj.cxx b/sc/qa/extras/sccellcursorobj.cxx index eefdcb98bd6d..674c9eff0b98 100644 --- a/sc/qa/extras/sccellcursorobj.cxx +++ b/sc/qa/extras/sccellcursorobj.cxx @@ -10,6 +10,7 @@ #include <test/calc_unoapi_test.hxx> #include <test/sheet/xcellseries.hxx> #include <test/sheet/xusedareacursor.hxx> +#include <test/sheet/xuniquecellformatrangessupplier.hxx> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> @@ -20,9 +21,9 @@ using namespace css::uno; namespace sc_apitest { -#define NUMBER_OF_TESTS 4 +#define NUMBER_OF_TESTS 5 -class ScCellCursorObj : public CalcUnoApiTest, private apitest::XCellSeries, public apitest::XUsedAreaCursor +class ScCellCursorObj : public CalcUnoApiTest, private apitest::XCellSeries, public apitest::XUsedAreaCursor, public apitest::XUniqueCellFormatRangesSupplier { public: ScCellCursorObj(); @@ -42,6 +43,9 @@ public: CPPUNIT_TEST(testFillAuto); CPPUNIT_TEST(testFillSeries); + // XUniqueCellFormatRangesSupplier + CPPUNIT_TEST(testGetUniqueCellFormatRanges); + CPPUNIT_TEST_SUITE_END(); private: diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index 65c9c697ba07..fff430036bda 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -8,12 +8,13 @@ */ #include <test/calc_unoapi_test.hxx> -#include <test/sheet/xcellrangesquery.hxx> #include <test/sheet/cellproperties.hxx> -#include <test/util/xreplaceable.hxx> -#include <test/util/xsearchable.hxx> #include <test/sheet/xcellrangedata.hxx> +#include <test/sheet/xcellrangesquery.hxx> #include <test/sheet/xcellseries.hxx> +#include <test/sheet/xuniquecellformatrangessupplier.hxx> +#include <test/util/xreplaceable.hxx> +#include <test/util/xsearchable.hxx> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> @@ -27,11 +28,11 @@ using namespace css::uno; namespace sc_apitest { -#define NUMBER_OF_TESTS 17 +#define NUMBER_OF_TESTS 18 class ScCellRangeObj : public CalcUnoApiTest, public apitest::XCellRangesQuery, public apitest::CellProperties, public apitest::XSearchable, public apitest::XReplaceable, public apitest::XCellRangeData, - public apitest::XCellSeries + public apitest::XCellSeries, public apitest::XUniqueCellFormatRangesSupplier { public: ScCellRangeObj(); @@ -42,26 +43,43 @@ public: virtual uno::Reference< uno::XInterface > getXCellRangeData() override; void testSortOOB(); - CPPUNIT_TEST_SUITE(ScCellRangeObj); + + // XCellRangesQuery CPPUNIT_TEST(testQueryColumnDifference); CPPUNIT_TEST(testQueryContentDifference); CPPUNIT_TEST(testQueryEmptyCells); + //CPPUNIT_TEST(testQueryFormulaCells); CPPUNIT_TEST(testQueryIntersection); CPPUNIT_TEST(testQueryRowDifference); CPPUNIT_TEST(testQueryVisibleCells); + + // CellProperties CPPUNIT_TEST(testVertJustify); CPPUNIT_TEST(testRotateReference); + + // XSearchable CPPUNIT_TEST(testFindAll); CPPUNIT_TEST(testFindFirst); + + // XReplaceable CPPUNIT_TEST(testReplaceAll); CPPUNIT_TEST(testCreateReplaceDescriptor); + + // XCellRangeData CPPUNIT_TEST(testGetDataArray); CPPUNIT_TEST(testSetDataArray); + CPPUNIT_TEST(testSortOOB); + + // XCellSeries CPPUNIT_TEST(testFillAuto); CPPUNIT_TEST(testFillSeries); + + // XUniqueCellFormatRangesSupplier + CPPUNIT_TEST(testGetUniqueCellFormatRanges); + CPPUNIT_TEST_SUITE_END(); private: diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index fabe8b7b0d76..c97e5230fbe3 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -8,10 +8,11 @@ */ #include <test/calc_unoapi_test.hxx> +#include <test/sheet/xcellseries.hxx> +#include <test/sheet/xprintareas.hxx> +#include <test/sheet/xuniquecellformatrangessupplier.hxx> #include <test/util/xreplaceable.hxx> #include <test/util/xsearchable.hxx> -#include <test/sheet/xprintareas.hxx> -#include <test/sheet/xcellseries.hxx> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> @@ -22,9 +23,9 @@ using namespace css::uno; namespace sc_apitest { -#define NUMBER_OF_TESTS 9 +#define NUMBER_OF_TESTS 10 -class ScTableSheetObj : public CalcUnoApiTest, public apitest::XSearchable, public apitest::XReplaceable, public apitest::XPrintAreas, public apitest::XCellSeries +class ScTableSheetObj : public CalcUnoApiTest, public apitest::XSearchable, public apitest::XReplaceable, public apitest::XPrintAreas, public apitest::XCellSeries, public apitest::XUniqueCellFormatRangesSupplier { public: ScTableSheetObj(); @@ -35,17 +36,27 @@ public: virtual uno::Reference< uno::XInterface > init() override; CPPUNIT_TEST_SUITE(ScTableSheetObj); + + // XSearchable CPPUNIT_TEST(testFindAll); CPPUNIT_TEST(testFindNext); CPPUNIT_TEST(testFindFirst); + + // XReplaceable CPPUNIT_TEST(testReplaceAll); CPPUNIT_TEST(testCreateReplaceDescriptor); + // XPrintAreas CPPUNIT_TEST(testSetAndGetPrintTitleColumns); CPPUNIT_TEST(testSetAndGetPrintTitleRows); + // XCellSeries CPPUNIT_TEST(testFillAuto); CPPUNIT_TEST(testFillSeries); + + // XUniqueCellFormatRangesSupplier + CPPUNIT_TEST(testGetUniqueCellFormatRanges); + CPPUNIT_TEST_SUITE_END(); private: |