[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Dec 1 18:14:06 UTC 2018
framework/qa/complex/api_internal/api.lst | 1
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv | 2
qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java | 118 ----------
sc/qa/extras/scarealinksobj.cxx | 9
sc/qa/unoapi/sc_2.sce | 1
6 files changed, 8 insertions(+), 124 deletions(-)
New commits:
commit e268016887aba18af67ad5060c8dfbf936f688d8
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Sat Dec 1 07:48:35 2018 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Sat Dec 1 19:13:46 2018 +0100
tdf#45904 Move XIndexAccess Java tests to C++
Move XIndexAccess Java test to C++ for ScAreaLinksObj.
Change-Id: I374b7301caf67c900b7a64920d2ac5b642a8c6fd
Reviewed-on: https://gerrit.libreoffice.org/64376
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 89361f5b9349..fd5f7f2dd491 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -73,7 +73,6 @@ job73=sc.ScAccessiblePreviewTable
job74=sc.ScAccessibleSpreadsheet
job75=sc.ScAnnotationObj
job76=sc.ScAnnotationsObj
-job77=sc.ScAreaLinksObj
job78=sc.ScAutoFormatFieldObj
job79=sc.ScAutoFormatObj
job80=sc.ScAutoFormatsObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index a2e9b82e89f8..575f7fa0c301 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -955,7 +955,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScAnnotationsObj \
qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor \
qadevOOo/tests/java/mod/_sc/ScAreaLinkObj \
- qadevOOo/tests/java/mod/_sc/ScAreaLinksObj \
qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj \
qadevOOo/tests/java/mod/_sc/ScAutoFormatObj \
qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv
deleted file mode 100644
index d21c646b1eee..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScAreaLinksObj";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScAreaLinksObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java
deleted file mode 100644
index 8b324a723502..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java
+++ /dev/null
@@ -1,118 +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.lang.XComponent;
-import com.sun.star.sheet.XAreaLinks;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.table.CellAddress;
-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.CellAreaLinks</code>.
-* This is a collection aff all links present
-* in a Spreadsheet document.
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::container::XIndexAccess</code></li>
-* <li> <code>com::sun::star::container::XElementAccess</code></li>
-* <li> <code>com::sun::star::sheet::XAreaLinks</code></li>
-* </ul>
-* This object test <b> is NOT </b> designed to be run in several
-* threads concurrently.
-* @see com.sun.star.container.XIndexAccess
-* @see com.sun.star.container.XElementAccess
-* @see com.sun.star.sheet.XAreaLinks
-* @see ifc.container._XIndexAccess
-* @see ifc.container._XElementAccess
-* @see ifc.sheet._XAreaLinks
-* @see com.sun.star.sheet.CellAreaLinks
-*/
-public class ScAreaLinksObj 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 Area Links using the 'AreaLinks'
- * property of the Spreadsheet document. Adds a new link to this
- * collection, which has a source in the same document. The
- * link collection is passed as a tested object.
- */
- @Override
- public TestEnvironment createTestEnvironment(
- TestParameters Param, PrintWriter log) throws Exception {
-
- XInterface oObj = null;
- TestEnvironment tEnv = null;
-
- // creation of testobject here
- XPropertySet props = UnoRuntime.queryInterface(XPropertySet.class,
- xSheetDoc);
- oObj = (XInterface) AnyConverter.toObject(new Type(XInterface.class),
- props.getPropertyValue("AreaLinks"));
- XAreaLinks links = null;
-
- // adding one link into collection (for best testing)
- links = UnoRuntime.queryInterface(XAreaLinks.class, oObj);
- CellAddress addr = new CellAddress((short) 1, 2, 3);
- String aSourceArea = util.utils.getFullTestURL("calcshapes.sxc");
- links.insertAtPosition(addr, aSourceArea, "a2:b5", "", "");
-
- // creating test environment
- tEnv = new TestEnvironment(oObj);
-
- return tEnv;
- }
-
-} // finish class ScAreaLinksObj
-
diff --git a/sc/qa/extras/scarealinksobj.cxx b/sc/qa/extras/scarealinksobj.cxx
index ab4bdd76ad43..6e14ccf22b01 100644
--- a/sc/qa/extras/scarealinksobj.cxx
+++ b/sc/qa/extras/scarealinksobj.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 <test/sheet/xarealinks.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -32,7 +33,8 @@ namespace sc_apitest
class ScAreaLinksObj : public CalcUnoApiTest,
public apitest::XAreaLinks,
public apitest::XElementAccess,
- public apitest::XEnumerationAccess
+ public apitest::XEnumerationAccess,
+ public apitest::XIndexAccess
{
public:
ScAreaLinksObj();
@@ -54,6 +56,10 @@ public:
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
+ // XIndexAccess
+ CPPUNIT_TEST(testGetByIndex);
+ CPPUNIT_TEST(testGetCount);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -63,6 +69,7 @@ private:
ScAreaLinksObj::ScAreaLinksObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType<sheet::XAreaLink>::get())
+ , XIndexAccess(1)
{
}
diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
index f69816334dae..17cba110967b 100644
--- a/sc/qa/unoapi/sc_2.sce
+++ b/sc/qa/unoapi/sc_2.sce
@@ -25,7 +25,6 @@
# -o sc.ScAnnotationShapeObj
-o sc.ScAnnotationsObj
-o sc.ScAreaLinkObj
--o sc.ScAreaLinksObj
-o sc.ScAutoFormatFieldObj
-o sc.ScAutoFormatObj
-o sc.ScAutoFormatsObj
More information about the Libreoffice-commits
mailing list