diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-09-03 08:04:24 +0000 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-10-09 01:15:49 +0200 |
commit | f3c6264d1e8a599ddfb23f6dc9a9dd2e42885c19 (patch) | |
tree | f6cb952b89b8ac3fa7e7d90b146f9052101d7b81 /sc | |
parent | 46fdca1e7d64fc1bb0305a683b185f11a44c25eb (diff) |
tdf#45904: Move _XAreaLinks Java to C++
This allows to re-activate the test and fixes #i84701.
Change-Id: Ifd295e9521a04e88a68aa96fad8f9e8e32f927fa
Reviewed-on: https://gerrit.libreoffice.org/41855
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/CppunitTest_sc_arealinksobj.mk | 107 | ||||
-rw-r--r-- | sc/Module_sc.mk | 1 | ||||
-rw-r--r-- | sc/qa/extras/scarealinksobj.cxx | 97 |
3 files changed, 205 insertions, 0 deletions
diff --git a/sc/CppunitTest_sc_arealinksobj.mk b/sc/CppunitTest_sc_arealinksobj.mk new file mode 100644 index 000000000000..dead8dfb28bd --- /dev/null +++ b/sc/CppunitTest_sc_arealinksobj.mk @@ -0,0 +1,107 @@ +# -*- 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_arealinksobj)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_arealinksobj, \ + sc/qa/extras/scarealinksobj \ +)) + +$(eval $(call gb_CppunitTest_use_external,sc_arealinksobj,boost_headers)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_arealinksobj, \ + 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_arealinksobj,\ + -I$(SRCDIR)/sc/source/ui/inc \ + -I$(SRCDIR)/sc/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_arealinksobj)) + +$(eval $(call gb_CppunitTest_use_ure,sc_arealinksobj)) +$(eval $(call gb_CppunitTest_use_vcl,sc_arealinksobj)) + +$(eval $(call gb_CppunitTest_use_components,sc_arealinksobj,\ + 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_arealinksobj)) + +# vim: set noet sw=4 ts=4: + + diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 3698137d27f6..bd5b7696e4fa 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -130,6 +130,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_arealinkobj \ CppunitTest_sc_datapilotitemobj \ CppunitTest_sc_subtotalfieldobj \ + CppunitTest_sc_arealinksobj \ )) $(eval $(call gb_Module_add_perfcheck_targets,sc,\ diff --git a/sc/qa/extras/scarealinksobj.cxx b/sc/qa/extras/scarealinksobj.cxx new file mode 100644 index 000000000000..21a90ee6f6c0 --- /dev/null +++ b/sc/qa/extras/scarealinksobj.cxx @@ -0,0 +1,97 @@ +/* -*- 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 <test/calc_unoapi_test.hxx> +#include <test/sheet/xarealinks.hxx> + +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/sheet/XAreaLinks.hpp> +#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> + +#include <com/sun/star/uno/XInterface.hpp> +#include <com/sun/star/uno/Reference.hxx> + +using namespace css; +using namespace css::uno; + +namespace sc_apitest { + +#define NUMBER_OF_TESTS 2 + +class ScAreaLinksObj : public CalcUnoApiTest, public apitest::XAreaLinks +{ +public: + ScAreaLinksObj(); + + virtual uno::Reference< uno::XInterface > init() override; + virtual void setUp() override; + virtual void tearDown() override; + + CPPUNIT_TEST_SUITE(ScAreaLinksObj); + + // XAreaLinks + CPPUNIT_TEST(testInsertAtPosition); + CPPUNIT_TEST(testRemoveByIndex); + + CPPUNIT_TEST_SUITE_END(); + +private: + static sal_Int32 nTest; + static uno::Reference< lang::XComponent > mxComponent; + +}; + +sal_Int32 ScAreaLinksObj::nTest = 0; +uno::Reference< lang::XComponent > ScAreaLinksObj::mxComponent; + +ScAreaLinksObj::ScAreaLinksObj() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") +{ +} + +uno::Reference< uno::XInterface > ScAreaLinksObj::init() +{ + // create a calc document + if (!mxComponent.is()) + mxComponent = loadFromDesktop("private:factory/scalc"); + + uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + + uno::Reference< beans::XPropertySet > xPropSet(xDoc, uno::UNO_QUERY_THROW); + uno::Reference< sheet::XAreaLinks > xLinks(xPropSet->getPropertyValue("AreaLinks"), uno::UNO_QUERY_THROW); + + return xLinks; +} + +void ScAreaLinksObj::setUp() +{ + nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); + CalcUnoApiTest::setUp(); +} + +void ScAreaLinksObj::tearDown() +{ + if (nTest == NUMBER_OF_TESTS) + { + closeDocument(mxComponent); + mxComponent.clear(); + } + + CalcUnoApiTest::tearDown(); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScAreaLinksObj); + +} // end namespace + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |