From 87d636a14be35468ecef7b6f95c6754d24bb6e94 Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Fri, 8 Dec 2017 01:00:24 +0000 Subject: tdf#45904 Move _XDataPilotTables Java tests to C++ Change-Id: I5a452f10799f78a6f83136bec4e1346c4ec8edf8 Reviewed-on: https://gerrit.libreoffice.org/46063 Tested-by: Jenkins Reviewed-by: Jens Carl --- include/test/sheet/xdatapilottables.hxx | 35 +++++ qadevOOo/Jar_OOoRunner.mk | 1 - ...m.sun.star.comp.office.ScDataPilotTablesObj.csv | 3 - .../tests/java/ifc/sheet/_XDataPilotTables.java | 149 --------------------- sc/CppunitTest_sc_datapilottablesobj.mk | 105 +++++++++++++++ sc/Module_sc.mk | 1 + sc/qa/extras/scdatapilottablesobj.cxx | 134 ++++++++++++++++++ test/Library_subsequenttest.mk | 1 + test/source/sheet/xdatapilottables.cxx | 54 ++++++++ 9 files changed, 330 insertions(+), 153 deletions(-) create mode 100644 include/test/sheet/xdatapilottables.hxx delete mode 100644 qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java create mode 100644 sc/CppunitTest_sc_datapilottablesobj.mk create mode 100644 sc/qa/extras/scdatapilottablesobj.cxx create mode 100644 test/source/sheet/xdatapilottables.cxx diff --git a/include/test/sheet/xdatapilottables.hxx b/include/test/sheet/xdatapilottables.hxx new file mode 100644 index 000000000000..f1d3671647d6 --- /dev/null +++ b/include/test/sheet/xdatapilottables.hxx @@ -0,0 +1,35 @@ +/* -*- 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/. + */ + +#ifndef INCLUDED_TEST_SHEET_XDATAPILOTTABLES_HXX +#define INCLUDED_TEST_SHEET_XDATAPILOTTABLES_HXX + +#include +#include + +#include + +namespace apitest +{ +class OOO_DLLPUBLIC_TEST XDataPilotTables +{ +public: + virtual css::uno::Reference init() = 0; + virtual css::uno::Reference getXSpreadsheet() = 0; + + void testXDataPilotTables(); + +protected: + ~XDataPilotTables() {} +}; +} + +#endif // INCLUDED_TEST_SHEET_XDATAPILOTTABLES_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 5751f1cb8ef9..539a24e803e4 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -597,7 +597,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor \ qadevOOo/tests/java/ifc/sheet/_XDatabaseRanges \ qadevOOo/tests/java/ifc/sheet/_XDataPilotField \ - qadevOOo/tests/java/ifc/sheet/_XDataPilotTables \ qadevOOo/tests/java/ifc/sheet/_XDDELink \ qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing \ qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv index 3fa9eccc6dda..fe555ba2cbc1 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv @@ -5,7 +5,4 @@ "ScDataPilotTablesObj";"com::sun::star::container::XIndexAccess";"getByIndex()" "ScDataPilotTablesObj";"com::sun::star::container::XElementAccess";"getElementType()" "ScDataPilotTablesObj";"com::sun::star::container::XElementAccess";"hasElements()" -"ScDataPilotTablesObj";"com::sun::star::sheet::XDataPilotTables";"createDataPilotDescriptor()" -"ScDataPilotTablesObj";"com::sun::star::sheet::XDataPilotTables";"insertNewByName()" -"ScDataPilotTablesObj";"com::sun::star::sheet::XDataPilotTables";"removeByName()" "ScDataPilotTablesObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java deleted file mode 100644 index 820bd4413340..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java +++ /dev/null @@ -1,149 +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 ifc.sheet; - -import lib.MultiMethodTest; -import lib.Status; -import lib.StatusException; - -import com.sun.star.sheet.XDataPilotDescriptor; -import com.sun.star.sheet.XDataPilotTables; -import com.sun.star.sheet.XSpreadsheet; -import com.sun.star.table.CellAddress; - -/** -* Testing com.sun.star.sheet.XDataPilotTables -* interface methods : -*
    -*
  • createDataPilotDescriptor()
    • -*
  • insertNewByName()
    • -*
  • removeByName()
    • -*

