qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv | 1 sc/CppunitTest_sc_cellsobj.mk | 43 +++++ sc/Module_sc.mk | 1 sc/qa/extras/sccellsobj.cxx | 101 +++++++++++++ 4 files changed, 145 insertions(+), 1 deletion(-)
New commits: commit 6408dbf268fc8cc72fa741197e38b07619f0e96a Author: Jens Carl <j.car...@gmx.de> AuthorDate: Fri Nov 30 07:11:51 2018 +0000 Commit: Jens Carl <j.car...@gmx.de> CommitDate: Fri Nov 30 18:15:08 2018 +0100 tdf#45904 Move XEnumerationAccess Java test to C++ Move XEnumerationAccess Java tests to C++ for ScCellsObj. Change-Id: I3ec78142db7cfa924bf5663ca44cca80b6a0e556 Reviewed-on: https://gerrit.libreoffice.org/64315 Tested-by: Jenkins Reviewed-by: Jens Carl <j.car...@gmx.de> diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv index d6ede74a7d3f..c8c8a23d9be7 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv @@ -1,3 +1,2 @@ "ScCellsObj";"com::sun::star::container::XElementAccess";"getElementType()" "ScCellsObj";"com::sun::star::container::XElementAccess";"hasElements()" -"ScCellsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()" diff --git a/sc/CppunitTest_sc_cellsobj.mk b/sc/CppunitTest_sc_cellsobj.mk new file mode 100644 index 000000000000..07dfd37992da --- /dev/null +++ b/sc/CppunitTest_sc_cellsobj.mk @@ -0,0 +1,43 @@ +# -*- 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_cellsobj)) + +$(eval $(call gb_CppunitTest_use_external,sc_cellsobj,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellsobj, \ + sc/qa/extras/sccellsobj \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_cellsobj, \ + cppu \ + sal \ + subsequenttest \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_cellsobj,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellsobj)) + +$(eval $(call gb_CppunitTest_use_ure,sc_cellsobj)) +$(eval $(call gb_CppunitTest_use_vcl,sc_cellsobj)) + +$(eval $(call gb_CppunitTest_use_components,sc_cellsobj,\ + $(sc_unoapi_common_components) \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_cellsobj)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 1dfe489869f6..530b5a791fec 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -110,6 +110,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_cellcursorobj \ CppunitTest_sc_cellformatsenumeration \ CppunitTest_sc_cellobj \ + CppunitTest_sc_cellsobj \ CppunitTest_sc_cellrangeobj \ CppunitTest_sc_cellrangesobj \ CppunitTest_sc_cellsenumeration \ diff --git a/sc/qa/extras/sccellsobj.cxx b/sc/qa/extras/sccellsobj.cxx new file mode 100644 index 000000000000..93c9c9f8d259 --- /dev/null +++ b/sc/qa/extras/sccellsobj.cxx @@ -0,0 +1,101 @@ +/* -*- 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/xenumerationaccess.hxx> + +#include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/sheet/XCellRangesQuery.hpp> +#include <com/sun/star/sheet/XSheetCellRanges.hpp> +#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> +#include <com/sun/star/sheet/XSpreadsheets.hpp> +#include <com/sun/star/table/XCell.hpp> +#include <com/sun/star/table/XCellRange.hpp> +#include <com/sun/star/text/XTextRange.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 +{ +class ScCells : public CalcUnoApiTest, public apitest::XEnumerationAccess +{ +public: + ScCells(); + + virtual uno::Reference<uno::XInterface> init() override; + virtual void setUp() override; + virtual void tearDown() override; + + CPPUNIT_TEST_SUITE(ScCells); + + // XEnumerationAccess + CPPUNIT_TEST(testCreateEnumeration); + + CPPUNIT_TEST_SUITE_END(); + +private: + uno::Reference<lang::XComponent> m_xComponent; +}; + +ScCells::ScCells() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") +{ +} + +uno::Reference<uno::XInterface> ScCells::init() +{ + uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + + uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW); + uno::Reference<table::XCellRange> xCellRange(xIA->getByIndex(0), uno::UNO_QUERY_THROW); + + uno::Reference<table::XCell> xCell0(xCellRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW); + uno::Reference<text::XTextRange> xTextRange0(xCell0, uno::UNO_QUERY_THROW); + xTextRange0->setString("ScCellsObj test 1"); + + uno::Reference<table::XCell> xCell1(xCellRange->getCellByPosition(5, 1), uno::UNO_QUERY_THROW); + xCell1->setValue(15); + + uno::Reference<table::XCell> xCell2(xCellRange->getCellByPosition(3, 9), uno::UNO_QUERY_THROW); + uno::Reference<text::XTextRange> xTextRange2(xCell2, uno::UNO_QUERY_THROW); + xTextRange2->setString("ScCellsObj test 2"); + + uno::Reference<sheet::XCellRangesQuery> xCRQ(xCellRange, uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSheetCellRanges> xSCR(xCRQ->queryVisibleCells(), uno::UNO_QUERY_THROW); + + return xSCR->getCells(); +} + +void ScCells::setUp() +{ + CalcUnoApiTest::setUp(); + m_xComponent = loadFromDesktop("private:factory/scalc"); + CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is()); +} + +void ScCells::tearDown() +{ + closeDocument(m_xComponent); + CalcUnoApiTest::tearDown(); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScCells); + +} // namespace sc_apitest + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits