tdf#45904 Move XNameAccess Java tests to C++
Move XNameAccess Java tests to C++ for ScNamedRangesObj.
Change-Id: Id6eea13bb00e291fdaf1c03b77630bb672938767
Reviewed-on: https://gerrit.libreoffice.org/66950
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 3f9f58a..4e140f0 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -979,7 +979,6 @@
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \
qadevOOo/tests/java/mod/_sc/ScModelObj \
qadevOOo/tests/java/mod/_sc/ScNamedRangesObj \
qadevOOo/tests/java/mod/_sc/ScShapeObj \
qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \
qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangesObj.csv
deleted file mode 100644
index 96616bf..0000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScNamedRangesObj.csv
+++ /dev/null
@@ -1,3 +0,0 @@
"ScNamedRangesObj";"com::sun::star::container::XNameAccess";"getByName()"
"ScNamedRangesObj";"com::sun::star::container::XNameAccess";"getElementNames()"
"ScNamedRangesObj";"com::sun::star::container::XNameAccess";"hasByName()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java
deleted file mode 100644
index 7371234..0000000
--- a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java
+++ /dev/null
@@ -1,139 +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.XIndexAccess;
import com.sun.star.lang.XComponent;
import com.sun.star.sheet.XNamedRanges;
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.table.CellRangeAddress;
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.NamedRanges</code>. <p>
* Object implements the following interfaces :
* <ul>
* <li> <code>com::sun::star::sheet::XNamedRanges</code></li>
* <li> <code>com::sun::star::container::XNameAccess</code></li>
* <li> <code>com::sun::star::container::XElementAccess</code></li>
* </ul>
* @see com.sun.star.sheet.NamedRanges
* @see com.sun.star.sheet.XNamedRanges
* @see com.sun.star.container.XNameAccess
* @see com.sun.star.container.XElementAccess
* @see ifc.sheet._XNamedRanges
* @see ifc.container._XNameAccess
* @see ifc.container._XElementAccess
*/
public class ScNamedRangesObj 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);
}
/**
* Creating a TestEnvironment for the interfaces to be tested.
* Retrieves a collection of spreadsheets from a document
* and takes one of them. Obtains the value of the property
* <code>'NamedRanges'</code> that is the collection of named ranges.
* This collection is the instance of the service
* <code>com.sun.star.sheet.NamedRanges</code>. Creates and adds new range to
* the collection.
* Object relations created :
* <ul>
* <li> <code>'SHEET'</code> for
* {@link ifc.sheet._XNamedRanges} (the retrieved spreadsheet) </li>
* </ul>
* @see com.sun.star.sheet.NamedRanges
*/
@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" );
XSpreadsheet oSheet = null;
log.println("Getting test object ");
XSpreadsheets oSheets = xSheetDoc.getSheets();
XIndexAccess oIndexSheets = UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
oSheet = (XSpreadsheet) AnyConverter.toObject(
new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
// 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;
TestEnvironment tEnv = new TestEnvironment( oObj );
// Other parameters required for interface tests
tEnv.addObjRelation("SHEET", oSheet);
return tEnv;
}
}
diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx
index c20380e..1e86db5 100644
--- a/sc/qa/extras/scnamedrangesobj.cxx
+++ b/sc/qa/extras/scnamedrangesobj.cxx
@@ -11,6 +11,7 @@
#include <test/container/xelementaccess.hxx>
#include <test/container/xenumerationaccess.hxx>
#include <test/container/xindexaccess.hxx>
#include <test/container/xnameaccess.hxx>
#include <test/sheet/xnamedranges.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -32,6 +33,7 @@
public apitest::XElementAccess,
public apitest::XEnumerationAccess,
public apitest::XIndexAccess,
public apitest::XNameAccess,
public apitest::XNamedRanges
{
public:
@@ -57,6 +59,11 @@
CPPUNIT_TEST(testGetCount);
// XNamedRanges
CPPUNIT_TEST(testGetByName);
CPPUNIT_TEST(testGetElementNames);
CPPUNIT_TEST(testHasByName);
// XNamedRanges
CPPUNIT_TEST(testAddNewByName);
CPPUNIT_TEST(testAddNewFromTitles);
//CPPUNIT_TEST_EXCEPTION(testRemoveByName, uno::RuntimeException);
@@ -72,6 +79,7 @@
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType<sheet::XNamedRange>::get())
, XIndexAccess(4)
, XNameAccess("initial1")
{
}
diff --git a/sc/qa/unoapi/sc_6.sce b/sc/qa/unoapi/sc_6.sce
index c842d05..0f73be8 100644
--- a/sc/qa/unoapi/sc_6.sce
+++ b/sc/qa/unoapi/sc_6.sce
@@ -16,7 +16,6 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-o sc.ScModelObj
-o sc.ScNamedRangesObj
# -o sc.ScShapeObj
# -o sc.ScSheetLinkObj
-o sc.ScSpreadsheetSettingsObj
