diff options
Diffstat (limited to 'qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java')
| -rw-r--r-- | qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java index f6355fe0de86..d50e80008079 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -190,7 +190,7 @@ public class ScTableSheetObj extends TestCase { * </ul> * @see com.sun.star.sheet.XArrayFormulaRange */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -206,7 +206,7 @@ public class ScTableSheetObj extends TestCase { try { oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oIndexAccess.getByIndex(0)); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); @@ -241,38 +241,38 @@ public class ScTableSheetObj extends TestCase { log.println("creating a new environment for object"); TestEnvironment tEnv = new TestEnvironment(oObj); - + // do not execute com::sun::star::sheets::XCellSeries::fillAuto() tEnv.addObjRelation("XCELLSERIES_FILLAUTO", new Boolean(false)); // set the adress ranges of the cells (see values set above): for e.g. XSheetOutline test - tEnv.addObjRelation("CellRangeAddress", + tEnv.addObjRelation("CellRangeAddress", new CellRangeAddress((short)0, 6, 6, 8, 8)); - tEnv.addObjRelation("CellRangeSubAddress", + tEnv.addObjRelation("CellRangeSubAddress", new CellRangeAddress((short)0, 6, 6, 7, 8)); // pick a cell with a formula for XSheetAuditing, a dependent cell and a precedent cell tEnv.addObjRelation("XSheetAuditing.CellAddress", new CellAddress((short)0, 8, 6)); tEnv.addObjRelation("XSheetAuditing.PrecedentCellAddress", new CellAddress((short)0, 7, 6)); tEnv.addObjRelation("XSheetAuditing.DependentCellAddress", new CellAddress((short)0, 9, 6)); - + // add an existing sheet for linking tEnv.addObjRelation("XSheetLinkable.LinkSheet", "ScSheetLinksObj.sdc"); - + //adding Scenario and with that a ScenarioSheet-Relation for Scenario and XScenarioEnhanced XScenariosSupplier scene = (XScenariosSupplier) UnoRuntime.queryInterface( - XScenariosSupplier.class, + XScenariosSupplier.class, tEnv.getTestObject()); scene.getScenarios() - .addNewByName("Scenario", + .addNewByName("Scenario", new CellRangeAddress[] { new CellRangeAddress((short) 0, 0, 0, 10, 10) }, "Comment"); XSpreadsheet sSheet = null; - + try { sSheet = (XSpreadsheet) UnoRuntime.queryInterface( - XSpreadsheet.class, + XSpreadsheet.class, xSpreadsheets.getByName("Scenario")); } catch (com.sun.star.container.NoSuchElementException e) { log.println("Couldn't get Scenario"); @@ -282,7 +282,7 @@ public class ScTableSheetObj extends TestCase { tEnv.addObjRelation("ScenarioSheet", sSheet); - log.println("adding ObjRelation 'noArray' to avoid the test" + + log.println("adding ObjRelation 'noArray' to avoid the test" + " 'XArrayFormulaRange'"); tEnv.addObjRelation("noArray", "ScTableSheetObj"); @@ -300,17 +300,17 @@ public class ScTableSheetObj extends TestCase { expectedResults[_XCellRangesQuery.QUERYINTERSECTION] = "Sheet1.D4"; expectedResults[_XCellRangesQuery.QUERYROWDIFFERENCES] = "Sheet1.A5;Sheet1.C1"; expectedResults[_XCellRangesQuery.QUERYVISIBLECELLS] = "Sheet1.A2"; - tEnv.addObjRelation("XCellRangesQuery.EXPECTEDRESULTS", + tEnv.addObjRelation("XCellRangesQuery.EXPECTEDRESULTS", expectedResults); // for XFormulaQuery interface test try { - tEnv.addObjRelation("MAKEENTRYINCELL", + tEnv.addObjRelation("MAKEENTRYINCELL", oSheet.getCellByPosition(15, 15)); tEnv.addObjRelation("RANGEINDICES", new int[] { 0, 0 }); - tEnv.addObjRelation("EXPECTEDDEPENDENTVALUES", + tEnv.addObjRelation("EXPECTEDDEPENDENTVALUES", new int[] { 0, 255, 0, 65535 }); - tEnv.addObjRelation("EXPECTEDPRECEDENTVALUES", + tEnv.addObjRelation("EXPECTEDPRECEDENTVALUES", new int[] { 0, 255, 0, 65535 }); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { log.println( @@ -319,9 +319,9 @@ public class ScTableSheetObj extends TestCase { // XSearchable interface test try { - tEnv.addObjRelation("XSearchable.MAKEENTRYINCELL", + tEnv.addObjRelation("XSearchable.MAKEENTRYINCELL", new XCell[] { - oSheet.getCellByPosition(15, 15), + oSheet.getCellByPosition(15, 15), oSheet.getCellByPosition(15, 16) }); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { @@ -333,7 +333,7 @@ public class ScTableSheetObj extends TestCase { //Adding relation for util.XSortable final PrintWriter finalLog = log; final XCellRange oTable = oSheet; - tEnv.addObjRelation("SORTCHECKER", + tEnv.addObjRelation("SORTCHECKER", new ifc.util._XSortable.XSortChecker() { PrintWriter out = finalLog; @@ -352,7 +352,7 @@ public class ScTableSheetObj extends TestCase { } } - public boolean checkSort(boolean isSortNumbering, + public boolean checkSort(boolean isSortNumbering, boolean isSortAscending) { out.println("Sort checking..."); @@ -376,16 +376,16 @@ public class ScTableSheetObj extends TestCase { String[] vals = { value[0], value[1], value[2], value[3] }; res = ValueComparer.equalValue(vals, rightVal); out.println("Expected 3, 4, 23, b"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } else { String[] rightVal = { "b", "23", "4", "3" }; String[] vals = { value[0], value[1], value[2], value[3] }; res = ValueComparer.equalValue(vals, rightVal); out.println("Expected b, 23, 4, 3"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } } else { @@ -393,15 +393,15 @@ public class ScTableSheetObj extends TestCase { String[] rightVal = { "3", "4", "23", "b" }; res = ValueComparer.equalValue(value, rightVal); out.println("Expected 3, 4, 23, b"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } else { String[] rightVal = { "b", "23", "4", "3" }; res = ValueComparer.equalValue(value, rightVal); out.println("Expected b, 23, 4, 3"); - out.println("getting: " + value[0] + ", " + - value[1] + ", " + value[2] + ", " + + out.println("getting: " + value[0] + ", " + + value[1] + ", " + value[2] + ", " + value[3]); } } |