diff options
author | Jens Carl <j.carl43@gmx.de> | 2018-01-04 23:55:51 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2018-01-05 02:40:41 +0100 |
commit | b673cbeeeb0cedb6836e1946e6e6c12bfd68add4 (patch) | |
tree | a5d21fab25e71e142d308347df3f4e5e7dc09bf0 /qadevOOo | |
parent | c8fbce439db78dd85295833df494a651bd64dcd4 (diff) |
tdf#45904 Move _DatabaseImportDescriptor Java tests to C++
Change-Id: I53e9a449cb18c26187f3b1676f8ab67918128499
Reviewed-on: https://gerrit.libreoffice.org/47447
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/_DatabaseImportDescriptor.java | 96 | ||||
-rw-r--r-- | qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java | 128 |
3 files changed, 0 insertions, 226 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index bc33f52aa853..d99390962f85 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -563,7 +563,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/_DatabaseImportDescriptor \ qadevOOo/tests/java/ifc/sheet/_DocumentSettings \ qadevOOo/tests/java/ifc/sheet/_FunctionDescription \ qadevOOo/tests/java/ifc/sheet/_GlobalSheetSettings \ @@ -1029,7 +1028,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj \ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \ - qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration \ diff --git a/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java deleted file mode 100644 index 6a8f402e741f..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java +++ /dev/null @@ -1,96 +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.util.XImportable; - -/** -* Testing <code>com.sun.star.sheet.DatabaseImportDescriptor</code> -* service properties: -* <ul> -* <li><code>DatabaseName</code></li> -* <li><code>SourceObject</code></li> -* <li><code>SourceType</code></li> -* </ul> <p> -* @see com.sun.star.sheet.DatabaseImportDescriptor -*/ -public class _DatabaseImportDescriptor extends MultiMethodTest { - - public XPropertySet oObj = null; - public XImportable xIMP = null; - public PropertyValue[] props = null; - - public void _DatabaseName() { - xIMP = (XImportable) tEnv.getObjRelation("xIMP"); - props = xIMP.createImportDescriptor(true); - changeProp("DatabaseName",0); - } - - public void _SourceObject() { - changeProp("SourceObject",2); - } - - public void _SourceType() { - changeProp("SourceType",1); - } - - public void changeProp(String name, int nr) { - - Object gValue = null; - Object sValue = null; - Object ValueToSet = null; - - 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; - ValueToSet = ValueChanger.changePValue(gValue); - props[nr].Value=ValueToSet; - sValue = props[nr].Value; - - //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 _DatabaseImportDescriptor - - diff --git a/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java deleted file mode 100644 index 5782b1327016..000000000000 --- a/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java +++ /dev/null @@ -1,128 +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.XImportable; - -/** - * - * initial description - * @see com.sun.star.sheet.DatabaseImportDescriptor - * - */ -public class ScImportDescriptorBase extends TestCase { - - 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; - XImportable xIMP = 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)); - - xIMP = UnoRuntime.queryInterface(XImportable.class,oObj); - - TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("xIMP",xIMP); - return tEnv; - - } // finish method getTestEnvironment - -} // finish class ScImportDescriptorBase - |