framework/qa/complex/api_internal/api.lst | 1
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatsObj.csv | 1
qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java | 137
----------
sc/qa/extras/scautoformatsobj.cxx | 15 +
sc/qa/unoapi/sc_2.sce | 1
6 files changed, 14 insertions(+), 142 deletions(-)
New commits:
commit 218916eb47e35fd14832d8f52225bf1d4d9c80a6
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Sat Mar 16 20:44:27 2019 +0000
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Sun Mar 17 04:04:14 2019 +0100
Add XServiceInfo tests to ScAutoFormatsObj
Change-Id: I88b817b5d2f6b13275585da2db377ace0fef6fb3
Reviewed-on: https://gerrit.libreoffice.org/69352
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/sc/qa/extras/scautoformatsobj.cxx
b/sc/qa/extras/scautoformatsobj.cxx
index 7507fc04758a..dec3c4f17f63 100644
--- a/sc/qa/extras/scautoformatsobj.cxx
+++ b/sc/qa/extras/scautoformatsobj.cxx
@@ -14,6 +14,7 @@
#include <test/container/xnameaccess.hxx>
#include <test/container/xnamecontainer.hxx>
#include <test/container/xnamereplace.hxx>
+#include <test/lang/xserviceinfo.hxx>
#include <cppu/unotype.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -35,7 +36,8 @@ class ScAutoFormatsObj : public CalcUnoApiTest,
public apitest::XIndexAccess,
public apitest::XNameAccess,
public apitest::XNameContainer,
- public apitest::XNameReplace
+ public apitest::XNameReplace,
+ public apitest::XServiceInfo
{
public:
ScAutoFormatsObj();
@@ -72,6 +74,11 @@ public:
// XNameReplace
CPPUNIT_TEST(testReplaceByName);
+ // XServiceInfo
+ CPPUNIT_TEST(testGetImplementationName);
+ CPPUNIT_TEST(testGetSupportedServiceNames);
+ CPPUNIT_TEST(testSupportsService);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -85,6 +92,7 @@ ScAutoFormatsObj::ScAutoFormatsObj()
, XNameAccess("Default")
, XNameContainer("ScAutoFormatsObj")
, XNameReplace("ScAutoFormatsObj")
+ , XServiceInfo("stardiv.StarCalc.ScAutoFormatsObj",
"com.sun.star.sheet.TableAutoFormats")
{
}
commit 0c6c0fe64c5be46712f21204a2d8ed2f99e4af62
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Sat Mar 16 20:30:52 2019 +0000
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Sun Mar 17 04:03:59 2019 +0100
tdf#45904 Move XEnumerationAccess Java test to C++
Move XEnumerationAccess Java test to C++ for ScAutoFormatsObj.
Change-Id: I2cbf6dd7f8dd77da51e20c5f60f19d300ecae62e
Reviewed-on: https://gerrit.libreoffice.org/69350
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/framework/qa/complex/api_internal/api.lst
b/framework/qa/complex/api_internal/api.lst
index 21a248e9e2ec..946bc59bea97 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
job78=sc.ScAutoFormatFieldObj
job79=sc.ScAutoFormatObj
-job80=sc.ScAutoFormatsObj
job81=sc.ScCellFieldObj
job85=sc.ScCellSearchObj
job88=sc.ScDatabaseRangeObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index d839184c72c1..4bc4edde3ba3 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -951,7 +951,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor \
qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj \
qadevOOo/tests/java/mod/_sc/ScAutoFormatObj \
- qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj \
qadevOOo/tests/java/mod/_sc/ScCellCursorObj \
qadevOOo/tests/java/mod/_sc/ScCellFieldObj \
qadevOOo/tests/java/mod/_sc/ScCellObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatsObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatsObj.csv
deleted file mode 100644
index 3d634863ec34..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatsObj.csv
+++ /dev/null
@@ -1 +0,0 @@
-"ScAutoFormatsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java
b/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java
deleted file mode 100644
index d13e11340134..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java
+++ /dev/null
@@ -1,137 +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.lang.XComponent;
-import com.sun.star.sheet.XSpreadsheetDocument;
-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.TableAutoFormats</code>. <p>
-* In StarCalc application there is a collection of autoformats
-* for tables (you can select a predefined format for a
-* table or create your own). The object represents
-* this collection. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::container::XNameAccess</code></li>
-* <li> <code>com::sun::star::container::XElementAccess</code></li>
-* <li> <code>com::sun::star::container::XNameReplace</code></li>
-* <li> <code>com::sun::star::container::XNameContainer</code></li>
-* </ul>
-* This object test <b> is NOT </b> designed to be run in several
-* threads concurrently.
-* @see com.sun.star.container.XNameAccess
-* @see com.sun.star.container.XElementAccess
-* @see com.sun.star.container.XNameReplace
-* @see com.sun.star.container.XNameContainer
-* @see ifc.container._XNameAccess
-* @see ifc.container._XElementAccess
-* @see ifc.container._XNameReplace
-* @see ifc.container._XNameContainer
-*/
-public class ScAutoFormatsObj extends TestCase{
- private XSpreadsheetDocument xSheetDoc = null;
- static SOfficeFactory SOF = null;
-
- /**
- * Creates Spreadsheet document.
- */
- @Override
- protected void initialize( TestParameters tParam, PrintWriter log ) throws
Exception {
- 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.
- * Creates an instance of the service
- * <code>com.sun.star.sheet.TableAutoFormats</code>.
- * Object relations created :
- * <ul>
- * <li> <code>'INSTANCE1', ..., 'INSTANCEN'</code> for
- * {@link ifc.container._XNameContainer},
- * {@link ifc.container._XNameReplace} N relations
- * which represents objects to be inserted - one
- * object for each interface thread. </li>
- * </ul>
- */
- @Override
- public TestEnvironment createTestEnvironment
- (TestParameters Param, PrintWriter log )
- throws Exception {
-
- XInterface oObj = null;
-
- // creation of testobject here
- // get AutoFormats
- XComponent xComp = UnoRuntime.queryInterface
- (XComponent.class, xSheetDoc);
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),Param.getMSF().createInstance
- ("com.sun.star.sheet.TableAutoFormats"));
- Object secondInstance = SOF.createInstance
- (xComp, "com.sun.star.sheet.TableAutoFormat");
-
- TestEnvironment tEnv = new TestEnvironment(oObj) ;
-
- //adding ObjRelation for XNameContainer
- tEnv.addObjRelation("SecondInstance",secondInstance);
-
- // INSTANCEn : _XNameContainer; _XNameReplace
- log.println( "adding INSTANCEn as mod relation to environment" );
- int THRCNT = 1;
- if ((String)Param.get("THRCNT") != null) {
- THRCNT = Integer.parseInt((String)Param.get("THRCNT"));
- }
- for (int n = 1; n < (THRCNT+1) ;n++ ) {
- log.println( "adding INSTANCE" + n
- +" as mod relation to environment" );
- tEnv.addObjRelation("INSTANCE" + n, SOF.createInstance(xComp,
- "com.sun.star.sheet.TableAutoFormat"));
- }
-
- return tEnv;
- }
-
-} // finish class ScAutoFormatsObj
-
diff --git a/sc/qa/extras/scautoformatsobj.cxx
b/sc/qa/extras/scautoformatsobj.cxx
index 20c0c3e62f29..7507fc04758a 100644
--- a/sc/qa/extras/scautoformatsobj.cxx
+++ b/sc/qa/extras/scautoformatsobj.cxx
@@ -9,6 +9,7 @@
#include <test/calc_unoapi_test.hxx>
#include <test/container/xelementaccess.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/container/xindexaccess.hxx>
#include <test/container/xnameaccess.hxx>
#include <test/container/xnamecontainer.hxx>
@@ -30,6 +31,7 @@ namespace sc_apitest
{
class ScAutoFormatsObj : public CalcUnoApiTest,
public apitest::XElementAccess,
+ public apitest::XEnumerationAccess,
public apitest::XIndexAccess,
public apitest::XNameAccess,
public apitest::XNameContainer,
@@ -48,6 +50,9 @@ public:
CPPUNIT_TEST(testGetElementType);
CPPUNIT_TEST(testHasElements);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// XIndexAccess
CPPUNIT_TEST(testGetByIndex);
CPPUNIT_TEST(testGetCount);
diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
index 0bc25a0d4cda..475da048cad1 100644
--- a/sc/qa/unoapi/sc_2.sce
+++ b/sc/qa/unoapi/sc_2.sce
@@ -24,7 +24,6 @@
# -o sc.ScAnnotationShapeObj
-o sc.ScAutoFormatFieldObj
-o sc.ScAutoFormatObj
--o sc.ScAutoFormatsObj
-o sc.ScCellCursorObj
# ported to cppunit -o sc.ScCellFieldObj
-o sc.ScCellObj
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
