tdf#45904 Move XEnumeration Java tests to C++
Move XEnumeration Java tests to C++ for ScIndexEnumeration_NamedRangesEnumeration. Change-Id: I7cbe9fbeddd4d8ecbccddfdfd14cdcae01a06684 Reviewed-on: https://gerrit.libreoffice.org/63517 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
This commit is contained in:
Jens Carl
@@ -98,7 +98,6 @@ job101=sc.ScIndexEnumeration_CellAnnotationsEnumeration
|
||||
job102=sc.ScIndexEnumeration_CellAreaLinksEnumeration
|
||||
job103=sc.ScIndexEnumeration_DatabaseRangesEnumeration
|
||||
job107=sc.ScIndexEnumeration_FunctionDescriptionEnumeration
|
||||
job109=sc.ScIndexEnumeration_NamedRangesEnumeration
|
||||
job111=sc.ScIndexEnumeration_SheetCellRangesEnumeration
|
||||
job113=sc.ScIndexEnumeration_SpreadsheetsEnumeration
|
||||
job114=sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration
|
||||
|
||||
@@ -997,7 +997,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
|
||||
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration \
|
||||
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \
|
||||
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration \
|
||||
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration \
|
||||
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration \
|
||||
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration \
|
||||
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration \
|
||||
|
||||
-2
@@ -1,2 +0,0 @@
|
||||
"ScIndexEnumeration_NamedRangesEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
|
||||
"ScIndexEnumeration_NamedRangesEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"
|
||||
|
@@ -1,105 +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.beans.XPropertySet;
|
||||
import com.sun.star.container.XEnumerationAccess;
|
||||
import com.sun.star.lang.XComponent;
|
||||
import com.sun.star.sheet.XNamedRanges;
|
||||
import com.sun.star.sheet.XSpreadsheetDocument;
|
||||
import com.sun.star.table.CellAddress;
|
||||
import com.sun.star.table.CellRangeAddress;
|
||||
import com.sun.star.uno.UnoRuntime;
|
||||
import com.sun.star.uno.XInterface;
|
||||
|
||||
public class ScIndexEnumeration_NamedRangesEnumeration 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 ");
|
||||
|
||||
// Getting named ranges.
|
||||
XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc);
|
||||
Object ranges = docProps.getPropertyValue("NamedRanges");
|
||||
|
||||
XNamedRanges xNamedRanges = UnoRuntime.queryInterface(XNamedRanges.class, ranges);
|
||||
|
||||
CellRangeAddress DataArea = new CellRangeAddress((short)0, 0, 0, 2, 2);
|
||||
CellAddress base = new CellAddress(DataArea.Sheet,
|
||||
DataArea.StartColumn,
|
||||
DataArea.StartRow);
|
||||
|
||||
xNamedRanges.addNewByName("ANamedRange", "A1:B2", base, 0);
|
||||
|
||||
CellAddress listOutputPosition = new CellAddress((short)0, 1, 1);
|
||||
xNamedRanges.outputList(listOutputPosition);
|
||||
|
||||
oObj = xNamedRanges;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -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_namedrangesenumeration))
|
||||
|
||||
$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_namedrangesenumeration,boost_headers))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_namedrangesenumeration, \
|
||||
sc/qa/extras/scindexenumeration_namedrangesenumeration \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_namedrangesenumeration, \
|
||||
cppu \
|
||||
sal \
|
||||
subsequenttest \
|
||||
test \
|
||||
unotest \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_namedrangesenumeration,\
|
||||
$$(INCLUDE) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_namedrangesenumeration))
|
||||
|
||||
$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_namedrangesenumeration))
|
||||
$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_namedrangesenumeration))
|
||||
|
||||
$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_namedrangesenumeration,\
|
||||
$(sc_unoapi_common_components) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_namedrangesenumeration))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
@@ -138,6 +138,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
|
||||
CppunitTest_sc_indexenumeration_datapilottablesenumeration \
|
||||
CppunitTest_sc_indexenumeration_ddelinksenumeration \
|
||||
CppunitTest_sc_indexenumeration_labelrangesenumeration \
|
||||
CppunitTest_sc_indexenumeration_namedrangesenumeration \
|
||||
CppunitTest_sc_indexenumeration_scenariosenumeration \
|
||||
CppunitTest_sc_indexenumeration_sheetlinksenumeration \
|
||||
CppunitTest_sc_indexenumeration_tableconditionalentryenumeration \
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
/* -*- 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/beans/XPropertySet.hpp>
|
||||
#include <com/sun/star/container/XEnumerationAccess.hpp>
|
||||
#include <com/sun/star/lang/XComponent.hpp>
|
||||
#include <com/sun/star/sheet/XNamedRanges.hpp>
|
||||
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
|
||||
#include <com/sun/star/table/CellAddress.hpp>
|
||||
#include <com/sun/star/table/CellRangeAddress.hpp>
|
||||
#include <com/sun/star/uno/XInterface.hpp>
|
||||
|
||||
#include <com/sun/star/uno/Any.hxx>
|
||||
#include <com/sun/star/uno/Sequence.hxx>
|
||||
#include <com/sun/star/uno/Reference.hxx>
|
||||
|
||||
using namespace css;
|
||||
using namespace css::uno;
|
||||
|
||||
namespace sc_apitest
|
||||
{
|
||||
class ScIndexEnumeration_NamedRangesEnumeration : public CalcUnoApiTest,
|
||||
public apitest::XEnumeration
|
||||
{
|
||||
public:
|
||||
ScIndexEnumeration_NamedRangesEnumeration();
|
||||
|
||||
virtual uno::Reference<uno::XInterface> init() override;
|
||||
virtual void setUp() override;
|
||||
virtual void tearDown() override;
|
||||
|
||||
CPPUNIT_TEST_SUITE(ScIndexEnumeration_NamedRangesEnumeration);
|
||||
|
||||
// XEnumeration
|
||||
CPPUNIT_TEST(testHasMoreElements);
|
||||
CPPUNIT_TEST(testNextElement);
|
||||
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
|
||||
private:
|
||||
uno::Reference<lang::XComponent> m_xComponent;
|
||||
};
|
||||
|
||||
ScIndexEnumeration_NamedRangesEnumeration::ScIndexEnumeration_NamedRangesEnumeration()
|
||||
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
|
||||
{
|
||||
}
|
||||
|
||||
uno::Reference<uno::XInterface> ScIndexEnumeration_NamedRangesEnumeration::init()
|
||||
{
|
||||
uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
|
||||
CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
|
||||
|
||||
uno::Reference<beans::XPropertySet> xPropertySet(xDoc, uno::UNO_QUERY_THROW);
|
||||
uno::Reference<sheet::XNamedRanges> xNR;
|
||||
CPPUNIT_ASSERT(xPropertySet->getPropertyValue("NamedRanges") >>= xNR);
|
||||
|
||||
table::CellRangeAddress aCellRangeAddr(0, 0, 0, 2, 2);
|
||||
table::CellAddress aBaseAddr(aCellRangeAddr.Sheet, aCellRangeAddr.StartColumn,
|
||||
aCellRangeAddr.StartRow);
|
||||
xNR->addNewByName("ANamedRange", "A1:B2", aBaseAddr, 0);
|
||||
xNR->outputList(table::CellAddress(0, 1, 1));
|
||||
|
||||
uno::Reference<container::XEnumerationAccess> xEA(xNR, uno::UNO_QUERY_THROW);
|
||||
|
||||
return xEA->createEnumeration();
|
||||
}
|
||||
|
||||
void ScIndexEnumeration_NamedRangesEnumeration::setUp()
|
||||
{
|
||||
CalcUnoApiTest::setUp();
|
||||
m_xComponent = loadFromDesktop("private:factory/scalc");
|
||||
CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
|
||||
}
|
||||
|
||||
void ScIndexEnumeration_NamedRangesEnumeration::tearDown()
|
||||
{
|
||||
closeDocument(m_xComponent);
|
||||
CalcUnoApiTest::tearDown();
|
||||
}
|
||||
|
||||
CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_NamedRangesEnumeration);
|
||||
|
||||
} // namespace sc_apitest
|
||||
|
||||
CPPUNIT_PLUGIN_IMPLEMENT();
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
|
||||
@@ -18,7 +18,6 @@
|
||||
-o sc.ScIndexEnumeration_DataPilotItemsEnumeration
|
||||
-o sc.ScIndexEnumeration_DatabaseRangesEnumeration
|
||||
-o sc.ScIndexEnumeration_FunctionDescriptionEnumeration
|
||||
-o sc.ScIndexEnumeration_NamedRangesEnumeration
|
||||
-o sc.ScIndexEnumeration_SheetCellRangesEnumeration
|
||||
-o sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration
|
||||
-o sc.ScIndexEnumeration_SpreadsheetsEnumeration
|
||||
|
||||
Reference in New Issue
Block a user