-* This test needs the following object relations : -*

    -*
  • 'SHEET' (of type XSpreadsheet): -* to have a spreadsheet document for document content checking
    • -*

      -* @see com.sun.star.sheet.XDataPilotTables -*/ -public class _XDataPilotTables extends MultiMethodTest { - - public XDataPilotTables oObj = null; - XDataPilotDescriptor DPDscr = null; - String name = "XDataPilotTables"; - CellAddress CA = new CellAddress((short)0, 9, 8); - XSpreadsheet oSheet = null; - - /** - * Retrieves object relations. - * @throws StatusException If one of relations not found. - */ - @Override - protected void before() { - oSheet = (XSpreadsheet)tEnv.getObjRelation("SHEET"); - if (oSheet == null) throw new StatusException(Status.failed - ("Relation 'SHEET' not found")); - } - - /** - * Test calls the method, stores returned value and checks returned value. - *

      Has OK status if returned value isn't null.

      - */ - public void _createDataPilotDescriptor(){ - DPDscr = oObj.createDataPilotDescriptor(); - tRes.tested("createDataPilotDescriptor()", DPDscr != null); - } - - /** - * Test calls the method inserting new table with new name and then calls - * the method inserting table with existent name.

      - * Has OK status if the cell content where table was inserted is - * equal to 'Filter' after first call and exception was thrown during - * second call.

      - * The following method tests are to be completed successfully before : - *

        - *
      • createDataPilotDescriptor() : to have - * XDataPilotDescriptor created by this method
        • - *
      - */ - public void _insertNewByName(){ - requiredMethod("createDataPilotDescriptor()"); - boolean bResult = true; - log.println("Inserting new Table \"" + name + "\""); - try { - oObj.insertNewByName(name, CA, DPDscr); - bResult &= oSheet.getCellByPosition - (CA.Column, CA.Row).getFormula().equals("Filter"); - } catch (com.sun.star.uno.Exception e) { - log.println("Exception occurred! " + e); - bResult = false; - } - - log.println(bResult ? "OK" : "FAILED"); - log.println("Trying to insert element with existent name"); - - try { - oObj.insertNewByName(name,new CellAddress((short)0, 7, 7), DPDscr); - log.println("No exception! - FAILED"); - bResult = false; - } catch (com.sun.star.uno.RuntimeException e) { - log.println("Expected exception - OK " + e); - } - - log.println("Inserting new table " + (bResult ? "OK" : "FAILED")); - tRes.tested("insertNewByName()", bResult); - } - - /** - * Test calls the method for existent table and for unexistent table.

      - * Has OK status if the cell where table was removed from is empty - * after first call and exception was thrown during second call.

      - * The following method tests are to be completed successfully before : - *

        - *
      • insertNewByName(): to have name of existent table
        • - *
      - */ - public void _removeByName(){ - requiredMethod("insertNewByName()"); - boolean bResult = true; - log.println("Remove table with name " + name); - try { - oObj.removeByName(name); - bResult &= oSheet.getCellByPosition - (CA.Column, CA.Row).getFormula().equals(""); - } catch (com.sun.star.uno.Exception e) { - log.println("Exception occurred ! " + e); - bResult = false; - } - log.println(bResult ? "OK" : "FAILED"); - log.println("Removing unexistent element"); - try { - oObj.removeByName(name); - log.println("No exception! - FAILED"); - bResult = false; - } catch (com.sun.star.uno.RuntimeException e) { - log.println("Expected exception - OK " + e); - } - - log.println("Removing a table " + (bResult ? "OK" : "FAILED")); - tRes.tested("removeByName()", bResult); - } - -} - diff --git a/sc/CppunitTest_sc_datapilottablesobj.mk b/sc/CppunitTest_sc_datapilottablesobj.mk new file mode 100644 index 000000000000..9da2198cad44 --- /dev/null +++ b/sc/CppunitTest_sc_datapilottablesobj.mk @@ -0,0 +1,105 @@ +# -*- 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_datapilottablesobj)) + +$(eval $(call gb_CppunitTest_use_external,sc_datapilottablesobj,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilottablesobj, \ + sc/qa/extras/scdatapilottablesobj \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_datapilottablesobj, \ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + drawinglayer \ + editeng \ + for \ + forui \ + i18nlangtag \ + msfilter \ + oox \ + sal \ + salhelper \ + sax \ + sb \ + sc \ + sfx \ + sot \ + subsequenttest \ + svl \ + svt \ + svx \ + svxcore \ + test \ + tk \ + tl \ + ucbhelper \ + unotest \ + utl \ + vbahelper \ + vcl \ + xo \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_datapilottablesobj,\ + -I$(SRCDIR)/sc/source/ui/inc \ + -I$(SRCDIR)/sc/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_datapilottablesobj)) + +$(eval $(call gb_CppunitTest_use_ure,sc_datapilottablesobj)) +$(eval $(call gb_CppunitTest_use_vcl,sc_datapilottablesobj)) + +$(eval $(call gb_CppunitTest_use_components,sc_datapilottablesobj,\ + basic/util/sb \ + comphelper/util/comphelp \ + configmgr/source/configmgr \ + dbaccess/util/dba \ + filter/source/config/cache/filterconfig1 \ + filter/source/storagefilterdetect/storagefd \ + forms/util/frm \ + framework/util/fwk \ + i18npool/util/i18npool \ + linguistic/source/lng \ + oox/util/oox \ + package/source/xstor/xstor \ + package/util/package2 \ + sax/source/expatwrap/expwrap \ + scripting/source/basprov/basprov \ + scripting/util/scriptframe \ + sc/util/sc \ + sc/util/scd \ + sc/util/scfilt \ + $(call gb_Helper_optional,SCRIPTING, \ + sc/util/vbaobj) \ + sfx2/util/sfx \ + sot/util/sot \ + svl/source/fsstor/fsstorage \ + toolkit/util/tk \ + ucb/source/core/ucb1 \ + ucb/source/ucp/file/ucpfile1 \ + ucb/source/ucp/tdoc/ucptdoc1 \ + unotools/util/utl \ + unoxml/source/rdf/unordf \ + unoxml/source/service/unoxml \ + uui/util/uui \ + xmloff/util/xo \ + svtools/util/svt \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_datapilottablesobj)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index ae9a2c4e89af..53d744397818 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -144,6 +144,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_headerfootercontentobj \ CppunitTest_sc_recentfunctionsobj \ CppunitTest_sc_functionlistobj \ + CppunitTest_sc_datapilottablesobj \ )) $(eval $(call gb_Module_add_perfcheck_targets,sc,\ diff --git a/sc/qa/extras/scdatapilottablesobj.cxx b/sc/qa/extras/scdatapilottablesobj.cxx new file mode 100644 index 000000000000..6b17298fdf97 --- /dev/null +++ b/sc/qa/extras/scdatapilottablesobj.cxx @@ -0,0 +1,134 @@ +/* -*- 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 + +using namespace css; +using namespace css::uno; +using namespace com::sun::star; + +namespace sc_apitest +{ +#define NUMBER_OF_TESTS 1 + +class ScDataPilotTablesObj : public CalcUnoApiTest, public apitest::XDataPilotTables +{ +public: + ScDataPilotTablesObj(); + + virtual uno::Reference init() override; + virtual uno::Reference getXSpreadsheet() override; + virtual void setUp() override; + virtual void tearDown() override; + + CPPUNIT_TEST_SUITE(ScDataPilotTablesObj); + + // XDataPilotTables + CPPUNIT_TEST(testXDataPilotTables); + + CPPUNIT_TEST_SUITE_END(); + +private: + static sal_Int32 nTest; + static uno::Reference mxComponent; +}; + +sal_Int32 ScDataPilotTablesObj::nTest = 0; +uno::Reference ScDataPilotTablesObj::mxComponent; + +ScDataPilotTablesObj::ScDataPilotTablesObj() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") +{ +} + +uno::Reference ScDataPilotTablesObj::init() +{ + // create a calc document + if (!mxComponent.is()) + mxComponent = loadFromDesktop("private:factory/scalc"); + + uno::Reference xDoc(mxComponent, UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + + uno::Reference xSheets(xDoc->getSheets(), UNO_QUERY_THROW); + uno::Reference xIndex(xDoc->getSheets(), UNO_QUERY_THROW); + uno::Reference xSheet(xIndex->getByIndex(0), UNO_QUERY_THROW); + + for (auto i = 1; i < 4; i++) + { + xSheet->getCellByPosition(i, 0)->setFormula("Col" + OUString::number(i)); + xSheet->getCellByPosition(0, i)->setFormula("Row" + OUString::number(i)); + } + + uno::Reference xDPTS(xSheet, UNO_QUERY_THROW); + uno::Reference xDPT(xDPTS->getDataPilotTables(), UNO_QUERY_THROW); + uno::Reference xDPD(xDPT->createDataPilotDescriptor(), + UNO_QUERY_THROW); + xDPD->setSourceRange(table::CellRangeAddress(0, 0, 0, 4, 4)); + //xDPT->insertNewByName("DataPilotTable", table::CellAddress(0, 5, 5), xDPD); + + return xDPT; +} + +uno::Reference ScDataPilotTablesObj::getXSpreadsheet() +{ + // create a calc document + if (!mxComponent.is()) + mxComponent = loadFromDesktop("private:factory/scalc"); + + uno::Reference xDoc(mxComponent, UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + + uno::Reference xSheets(xDoc->getSheets(), UNO_QUERY_THROW); + uno::Reference xIndex(xDoc->getSheets(), UNO_QUERY_THROW); + uno::Reference xSheet(xIndex->getByIndex(0), UNO_QUERY_THROW); + + return xSheet; +} + +void ScDataPilotTablesObj::setUp() +{ + nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); + CalcUnoApiTest::setUp(); +} + +void ScDataPilotTablesObj::tearDown() +{ + if (nTest == NUMBER_OF_TESTS) + { + closeDocument(mxComponent); + mxComponent.clear(); + } + + CalcUnoApiTest::tearDown(); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotTablesObj); + +} // end namespace + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index ec2cfb06020f..0197f564ba55 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\ test/source/sheet/xdatapilotfieldgrouping \ test/source/sheet/xdatapilottable \ test/source/sheet/xdatapilottable2 \ + test/source/sheet/xdatapilottables \ test/source/sheet/xdatapilottablessupplier \ test/source/sheet/xfunctiondescriptions \ test/source/sheet/xheaderfootercontent \ diff --git a/test/source/sheet/xdatapilottables.cxx b/test/source/sheet/xdatapilottables.cxx new file mode 100644 index 000000000000..e99bbea4c893 --- /dev/null +++ b/test/source/sheet/xdatapilottables.cxx @@ -0,0 +1,54 @@ +/* -*- 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 + +using namespace css; +using namespace css::uno; + +namespace apitest +{ +void XDataPilotTables::testXDataPilotTables() +{ + uno::Reference xDPT(init(), UNO_QUERY_THROW); + uno::Reference xSheet(getXSpreadsheet(), UNO_QUERY_THROW); + + uno::Reference xDPD(xDPT->createDataPilotDescriptor(), + UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("Unable to create DataPilotDescriptor", xDPD.is()); + + xDPT->insertNewByName("XDataPilotTables", table::CellAddress(0, 9, 8), xDPD); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to insert new DataPilotTable", OUString("Filter"), + xSheet->getCellByPosition(9, 8)->getFormula()); + + CPPUNIT_ASSERT_THROW_MESSAGE( + "No exception thrown, when inserting element with existing name", + xDPT->insertNewByName("XDataPilotTables", table::CellAddress(0, 7, 7), xDPD), + css::uno::RuntimeException); + + xDPT->removeByName("XDataPilotTables"); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove DataPilotTable", OUString(""), + xSheet->getCellByPosition(9, 8)->getFormula()); + + CPPUNIT_ASSERT_THROW_MESSAGE("No exception, when removing no existing element", + xDPT->removeByName("XDataPilotTables"), + css::uno::RuntimeException); +} +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ -- cgit v1.2.3