tdf#45904 Move _XEnumeration tests for ScCellFormatsEnumeration to C++
Change-Id: Icf133ae51a564d889997d3920de2816aadd105e1
Reviewed-on: https://gerrit.libreoffice.org/63353
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index d886419..30f27b5 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -79,7 +79,6 @@
job80=sc.ScAutoFormatsObj
job81=sc.ScCellFieldObj
job82=sc.ScCellFieldsObj
job83=sc.ScCellFormatsEnumeration
job84=sc.ScCellFormatsObj
job85=sc.ScCellSearchObj
job87=sc.ScCellsObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 811627a..59d57b1 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -962,7 +962,6 @@
qadevOOo/tests/java/mod/_sc/ScCellCursorObj \
qadevOOo/tests/java/mod/_sc/ScCellFieldObj \
qadevOOo/tests/java/mod/_sc/ScCellFieldsObj \
qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration \
qadevOOo/tests/java/mod/_sc/ScCellFormatsObj \
qadevOOo/tests/java/mod/_sc/ScCellObj \
qadevOOo/tests/java/mod/_sc/ScCellRangeObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsEnumeration.csv
deleted file mode 100644
index f977812..0000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsEnumeration.csv
+++ /dev/null
@@ -1,2 +0,0 @@
"ScCellFormatsEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
"ScCellFormatsEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java
deleted file mode 100644
index a605e57..0000000
--- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java
+++ /dev/null
@@ -1,128 +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.container.XIndexAccess;
import com.sun.star.lang.XComponent;
import com.sun.star.sheet.XCellFormatRangesSupplier;
import com.sun.star.sheet.XSpreadsheet;
import com.sun.star.sheet.XSpreadsheetDocument;
import com.sun.star.sheet.XSpreadsheets;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.Type;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
/**
* Test for object which is represented by service
* <code>com.sun.star.sheet.CellFormatRangesEnumeration</code>. <p>
* Object implements the following interfaces :
* <ul>
* <li> <code>com::sun::star::container::XEnumeration</code></li>
* </ul>
* @see com.sun.star.sheet.CellFormatRangesEnumeration
* @see com.sun.star.container.XEnumeration
* @see ifc.container._XEnumeration
*/
public class ScCellFormatsEnumeration extends TestCase {
private XSpreadsheetDocument xSheetDoc = 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" );
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);
}
/**
* Creating a TestEnvironment for the interfaces to be tested.
* Retrieves a collection of spreadsheets from a document,
* and takes one of them. Then retrieves a collection of cell format range
* using the interface <code>XCellFormatRangesSupplier</code>, creates the
* enumeration of this collection using interface <code>XEnumerationAccess</code>.
* This enumeration is the instance of the service
* <code>com.sun.star.sheet.CellFormatRangesEnumeration</code>.
* Object relations created :
* <ul>
* <li> <code>'ENUM'</code> for
* {@link ifc.container._XEnumeration} (type of
* <code>XEnumerationAccess</code> that was queried from the collection
* of cell format range)</li>
* </ul>
* @see com.sun.star.sheet.CellFormatRangesEnumeration
* @see com.sun.star.sheet.XCellFormatRangesSupplier
* @see com.sun.star.container.XEnumerationAccess
*/
@Override
protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
XInterface oObj = null;
log.println("getting sheets");
XSpreadsheets xSpreadsheets = xSheetDoc.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("getting CellFormats");
XCellFormatRangesSupplier xCFRS = UnoRuntime.queryInterface(XCellFormatRangesSupplier.class,oSheet);
XIndexAccess formats = xCFRS.getCellFormatRanges();
log.println("getting Enumeration");
XEnumerationAccess oEnum = UnoRuntime.queryInterface(XEnumerationAccess.class,formats);
oObj = oEnum.createEnumeration();
log.println("creating a new environment for object");
TestEnvironment tEnv = new TestEnvironment(oObj);
tEnv.addObjRelation("ENUM", oEnum);
return tEnv;
}
} // finish class ScCellFormatsEnumeration
diff --git a/sc/CppunitTest_sc_cellformatsenumeration.mk b/sc/CppunitTest_sc_cellformatsenumeration.mk
new file mode 100644
index 0000000..2da7fed
--- /dev/null
+++ b/sc/CppunitTest_sc_cellformatsenumeration.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_cellformatsenumeration))
$(eval $(call gb_CppunitTest_use_external,sc_cellformatsenumeration,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellformatsenumeration, \
sc/qa/extras/sccellformatsenumeration \
))
$(eval $(call gb_CppunitTest_use_libraries,sc_cellformatsenumeration, \
cppu \
sal \
subsequenttest \
test \
unotest \
))
$(eval $(call gb_CppunitTest_set_include,sc_cellformatsenumeration,\
$$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellformatsenumeration))
$(eval $(call gb_CppunitTest_use_ure,sc_cellformatsenumeration))
$(eval $(call gb_CppunitTest_use_vcl,sc_cellformatsenumeration))
$(eval $(call gb_CppunitTest_use_components,sc_cellformatsenumeration,\
$(sc_unoapi_common_components) \
))
$(eval $(call gb_CppunitTest_use_configuration,sc_cellformatsenumeration))
# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index be0d643..0d5e510 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -109,6 +109,7 @@
CppunitTest_sc_arealinksobj \
CppunitTest_sc_autoformatobj \
CppunitTest_sc_cellcursorobj \
CppunitTest_sc_cellformatsenumeration \
CppunitTest_sc_cellobj \
CppunitTest_sc_cellrangeobj \
CppunitTest_sc_cellrangesobj \
diff --git a/sc/qa/extras/sccellformatsenumeration.cxx b/sc/qa/extras/sccellformatsenumeration.cxx
new file mode 100644
index 0000000..927479c
--- /dev/null
+++ b/sc/qa/extras/sccellformatsenumeration.cxx
@@ -0,0 +1,91 @@
/* -*- 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/XIndexAccess.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/sheet/XCellFormatRangesSupplier.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/sheet/XSpreadsheets.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 ScCellFormatsEnumeration : public CalcUnoApiTest, public apitest::XEnumeration
{
public:
ScCellFormatsEnumeration();
virtual uno::Reference<uno::XInterface> init() override;
virtual void setUp() override;
virtual void tearDown() override;
CPPUNIT_TEST_SUITE(ScCellFormatsEnumeration);
// XEnumeration
CPPUNIT_TEST(testHasMoreElements);
CPPUNIT_TEST(testNextElement);
CPPUNIT_TEST_SUITE_END();
private:
uno::Reference<lang::XComponent> m_xComponent;
};
ScCellFormatsEnumeration::ScCellFormatsEnumeration()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
uno::Reference<uno::XInterface> ScCellFormatsEnumeration::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::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
uno::Reference<sheet::XCellFormatRangesSupplier> xCFRS(xSheet0, uno::UNO_QUERY_THROW);
uno::Reference<container::XIndexAccess> xIA_CFR(xCFRS->getCellFormatRanges(),
uno::UNO_QUERY_THROW);
uno::Reference<container::XEnumerationAccess> xEA(xIA_CFR, uno::UNO_QUERY_THROW);
return xEA->createEnumeration();
}
void ScCellFormatsEnumeration::setUp()
{
CalcUnoApiTest::setUp();
m_xComponent = loadFromDesktop("private:factory/scalc");
CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
}
void ScCellFormatsEnumeration::tearDown()
{
closeDocument(m_xComponent);
CalcUnoApiTest::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScCellFormatsEnumeration);
} // 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_2.sce b/sc/qa/unoapi/sc_2.sce
index d934bc7..f698163 100644
--- a/sc/qa/unoapi/sc_2.sce
+++ b/sc/qa/unoapi/sc_2.sce
@@ -32,6 +32,5 @@
-o sc.ScCellCursorObj
# ported to cppunit -o sc.ScCellFieldObj
-o sc.ScCellFieldsObj
-o sc.ScCellFormatsEnumeration
-o sc.ScCellFormatsObj
-o sc.ScCellObj
