diff options
8 files changed, 129 insertions, 95 deletions
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst index 4086d1be67e5..3e7a3e935387 100644 --- a/framework/qa/complex/api_internal/api.lst +++ b/framework/qa/complex/api_internal/api.lst @@ -94,7 +94,6 @@ job96=sc.ScFilterDescriptorBase job97=sc.ScFunctionListObj job98=sc.ScHeaderFieldObj job99=sc.ScHeaderFieldsObj -job107=sc.ScIndexEnumeration_FunctionDescriptionEnumeration job111=sc.ScIndexEnumeration_SheetCellRangesEnumeration job113=sc.ScIndexEnumeration_SpreadsheetsEnumeration job114=sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 1de4559d9134..3b4af41d75d7 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -993,7 +993,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \ - qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_FunctionDescriptionEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_FunctionDescriptionEnumeration.csv deleted file mode 100644 index b52ab0a709c8..000000000000 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_FunctionDescriptionEnumeration.csv +++ /dev/null @@ -1,2 +0,0 @@ -"ScIndexEnumeration_FunctionDescriptionEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()" -"ScIndexEnumeration_FunctionDescriptionEnumeration";"com::sun::star::container::XEnumeration";"nextElement()" diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java deleted file mode 100644 index 0e0f75ad9e2e..000000000000 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -package mod._sc; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.SOfficeFactory; - -import com.sun.star.container.XEnumerationAccess; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - -public class ScIndexEnumeration_FunctionDescriptionEnumeration extends TestCase { - private XSpreadsheetDocument xSheetDoc = null; - - /** - * Creates Spreadsheet document. - */ - @Override - protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); - log.println( "creating a Spreadsheet document" ); - xSheetDoc = SOF.createCalcDoc(null); - } - - /** - * Disposes Spreadsheet document. - */ - @Override - protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing xSheetDoc " ); - XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; - util.DesktopTools.closeDoc(oComp); - } - - @Override - protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception { - - XInterface oObj = null; - - // creation of testobject here - // first we write what we are intend to do to log file - log.println( "Creating a test environment" ); - - log.println("Getting test object ") ; - - XMultiServiceFactory oDocMSF = Param.getMSF(); - oObj = (XInterface)oDocMSF.createInstance( - "com.sun.star.sheet.FunctionDescriptions"); - log.println("Creating object - " + - ((oObj == null) ? "FAILED" : "OK")); - - XEnumerationAccess ea = UnoRuntime.queryInterface(XEnumerationAccess.class,oObj); - - oObj = ea.createEnumeration(); - - log.println("ImplementationName: "+util.utils.getImplName(oObj)); - // creating test environment - TestEnvironment tEnv = new TestEnvironment( oObj ); - - tEnv.addObjRelation("ENUM",ea); - - return tEnv; - } - -} - - diff --git a/sc/CppunitTest_sc_indexenumeration_functiondescriptionenumeration.mk b/sc/CppunitTest_sc_indexenumeration_functiondescriptionenumeration.mk new file mode 100644 index 000000000000..b57220ceb975 --- /dev/null +++ b/sc/CppunitTest_sc_indexenumeration_functiondescriptionenumeration.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_functiondescriptionenumeration)) + +$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_functiondescriptionenumeration,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_functiondescriptionenumeration, \ + sc/qa/extras/scindexenumeration_functiondescriptionenumeration \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_functiondescriptionenumeration, \ + cppu \ + sal \ + subsequenttest \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_functiondescriptionenumeration,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_functiondescriptionenumeration)) + +$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_functiondescriptionenumeration)) +$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_functiondescriptionenumeration)) + +$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_functiondescriptionenumeration,\ + $(sc_unoapi_common_components) \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_functiondescriptionenumeration)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index e2ae354ccad5..3ab90123fb3e 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -140,6 +140,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_indexenumeration_datapilotfieldsenumeration \ CppunitTest_sc_indexenumeration_datapilottablesenumeration \ CppunitTest_sc_indexenumeration_ddelinksenumeration \ + CppunitTest_sc_indexenumeration_functiondescriptionenumeration \ CppunitTest_sc_indexenumeration_labelrangesenumeration \ CppunitTest_sc_indexenumeration_namedrangesenumeration \ CppunitTest_sc_indexenumeration_scenariosenumeration \ diff --git a/sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx b/sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx new file mode 100644 index 000000000000..33572aa2d7ff --- /dev/null +++ b/sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx @@ -0,0 +1,85 @@ +/* -*- 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/lang/XComponent.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.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 +{ +class ScIndexEnumeration_FunctionDescriptionEnumeration : public CalcUnoApiTest, + public apitest::XEnumeration +{ +public: + ScIndexEnumeration_FunctionDescriptionEnumeration(); + + virtual uno::Reference<uno::XInterface> init() override; + virtual void setUp() override; + virtual void tearDown() override; + + CPPUNIT_TEST_SUITE(ScIndexEnumeration_FunctionDescriptionEnumeration); + + // XEnumeration + CPPUNIT_TEST(testHasMoreElements); + CPPUNIT_TEST(testNextElement); + + CPPUNIT_TEST_SUITE_END(); + +private: + uno::Reference<lang::XComponent> m_xComponent; +}; + +ScIndexEnumeration_FunctionDescriptionEnumeration:: + ScIndexEnumeration_FunctionDescriptionEnumeration() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") +{ +} + +uno::Reference<uno::XInterface> ScIndexEnumeration_FunctionDescriptionEnumeration::init() +{ + uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + + uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc, uno::UNO_QUERY_THROW); + uno::Reference<container::XEnumerationAccess> xEA( + xMSF->createInstance("com.sun.star.sheet.FunctionDescriptions"), uno::UNO_QUERY_THROW); + + return xEA->createEnumeration(); +} + +void ScIndexEnumeration_FunctionDescriptionEnumeration::setUp() +{ + CalcUnoApiTest::setUp(); + m_xComponent = loadFromDesktop("private:factory/scalc"); + CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is()); +} + +void ScIndexEnumeration_FunctionDescriptionEnumeration::tearDown() +{ + closeDocument(m_xComponent); + CalcUnoApiTest::tearDown(); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_FunctionDescriptionEnumeration); + +} // 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_5.sce b/sc/qa/unoapi/sc_5.sce index 9add7d918778..9d20e4d15520 100644 --- a/sc/qa/unoapi/sc_5.sce +++ b/sc/qa/unoapi/sc_5.sce @@ -16,7 +16,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -o sc.ScIndexEnumeration_DataPilotItemsEnumeration --o sc.ScIndexEnumeration_FunctionDescriptionEnumeration -o sc.ScIndexEnumeration_SheetCellRangesEnumeration -o sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration -o sc.ScIndexEnumeration_SpreadsheetsEnumeration |