[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Dec 5 22:15:18 UTC 2018
framework/qa/complex/api_internal/api.lst | 1
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv | 2
qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java | 112 ----------
sc/qa/extras/sccellformatsobj.cxx | 9
sc/qa/unoapi/sc_2.sce | 1
6 files changed, 8 insertions(+), 118 deletions(-)
New commits:
commit a91782b92d9509619da2598904c644a19aead70b
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Wed Dec 5 19:49:21 2018 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Wed Dec 5 23:14:51 2018 +0100
tdf#45904 Move XIndexAccess Java tests to C++
Move XIndexAccess Java tests to C++ for ScCellFormatsObj.
Change-Id: I5ef1e789a535af55705c3a39f07a9396666adbed
Reviewed-on: https://gerrit.libreoffice.org/64648
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index 4f1cc7cb2540..167c2308c54f 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -77,7 +77,6 @@ job79=sc.ScAutoFormatObj
job80=sc.ScAutoFormatsObj
job81=sc.ScCellFieldObj
job82=sc.ScCellFieldsObj
-job84=sc.ScCellFormatsObj
job85=sc.ScCellSearchObj
job88=sc.ScDatabaseRangeObj
job89=sc.ScDatabaseRangesObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 80b62f084af6..86bda8985a6b 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -960,7 +960,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScCellCursorObj \
qadevOOo/tests/java/mod/_sc/ScCellFieldObj \
qadevOOo/tests/java/mod/_sc/ScCellFieldsObj \
- qadevOOo/tests/java/mod/_sc/ScCellFormatsObj \
qadevOOo/tests/java/mod/_sc/ScCellObj \
qadevOOo/tests/java/mod/_sc/ScCellRangeObj \
qadevOOo/tests/java/mod/_sc/ScCellRangesObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv
deleted file mode 100644
index d9fa9324ba53..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFormatsObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScCellFormatsObj";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScCellFormatsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java
deleted file mode 100644
index e67bcf105a4a..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java
+++ /dev/null
@@ -1,112 +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.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.CellFormatRanges</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::container::XEnumerationAccess</code></li>
-* <li> <code>com::sun::star::container::XElementAccess</code></li>
-* </ul>
-* @see com.sun.star.sheet.CellFormatRanges
-* @see com.sun.star.container.XEnumerationAccess
-* @see com.sun.star.container.XElementAccess
-* @see ifc.container._XEnumerationAccess
-* @see ifc.container._XElementAccess
-*/
-public class ScCellFormatsObj 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 format cell
- * range using the interface <code>XCellFormatRangesSupplier</code> that is
- * instance of service <code>com.sun.star.sheet.CellFormatRanges</code>.
- * @see com.sun.star.sheet.CellFormatRanges
- * @see com.sun.star.sheet.XCellFormatRangesSupplier
- */
- @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();
-
- oObj = formats;
-
- log.println("creating a new environment for object");
- TestEnvironment tEnv = new TestEnvironment(oObj);
-
- return tEnv;
- }
-} // finish class ScCellFormatsObj
-
diff --git a/sc/qa/extras/sccellformatsobj.cxx b/sc/qa/extras/sccellformatsobj.cxx
index e4d407002d4d..fc8ffd022682 100644
--- a/sc/qa/extras/sccellformatsobj.cxx
+++ b/sc/qa/extras/sccellformatsobj.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 @@ namespace sc_apitest
{
class ScCellFormatsObj : public CalcUnoApiTest,
public apitest::XElementAccess,
- public apitest::XEnumerationAccess
+ public apitest::XEnumerationAccess,
+ public apitest::XIndexAccess
{
public:
ScCellFormatsObj();
@@ -49,6 +51,10 @@ public:
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
+ // XIndexAccess
+ CPPUNIT_TEST(testGetByIndex);
+ CPPUNIT_TEST(testGetCount);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -58,6 +64,7 @@ private:
ScCellFormatsObj::ScCellFormatsObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType<table::XCellRange>::get())
+ , XIndexAccess(1)
{
}
diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
index b45313ed7830..f5828f20fcdf 100644
--- a/sc/qa/unoapi/sc_2.sce
+++ b/sc/qa/unoapi/sc_2.sce
@@ -30,5 +30,4 @@
-o sc.ScCellCursorObj
# ported to cppunit -o sc.ScCellFieldObj
-o sc.ScCellFieldsObj
--o sc.ScCellFormatsObj
-o sc.ScCellObj
More information about the Libreoffice-commits
mailing list