tdf#45904 Move XIndexAccess Java tests to C++
Move XIndexAccess Java tests to C++ for ScUniqueCellFormatsObj.
Change-Id: I2aabc835d37c5f12afacfcbafc2d7d6346619a3c
Reviewed-on: https://gerrit.libreoffice.org/64666
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 86bda898..be961b4 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -1008,7 +1008,6 @@
qadevOOo/tests/java/mod/_sc/ScTableSheetsObj \
qadevOOo/tests/java/mod/_sc/ScTableValidationObj \
qadevOOo/tests/java/mod/_sc/ScTabViewObj \
qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj \
qadevOOo/tests/java/mod/_sc/ScViewPaneObj \
qadevOOo/tests/java/mod/_sc/XMLContentExporter \
qadevOOo/tests/java/mod/_sc/XMLContentImporter \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv
deleted file mode 100644
index 548af7f..0000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
"ScUniqueCellFormatsObj";"com::sun::star::container::XIndexAccess";"getCount()"
"ScUniqueCellFormatsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
deleted file mode 100644
index 808ac67..0000000
--- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
+++ /dev/null
@@ -1,115 +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 com.sun.star.beans.XPropertySet;
import com.sun.star.container.XIndexAccess;
import com.sun.star.sheet.XSpreadsheet;
import com.sun.star.sheet.XSpreadsheetDocument;
import com.sun.star.sheet.XUniqueCellFormatRangesSupplier;
import com.sun.star.table.XCellRange;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
import java.awt.Color;
import java.io.PrintWriter;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
import util.SOfficeFactory;
public class ScUniqueCellFormatsObj extends TestCase {
private XSpreadsheetDocument xSheetDoc = null;
static XSpreadsheet oSheet = 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) {
util.DesktopTools.closeDoc(xSheetDoc);
}
@Override
protected TestEnvironment createTestEnvironment(TestParameters tParam,
PrintWriter log) throws Exception {
log.println("Getting the first sheet");
XIndexAccess xIA = UnoRuntime.queryInterface(
XIndexAccess.class, xSheetDoc.getSheets());
oSheet = UnoRuntime.queryInterface(
XSpreadsheet.class, xIA.getByIndex(0));
changeColor("A1:A5", 0, 255, 0);
changeColor("A6:B10", 255, 0, 0);
changeColor("B1:B6", 0, 0, 255);
changeColor("B7", 0, 255, 0);
changeColor("B8:B10", 0, 0, 255);
changeColor("C1:C10", 0, 0, 255);
changeColor("D1:D10", 0, 255, 0);
XUniqueCellFormatRangesSupplier xUCRS = UnoRuntime.queryInterface(
XUniqueCellFormatRangesSupplier.class,
oSheet);
XInterface oObj = xUCRS.getUniqueCellFormatRanges();
log.println("Implementationname: " + util.utils.getImplName(oObj));
TestEnvironment tEnv = new TestEnvironment(oObj);
return tEnv;
}
protected void changeColor(String RangeName, int r, int g, int b) {
XCellRange xRange = oSheet.getCellRangeByName(RangeName);
XPropertySet xPropertySet = UnoRuntime.queryInterface(
XPropertySet.class, xRange);
Color c = new Color(r, g, b);
int c2int = 16777216 + c.hashCode();
try {
xPropertySet.setPropertyValue("CellBackColor", Integer.valueOf(c2int));
} catch (com.sun.star.beans.UnknownPropertyException e) {
log.println("Couldn't change CellFormat");
} catch (com.sun.star.beans.PropertyVetoException e) {
log.println("Couldn't change CellFormat");
} catch (com.sun.star.lang.IllegalArgumentException e) {
log.println("Couldn't change CellFormat");
} catch (com.sun.star.lang.WrappedTargetException e) {
log.println("Couldn't change CellFormat");
}
}
}
diff --git a/sc/qa/extras/scuniquecellformatsobj.cxx b/sc/qa/extras/scuniquecellformatsobj.cxx
index 58c9b96..b5f32ed 100644
--- a/sc/qa/extras/scuniquecellformatsobj.cxx
+++ b/sc/qa/extras/scuniquecellformatsobj.cxx
@@ -10,6 +10,7 @@
#include <test/calc_unoapi_test.hxx>
#include <test/container/xelementaccess.hxx>
#include <test/container/xenumerationaccess.hxx>
#include <test/container/xindexaccess.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/lang/XComponent.hpp>
@@ -31,7 +32,8 @@
{
class ScUniqueCellFormatsObj : public CalcUnoApiTest,
public apitest::XElementAccess,
public apitest::XEnumerationAccess
public apitest::XEnumerationAccess,
public apitest::XIndexAccess
{
public:
ScUniqueCellFormatsObj();
@@ -49,6 +51,10 @@
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
// XIndexAccess
CPPUNIT_TEST(testGetByIndex);
CPPUNIT_TEST(testGetCount);
CPPUNIT_TEST_SUITE_END();
private:
@@ -58,6 +64,7 @@
ScUniqueCellFormatsObj::ScUniqueCellFormatsObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType<sheet::XSheetCellRangeContainer>::get())
, XIndexAccess(1)
{
}
diff --git a/sc/qa/unoapi/sc_7.sce b/sc/qa/unoapi/sc_7.sce
index 305801e..70a8acd 100644
--- a/sc/qa/unoapi/sc_7.sce
+++ b/sc/qa/unoapi/sc_7.sce
@@ -24,7 +24,6 @@
# -o sc.ScTableRowObj
-o sc.ScTableRowsObj
# -o sc.ScTableSheetObj
-o sc.ScUniqueCellFormatsObj
# -o sc.ScTableSheetsObj
-o sc.ScTableValidationObj
#-o sc.ScViewPaneObj