diff options
| -rw-r--r-- | qadevOOo/Jar_OOoRunner.mk | 1 | ||||
| -rw-r--r-- | qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv | 2 | ||||
| -rw-r--r-- | qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java | 156 | ||||
| -rw-r--r-- | sc/qa/extras/sctablesheetsobj.cxx | 12 | ||||
| -rw-r--r-- | sc/qa/unoapi/sc_7.sce | 1 |
5 files changed, 8 insertions, 164 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 201b83e1b942..b3f7f3333258 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -962,7 +962,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \ qadevOOo/tests/java/mod/_sc/ScStyleObj \ qadevOOo/tests/java/mod/_sc/ScTableSheetObj \ - qadevOOo/tests/java/mod/_sc/ScTableSheetsObj \ qadevOOo/tests/java/mod/_sc/ScTabViewObj \ qadevOOo/tests/java/mod/_sc/XMLContentExporter \ qadevOOo/tests/java/mod/_sc/XMLContentImporter \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv deleted file mode 100644 index 18c378322001..000000000000 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv +++ /dev/null @@ -1,2 +0,0 @@ -"ScTableSheetsObj";"com::sun::star::container::XNameContainer";"insertByName()" -"ScTableSheetsObj";"com::sun::star::container::XNameContainer";"removeByName()" diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java deleted file mode 100644 index 8270337b7aef..000000000000 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java +++ /dev/null @@ -1,156 +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.StatusException; -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.SOfficeFactory; - -import com.sun.star.lang.XComponent; -import com.sun.star.sheet.XSpreadsheet; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.sheet.XSpreadsheets; -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.Spreadsheets</code>. <p> -* Object implements the following interfaces : -* <ul> -* <li> <code>com::sun::star::sheet::XSpreadsheets</code></li> -* <li> <code>com::sun::star::container::XNameAccess</code></li> -* <li> <code>com::sun::star::container::XIndexAccess</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> -* @see com.sun.star.sheet.Spreadsheets -* @see com.sun.star.sheet.XSpreadsheets -* @see com.sun.star.container.XNameAccess -* @see com.sun.star.container.XIndexAccess -* @see com.sun.star.container.XElementAccess -* @see com.sun.star.container.XNameReplace -* @see com.sun.star.container.XNameContainer -* @see ifc.sheet._XSpreadsheets -* @see ifc.container._XNameAccess -* @see ifc.container._XIndexAccess -* @see ifc.container._XElementAccess -* @see ifc.container._XNameReplace -* @see ifc.container._XNameContainer -*/ -public class ScTableSheetsObj extends TestCase { - private XSpreadsheetDocument xSpreadsheetDoc = null; - - /** - * Creates Spreadsheet document. - */ - @Override - public void initialize( TestParameters Param, PrintWriter log ) throws Exception { - // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); - log.println("creating a spreadsheetdocument"); - xSpreadsheetDoc = SOF.createCalcDoc(null); - } - - /** - * Disposes Spreadsheet document. - */ - @Override - protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println("disposing xSpreadsheetDocument"); - XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc); - util.DesktopTools.closeDoc(oComp); - } - - /** - * Creating a TestEnvironment for the interfaces to be tested. - * Retrieves the collection of the spreadsheets using the interface - * <code>XSpreadsheetDocument</code>. The retrieved collection is the - * instance of the service <code>com.sun.star.sheet.Spreadsheets</code>. - * Creates instances of the service <code>com.sun.star.sheet.Spreadsheet</code>. - * Object relations created : - * <ul> - * <li> <code>'SecondInstance'</code> for - * {@link ifc.container._XNameContainer} (the created instance of the - * service <code>com.sun.star.sheet.Spreadsheet</code>) </li> - * <li> <code>'INSTANCE1', ..., 'INSTANCEN'</code> for - * {@link ifc.container._XNameContainer} (the created instances of the - * service <code>com.sun.star.sheet.Spreadsheet</code>) </li> - * </ul> - * @see com.sun.star.sheet.Spreadsheets - * @see com.sun.star.sheet.XSpreadsheetDocument - * @see com.sun.star.sheet.Spreadsheet - */ - @Override - protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - - SOfficeFactory.getFactory( Param.getMSF()); - - log.println("getting sheets"); - XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); - - XInterface oObj = UnoRuntime.queryInterface(XInterface.class, xSpreadsheets); - - log.println("creating a new environment for object"); - TestEnvironment tEnv = new TestEnvironment(oObj); - - log.println("creating instance of the sheet object to use it in tests"); - XSpreadsheet oSecondSheet = null; - - try { - oSecondSheet = SOfficeFactory.createSpreadsheet(xSpreadsheetDoc); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(log); - throw new StatusException("Couldn't create instances", e); - } - - //adding Instance for XNameContainer - tEnv.addObjRelation("SecondInstance",oSecondSheet); - - // 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")); - } - try { - for (int n = 1; n < (THRCNT+1) ;n++ ) { - log.println( - "adding INSTANCE" + n +" as mod relation to environment" ); - tEnv.addObjRelation( - "INSTANCE" + n, - SOfficeFactory.createSpreadsheet(xSpreadsheetDoc) ); - } - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(log); - throw new StatusException( - "Couldn't create instances for object relations", e); - } - - return tEnv; - } -} - - diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx index b995a03a78ab..41856b5b2df7 100644 --- a/sc/qa/extras/sctablesheetsobj.cxx +++ b/sc/qa/extras/sctablesheetsobj.cxx @@ -59,6 +59,13 @@ public: CPPUNIT_TEST(testGetElementNames); CPPUNIT_TEST(testHasByName); + // XNameContainer + CPPUNIT_TEST(testInsertByName); + CPPUNIT_TEST(testInsertByNameEmptyName); + CPPUNIT_TEST(testInsertByNameDuplicate); + CPPUNIT_TEST(testRemoveByName); + CPPUNIT_TEST(testRemoveByNameNoneExistingElement); + // XNameReplace CPPUNIT_TEST(testReplaceByName); @@ -81,10 +88,6 @@ public: CPPUNIT_TEST(testImportCellStyle); CPPUNIT_TEST(testLastAfterInsertCopy); - // XNameContainer - CPPUNIT_TEST(testRemoveByName); - CPPUNIT_TEST(testRemoveByNameNoneExistingElement); - CPPUNIT_TEST_SUITE_END(); virtual uno::Reference< lang::XComponent > getComponent() override; @@ -126,6 +129,7 @@ uno::Reference< uno::XInterface > ScTableSheetsObj::init() uno::Reference< uno::XInterface > xReturn( xDocument->getSheets(), UNO_QUERY_THROW); uno::Reference<lang::XMultiServiceFactory> xMSF(mxComponent, uno::UNO_QUERY_THROW); + XNameContainer::setElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.Spreadsheet"))); // XNameReplace setReplacementElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.Spreadsheet"))); diff --git a/sc/qa/unoapi/sc_7.sce b/sc/qa/unoapi/sc_7.sce index e88e9db49f4e..f060cb194313 100644 --- a/sc/qa/unoapi/sc_7.sce +++ b/sc/qa/unoapi/sc_7.sce @@ -18,7 +18,6 @@ # -o sc.ScStyleObj # # i84656 -o sc.ScTabViewObj # -o sc.ScTableSheetObj -# -o sc.ScTableSheetsObj # #i89411 -o sc.XMLContentExporter # #i89411 -o sc.XMLContentImporter # #i89411 -o sc.XMLExporter |