diff options
author | Jens Carl <j.carl43@gmx.de> | 2019-10-26 21:54:16 -0700 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2019-10-27 06:49:18 +0100 |
commit | b7735d9c705bdec53ddb0077b93ae70ce4c2df48 (patch) | |
tree | f272b605903b9527950736b9e7e272a814038ada | |
parent | 2b0626161d3ef7c4a51007018d13ec391d3a2b04 (diff) |
tdf#45904 Move XNamed Java tests to C++
Move XNamed Java tests to C++ for ScStyleObj.
Change-Id: Idaff7307d15ca2665005e866dff36a033aa91354
Reviewed-on: https://gerrit.libreoffice.org/81553
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
-rw-r--r-- | qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv | 2 | ||||
-rw-r--r-- | sc/CppunitTest_sc_styleobj.mk | 45 | ||||
-rw-r--r-- | sc/Module_sc.mk | 1 | ||||
-rw-r--r-- | sc/qa/extras/scstyleobj.cxx | 111 |
4 files changed, 157 insertions, 2 deletions
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv index cd24c8c8f6bc..fbcfe7e91ac5 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv @@ -12,8 +12,6 @@ "ScStyleObj";"com::sun::star::style::Style";"FollowStyle#optional" "ScStyleObj";"com::sun::star::style::Style";"DisplayName#optional" "ScStyleObj";"com::sun::star::style::Style";"IsAutoUpdate#optional" -"ScStyleObj";"com::sun::star::container::XNamed";"getName()" -"ScStyleObj";"com::sun::star::container::XNamed";"setName()" "ScStyleObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()" "ScStyleObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()" "ScStyleObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()" diff --git a/sc/CppunitTest_sc_styleobj.mk b/sc/CppunitTest_sc_styleobj.mk new file mode 100644 index 000000000000..59595a8f402b --- /dev/null +++ b/sc/CppunitTest_sc_styleobj.mk @@ -0,0 +1,45 @@ +# -*- 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_styleobj)) + +$(eval $(call gb_CppunitTest_use_external,sc_styleobj,boost_headers)) + +$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_styleobj)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_styleobj, \ + sc/qa/extras/scstyleobj \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_styleobj, \ + cppu \ + sal \ + subsequenttest \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_styleobj,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_styleobj)) + +$(eval $(call gb_CppunitTest_use_ure,sc_styleobj)) +$(eval $(call gb_CppunitTest_use_vcl,sc_styleobj)) + +$(eval $(call gb_CppunitTest_use_components,sc_styleobj,\ + $(sc_unoapi_common_components) \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_styleobj)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 1b2ca6bfc399..cbe32e32ebc2 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -191,6 +191,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_sortdescriptorbaseobj \ CppunitTest_sc_spreadsheetsettings \ CppunitTest_sc_spreadsheetsettingsobj \ + CppunitTest_sc_styleobj \ CppunitTest_sc_stylefamiliesobj \ CppunitTest_sc_stylefamilyobj \ CppunitTest_sc_subtotaldescriptorbase \ diff --git a/sc/qa/extras/scstyleobj.cxx b/sc/qa/extras/scstyleobj.cxx new file mode 100644 index 000000000000..a29243882ffc --- /dev/null +++ b/sc/qa/extras/scstyleobj.cxx @@ -0,0 +1,111 @@ +/* -*- 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/container/xnamed.hxx> + +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/sheet/XSpreadsheet.hpp> +#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> +#include <com/sun/star/style/XStyle.hpp> +#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> +#include <com/sun/star/table/XCell.hpp> +#include <com/sun/star/uno/XInterface.hpp> + +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.hxx> + +using namespace css; + +namespace sc_apitest +{ +class ScStyleObj : public CalcUnoApiTest, public apitest::XNamed +{ +public: + ScStyleObj(); + + virtual void setUp() override; + virtual void tearDown() override; + + virtual uno::Reference<uno::XInterface> init() override; + + CPPUNIT_TEST_SUITE(ScStyleObj); + + // XNamed + CPPUNIT_TEST(testGetName); + CPPUNIT_TEST(testSetName); + + CPPUNIT_TEST_SUITE_END(); + +private: + uno::Reference<lang::XComponent> m_xComponent; +}; + +ScStyleObj::ScStyleObj() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") + , XNamed("ScStyleObj") +{ +} + +uno::Reference<uno::XInterface> ScStyleObj::init() +{ + uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW); + + uno::Reference<style::XStyleFamiliesSupplier> xSFS(xDoc, uno::UNO_QUERY_THROW); + uno::Reference<container::XNameAccess> xNA_StyleFamilies(xSFS->getStyleFamilies(), + uno::UNO_SET_THROW); + uno::Reference<container::XIndexAccess> xIA_StyleFamilies(xNA_StyleFamilies, + uno::UNO_QUERY_THROW); + uno::Reference<container::XNameAccess> xNA_StyleFamily(xIA_StyleFamilies->getByIndex(0), + uno::UNO_QUERY_THROW); + + uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc, uno::UNO_QUERY_THROW); + uno::Reference<style::XStyle> xStyle(xMSF->createInstance("com.sun.star.style.CellStyle"), + uno::UNO_QUERY_THROW); + uno::Reference<container::XNameContainer> xNC(xNA_StyleFamily, uno::UNO_QUERY_THROW); + if (xNC->hasByName("ScStyleObj")) + { + xNC->removeByName("ScStyleObj"); + } + xNC->insertByName("ScStyleObj", uno::makeAny(xStyle)); + + uno::Reference<container::XIndexAccess> xIA_sheets(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSpreadsheet> xSheet0(xIA_sheets->getByIndex(0), uno::UNO_QUERY_THROW); + uno::Reference<table::XCell> xCell = xSheet0->getCellByPosition(2, 3); + uno::Reference<beans::XPropertySet> xPS(xCell, uno::UNO_QUERY_THROW); + xPS->setPropertyValue("CellStyle", uno::makeAny(xStyle->getName())); + + return xStyle; +} + +void ScStyleObj::setUp() +{ + CalcUnoApiTest::setUp(); + // create calc document + m_xComponent = loadFromDesktop("private:factory/scalc"); +} + +void ScStyleObj::tearDown() +{ + closeDocument(m_xComponent); + CalcUnoApiTest::tearDown(); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScStyleObj); + +} // namespace sc_apitest + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |