diff options
author | Jens Carl <j.carl43@gmx.de> | 2018-11-16 22:03:39 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2018-11-17 00:40:34 +0100 |
commit | a9cabfed5ea019c2e69220d924d000688bb5c935 (patch) | |
tree | e8b2a40e87011d248f512b253207a8f755e38ec5 /sc | |
parent | fb036ee652cf2284a70036b3bf2948ef966cffb0 (diff) |
tdf#45904 Move XEnumeration Java tests to C++
Move XEnumeration Java tests to C++ for
ScIndexEnumeration_TableColumnsEnumeration.
Change-Id: Id4a3f78942b3bed2a09f617b961507a01374f455
Reviewed-on: https://gerrit.libreoffice.org/63485
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/CppunitTest_sc_indexenumeration_tablecolumnsenumeration.mk | 43 | ||||
-rw-r--r-- | sc/Module_sc.mk | 1 | ||||
-rw-r--r-- | sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx | 94 | ||||
-rw-r--r-- | sc/qa/unoapi/sc_6.sce | 1 |
4 files changed, 138 insertions, 1 deletions
diff --git a/sc/CppunitTest_sc_indexenumeration_tablecolumnsenumeration.mk b/sc/CppunitTest_sc_indexenumeration_tablecolumnsenumeration.mk new file mode 100644 index 000000000000..a8a9654c8afb --- /dev/null +++ b/sc/CppunitTest_sc_indexenumeration_tablecolumnsenumeration.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_tablecolumnsenumeration)) + +$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_tablecolumnsenumeration,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_tablecolumnsenumeration, \ + sc/qa/extras/scindexenumeration_tablecolumnsenumeration \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_tablecolumnsenumeration, \ + cppu \ + sal \ + subsequenttest \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_tablecolumnsenumeration,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_tablecolumnsenumeration)) + +$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_tablecolumnsenumeration)) +$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_tablecolumnsenumeration)) + +$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_tablecolumnsenumeration,\ + $(sc_unoapi_common_components) \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_tablecolumnsenumeration)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 562442483970..b4422740e1d9 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_tablecolumnsenumeration \ CppunitTest_sc_indexenumeration_tablerowsenumeration \ CppunitTest_sc_indexenumeration_textfieldenumeration \ CppunitTest_sc_importdescriptorbaseobj \ diff --git a/sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx b/sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx new file mode 100644 index 000000000000..3836a7039d5d --- /dev/null +++ b/sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx @@ -0,0 +1,94 @@ +/* -*- 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/XColumnRowRange.hpp> +#include <com/sun/star/table/XTableColumns.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_TableColumnsEnumeration : public CalcUnoApiTest, + public apitest::XEnumeration +{ +public: + ScIndexEnumeration_TableColumnsEnumeration(); + + virtual uno::Reference<uno::XInterface> init() override; + virtual void setUp() override; + virtual void tearDown() override; + + CPPUNIT_TEST_SUITE(ScIndexEnumeration_TableColumnsEnumeration); + + // XEnumeration + CPPUNIT_TEST(testHasMoreElements); + CPPUNIT_TEST(testNextElement); + + CPPUNIT_TEST_SUITE_END(); + +private: + uno::Reference<lang::XComponent> m_xComponent; +}; + +ScIndexEnumeration_TableColumnsEnumeration::ScIndexEnumeration_TableColumnsEnumeration() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") +{ +} + +uno::Reference<uno::XInterface> ScIndexEnumeration_TableColumnsEnumeration::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); + + uno::Reference<table::XColumnRowRange> xColumnRowRange(xSheet0, uno::UNO_QUERY_THROW); + uno::Reference<table::XTableColumns> xTableColumns(xColumnRowRange->getColumns(), + uno::UNO_QUERY_THROW); + uno::Reference<container::XEnumerationAccess> xEA(xTableColumns, uno::UNO_QUERY_THROW); + + return xEA->createEnumeration(); +} + +void ScIndexEnumeration_TableColumnsEnumeration::setUp() +{ + CalcUnoApiTest::setUp(); + m_xComponent = loadFromDesktop("private:factory/scalc"); + CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is()); +} + +void ScIndexEnumeration_TableColumnsEnumeration::tearDown() +{ + closeDocument(m_xComponent); + CalcUnoApiTest::tearDown(); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_TableColumnsEnumeration); + +} // 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 159ec2e1b324..0074f6700b8c 100644 --- a/sc/qa/unoapi/sc_6.sce +++ b/sc/qa/unoapi/sc_6.sce @@ -15,7 +15,6 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # --o sc.ScIndexEnumeration_TableColumnsEnumeration -o sc.ScIndexEnumeration_TableConditionalEntryEnumeration -o sc.ScLabelRangesObj -o sc.ScModelObj |