diff options
author | Rahul Gurung <gurungrahul2@gmail.com> | 2018-09-09 15:35:54 +0530 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-09-10 02:03:10 +0200 |
commit | efe119aaa50e9f532b3fac1ef153469c80f24b80 (patch) | |
tree | 59a686d969f9c473f9304c43e604cb947d16cd55 /sc | |
parent | 8e12e517473dcdfbfd04dc5192c841aff011f609 (diff) |
tdf#45904 Move _XMergeable Java Tests to C++
Change-Id: I37dc759a64301810a7d32a3f160b9bcbf546dd01
Reviewed-on: https://gerrit.libreoffice.org/60211
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/qa/extras/sccellcursorobj.cxx | 5 | ||||
-rw-r--r-- | sc/qa/extras/sccellrangeobj.cxx | 5 | ||||
-rw-r--r-- | sc/qa/extras/sctablesheetobj.cxx | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/sc/qa/extras/sccellcursorobj.cxx b/sc/qa/extras/sccellcursorobj.cxx index ed1fd270f980..7630211c1820 100644 --- a/sc/qa/extras/sccellcursorobj.cxx +++ b/sc/qa/extras/sccellcursorobj.cxx @@ -27,6 +27,7 @@ #include <test/sheet/xusedareacursor.hxx> #include <test/table/xcellcursor.hxx> #include <test/table/xcolumnrowrange.hxx> +#include <test/util/xmergeable.hxx> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> @@ -47,6 +48,7 @@ class ScCellCursorObj : public CalcUnoApiTest, public apitest::SheetCellRange, public apitest::XCellSeries, public apitest::XColumnRowRange, public apitest::XFormulaQuery, + public apitest::XMergeable, public apitest::XMultipleOperation, public apitest::XSheetCellCursor, public apitest::XSheetCellRange, @@ -106,6 +108,9 @@ public: CPPUNIT_TEST(testQueryDependents); CPPUNIT_TEST(testQueryPrecedents); + // XMergeable + CPPUNIT_TEST(testGetIsMergedMerge); + // XMultipleOperation CPPUNIT_TEST(testSetTableOperation); diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index 2cb241c81cb2..b330290491c2 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -26,6 +26,7 @@ #include <test/sheet/xsubtotalcalculatable.hxx> #include <test/sheet/xuniquecellformatrangessupplier.hxx> #include <test/table/xcolumnrowrange.hxx> +#include <test/util/xmergeable.hxx> #include <test/util/xreplaceable.hxx> #include <test/util/xsearchable.hxx> @@ -62,6 +63,7 @@ class ScCellRangeObj : public CalcUnoApiTest, public apitest::CellProperties, public apitest::XCellSeries, public apitest::XColumnRowRange, public apitest::XFormulaQuery, + public apitest::XMergeable, public apitest::XMultipleOperation, public apitest::XReplaceable, public apitest::XSearchable, @@ -128,6 +130,9 @@ public: CPPUNIT_TEST(testQueryDependents); CPPUNIT_TEST(testQueryPrecedents); + // XMergeable + CPPUNIT_TEST(testGetIsMergedMerge); + // XMultipleOperation CPPUNIT_TEST(testSetTableOperation); diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index f7eadb1e048a..19ba24d51691 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -37,6 +37,7 @@ #include <test/sheet/xsubtotalcalculatable.hxx> #include <test/sheet/xuniquecellformatrangessupplier.hxx> #include <test/table/xcolumnrowrange.hxx> +#include <test/util/xmergeable.hxx> #include <test/util/xreplaceable.hxx> #include <test/util/xsearchable.hxx> @@ -64,6 +65,7 @@ class ScTableSheetObj : public CalcUnoApiTest, public apitest::Scenario, public apitest::XColumnRowRange, public apitest::XDataPilotTablesSupplier, public apitest::XFormulaQuery, + public apitest::XMergeable, public apitest::XMultipleOperation, public apitest::XPrintAreas, public apitest::XReplaceable, @@ -149,6 +151,9 @@ public: CPPUNIT_TEST(testQueryDependents); CPPUNIT_TEST(testQueryPrecedents); + // XMergeable + CPPUNIT_TEST(testGetIsMergedMerge); + // XSearchable CPPUNIT_TEST(testFindAll); CPPUNIT_TEST(testFindNext); |