summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorJens Carl <j.carl43@gmx.de>2017-11-23 01:50:39 +0000
committerJens Carl <j.carl43@gmx.de>2017-11-23 08:41:48 +0100
commit39c5ade7bbb444eb204015955276748a5b381ad9 (patch)
treeda623126068a4db9e2309685cf4f7ca68ee95c13 /qadevOOo
parent0e2f224d07a0e7f542984d9e9f48c9cda86a80f6 (diff)
tdf#45904 Move _XSheetAuditing Java tests to C++
Change-Id: I057447494ff488546d43d2d3068a65d5c0d402e0 Reviewed-on: https://gerrit.libreoffice.org/45120 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/Jar_OOoRunner.mk1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv7
-rw-r--r--qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java195
3 files changed, 0 insertions, 203 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 9faab8d10327..f8d6b4a5ecd8 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -611,7 +611,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_XScenario \
qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced \
qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor \
- qadevOOo/tests/java/ifc/sheet/_XSheetAuditing \
qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
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 9c5a9b9fe29f..6f434c9b484c 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -142,13 +142,6 @@
"ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryColumnDifferences()"
"ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryRowDifferences()"
"ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryIntersection()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"hideDependents()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"hidePrecedents()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"showDependents()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"showPrecedents()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"showErrors()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"showInvalid()"
-"ScTableSheetObj";"com::sun::star::sheet::XSheetAuditing";"clearArrows()"
"ScTableSheetObj";"com::sun::star::sheet::XScenario";"getIsScenario()"
"ScTableSheetObj";"com::sun::star::sheet::XScenario";"getScenarioComment()"
"ScTableSheetObj";"com::sun::star::sheet::XScenario";"setScenarioComment()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java
deleted file mode 100644
index 49665104abd2..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java
+++ /dev/null
@@ -1,195 +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.beans.XPropertySet;
-import com.sun.star.drawing.XDrawPage;
-import com.sun.star.drawing.XDrawPageSupplier;
-import com.sun.star.drawing.XShape;
-import com.sun.star.sheet.ValidationType;
-import com.sun.star.sheet.XSheetAuditing;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.table.CellAddress;
-import com.sun.star.table.XCell;
-import com.sun.star.text.XText;
-import com.sun.star.uno.UnoRuntime;
-import lib.MultiMethodTest;
-import lib.Status;
-import lib.StatusException;
-
-/**
- *
- */
-public class _XSheetAuditing extends MultiMethodTest {
- public XSheetAuditing oObj = null;
- CellAddress address = null;
- CellAddress precedentAddress = null;
- CellAddress dependentAddress = null;
- XCell xAddress = null;
- XCell xPrecedentAddress = null;
- XDrawPage xDrawPage = null;
- int elementCount = 0;
-
- @Override
- public void before() {
- address = (CellAddress)tEnv.getObjRelation("XSheetAuditing.CellAddress");
- precedentAddress = (CellAddress)tEnv.getObjRelation("XSheetAuditing.PrecedentCellAddress");
- dependentAddress= (CellAddress)tEnv.getObjRelation("XSheetAuditing.DependentCellAddress");
- if (address == null || precedentAddress == null || dependentAddress == null) {
- throw new StatusException(Status.failed("Necessary CellAddress object relations not found."));
- }
-
- // get the draw page for checking the shapes
- xDrawPage = (XDrawPage)tEnv.getObjRelation("XSheetAuditing.DrawPage");
- if (xDrawPage == null) { // get from object
- XDrawPageSupplier oDPS = UnoRuntime.queryInterface(XDrawPageSupplier.class, oObj);
- xDrawPage = oDPS.getDrawPage();
- }
- if (xDrawPage == null) {
- throw new StatusException(Status.failed("'XSheetAuditing.DrawPage' object relation not found."));
- }
- if (xDrawPage.hasElements()) {
- elementCount = xDrawPage.getCount();
- }
-
- // get a sheet for changing the cells
- XSpreadsheet xSheet = (XSpreadsheet)tEnv.getObjRelation("XSheetAuditing.Spreadsheet");
- if (xSheet == null) // query on their object
- xSheet = UnoRuntime.queryInterface(XSpreadsheet.class, oObj);
- if (xSheet == null)
- throw new StatusException(Status.failed("'XSheetAuditing.Spreadsheet' object relation not found."));
- try {
- xAddress = xSheet.getCellByPosition(address.Column, address.Row);
- xSheet.getCellByPosition(dependentAddress.Column, dependentAddress.Row);
- xPrecedentAddress = xSheet.getCellByPosition(precedentAddress.Column, precedentAddress.Row);
- }
- catch(com.sun.star.lang.IndexOutOfBoundsException e) {
- throw new StatusException(e, Status.failed("Invalid cell addresses in object relations."));
- }
- }
-
- public void _clearArrows() {
- requiredMethod("hideDependents()");
- boolean erg = false;
- oObj.showDependents(address);
- oObj.showPrecedents(address);
- erg = hasRightAmountOfShapes(3);
- oObj.clearArrows();
- erg &= hasRightAmountOfShapes(0);
- tRes.tested("clearArrows()", erg);
- }
-
- public void _hideDependents() {
- requiredMethod("showDependents()");
- oObj.hideDependents(address);
- tRes.tested("hideDependents()", hasRightAmountOfShapes(0));
- }
-
- public void _hidePrecedents() {
- requiredMethod("showPrecedents()");
- oObj.hidePrecedents(address);
- tRes.tested("hidePrecedents()", hasRightAmountOfShapes(0));
- }
-
- public void _showDependents() {
- requiredMethod("hidePrecedents()");
- oObj.showDependents(address);
- tRes.tested("showDependents()", hasRightAmountOfShapes(1));
- }
-
- public void _showErrors() {
- requiredMethod("clearArrows()");
- // construct an error: square root from -3
- xPrecedentAddress.setValue(-9);
- String cellAddress = "" + (char)('A' + precedentAddress.Column) + (precedentAddress.Row + 1);
- xAddress.setFormula("=SQRT(" + cellAddress + ")");
- XText xText = UnoRuntime.queryInterface(XText.class, xAddress);
- // correct error in cell:
- String error = xText.getString();
- boolean erg = error.equals("Err:502");
- log.println("Content: " + error);
- oObj.showErrors(dependentAddress);
- erg &= hasRightAmountOfShapes(2);
- tRes.tested("showErrors()", erg);
- }
-
- public void _showInvalid() {
- requiredMethod("showErrors()");
- boolean result = true;
- // insert a value
- xAddress.setValue(2.5);
- try {
- // add a validitation to a cell: only whole numbers are allowed
- XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xAddress);
- Object o = xPropertySet.getPropertyValue("Validation");
- XPropertySet xValidation = UnoRuntime.queryInterface(XPropertySet.class, o);
- xValidation.setPropertyValue("Type", ValidationType.WHOLE);
- xPropertySet.setPropertyValue("Validation", xValidation);
- // test
- oObj.showInvalid();
- result = hasRightAmountOfShapes(1);
- oObj.clearArrows();
- result &= hasRightAmountOfShapes(0);
- // revoke the validitation to a cell
- xValidation.setPropertyValue("Type", ValidationType.ANY);
- xPropertySet.setPropertyValue("Validation", xValidation);
- // test again
- oObj.showInvalid();
- result &= hasRightAmountOfShapes(0);
- }
- catch(com.sun.star.uno.Exception e) {
- e.printStackTrace(log);
- result = false;
- }
-
- tRes.tested("showInvalid()", result);
- }
-
- public void _showPrecedents() {
- oObj.showPrecedents(address);
- tRes.tested("showPrecedents()", hasRightAmountOfShapes(2));
- }
-
- /**
- * Check if the amount of shapes is the right one after displaying that stuff
- * 2do improve this: check that the shapes are the correct ones -> convwatch
- * @desiredValue That's the amount of shapes that have to be here.
- * @return True, if the actual count of shapes is the same
- */
- private boolean hasRightAmountOfShapes(int desiredValue) {
- int newCount = xDrawPage.getCount();
- if (newCount != elementCount + desiredValue) {
- return false;
- }
- else {
- if (desiredValue >= 0) {
- for (int i=elementCount; i<newCount; i++) {
- try {
- Object o = xDrawPage.getByIndex(i);
- XShape xShape = UnoRuntime.queryInterface(XShape.class, o);
- System.out.println("Shape Type: " + xShape.getShapeType());
- }
- catch(com.sun.star.uno.Exception e) {
- e.printStackTrace();
- }
- }
- }
- }
- return true;
- }
-}