diff options
| author | Jens Carl <j.carl43@gmx.de> | 2019-03-28 21:24:35 +0000 |
|---|---|---|
| committer | Jens Carl <j.carl43@gmx.de> | 2019-03-29 00:45:46 +0100 |
| commit | b99ea0ff33b78ba76d1ae436895efac490252e0f (patch) | |
| tree | 8c70d44e5de2e211a0efa58be46d323b98dd7afc /sc | |
| parent | edcbe8c4e02a67c74ec6f85f28899431dbfa0765 (diff) | |
tdf#45904 Move XShapes Java tests to C++
Move XShapes Java tests to C++ for ScDrawPageObj.
Change-Id: I1b65e8ad685c3d387a5023e8e8e9b9e06627af11
Reviewed-on: https://gerrit.libreoffice.org/69904
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/extras/scdrawpageobj.cxx | 9 | ||||
| -rw-r--r-- | sc/qa/unoapi/sc_4.sce | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sc/qa/extras/scdrawpageobj.cxx b/sc/qa/extras/scdrawpageobj.cxx index 7d50a783d9d5..436b5f33c8ed 100644 --- a/sc/qa/extras/scdrawpageobj.cxx +++ b/sc/qa/extras/scdrawpageobj.cxx @@ -12,6 +12,7 @@ #include <test/container/xelementaccess.hxx> #include <test/container/xindexaccess.hxx> #include <test/drawing/xshapegrouper.hxx> +#include <test/drawing/xshapes.hxx> #include <test/lang/xserviceinfo.hxx> #include <cppu/unotype.hxx> @@ -34,7 +35,8 @@ class ScDrawPageObj : public CalcUnoApiTest, public apitest::XElementAccess, public apitest::XIndexAccess, public apitest::XServiceInfo, - public apitest::XShapeGrouper + public apitest::XShapeGrouper, + public apitest::XShapes { public: ScDrawPageObj(); @@ -62,6 +64,9 @@ public: CPPUNIT_TEST(testGroup); CPPUNIT_TEST(testUngroup); + // XShapes + CPPUNIT_TEST(testAddRemove); + CPPUNIT_TEST_SUITE_END(); private: @@ -98,6 +103,8 @@ uno::Reference<uno::XInterface> ScDrawPageObj::init() // needed for XShapeGrouper tests setDrawPage(xDrawPage); + // needed for XShapes tests + setShape(apitest::helper::shape::createLine(m_xComponent, 7500, 10000, 5000, 3500)); return xDrawPage; } diff --git a/sc/qa/unoapi/sc_4.sce b/sc/qa/unoapi/sc_4.sce index 2e467f5433e9..50727b8425fa 100644 --- a/sc/qa/unoapi/sc_4.sce +++ b/sc/qa/unoapi/sc_4.sce @@ -18,7 +18,6 @@ -o sc.ScDataPilotItemObj -o sc.ScDatabaseRangeObj -o sc.ScDocumentConfiguration --o sc.ScDrawPageObj # ported to cppunit -o sc.ScHeaderFieldObj -o sc.ScHeaderFieldsObj # The two HeaderFooter tests seem to fail randomly |