From 3b7faa73420550d508d480ed70146468dfadb268 Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Sat, 17 Nov 2018 00:50:38 +0000 Subject: tdf#45904 Move XEnumeration Java tests to C++ Move XEnumeration Java tests to C++ for ScIndexEnumeration_TableConditionalEntryEnumeration. Change-Id: I205a224160af39bba611cc4af76286082dd7966f Reviewed-on: https://gerrit.libreoffice.org/63486 Tested-by: Jenkins Reviewed-by: Jens Carl --- framework/qa/complex/api_internal/api.lst | 1 - qadevOOo/Jar_OOoRunner.mk | 1 - ...numeration_TableConditionalEntryEnumeration.csv | 2 - ...umeration_TableConditionalEntryEnumeration.java | 150 --------------------- ...enumeration_tableconditionalentryenumeration.mk | 43 ++++++ sc/Module_sc.mk | 1 + ...numeration_tableconditionalentryenumeration.cxx | 123 +++++++++++++++++ sc/qa/unoapi/sc_6.sce | 1 - 8 files changed, 167 insertions(+), 155 deletions(-) delete mode 100644 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableConditionalEntryEnumeration.csv delete mode 100644 qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java create mode 100644 sc/CppunitTest_sc_indexenumeration_tableconditionalentryenumeration.mk create mode 100644 sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst index 6ecbb2757188..a675e8a1dfaf 100644 --- a/framework/qa/complex/api_internal/api.lst +++ b/framework/qa/complex/api_internal/api.lst @@ -109,7 +109,6 @@ job114=sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration job115=sc.ScIndexEnumeration_SubTotalFieldsEnumeration job116=sc.ScIndexEnumeration_TableAutoFormatEnumeration job117=sc.ScIndexEnumeration_TableChartsEnumeration -job119=sc.ScIndexEnumeration_TableConditionalEntryEnumeration job122=sc.ScLabelRangesObj job125=sc.ScScenariosObj job126=sc.ScSheetLinkObj diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index b9f2d912a109..fa916a29a0ad 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -1008,7 +1008,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration \ - qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration \ qadevOOo/tests/java/mod/_sc/ScLabelRangesObj \ qadevOOo/tests/java/mod/_sc/ScModelObj \ qadevOOo/tests/java/mod/_sc/ScNamedRangesObj \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableConditionalEntryEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableConditionalEntryEnumeration.csv deleted file mode 100644 index da66a948dec2..000000000000 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableConditionalEntryEnumeration.csv +++ /dev/null @@ -1,2 +0,0 @@ -"ScIndexEnumeration_TableConditionalEntryEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()" -"ScIndexEnumeration_TableConditionalEntryEnumeration";"com::sun::star::container::XEnumeration";"nextElement()" diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java deleted file mode 100644 index bed5fa04c677..000000000000 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java +++ /dev/null @@ -1,150 +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 util.utils; - -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.XPropertySet; -import com.sun.star.container.XEnumerationAccess; -import com.sun.star.container.XIndexAccess; -import com.sun.star.lang.XComponent; -import com.sun.star.sheet.ConditionOperator; -import com.sun.star.sheet.XSheetConditionalEntries; -import com.sun.star.sheet.XSpreadsheet; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.sheet.XSpreadsheets; -import com.sun.star.table.CellAddress; -import com.sun.star.uno.AnyConverter; -import com.sun.star.uno.Type; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - -public class ScIndexEnumeration_TableConditionalEntryEnumeration extends TestCase { - private XSpreadsheetDocument xSpreadsheetDoc = null; - - /** - * Creates Spreadsheet document. - */ - @Override - protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception { - // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); - log.println( "creating a sheetdocument" ); - xSpreadsheetDoc = SOF.createCalcDoc(null); - } - - /** - * Disposes Spreadsheet document. - */ - @Override - protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing xSheetDoc " ); - XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; - util.DesktopTools.closeDoc(oComp); - } - - @Override - protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception { - - XInterface oObj = null; - log.println("getting sheets"); - XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); - - log.println("getting a sheet"); - XSpreadsheet oSheet = null; - XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets); - - oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0)); - - log.println("filling some cells"); - try { - oSheet.getCellByPosition(5, 5).setValue(15); - oSheet.getCellByPosition(1, 4).setValue(10); - oSheet.getCellByPosition(2, 0).setValue(-5.15); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - log.println("Exception occurred while filling cells"); - e.printStackTrace(log); - } - - Object CFormat = null; - XPropertySet Props = null; - - Props = UnoRuntime.queryInterface(XPropertySet.class, oSheet); - CFormat = Props.getPropertyValue("ConditionalFormat"); - if (utils.isVoid(CFormat)) { - log.println("Property 'ConditionalFormat' is void"); - } - - XSheetConditionalEntries xSCE = UnoRuntime.queryInterface(XSheetConditionalEntries.class, CFormat); - xSCE.addNew(Conditions()); - Props.setPropertyValue("ConditionalFormat", xSCE); - oObj = xSCE; - - log.println("creating a new environment for object"); - 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; - } // finish method getTestEnvironment - - /** - * Returns the array of the property values that was filled by condition - * values. - */ - protected PropertyValue[] Conditions() { - PropertyValue[] con = new PropertyValue[5]; - CellAddress ca = new CellAddress(); - ca.Column = 1; - ca.Row = 5; - ca.Sheet = 0; - con[0] = new PropertyValue(); - con[0].Name = "StyleName"; - con[0].Value = "Result2"; - con[1] = new PropertyValue(); - con[1].Name = "Formula1"; - con[1].Value = "$Sheet1.$B$5"; - con[2] = new PropertyValue(); - con[2].Name = "Formula2"; - con[2].Value = ""; - con[3] = new PropertyValue(); - con[3].Name = "Operator"; - con[3].Value = ConditionOperator.EQUAL; - con[4] = new PropertyValue(); - con[4].Name = "SourcePosition"; - con[4].Value = ca; - return con; - } - -} // finish class ScTableConditionalEntry - diff --git a/sc/CppunitTest_sc_indexenumeration_tableconditionalentryenumeration.mk b/sc/CppunitTest_sc_indexenumeration_tableconditionalentryenumeration.mk new file mode 100644 index 000000000000..7a1844357f27 --- /dev/null +++ b/sc/CppunitTest_sc_indexenumeration_tableconditionalentryenumeration.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_tableconditionalentryenumeration)) + +$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_tableconditionalentryenumeration,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_tableconditionalentryenumeration, \ + sc/qa/extras/scindexenumeration_tableconditionalentryenumeration \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_tableconditionalentryenumeration, \ + cppu \ + sal \ + subsequenttest \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_tableconditionalentryenumeration,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_tableconditionalentryenumeration)) + +$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_tableconditionalentryenumeration)) +$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_tableconditionalentryenumeration)) + +$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_tableconditionalentryenumeration,\ + $(sc_unoapi_common_components) \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_tableconditionalentryenumeration)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index b4422740e1d9..153f84093b28 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_tableconditionalentryenumeration \ CppunitTest_sc_indexenumeration_tablecolumnsenumeration \ CppunitTest_sc_indexenumeration_tablerowsenumeration \ CppunitTest_sc_indexenumeration_textfieldenumeration \ diff --git a/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx b/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx new file mode 100644 index 000000000000..ff3aa6eb7482 --- /dev/null +++ b/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx @@ -0,0 +1,123 @@ +/* -*- 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 +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +using namespace css; +using namespace css::uno; + +namespace sc_apitest +{ +class ScIndexEnumeration_TableConditionalEntryEnumeration : public CalcUnoApiTest, + public apitest::XEnumeration +{ +public: + ScIndexEnumeration_TableConditionalEntryEnumeration(); + + virtual uno::Reference init() override; + virtual void setUp() override; + virtual void tearDown() override; + + CPPUNIT_TEST_SUITE(ScIndexEnumeration_TableConditionalEntryEnumeration); + + // XEnumeration + CPPUNIT_TEST(testHasMoreElements); + CPPUNIT_TEST(testNextElement); + + CPPUNIT_TEST_SUITE_END(); + +private: + uno::Reference m_xComponent; +}; + +ScIndexEnumeration_TableConditionalEntryEnumeration:: + ScIndexEnumeration_TableConditionalEntryEnumeration() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") +{ +} + +uno::Reference ScIndexEnumeration_TableConditionalEntryEnumeration::init() +{ + uno::Reference xDoc(m_xComponent, uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + + uno::Reference xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference xIA(xSheets, uno::UNO_QUERY_THROW); + uno::Reference xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW); + + xSheet0->getCellByPosition(5, 5)->setValue(15); + xSheet0->getCellByPosition(1, 4)->setValue(10); + xSheet0->getCellByPosition(2, 0)->setValue(-5.15); + + uno::Sequence aConditions(5); + aConditions[0].Name = "StyleName"; + aConditions[0].Value <<= OUString("Result2"); + aConditions[1].Name = "Formula1"; + aConditions[1].Value <<= OUString("$Sheet1.$B$5"); + aConditions[2].Name = "Formula2"; + aConditions[2].Value <<= OUString(""); + aConditions[3].Name = "Operator"; + aConditions[3].Value <<= sheet::ConditionOperator_EQUAL; + aConditions[4].Name = "SoucePosition"; + aConditions[4].Value <<= table::CellAddress(0, 1, 5); + + uno::Reference xPropertySet(xSheet0, uno::UNO_QUERY_THROW); + uno::Reference xSCE( + xPropertySet->getPropertyValue("ConditionalFormat"), uno::UNO_QUERY_THROW); + xSCE->addNew(aConditions); + + uno::Any aProperty; + aProperty <<= xSCE; + xPropertySet->setPropertyValue("ConditionalFormat", aProperty); + + uno::Reference xEA(xSCE, uno::UNO_QUERY_THROW); + + return xEA->createEnumeration(); +} + +void ScIndexEnumeration_TableConditionalEntryEnumeration::setUp() +{ + CalcUnoApiTest::setUp(); + m_xComponent = loadFromDesktop("private:factory/scalc"); + CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is()); +} + +void ScIndexEnumeration_TableConditionalEntryEnumeration::tearDown() +{ + closeDocument(m_xComponent); + CalcUnoApiTest::tearDown(); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_TableConditionalEntryEnumeration); + +} // 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 0074f6700b8c..ae64fae00d92 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_TableConditionalEntryEnumeration -o sc.ScLabelRangesObj -o sc.ScModelObj -o sc.ScNamedRangesObj -- cgit