From 7b7e0ff7b78f2e745712c551e5efe7457987f136 Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Sun, 4 Mar 2018 08:13:28 +0000 Subject: tdf#45904: Move _Shape Java tests to C++ Change-Id: If0bfa9fb465f37e0ccce5b2fa4e909baaac1df50 Reviewed-on: https://gerrit.libreoffice.org/50722 Tested-by: Jenkins Reviewed-by: Jens Carl --- sc/CppunitTest_sc_shapeobj.mk | 105 ++++++++++++++++++++++++++++++++++++++ sc/Module_sc.mk | 1 + sc/qa/extras/scshapeobj.cxx | 114 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 220 insertions(+) create mode 100644 sc/CppunitTest_sc_shapeobj.mk create mode 100644 sc/qa/extras/scshapeobj.cxx (limited to 'sc') diff --git a/sc/CppunitTest_sc_shapeobj.mk b/sc/CppunitTest_sc_shapeobj.mk new file mode 100644 index 000000000000..a5939ac3814b --- /dev/null +++ b/sc/CppunitTest_sc_shapeobj.mk @@ -0,0 +1,105 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,sc_shapeobj)) + +$(eval $(call gb_CppunitTest_use_external,sc_shapeobj,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_shapeobj, \ + sc/qa/extras/scshapeobj \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_shapeobj, \ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + drawinglayer \ + editeng \ + for \ + forui \ + i18nlangtag \ + msfilter \ + oox \ + sal \ + salhelper \ + sax \ + sb \ + sc \ + sfx \ + sot \ + subsequenttest \ + svl \ + svt \ + svx \ + svxcore \ + test \ + tk \ + tl \ + ucbhelper \ + unotest \ + utl \ + vbahelper \ + vcl \ + xo \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_shapeobj,\ + -I$(SRCDIR)/sc/source/ui/inc \ + -I$(SRCDIR)/sc/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_shapeobj)) + +$(eval $(call gb_CppunitTest_use_ure,sc_shapeobj)) +$(eval $(call gb_CppunitTest_use_vcl,sc_shapeobj)) + +$(eval $(call gb_CppunitTest_use_components,sc_shapeobj,\ + basic/util/sb \ + comphelper/util/comphelp \ + configmgr/source/configmgr \ + dbaccess/util/dba \ + filter/source/config/cache/filterconfig1 \ + filter/source/storagefilterdetect/storagefd \ + forms/util/frm \ + framework/util/fwk \ + i18npool/util/i18npool \ + linguistic/source/lng \ + oox/util/oox \ + package/source/xstor/xstor \ + package/util/package2 \ + sax/source/expatwrap/expwrap \ + scripting/source/basprov/basprov \ + scripting/util/scriptframe \ + sc/util/sc \ + sc/util/scd \ + sc/util/scfilt \ + $(call gb_Helper_optional,SCRIPTING, \ + sc/util/vbaobj) \ + sfx2/util/sfx \ + sot/util/sot \ + svl/source/fsstor/fsstorage \ + toolkit/util/tk \ + ucb/source/core/ucb1 \ + ucb/source/ucp/file/ucpfile1 \ + ucb/source/ucp/tdoc/ucptdoc1 \ + unotools/util/utl \ + unoxml/source/rdf/unordf \ + unoxml/source/service/unoxml \ + uui/util/uui \ + xmloff/util/xo \ + svtools/util/svt \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_shapeobj)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index ca37c6413780..482b77e4e93e 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -152,6 +152,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_importdescriptorbaseobj \ CppunitTest_sc_documentconfigurationobj \ CppunitTest_sc_spreadsheetsettingsobj \ + CppunitTest_sc_shapeobj \ )) $(eval $(call gb_Module_add_perfcheck_targets,sc,\ diff --git a/sc/qa/extras/scshapeobj.cxx b/sc/qa/extras/scshapeobj.cxx new file mode 100644 index 000000000000..1e2fab13ac86 --- /dev/null +++ b/sc/qa/extras/scshapeobj.cxx @@ -0,0 +1,114 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +using namespace css; +using namespace css::uno; +using namespace com::sun::star; + +namespace sc_apitest +{ +class ScShapeObj : public CalcUnoApiTest, public apitest::Shape +{ +public: + ScShapeObj(); + + virtual uno::Reference init() override; + virtual uno::Reference getXSheetDocument() override; + virtual void setUp() override; + virtual void tearDown() override; + + CPPUNIT_TEST_SUITE(ScShapeObj); + + // Shape + CPPUNIT_TEST(testShapeProperties); + + CPPUNIT_TEST_SUITE_END(); + +private: + uno::Reference mxComponent; +}; + +ScShapeObj::ScShapeObj() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") +{ +} + +uno::Reference ScShapeObj::init() +{ + uno::Reference xDoc(mxComponent, UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + + uno::Reference xMSF(xDoc, UNO_QUERY_THROW); + uno::Reference xShape( + xMSF->createInstance("com.sun.star.drawing.RectangleShape"), UNO_QUERY_THROW); + xShape->setPosition(awt::Point(5000, 3500)); + xShape->setSize(awt::Size(7500, 5000)); + + uno::Reference xDPS(xDoc, UNO_QUERY_THROW); + uno::Reference xDrawPages = xDPS->getDrawPages(); + uno::Reference xDrawPage(xDrawPages->getByIndex(0), UNO_QUERY_THROW); + uno::Reference xShapes(xDrawPage, UNO_QUERY_THROW); + xShapes->add(xShape); + + for (auto i = 0; i < 10; i++) + { + xShape->setPosition(awt::Point(5000, 3500)); + xShape->setSize(awt::Size(7510 + 10 * i, 5010 + 10 * i)); + xShapes->add(xShape); + } + + return xShape; +} + +uno::Reference ScShapeObj::getXSheetDocument() +{ + uno::Reference xDoc(mxComponent, UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + + return xDoc; +} + +void ScShapeObj::setUp() +{ + CalcUnoApiTest::setUp(); + // create a calc document + mxComponent = loadFromDesktop("private:factory/scalc"); +} + +void ScShapeObj::tearDown() +{ + closeDocument(mxComponent); + CalcUnoApiTest::tearDown(); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScShapeObj); + +} // end namespace + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ -- cgit