diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-06-08 11:28:20 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-06-08 11:28:20 +0200 |
commit | c1f9292b96edcb184a57147a4e47a7e10aacf1e8 (patch) | |
tree | 81d7c320f9d9530ba017dff318b5a8ef15a96af8 /qadevOOo | |
parent | c1a276e8e7e88f29f50ca0557fe1c0d9aa0f276a (diff) |
Fix build after f1454b474d9248d7ef2cb84f396a974184e5167e
..."tdf#45904 Move java XCellSeries test to c++".
For one, the XCellSeries tests needed to be removed from
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv, now that those
tests are done in C++. (Plus some clean-up in
qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java and
sc/qa/unoapi/knownissues.xcl that was missing from
f1454b474d9248d7ef2cb84f396a974184e5167e.)
But for another, qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
and qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv still list
XCellSeries tests (which apparently have not been superseded with C++ tests),
so partially revert f1454b474d9248d7ef2cb84f396a974184e5167e to get back
qadevOOo/tests/java/ifc/sheet/_XCellSeries.java needed by those tests.
Change-Id: I09f756fb804dafee3064947abcfb796db4797b32
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 | 2 | ||||
-rw-r--r-- | qadevOOo/tests/java/ifc/sheet/_XCellSeries.java | 237 | ||||
-rw-r--r-- | qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java | 3 |
4 files changed, 238 insertions, 5 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index da5822fcd1bd..869d17a9a1d5 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -600,6 +600,7 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement \ qadevOOo/tests/java/ifc/sheet/_XCellRangeReferrer \ qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery \ + qadevOOo/tests/java/ifc/sheet/_XCellSeries \ qadevOOo/tests/java/ifc/sheet/_XConsolidatable \ qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor \ qadevOOo/tests/java/ifc/sheet/_XDatabaseRange \ 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 7a443be1eb98..1504f50f7f9e 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv @@ -278,8 +278,6 @@ "ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"setRowDescriptions()" "ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"getColumnDescriptions()" "ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"setColumnDescriptions()" -"ScTableSheetObj";"com::sun::star::sheet::XCellSeries";"fillSeries()" -"ScTableSheetObj";"com::sun::star::sheet::XCellSeries";"fillAuto()" "ScTableSheetObj";"com::sun::star::sheet::XDataPilotTablesSupplier";"getDataPilotTables()" "ScTableSheetObj";"com::sun::star::sheet::XCellFormatRangesSupplier";"getCellFormatRanges()" "ScTableSheetObj";"com::sun::star::util::XModifyBroadcaster#optional";"addModifyListener()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java b/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java new file mode 100644 index 000000000000..72e078e9c0cb --- /dev/null +++ b/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java @@ -0,0 +1,237 @@ +/* + * 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 helper.LoggingThread; +import lib.MultiMethodTest; +import lib.Status; +import lib.StatusException; + +import com.sun.star.sheet.XCellSeries; +import com.sun.star.sheet.XSpreadsheet; +import com.sun.star.uno.UnoRuntime; +import share.LogWriter; + + +public class _XCellSeries extends MultiMethodTest { + public XCellSeries oObj = null; + protected XSpreadsheet oSheet = null; + protected boolean isSpreadSheet = false; + protected boolean fillAuto = true; + protected boolean forceFillAuto = false; + + + @Override + protected void before() { + oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET"); + + if (oSheet == null) { + log.println("Object relation oSheet is missing"); + log.println("Trying to query the needed Interface"); + oSheet = UnoRuntime.queryInterface( + XSpreadsheet.class, tEnv.getTestObject()); + + if (oSheet == null) { + throw new StatusException(Status.failed( + "Object relation oSheet is missing")); + } else { + isSpreadSheet = true; + } + } + + Boolean myFillAuto = (Boolean) tEnv.getObjRelation("XCELLSERIES_FILLAUTO"); + + if (myFillAuto != null) fillAuto = myFillAuto.booleanValue(); + + if (tParam.containsKey("force_fillauto")){ + fillAuto = tParam.getBool("force_fillauto"); + forceFillAuto = tParam.getBool("force_fillauto"); + } + } + + public void _fillAuto() { + + if ((isSpreadSheet && !forceFillAuto) || !fillAuto) { + log.println("This method consumes to much time for a complete SpreadSheet"); + log.println("Please use parameter '-force_fillauto true' to force this test"); + tRes.tested("fillAuto()",Status.skipped(true)); + return; + } + + boolean res = true; + + try { + oSheet.getCellByPosition(0, 0).setValue(2); + + log.println( + "calling oObj.fillAuto(com.sun.star.sheet.FillDirection.TO_RIGHT, 1)"); + oObj.fillAuto(com.sun.star.sheet.FillDirection.TO_RIGHT, 1); + oSheet.getCellByPosition(0, 4).setFormula("=sum(A1:D1)"); + + double getting = oSheet.getCellByPosition(0, 4).getValue(); + boolean locres = (getting == 14); + + if (!locres) { + log.println("Operation failed"); + } else { + log.println("Successful"); + } + + res &= locres; + + log.println( + "calling oObj.fillAuto(com.sun.star.sheet.FillDirection.TO_BOTTOM, 1)"); + oObj.fillAuto(com.sun.star.sheet.FillDirection.TO_BOTTOM, 1); + oSheet.getCellByPosition(4, 0).setFormula("=sum(A1:A4)"); + getting = oSheet.getCellByPosition(4, 0).getValue(); + locres = (getting == 14); + + if (!locres) { + log.println("Operation failed"); + } else { + log.println("Successful"); + } + + res &= locres; + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + log.println("Couldn't set initial version to cell"); + res = false; + } + + tRes.tested("fillAuto()", res); + } + + public void _fillSeries() { + + if (isSpreadSheet) { + log.println("This method consumes to much time for a complete SpreadSheet"); + tRes.tested("fillSeries()",Status.skipped(true)); + return; + } + + boolean res = true; + + try { + oSheet.getCellByPosition(0, 0).setValue(2); + + LoggingThread logger = new LoggingThread((LogWriter)log, tParam); + logger.start(); + + log.println( + "calling oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_RIGHT, com.sun.star.sheet.FillMode.LINEAR, com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 8)"); + oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_RIGHT, + com.sun.star.sheet.FillMode.LINEAR, + com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 8); + oSheet.getCellByPosition(0, 4).setFormula("=sum(A1:D1)"); + + double getting = oSheet.getCellByPosition(0, 4).getValue(); + boolean locres = (getting == 20); + + logger.finish(); + + if (!locres) { + log.println("Operation failed"); + } else { + log.println("Successful"); + } + + res &= locres; + + logger = new LoggingThread((LogWriter)log, tParam); + logger.start(); + + log.println( + "calling oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_RIGHT, com.sun.star.sheet.FillMode.GROWTH, com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 16)"); + oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_RIGHT, + com.sun.star.sheet.FillMode.GROWTH, + com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, + 16); + oSheet.getCellByPosition(0, 4).setFormula("=sum(A1:D1)"); + getting = oSheet.getCellByPosition(0, 4).getValue(); + locres = (getting == 30); + + logger.finish(); + + if (!locres) { + log.println("Operation failed"); + } else { + log.println("Successful"); + } + + res &= locres; + + logger = new LoggingThread((LogWriter)log, tParam); + logger.start(); + + log.println( + "calling oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_BOTTOM, com.sun.star.sheet.FillMode.LINEAR, com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 8)"); + oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_BOTTOM, + com.sun.star.sheet.FillMode.LINEAR, + com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 8); + oSheet.getCellByPosition(4, 0).setFormula("=sum(A1:A4)"); + getting = oSheet.getCellByPosition(4, 0).getValue(); + locres = (getting == 20); + + logger.finish(); + + if (!locres) { + log.println("Operation failed"); + } else { + log.println("Successful"); + } + + res &= locres; + + logger = new LoggingThread((LogWriter)log, tParam); + logger.start(); + + log.println( + "calling oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_BOTTOM, com.sun.star.sheet.FillMode.GROWTH, com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, 16)"); + oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_BOTTOM, + com.sun.star.sheet.FillMode.GROWTH, + com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, 2, + 16); + oSheet.getCellByPosition(4, 0).setFormula("=sum(A1:A4)"); + getting = oSheet.getCellByPosition(4, 0).getValue(); + locres = (getting == 30); + + logger.finish(); + + if (!locres) { + log.println("Operation failed"); + } else { + log.println("Successful"); + } + + res &= locres; + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + log.println("Couldn't set initial version to cell"); + res = false; + } + + tRes.tested("fillSeries()", res); + } + + /** + * Forces environment recreation. + */ + @Override + public void after() { + disposeEnvironment(); + } +}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java index 0c9192e51df5..9647437c0fb4 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java @@ -208,9 +208,6 @@ public class ScTableSheetObj extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - // do not execute com::sun::star::sheets::XCellSeries::fillAuto() - tEnv.addObjRelation("XCELLSERIES_FILLAUTO", Boolean.FALSE); - // set the address ranges of the cells (see values set above): for e.g. XSheetOutline test tEnv.addObjRelation("CellRangeAddress", new CellRangeAddress((short)0, 6, 6, 8, 8)); |