diff options
author | Jens Carl <j.carl43@gmx.de> | 2018-11-15 13:25:54 -0800 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2018-11-16 07:43:44 +0100 |
commit | fdb520825339a8618cd41b0d972b98155039b9e7 (patch) | |
tree | 1f471e3748eaa74f6edbed435d757c59a7ef8ab3 /sc | |
parent | a2751c0795cdac9d78f8919aab319a418b6e0bbc (diff) |
tdf#45904 Move XEnumeration Java tests to C++
Move XEnumeration Java tests for
ScIndexEnumeration_TableRowsEnumeration to C++. Also improved the
overall run time of the test by limiting the range to enumerate over for
reasons mentioned in fdo#45337.
Change-Id: Id8eb998242cacf61bb472a0c130f38482c95db1c
Reviewed-on: https://gerrit.libreoffice.org/63444
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/CppunitTest_sc_indexenumeration_tablerowsenumeration.mk | 43 | ||||
-rw-r--r-- | sc/Module_sc.mk | 1 | ||||
-rw-r--r-- | sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx | 97 | ||||
-rw-r--r-- | sc/qa/unoapi/sc_6.sce | 1 |
4 files changed, 141 insertions, 1 deletions
diff --git a/sc/CppunitTest_sc_indexenumeration_tablerowsenumeration.mk b/sc/CppunitTest_sc_indexenumeration_tablerowsenumeration.mk new file mode 100644 index 000000000000..cf469828aa74 --- /dev/null +++ b/sc/CppunitTest_sc_indexenumeration_tablerowsenumeration.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_indexenumeration_tablerowsenumeration)) + +$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_tablerowsenumeration,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_tablerowsenumeration, \ + sc/qa/extras/scindexenumeration_tablerowsenumeration \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_tablerowsenumeration, \ + cppu \ + sal \ + subsequenttest \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_tablerowsenumeration,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_tablerowsenumeration)) + +$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_tablerowsenumeration)) +$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_tablerowsenumeration)) + +$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_tablerowsenumeration,\ + $(sc_unoapi_common_components) \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_tablerowsenumeration)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index bb405f80f0a1..9a3edafeb975 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -136,6 +136,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_headerfootercontentobj \ CppunitTest_sc_indexenumeration_ddelinksenumeration \ CppunitTest_sc_indexenumeration_scenariosenumeration \ + CppunitTest_sc_indexenumeration_tablerowsenumeration \ CppunitTest_sc_importdescriptorbaseobj \ CppunitTest_sc_labelrangeobj \ CppunitTest_sc_labelrangesobj \ diff --git a/sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx b/sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx new file mode 100644 index 000000000000..17b84b8c2b8a --- /dev/null +++ b/sc/qa/extras/scindexenumeration_tablerowsenumeration.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/container/xenumeration.hxx> + +#include <com/sun/star/container/XEnumerationAccess.hpp> +#include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/sheet/XSpreadsheet.hpp> +#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> +#include <com/sun/star/sheet/XSpreadsheets.hpp> +#include <com/sun/star/table/XCellRange.hpp> +#include <com/sun/star/table/XColumnRowRange.hpp> +#include <com/sun/star/table/XTableRows.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 ScIndexEnumeration_TableRowsEnumeration : public CalcUnoApiTest, public apitest::XEnumeration +{ +public: + ScIndexEnumeration_TableRowsEnumeration(); + + virtual uno::Reference<uno::XInterface> init() override; + virtual void setUp() override; + virtual void tearDown() override; + + CPPUNIT_TEST_SUITE(ScIndexEnumeration_TableRowsEnumeration); + + // XEnumeration + CPPUNIT_TEST(testHasMoreElements); + CPPUNIT_TEST(testNextElement); + + CPPUNIT_TEST_SUITE_END(); + +private: + uno::Reference<lang::XComponent> m_xComponent; +}; + +ScIndexEnumeration_TableRowsEnumeration::ScIndexEnumeration_TableRowsEnumeration() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") +{ +} + +uno::Reference<uno::XInterface> ScIndexEnumeration_TableRowsEnumeration::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::XNameAccess> xNA(xSheets, uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSpreadsheet> xSheet0(xNA->getByName(xNA->getElementNames()[0]), + uno::UNO_QUERY_THROW); + + // limit the range the XEnumeration has to walk over (see fdo#45337). + uno::Reference<table::XCellRange> xCR(xSheet0->getCellRangeByName("A1:A4"), + uno::UNO_QUERY_THROW); + + uno::Reference<table::XColumnRowRange> xColRowRange(xCR, uno::UNO_QUERY_THROW); + uno::Reference<table::XTableRows> xTableRows(xColRowRange->getRows(), uno::UNO_QUERY_THROW); + uno::Reference<container::XEnumerationAccess> xEA(xTableRows, uno::UNO_QUERY_THROW); + + return xEA->createEnumeration(); +} + +void ScIndexEnumeration_TableRowsEnumeration::setUp() +{ + CalcUnoApiTest::setUp(); + m_xComponent = loadFromDesktop("private:factory/scalc"); + CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is()); +} + +void ScIndexEnumeration_TableRowsEnumeration::tearDown() +{ + closeDocument(m_xComponent); + CalcUnoApiTest::tearDown(); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_TableRowsEnumeration); + +} // namespace sc_apitest + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sc/qa/unoapi/sc_6.sce b/sc/qa/unoapi/sc_6.sce index 77864244753c..89d1c8d80c73 100644 --- a/sc/qa/unoapi/sc_6.sce +++ b/sc/qa/unoapi/sc_6.sce @@ -17,7 +17,6 @@ # -o sc.ScIndexEnumeration_TableColumnsEnumeration -o sc.ScIndexEnumeration_TableConditionalEntryEnumeration -# fdo#45337 -o sc.ScIndexEnumeration_TableRowsEnumeration -o sc.ScIndexEnumeration_TextFieldEnumeration -o sc.ScLabelRangesObj -o sc.ScModelObj |