diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-10-20 03:27:37 +0000 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-10-29 23:44:53 +0100 |
commit | 4200896e36f259a60b3d3288e13ff08d2fda861c (patch) | |
tree | abe74ba72e907caabea1ae840937658823c6db89 /qadevOOo | |
parent | a0b7cd137aac7529b328c813b011166a78074cb4 (diff) |
tdf#45904: Move Java _XSheetLinkable tests to C++
Change-Id: I0f99c3b4a74748d7f1c73ef584170ae84b08cd9a
Reviewed-on: https://gerrit.libreoffice.org/43582
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'qadevOOo')
-rw-r--r-- | qadevOOo/Jar_OOoRunner.mk | 1 | ||||
-rw-r--r-- | qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv | 7 | ||||
-rw-r--r-- | qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java | 104 |
3 files changed, 0 insertions, 112 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index a6ebf3502b72..42108bb54891 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -627,7 +627,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XSheetFilterable \ qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx \ qadevOOo/tests/java/ifc/sheet/_XSheetFilterDescriptor \ - qadevOOo/tests/java/ifc/sheet/_XSheetLinkable \ qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \ qadevOOo/tests/java/ifc/style/_CharacterProperties \ qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv index 16ddec448d96..89344e1ff08a 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv @@ -172,13 +172,6 @@ "ScTableSheetObj";"com::sun::star::beans::XTolerantMultiPropertySet#optional";"setPropertyValuesTolerant()" "ScTableSheetObj";"com::sun::star::beans::XTolerantMultiPropertySet#optional";"getPropertyValuesTolerant()" "ScTableSheetObj";"com::sun::star::beans::XTolerantMultiPropertySet#optional";"getDirectPropertyValuesTolerant()" -"ScTableSheetObj";"com::sun::star::sheet::XSheetLinkable";"getLinkMode()" -"ScTableSheetObj";"com::sun::star::sheet::XSheetLinkable";"setLinkMode()" -"ScTableSheetObj";"com::sun::star::sheet::XSheetLinkable";"getLinkUrl()" -"ScTableSheetObj";"com::sun::star::sheet::XSheetLinkable";"setLinkUrl()" -"ScTableSheetObj";"com::sun::star::sheet::XSheetLinkable";"getLinkSheetName()" -"ScTableSheetObj";"com::sun::star::sheet::XSheetLinkable";"setLinkSheetName()" -"ScTableSheetObj";"com::sun::star::sheet::XSheetLinkable";"link()" "ScTableSheetObj";"com::sun::star::container::XNamed";"getName()" "ScTableSheetObj";"com::sun::star::container::XNamed";"setName()" "ScTableSheetObj";"com::sun::star::sheet::XCellRangeMovement";"insertCells()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java b/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java deleted file mode 100644 index 8494525b40d5..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java +++ /dev/null @@ -1,104 +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 com.sun.star.sheet.SheetLinkMode; -import com.sun.star.sheet.XSheetLinkable; -import lib.MultiMethodTest; -import util.utils; - -/** - * - */ -public class _XSheetLinkable extends MultiMethodTest { - public XSheetLinkable oObj = null; - SheetLinkMode slm = null; - String linkSheetName = null; - String linkUrl = null; - String linkUrl2 = null; - - @Override - public void before() { - // get a document for linking. - linkUrl = (String)tEnv.getObjRelation("XSheetLinkable.LinkSheet"); - linkUrl = utils.getFullTestURL(linkUrl); - - // get a second sheet for changing the link url: if it's not set, - // this part of the test is omitted. - linkUrl2 = (String)tEnv.getObjRelation("XSheetLinkable.LinkSheet2"); - if (linkUrl2 != null) - linkUrl = utils.getFullTestURL(linkUrl); - - // set a name for the sheet. - linkSheetName = "Sheet1"; - } - - public void _getLinkMode() { - requiredMethod("link()"); - slm = oObj.getLinkMode(); - tRes.tested("getLinkMode()", slm == SheetLinkMode.VALUE); - } - - public void _getLinkSheetName() { - requiredMethod("link()"); - String lSheetName = oObj.getLinkSheetName(); - tRes.tested("getLinkSheetName()", linkSheetName.equals(lSheetName)); - } - - public void _getLinkUrl() { - requiredMethod("link()"); - String lUrl = oObj.getLinkUrl(); - System.out.println("URL: " + lUrl); - tRes.tested("getLinkUrl()", lUrl.equals(linkUrl)); - } - - public void _link() { - oObj.link(linkUrl, linkSheetName, "", "", SheetLinkMode.VALUE); - tRes.tested("link()", true); - } - - public void _setLinkMode() { - requiredMethod("getLinkMode()"); - oObj.setLinkMode(SheetLinkMode.NONE); - slm = oObj.getLinkMode(); - tRes.tested("setLinkMode()", slm == SheetLinkMode.NONE); - } - - public void _setLinkSheetName() { - requiredMethod("getLinkSheetName()"); - oObj.setLinkSheetName("Sheet2"); - linkSheetName = oObj.getLinkSheetName(); - tRes.tested("setLinkSheetName()", linkSheetName.equals("Sheet2")); - } - - public void _setLinkUrl() { - requiredMethod("getLinkUrl()"); - boolean result = false; - if (linkUrl2 == null) { - // set back to the original value - oObj.setLinkUrl(linkUrl); - result = true; - } - else { - oObj.setLinkUrl(linkUrl2); - linkUrl = oObj.getLinkUrl(); - result = linkUrl.equals(linkUrl2); - } - tRes.tested("setLinkUrl()", result); - } -} |