diff options
author | Jens Carl <j.carl43@gmx.de> | 2018-04-10 04:46:44 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2018-04-17 17:45:53 +0200 |
commit | 73a7c7ddbc52ed3fe512d4c5206e90810f14b50c (patch) | |
tree | afda9369f3ef62d5556a0f836413065a75e6db97 /qadevOOo | |
parent | a418c365644a4bfb0e40621d1b36b1708978a500 (diff) |
tdf#45904 Move _SheetSortDescriptor Java tests to C++
The C++ tests are now located in sheetsortdescriptor2.(hxx|cxx), because
this is the latest implementation of the UNO API interface
(SheetSortDescriptor2.idl).
Change-Id: I5b11a38f6cd0473714c4d57ee92889bfd7605e83
Reviewed-on: https://gerrit.libreoffice.org/52930
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'qadevOOo')
-rw-r--r-- | qadevOOo/Jar_OOoRunner.mk | 2 | ||||
-rw-r--r-- | qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java | 135 | ||||
-rw-r--r-- | qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java | 130 |
3 files changed, 0 insertions, 267 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 56d52e04ffc6..575e130efcd8 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -562,7 +562,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer \ qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer \ qadevOOo/tests/java/ifc/sdb/_XSQLErrorBroadcaster \ - qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor \ qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument \ qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \ qadevOOo/tests/java/ifc/sheet/_XCellRangeData \ @@ -1037,7 +1036,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScShapeObj \ qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \ qadevOOo/tests/java/mod/_sc/ScSheetLinksObj \ - qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase \ qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings \ qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj \ qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj \ diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java deleted file mode 100644 index f540d77db610..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java +++ /dev/null @@ -1,135 +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 ifc.sheet; - -import lib.MultiMethodTest; -import util.ValueChanger; - -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.XPropertySet; -import com.sun.star.table.CellAddress; -import com.sun.star.util.XSortable; - -/** -* Testing <code>com.sun.star.sheet.SheetSortDescriptor</code> -* service properties: <p> -* <ul> -* <li><code>BindFormatsToContent</code></li> -* <li><code>CopyOutputData</code></li> -* <li><code>IsCaseSensitive</code></li> -* <li><code>IsUserListEnabled</code></li> -* <li><code>OutputPosition</code></li> -* <li><code>SortAscending</code></li> -* <li><code>UserListIndex</code></li> -* </ul> <p> -* @see com.sun.star.sheet.SheetSortDescriptor -*/ -public class _SheetSortDescriptor extends MultiMethodTest { - - public XPropertySet oObj = null; - public XSortable xSORT = null; - public PropertyValue[] props = null; - - public void _BindFormatsToContent() { - xSORT = (XSortable) tEnv.getObjRelation("xSORT"); - props = xSORT.createSortDescriptor(); - changeProp("BindFormatsToContent",5); - } - - public void _CopyOutputData() { - changeProp("CopyOutputData",6); - } - - public void _IsCaseSensitive() { - changeProp("IsCaseSensitive",4); - } - - public void _IsUserListEnabled() { - changeProp("IsUserListEnabled",8); - } - - public void _OutputPosition() { - changeProp("OutputPosition",7); - } - - public void _SortAscending() { - log.println("Property 'SortAscending' is not part of the "+ - "property array"); - log.println("Available properties:"); - for (int i=0; i<props.length;i++) { - log.println("\t"+props[i].Name); - } - tRes.tested("SortAscending",false); - } - - public void _UserListIndex() { - changeProp("UserListIndex",9); - } - - public void changeProp(String name, int nr) { - - Object gValue = null; - Object sValue = null; - Object ValueToSet = null; - int gInt = 0; - int sInt = 0; - - if ( ! name.equals(props[nr].Name) ) { - log.println("Property '"+props[nr].Name+"' is tested"); - log.println("But the status is for '"+name+"'"); - } - - - try { - gValue = props[nr].Value; - if ( name.equals("OutputPosition")) { - gInt = ((CellAddress) gValue).Row; - } - ValueToSet = ValueChanger.changePValue(gValue); - props[nr].Value=ValueToSet; - sValue = props[nr].Value; - if ( name.equals("OutputPosition")) { - sInt = ((CellAddress) sValue).Row; - gValue = Integer.valueOf(gInt); - sValue = Integer.valueOf(sInt); - } - - //check get-set methods - if ( (gValue.equals(sValue)) || (sValue == null) ) { - log.println("Value for '"+name+"' hasn't changed"); - tRes.tested(name, false); - } - else { - log.println("Property '"+name+"' OK"); - tRes.tested(name, true); - } - } catch (Exception e) { - log.println("Exception occurred while testing property '" + - name + "'"); - e.printStackTrace(log); - tRes.tested(name, false); - } - - - }// end of changeProp - - -} // finish class _SheetSortDescriptor - - diff --git a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java deleted file mode 100644 index 74a2d085f9a5..000000000000 --- a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java +++ /dev/null @@ -1,130 +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.XSpreadsheetDocument; -import com.sun.star.sheet.XSpreadsheets; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import com.sun.star.util.XSortable; - - -/** - * - * initial description - * @see com.sun.star.beans.XPropertySet - * @see com.sun.star.sheet.SheetSortDescriptor - * - */ -public class ScSortDescriptorBase extends TestCase { - - private XSpreadsheetDocument xSpreadsheetDoc; - - /** - * in general this method creates a testdocument - * - * @param tParam class which contains additional test parameters - * @param log class to log the test state and result - * - * - * @see TestParameters - * @see PrintWriter - * - */ - @Override - protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); - log.println( "creating a Spreadsheet document" ); - xSpreadsheetDoc = SOF.createCalcDoc(null); - } - - /** - * in general this method disposes the testenvironment and document - * - * @param tParam class which contains additional test parameters - * @param log class to log the test state and result - * - * - * @see TestParameters - * @see PrintWriter - * - */ - @Override - protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing xSheetDoc " ); - XComponent oComp = UnoRuntime.queryInterface - (XComponent.class, xSpreadsheetDoc) ; - util.DesktopTools.closeDoc(oComp); - } - - - - /** - * creating a TestEnvironment for the interfaces to be tested - * - * @param tParam class which contains additional test parameters - * @param log class to log the test state and result - * - * @return Status class - * - * @see TestParameters - * @see PrintWriter - */ - @Override - public TestEnvironment createTestEnvironment( TestParameters tParam, - PrintWriter log ) - throws Exception { - - XInterface oObj = null; - XSortable xSORT = null; - - // creation of testobject here - // first we write what we are intend to do to log file - log.println( "creating a test environment" ); - - // create testobject here - - log.println("getting sheets"); - XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); - if (xSpreadsheets == null) log.println("FAILED"); else log.println("OK"); - - log.println("getting a sheet"); - XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets); - - oObj = UnoRuntime.queryInterface(XInterface.class,oIndexAccess.getByIndex(0)); - - xSORT = UnoRuntime.queryInterface(XSortable.class,oObj); - - TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("xSORT",xSORT); - return tEnv; - - } // finish method getTestEnvironment - -} // finish class ScSortDescriptorBase - |