From 0c5f51ebbcb7e22baa913e2012e3dcfcc6cf7897 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 5 Aug 2014 09:54:58 +0200 Subject: java: remove commented out code Change-Id: I44e2043e5da23bc9421c03e550ef1d8b7ebaad36 --- sc/qa/complex/calcPreview/ViewForwarder.java | 49 ---------------------- .../complex/cellRanges/CheckXCellRangesQuery.java | 20 --------- sc/qa/complex/dataPilot/CheckDataPilot.java | 5 --- sc/qa/complex/dataPilot/_XDataPilotDescriptor.java | 16 ------- sc/qa/complex/dataPilot/_XDataPilotTable.java | 9 ---- sc/qa/complex/dataPilot/_XNamed.java | 9 ---- sc/qa/complex/dataPilot/_XPropertySet.java | 10 ----- sc/qa/complex/sc/CalcRTL.java | 13 ------ 8 files changed, 131 deletions(-) (limited to 'sc/qa/complex') diff --git a/sc/qa/complex/calcPreview/ViewForwarder.java b/sc/qa/complex/calcPreview/ViewForwarder.java index 8ea5a9899cd9..1824dc5138f1 100644 --- a/sc/qa/complex/calcPreview/ViewForwarder.java +++ b/sc/qa/complex/calcPreview/ViewForwarder.java @@ -18,21 +18,16 @@ package complex.calcPreview; -// import complexlib.ComplexTestCase; - import com.sun.star.awt.XWindow; import com.sun.star.container.XIndexAccess; import com.sun.star.frame.XController; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XDispatchProvider; import com.sun.star.frame.XModel; -// import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.sheet.XSpreadsheet; -// import com.sun.star.sheet.XSpreadsheetDocument; import com.sun.star.sheet.XSpreadsheets; import com.sun.star.table.XCell; -// import com.sun.star.uno.Any; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; @@ -50,7 +45,6 @@ import util.SOfficeFactory; import util.utils; import com.sun.star.beans.XPropertySet; -// import com.sun.star.beans.XPropertySetInfo; import com.sun.star.container.XNameAccess; import com.sun.star.lang.XComponent; import com.sun.star.sheet.XHeaderFooterContent; @@ -58,18 +52,7 @@ import com.sun.star.sheet.XSpreadsheetDocument; import com.sun.star.style.XStyle; import com.sun.star.style.XStyleFamiliesSupplier; import com.sun.star.text.XText; -// import com.sun.star.drawing.XDrawPageSupplier; -// import com.sun.star.drawing.XDrawPage; -// import com.sun.star.drawing.XShape; -// import com.sun.star.drawing.XShapes; - - -// import com.sun.star.beans.Property; -// import com.sun.star.lang.XServiceInfo; - - -// import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -86,28 +69,12 @@ public class ViewForwarder { /** The MultiServiceFactory **/ private XMultiServiceFactory mXMSF = null; - /** Get all test methods. - * @return The test methods. - */ -// public String[] getTestMethodNames() { -// return new String[]{"checkPositiveViewForwarder", -// "checkNegativeViewForwarder", -// "checkPreviewHeaderCells", -// "checkPreviewShape" -// }; -// } - /** * Get a MultiServiceFactory from the Office before the test. */ @Before public void before() { mXMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); - // SOfficeFactory SOF = SOfficeFactory.getFactory(mXMSF); - - // param = new TestParameters(); - // param.put("ServiceFactory", xMsf); - // mXMSF = (XMultiServiceFactory)param.getMSF(); } @@ -901,8 +868,6 @@ public class ViewForwarder { XWindow xWindow = AccessibilityTools.getCurrentWindow(mXMSF, xModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); -// System.out.println("ImplementationName " + utils.getImplName(oObj)); - System.out.println("Press any key when the header cell is on top."); try{ byte[]b = new byte[16]; @@ -917,9 +882,6 @@ public class ViewForwarder { try { System.out.println("Count: " +AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.TABLE, "").getAccessibleChildCount()); -// parent = at.getAccessibleObjectForRole -// (xRoot, AccessibleRole.TABLE, "").getAccessibleChild(0); -// oObj = parent.getAccessibleContext().getAccessibleChild(1); System.out.println("Getting child 2"); oObj = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.TABLE, "").getAccessibleChild(2); @@ -935,16 +897,6 @@ public class ViewForwarder { System.out.println("*****************"); -/* XAccessibleContext accCtx = (XAccessibleContext) - UnoRuntime.queryInterface(XAccessibleContext.class, oObj); - try { - System.out.println("Children now: " + accCtx.getAccessibleChild(0).getAccessibleContext().getAccessibleChildCount()); - } catch (com.sun.star.lang.IndexOutOfBoundsException iabe) { - fail(iabe.getMessage()); - return; - } -*/ - XAccessibleValue accV = UnoRuntime.queryInterface(XAccessibleValue.class, oObj); Object o = accV.getCurrentValue(); @@ -982,7 +934,6 @@ public class ViewForwarder { try { String docName = "calcshapes.sxc"; System.out.println("Loading a spreadsheetdocument."); - // String url = utils.getFullURL((String)param.get("TestDocumentPath") + "/" + docName); String url = TestDocument.getUrl(docName); System.out.println("loading document '" + url + "'"); xComp = SOF.loadDocument(url); diff --git a/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java b/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java index 5039c2d7e4ba..77dad34a522f 100644 --- a/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java +++ b/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java @@ -19,23 +19,17 @@ package complex.cellRanges; import com.sun.star.container.XIndexAccess; -// import complexlib.ComplexTestCase; import com.sun.star.lang.XMultiServiceFactory; -// import com.sun.star.sheet.CellFlags; import com.sun.star.sheet.XCellRangesQuery; import com.sun.star.sheet.XSheetCellRanges; import com.sun.star.sheet.XSpreadsheet; import com.sun.star.sheet.XSpreadsheetDocument; import com.sun.star.sheet.XSpreadsheets; import com.sun.star.table.CellAddress; -// import com.sun.star.table.XColumnRowRange; -// import com.sun.star.table.XTableColumns; -// import com.sun.star.table.XTableRows; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.Type; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; -// import java.io.PrintWriter; import com.sun.star.util.XCloseable; import util.SOfficeFactory; @@ -59,21 +53,12 @@ public class CheckXCellRangesQuery /* extends ComplexTestCase */ { XSpreadsheet m_xSpreadSheet = null; String sSheetName = ""; - /** - * Get all test methods. - * @return The test methods. - */ -// public String[] getTestMethodNames() { -// return new String[] {"checkEmptyCell", "checkFilledCell"}; -// } - /** * Creates Spreadsheet document and the test object, * before the actual test starts. */ @Before public void before() { // create a calc document - // SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)param.getMSF() ); final XMultiServiceFactory xMsf = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); SOfficeFactory SOF = SOfficeFactory.getFactory(xMsf); @@ -120,9 +105,6 @@ public class CheckXCellRangesQuery /* extends ComplexTestCase */ { m_xSpreadSheet.getCellByPosition(1, 1).setValue(15); m_xSpreadSheet.getCellByPosition(1, 3).setValue(5); m_xSpreadSheet.getCellByPosition(2, 1).setFormula("=B2+B4"); -/* m_xSpreadSheet.getCellByPosition(2, 1).setFormula("=B2+B3"); - m_xSpreadSheet.getCellByPosition(3, 2).setFormula(""); - m_xSpreadSheet.getCellByPosition(3, 3).setFormula(""); */ } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace(); fail("Could not fill cell (1, 1) with a value."); @@ -177,8 +159,6 @@ public class CheckXCellRangesQuery /* extends ComplexTestCase */ { assertTrue("\tQuery column differences did not return the correct value.", _queryColumnDifferences(sSheetName+".C4")); // compare an empty cell with a cell with a value assertTrue("\tQuery column differences did not return the correct value.", _queryRowDifferences(sSheetName+".C4")); - // try to get this cell -// assertTrue("\tQuery empty cells did not return the correct value.", _queryEmptyCells("Sheet1.C4")); System.out.println("...done"); } diff --git a/sc/qa/complex/dataPilot/CheckDataPilot.java b/sc/qa/complex/dataPilot/CheckDataPilot.java index 56e0a0e5a795..ee499c30c495 100644 --- a/sc/qa/complex/dataPilot/CheckDataPilot.java +++ b/sc/qa/complex/dataPilot/CheckDataPilot.java @@ -22,12 +22,10 @@ import com.sun.star.beans.XPropertySet; import com.sun.star.container.XIndexAccess; import com.sun.star.container.XNamed; import com.sun.star.lang.XMultiServiceFactory; -// import com.sun.star.sheet.TableFilterField; import com.sun.star.sheet.XDataPilotDescriptor; import com.sun.star.sheet.XDataPilotTable; import com.sun.star.sheet.XDataPilotTables; import com.sun.star.sheet.XDataPilotTablesSupplier; -// import com.sun.star.sheet.XSheetFilterDescriptor; import com.sun.star.sheet.XSpreadsheet; import com.sun.star.sheet.XSpreadsheetDocument; import com.sun.star.sheet.XSpreadsheets; @@ -42,7 +40,6 @@ import complex.dataPilot._XPropertySet; import complex.dataPilot._XNamed; import complex.dataPilot._XDataPilotDescriptor; import complex.dataPilot._XDataPilotTable; -// import complexlib.ComplexTestCase; import lib.StatusException; import lib.TestParameters; import util.SOfficeFactory; @@ -163,9 +160,7 @@ public class CheckDataPilot { * create an environment for the test */ @Before public void before() { -// Object oInterface = null; - // SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)param.getMSF() ); final XMultiServiceFactory xMsf = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); SOfficeFactory SOF = SOfficeFactory.getFactory(xMsf); diff --git a/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java b/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java index f530b402b5e5..ddafe839c4a0 100644 --- a/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java +++ b/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java @@ -25,11 +25,7 @@ import com.sun.star.sheet.DataPilotFieldOrientation; import com.sun.star.sheet.XDataPilotDescriptor; import com.sun.star.table.CellRangeAddress; import com.sun.star.uno.UnoRuntime; -// import lib.MultiMethodTest; -// import lib.Status; -//import lib.StatusException; import lib.TestParameters; -// import share.LogWriter; /** * Testing com.sun.star.sheet.XDataPilotDescriptor @@ -69,11 +65,6 @@ public class _XDataPilotDescriptor { */ private TestParameters param = null; - /** - * The log writer - */ -// private LogWriter log = null; - /** * Constructor: gets the object to test, a logger and the test parameters * @param xObj The test object @@ -82,7 +73,6 @@ public class _XDataPilotDescriptor { public _XDataPilotDescriptor(XDataPilotDescriptor xObj/*, LogWriter log*/, TestParameters param) { oObj = xObj; - // this.log = log; this.param = param; } @@ -163,7 +153,6 @@ public class _XDataPilotDescriptor { * @return */ public boolean _getTag(){ -// requiredMethod("setTag()"); boolean bResult = true; String objTag = oObj.getTag(); @@ -302,7 +291,6 @@ public class _XDataPilotDescriptor { * @return */ public boolean _getColumnFields(){ -// requiredMethod("getDataPilotFields()"); System.out.println("getColumnFields") ; XIndexAccess IA = oObj.getColumnFields(); return CheckNames(IA, 0); @@ -320,7 +308,6 @@ public class _XDataPilotDescriptor { * @return */ public boolean _getDataFields(){ -// requiredMethod("getDataPilotFields()"); System.out.println("getDataFields") ; XIndexAccess IA = oObj.getDataFields(); return CheckNames(IA, 2); @@ -338,7 +325,6 @@ public class _XDataPilotDescriptor { * @return */ public boolean _getHiddenFields(){ -// requiredMethod("getDataPilotFields()"); System.out.println("getHiddenFields") ; XIndexAccess IA = oObj.getHiddenFields(); return CheckNames(IA, 3); @@ -356,7 +342,6 @@ public class _XDataPilotDescriptor { * @return */ public boolean _getRowFields(){ -// requiredMethod("getDataPilotFields()"); System.out.println("getRowFields") ; XIndexAccess IA = oObj.getRowFields(); boolean bResult = CheckNames(IA, 1); @@ -374,7 +359,6 @@ public class _XDataPilotDescriptor { * @return */ public boolean _getPageFields(){ -// requiredMethod("getDataPilotFields()"); System.out.println("getPageFields") ; XIndexAccess IA = oObj.getPageFields(); boolean bResult = CheckNames(IA, 4); diff --git a/sc/qa/complex/dataPilot/_XDataPilotTable.java b/sc/qa/complex/dataPilot/_XDataPilotTable.java index c653bc736388..4e462d0bff99 100644 --- a/sc/qa/complex/dataPilot/_XDataPilotTable.java +++ b/sc/qa/complex/dataPilot/_XDataPilotTable.java @@ -22,10 +22,7 @@ import com.sun.star.sheet.XDataPilotTable; import com.sun.star.table.CellAddress; import com.sun.star.table.CellRangeAddress; import com.sun.star.table.XCell; -// import lib.Status; -//import lib.StatusException; import lib.TestParameters; -// import share.LogWriter; /** * Testing com.sun.star.sheet.XDataPilotTable @@ -59,11 +56,6 @@ public class _XDataPilotTable { */ private TestParameters param = null; - /** - * The log writer - */ - // private LogWriter log = null; - /** * Constructor: gets the object to test, a logger and the test parameters * @param xObj The test object @@ -73,7 +65,6 @@ public class _XDataPilotTable { public _XDataPilotTable(XDataPilotTable xObj/*, LogWriter log*/, TestParameters param) { oObj = xObj; - // this.log = log; this.param = param; } diff --git a/sc/qa/complex/dataPilot/_XNamed.java b/sc/qa/complex/dataPilot/_XNamed.java index 6ab9b9128aba..1fbfaca5ba8e 100644 --- a/sc/qa/complex/dataPilot/_XNamed.java +++ b/sc/qa/complex/dataPilot/_XNamed.java @@ -20,8 +20,6 @@ package complex.dataPilot; import com.sun.star.container.XNamed; import lib.TestParameters; -// import share.LogWriter; -// import util.utils; /** * Testing com.sun.star.container.XNamed @@ -47,11 +45,6 @@ public class _XNamed { */ public XNamed oObj = null; - /** - * The log writer - */ - // private LogWriter log = null; - /** * Constructor: gets the object to test, a logger and the test parameters * @param xObj The test object @@ -60,7 +53,6 @@ public class _XNamed { */ public _XNamed(XNamed xObj/*, LogWriter log*/, TestParameters param) { oObj = xObj; - // this.log = log; } /** @@ -110,7 +102,6 @@ public class _XNamed { * */ public boolean _setName(){ -// requiredMethod("getName()"); System.out.println("testing setName() ... "); String oldName = oObj.getName(); diff --git a/sc/qa/complex/dataPilot/_XPropertySet.java b/sc/qa/complex/dataPilot/_XPropertySet.java index e2f57896e277..d163dbef37fb 100644 --- a/sc/qa/complex/dataPilot/_XPropertySet.java +++ b/sc/qa/complex/dataPilot/_XPropertySet.java @@ -29,8 +29,6 @@ import com.sun.star.lang.EventObject; import java.util.Random; import java.util.StringTokenizer; import lib.TestParameters; -// import share.LogWriter; -//import lib.MultiMethodTest; import util.ValueChanger; import util.utils; @@ -60,11 +58,6 @@ public class _XPropertySet { */ private TestParameters param = null; - /** - * The log writer - */ - // private LogWriter log = null; - /** * Flag that indicates change listener was called. */ @@ -523,9 +516,6 @@ public class _XPropertySet { if (name.startsWith("LayerName")) isWritable = false; if (name.startsWith("Line")) isWritable = false; - //if (name.equals("xinterfaceA") || name.equals("xtypeproviderA") - //|| name.equals("arAnyA")) isWritable=false; - if ( isWritable && isNotNull ) canChange = isChangeable(name); if ( isWritable && isNotNull && isBound && canChange) { diff --git a/sc/qa/complex/sc/CalcRTL.java b/sc/qa/complex/sc/CalcRTL.java index ee5f3039b5cb..ea391bd2e991 100644 --- a/sc/qa/complex/sc/CalcRTL.java +++ b/sc/qa/complex/sc/CalcRTL.java @@ -35,24 +35,17 @@ import com.sun.star.sheet.XCellRangeAddressable; import com.sun.star.sheet.XSpreadsheet; import com.sun.star.sheet.XSpreadsheetDocument; import com.sun.star.sheet.XSpreadsheets; -// import com.sun.star.table.XCell; import com.sun.star.uno.Any; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.Type; import com.sun.star.uno.UnoRuntime; import com.sun.star.util.XCloseable; -// import complexlib.ComplexTestCase; - -// import java.io.PrintWriter; - import util.DrawTools; import util.SOfficeFactory; import util.ValueComparer; -// import org.junit.After; import org.junit.AfterClass; -// import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.openoffice.test.OfficeConnection; @@ -74,12 +67,6 @@ public class CalcRTL /* extends ComplexTestCase */ *
* 3. A calc document is opened and a shape inserted, afterwards the effect of changing the TableLayout to the shape is checked */ -// public String[] getTestMethodNames() { -// return new String[] { -// "checkSpreadsheetProperties", "checkShapeProperties", -// "checkInfluenceOfSpreadsheetChange" -// }; -// } /* * In this method a spreadsheet document is opened
-- cgit