diff options
Diffstat (limited to 'qadevOOo/tests/java/mod/_forms')
41 files changed, 520 insertions, 520 deletions
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java index dce88234885f..8ddbbc293a06 100644 --- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java +++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.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 @@ -138,19 +138,19 @@ public class GenericModelTest extends TestCase { private static DBTools.DataSourceInfo m_srcInf = null; /** * This is the name of the Data Base which the test uses: "APITestDatabase" - */ + */ protected final static String m_dbSourceName = "APITestDatabase"; protected final static String m_TestDB = "TestDB"; private DBTools m_dbTools = null; - + private static boolean m_ConnectionColsed = false; - + /** * descibes the kind of the shape which should be created. * Example: m_kindOfshape=DateFiled - */ + */ public static String m_kindOfControl = null; - + /** * If your object needs some special propery values you can specify them with this * <CODE>ArrayList</CODE>. You have to add a <CODE>NamedValue</CODE> to this list. @@ -159,9 +159,9 @@ public class GenericModelTest extends TestCase { * myProp.Name = "Test"; * myProp.Value = "My special Value"; * m_propertiesToSet.add(myProp); - */ + */ public static ArrayList m_propertiesToSet = new ArrayList(); - + /** * This variable contains the name of the property which should be changed while * interface <CODE>com::sun::star::form::XUpdateBroadcaster</CODE> is tested. The @@ -169,7 +169,7 @@ public class GenericModelTest extends TestCase { * "XUpdateBroadcaster.Checker" which is a <CODE>ifc.form._XUpdateBroadcaster.UpdateChecker</CODE>. * @see ifc.form._XUpdateBroadcaster.UpdateChecker * @see ifc.form._XUpdateBroadcaster - */ + */ public static String m_ChangePropertyName = null; /** * This variable contains the value the property should be set while @@ -180,28 +180,28 @@ public class GenericModelTest extends TestCase { * the value of the property. If the current of this property is NULL the * <CODE>ValueChanger</CODE> is unable to change the value. In this case the value * of this variable was used. - */ + */ public static Object m_ChangePropertyValue = null; - + /** * This variable contains the implelemtation name of the object. - */ + */ public static String m_ObjectName = null; - + /** * For local implementaions of <CODE>Checker</CODE> this variable contains the * <CODE>FormLoader</CODE> - */ + */ protected static XLoadable m_XFormLoader = null; /** * For local implementaions of <CODE>Checker</CODE> this variable contains the * <CODE>XPropertySet</CODE> - */ + */ protected static XPropertySet m_XPS = null; /** * For local implementaions of <CODE>Checker</CODE> this variable contains the * <CODE>Control</CODE> - */ + */ protected static XInterface m_XCtrl = null; /** * The insterface test of <CODE>ifc.form._DataWareControlModel</CODE> expects an @@ -211,16 +211,16 @@ public class GenericModelTest extends TestCase { * @see ifc.form._DataAwareControlModel */ protected static String m_LCShape_Type = null; - + protected static String m_XPropertyAccess_propertyToChange = "HelpText"; - + protected static String m_XPropertyContainer_propertyNotRemovable = "HelpText"; /** - * If this variable is true some more debug info was logged. It was setted by the parameter variable + * If this variable is true some more debug info was logged. It was setted by the parameter variable * <code>debug_is_active</code> */ protected static boolean debug = false; - + /** * Creates Writer document where controls are placed. * @param tParam the test paremter @@ -244,19 +244,19 @@ public class GenericModelTest extends TestCase { */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println("closing connection..."); - + // some interface tests call cleanup to reset the environment. If such // a test is the last one cleanup was called twice. The second call // causes then nasty exceptions... if (m_ConnectionColsed) return; - + try { - XForm myForm = (XForm) AnyConverter.toObject(new Type(XForm.class), + XForm myForm = (XForm) AnyConverter.toObject(new Type(XForm.class), (FormTools.getForms( WriterTools.getDrawPage( m_xTextDoc))) .getByName("Standard")); - + if (debug){ if (myForm == null){ log.println("ERROR: could not get 'Standard' from drawpage!"); @@ -266,18 +266,18 @@ public class GenericModelTest extends TestCase { for (int i = 0; i< elements.length; i++){ log.println("Element[" + i + "] :" + elements[i]); } - + } - + XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, myForm); XConnection connection = (XConnection) AnyConverter.toObject( - new Type(XConnection.class), + new Type(XConnection.class), xSetProp.getPropertyValue("ActiveConnection")); if (debug && connection == null){ log.println("ERROR: could not get property 'ActiveConnection' from the XForm"); } - + connection.close(); } catch (Exception e) { log.println("ERROR: Can't close the connection: " + e.toString()); @@ -306,7 +306,7 @@ public class GenericModelTest extends TestCase { } catch (Exception e) { log.println("ERROR: couldn't close data source: " + e.toString()); } - + log.println("disposing data source..."); try { XComponent dataSourceComp = (XComponent)UnoRuntime.queryInterface( @@ -316,7 +316,7 @@ public class GenericModelTest extends TestCase { catch (Exception e) { log.println("couldn't dispose the data source"); } - + log.println("closing document..."); try { @@ -338,7 +338,7 @@ public class GenericModelTest extends TestCase { } catch (com.sun.star.uno.Exception e) { log.println("ERROR: Error while object test cleaning up: " + e.toString()); } - + m_ConnectionColsed = true; } @@ -377,40 +377,40 @@ public class GenericModelTest extends TestCase { * @param log the log writer * @return a test environment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XControlShape aShape = null; XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF(); - + try{ log.println("adding contol shape '" + m_kindOfControl + "'"); - aShape = FormTools.createControlShape(m_xTextDoc, 3000, - 4500, 15000, 10000, + aShape = FormTools.createControlShape(m_xTextDoc, 3000, + 4500, 15000, 10000, m_kindOfControl); } catch (Exception e){ e.printStackTrace(log); - throw new StatusException("Couldn't create following control shape (m_kindOfControl): '" + + throw new StatusException("Couldn't create following control shape (m_kindOfControl): '" + m_kindOfControl + "': ", e); - + } WriterTools.getDrawPage(m_xTextDoc).add((XShape) aShape); oObj = aShape.getControl(); - + log.println("Implementation name: " + util.utils.getImplName(oObj)); try { String sourceTestDB = utils.getFullURL(utils.getFullTestDocName("TestDB/testDB.dbf")); String destTestDB = utils.getOfficeTemp(xMSF); destTestDB = utils.getFullURL(destTestDB + "testDB.dbf"); - + log.println("copy '"+sourceTestDB + "' -> '" + destTestDB + "'"); utils.copyFile(xMSF, sourceTestDB, destTestDB); - + m_dbTools = new DBTools( xMSF, log ); String tmpDir = utils.getOfficeTemp((xMSF)); - + m_srcInf = m_dbTools.newDataSourceInfo(); m_srcInf.URL = "sdbc:dbase:" + DBTools.dirToUrl(tmpDir); log.println("data source: " + m_srcInf.URL); @@ -418,7 +418,7 @@ public class GenericModelTest extends TestCase { m_dbSrc = m_srcInf.getDataSourceService(); m_dbTools.reRegisterDB(m_dbSourceName, m_dbSrc); - m_XFormLoader = FormTools.bindForm(m_xTextDoc, m_dbSourceName, + m_XFormLoader = FormTools.bindForm(m_xTextDoc, m_dbSourceName, m_TestDB); } catch (com.sun.star.uno.Exception e) { log.println("!!! Can't access TestDB !!!"); @@ -429,25 +429,25 @@ public class GenericModelTest extends TestCase { log.println("creating a new environment for object"); TestEnvironment tEnv = new TestEnvironment(oObj); - + tEnv.addObjRelation("OBJNAME", m_ObjectName); - + log.println("adding shape '" + m_LCShape_Type +"' for DataAwareControlModel test"); - aShape = FormTools.createControlShape(m_xTextDoc, 6000, 4500, 15000, + aShape = FormTools.createControlShape(m_xTextDoc, 6000, 4500, 15000, 10000, m_LCShape_Type); WriterTools.getDrawPage(m_xTextDoc).add((XShape) aShape); m_XPS = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, oObj); - + int i = 0; NamedValue prop = null; try { for (i = 0; i < m_propertiesToSet.size(); i++){ prop = (NamedValue) m_propertiesToSet.get(i); - + log.println("setting property: '"+prop.Name+"' to value '"+prop.Value.toString()+"'"); - + m_XPS.setPropertyValue(prop.Name, prop.Value); } } catch (com.sun.star.lang.WrappedTargetException e) { @@ -475,12 +475,12 @@ public class GenericModelTest extends TestCase { // adding relation for XUpdateBroadcaster m_XCtrl = oObj; - - tEnv.addObjRelation("XUpdateBroadcaster.Checker", + + tEnv.addObjRelation("XUpdateBroadcaster.Checker", new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue)); // adding relation for DataAwareControlModel service - tEnv.addObjRelation("DataAwareControlModel.NewFieldName", + tEnv.addObjRelation("DataAwareControlModel.NewFieldName", DBTools.TST_DATE_F); //adding ObjRelation for XPersistObject @@ -490,18 +490,18 @@ public class GenericModelTest extends TestCase { java.util.HashSet exclude = new java.util.HashSet(); exclude.add("FormatKey"); tEnv.addObjRelation("XFastPropertySet.ExcludeProps", exclude); - + PropertyValue propVal = new PropertyValue(); propVal.Name = m_XPropertyAccess_propertyToChange; propVal.Value = "Text since XPropertyAccess"; tEnv.addObjRelation("XPropertyAccess.propertyToChange", propVal); tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", m_XPropertyContainer_propertyNotRemovable); - + return tEnv; } // finish method getTestEnvironment - - + + static class Checker implements ifc.form._XUpdateBroadcaster.UpdateChecker { private Object lastValue = null; XLoadable formLoaderF = null; @@ -509,7 +509,7 @@ public class GenericModelTest extends TestCase { XInterface ctrl = null; String ChangePropertyName = null; Object ChangePropertyValue = null; - + public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) { formLoaderF = xl; this.ps = ps; @@ -517,26 +517,26 @@ public class GenericModelTest extends TestCase { this.ChangePropertyName=ChangePropertyName; this.ChangePropertyValue=ChangePropertyValue; } - + public void update() throws com.sun.star.uno.Exception { if (!formLoaderF.isLoaded()) { formLoaderF.load(); } lastValue = util.ValueChanger.changePValue(ps.getPropertyValue(ChangePropertyName)); - + if (lastValue == null){ if (ChangePropertyValue != null){ - + lastValue = ChangePropertyValue; - + } else { - + String msg = "The initial value of the property '" + ChangePropertyName + "' is NULL\n"; msg += "The member variable 'm_ChangePropertyValue' is NULL\n"; msg += "Could not change Property."; - + throw new StatusException(Status.failed(msg)); } } @@ -547,7 +547,7 @@ public class GenericModelTest extends TestCase { XBoundComponent bound = (XBoundComponent) UnoRuntime.queryInterface( XBoundComponent.class, ctrl); XResultSetUpdate update = (XResultSetUpdate) UnoRuntime.queryInterface( - XResultSetUpdate.class, + XResultSetUpdate.class, formLoaderF); bound.commit(); diff --git a/qadevOOo/tests/java/mod/_forms/OButtonControl.java b/qadevOOo/tests/java/mod/_forms/OButtonControl.java index d6bff70496db..7d21c2deead6 100644 --- a/qadevOOo/tests/java/mod/_forms/OButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/OButtonControl.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 @@ -119,7 +119,7 @@ public class OButtonControl extends TestCase { } catch (com.sun.star.util.CloseVetoException e) { log.println("couldn't close document"); } catch (com.sun.star.lang.DisposedException e) { - log.println("couldn't close document"); + log.println("couldn't close document"); } } @@ -152,7 +152,7 @@ public class OButtonControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -162,16 +162,16 @@ public class OButtonControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "CommandButton"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -180,7 +180,7 @@ public class OButtonControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OButtonControl @@ -212,7 +212,7 @@ public class OButtonControl extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_forms/OButtonModel.java b/qadevOOo/tests/java/mod/_forms/OButtonModel.java index 5c5618f5167e..b648236a9533 100644 --- a/qadevOOo/tests/java/mod/_forms/OButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/OButtonModel.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 @@ -86,7 +86,7 @@ import lib.TestParameters; * @see ifc.lang._XComponent */ public class OButtonModel extends GenericModelTest { - + /** * Set some member variable of the super class <CODE>GenericModelTest</CODE>: * <pre> @@ -98,17 +98,17 @@ public class OButtonModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="CommandButton"; - + super.m_ObjectName = "stardiv.one.form.component.CommandButton"; - + super.m_LCShape_Type = "CommandButton"; - + } /** * calls <CODE>cleanup()</CODE> from it's super class @@ -118,8 +118,8 @@ public class OButtonModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - - + + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class * @param Param the test parameter @@ -130,5 +130,5 @@ public class OButtonModel extends GenericModelTest { PrintWriter log) { return super.createTestEnvironment(Param, log); } - + } // finish class OButtonModelold diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java index fc01ddfc9c04..70ee585e3083 100644 --- a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.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 @@ -127,7 +127,7 @@ public class OCheckBoxControl extends TestCase { } catch (com.sun.star.util.CloseVetoException e) { log.println("couldn't close document"); } catch (com.sun.star.lang.DisposedException e) { - log.println("couldn't close document"); + log.println("couldn't close document"); } } diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java index 9a569c833470..342e6d6aff48 100644 --- a/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.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 @@ -115,13 +115,13 @@ public class OCheckBoxModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl= "CheckBox"; - + super.m_ObjectName = "stardiv.one.form.component.CheckBox"; - + super.m_LCShape_Type = "FixedText"; } @@ -133,7 +133,7 @@ public class OCheckBoxModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -141,7 +141,7 @@ public class OCheckBoxModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java index bc9c315e9443..5e21356f623b 100644 --- a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.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 @@ -164,7 +164,7 @@ public class OComboBoxControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -174,16 +174,16 @@ public class OComboBoxControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "ComboBox"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -192,7 +192,7 @@ public class OComboBoxControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OButtonControl @@ -225,14 +225,14 @@ public class OComboBoxControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java b/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java index 4f3b256fa982..326ccda4554d 100644 --- a/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OComboBoxModel.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 @@ -123,22 +123,22 @@ public class OComboBoxModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "Text"; - + super.m_kindOfControl="ComboBox"; - + super.m_ObjectName = "stardiv.one.form.component.ComboBox"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_STRING_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_STRING_F; super.m_propertiesToSet.add(DataField); - + super.m_LCShape_Type = "FixedText"; - + } /** * calls <CODE>cleanup()</CODE> from it's super class @@ -148,7 +148,7 @@ public class OComboBoxModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -156,7 +156,7 @@ public class OComboBoxModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java index 6cbcb2de6bce..c3977ec7eb63 100644 --- a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java +++ b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.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 @@ -167,7 +167,7 @@ public class OCurrencyControl extends TestCase { * can have only numeric values the relation must be specified. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -177,16 +177,16 @@ public class OCurrencyControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "CurrencyField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -195,7 +195,7 @@ public class OCurrencyControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OCurrencyControl @@ -232,14 +232,14 @@ public class OCurrencyControl extends TestCase { tEnv.addObjRelation("XTextComponent.onlyNumbers", new Object()); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java index 319e1a90a502..c1c98761239b 100644 --- a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java +++ b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.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 @@ -118,23 +118,23 @@ public class OCurrencyModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ObjectName = "stardiv.one.form.component.CurrencyField"; super.m_kindOfControl="CurrencyField"; - - NamedValue myProp = new NamedValue(); + + NamedValue myProp = new NamedValue(); myProp.Name = "DataField"; - myProp.Value = "Identifier"; + myProp.Value = "Identifier"; super.m_propertiesToSet.add(myProp); super.m_ChangePropertyName = "Value"; super.m_ChangePropertyValue = new Double(0); - + super.m_LCShape_Type = "FixedText"; - + } /** * calls <CODE>cleanup()</CODE> from it's super class @@ -144,7 +144,7 @@ public class OCurrencyModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -152,7 +152,7 @@ public class OCurrencyModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index 4b360e20fd10..a060245ddfde 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.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 @@ -283,7 +283,7 @@ public class ODatabaseForm extends TestCase { } catch (com.sun.star.uno.Exception e) { log.println("Error while object test initialization :"); e.printStackTrace(log); - throw new StatusException("Error while object test" + + throw new StatusException("Error while object test" + " initialization", e); } } else { @@ -291,9 +291,9 @@ public class ODatabaseForm extends TestCase { try { String myDbUrl = "sdbc:dbase:" + DBTools.dirToUrl(tmpDir); srcInf.URL = myDbUrl; - + log.println("try to register '"+myDbUrl+"' as '"+dbSourceName+"'"); - + dbSrc = srcInf.getDataSourceService(); dbTools.reRegisterDB(dbSourceName, dbSrc); } catch (com.sun.star.uno.Exception e) { @@ -309,9 +309,9 @@ public class ODatabaseForm extends TestCase { do { tableName = "ODatabaseForm_tmp" + uniqueSuffix; oldF = utils.getFullURL(origDB); - newF = utils.getOfficeTemp((XMultiServiceFactory) tParam.getMSF()) + tableName + + newF = utils.getOfficeTemp((XMultiServiceFactory) tParam.getMSF()) + tableName + ".dbf"; - } while (!utils.tryOverwriteFile(((XMultiServiceFactory) tParam.getMSF()), oldF, newF) && + } while (!utils.tryOverwriteFile(((XMultiServiceFactory) tParam.getMSF()), oldF, newF) && (uniqueSuffix++ < 50)); } } @@ -319,7 +319,7 @@ public class ODatabaseForm extends TestCase { /** * * creating a Testenvironment for the interfaces to be tested */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { if (xTextDoc != null) { try { @@ -383,10 +383,10 @@ public class ODatabaseForm extends TestCase { XLoadable formLoader = null; try { - formLoader = FormTools.bindForm(xTextDoc, "MyForm", dbSourceName, + formLoader = FormTools.bindForm(xTextDoc, "MyForm", dbSourceName, tableName); } catch (com.sun.star.uno.Exception e) { - log.println("Cann't bind the form to source '" + dbSourceName + + log.println("Cann't bind the form to source '" + dbSourceName + "', table '" + tableName + "' :"); e.printStackTrace(log); throw new StatusException("Cann't bind a form", e); @@ -409,12 +409,12 @@ public class ODatabaseForm extends TestCase { log.println("Elements in the 'MyForm' :"); XIndexAccess formElements1 = (XIndexAccess) UnoRuntime.queryInterface( - XIndexAccess.class, + XIndexAccess.class, forms.getByName("MyForm")); for (int i = 0; i < formElements1.getCount(); i++) { XNamed elemName = (XNamed) UnoRuntime.queryInterface( - XNamed.class, + XNamed.class, formElements1.getByIndex(i)); log.println(" '" + elemName.getName() + "'"); } @@ -424,14 +424,14 @@ public class ODatabaseForm extends TestCase { //put something on the drawpage log.println("inserting some ControlShapes"); oShapes = DrawTools.getShapes(WriterTools.getDrawPage(xTextDoc)); - shape1 = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, + shape1 = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, 1000, "CommandButton"); - shape2 = FormTools.createControlShape(xTextDoc, 5000, 3500, 7500, + shape2 = FormTools.createControlShape(xTextDoc, 5000, 3500, 7500, 5000, "TextField"); - XControlShape shape3 = FormTools.createControlShape(xTextDoc, 2000, - 1500, 1000, - 1000, + XControlShape shape3 = FormTools.createControlShape(xTextDoc, 2000, + 1500, 1000, + 1000, "CheckBox"); oShapes.add((XShape) shape1); oShapes.add((XShape) shape2); @@ -451,12 +451,12 @@ public class ODatabaseForm extends TestCase { log.println("Elements in the 'MyForm' :"); XIndexAccess formElements1 = (XIndexAccess) UnoRuntime.queryInterface( - XIndexAccess.class, + XIndexAccess.class, forms.getByName("MyForm")); for (int i = 0; i < formElements1.getCount(); i++) { XNamed elemName = (XNamed) UnoRuntime.queryInterface( - XNamed.class, + XNamed.class, formElements1.getByIndex(i)); log.println(" '" + elemName.getName() + "'"); } @@ -467,7 +467,7 @@ public class ODatabaseForm extends TestCase { formLoader.load(); try { - oObj = (XForm) AnyConverter.toObject(new Type(XForm.class), + oObj = (XForm) AnyConverter.toObject(new Type(XForm.class), (FormTools.getForms( WriterTools.getDrawPage( xTextDoc))) @@ -476,7 +476,7 @@ public class ODatabaseForm extends TestCase { XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, oObj); connection = (XConnection) AnyConverter.toObject( - new Type(XConnection.class), + new Type(XConnection.class), xSetProp.getPropertyValue("ActiveConnection")); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get Form"); @@ -498,7 +498,7 @@ public class ODatabaseForm extends TestCase { // adding relation for XSubmit XControlModel the_Model = shape2.getControl(); XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); XControl cntrl = null; @@ -520,7 +520,7 @@ public class ODatabaseForm extends TestCase { } catch (SQLException e) { log.println("Cann't move cursor to the first row."); e.printStackTrace(); - throw new StatusException("Can't move cursor to the first row.", e); + throw new StatusException("Can't move cursor to the first row.", e); } tEnv.addObjRelation("Model1", shape1.getControl()); @@ -555,9 +555,9 @@ public class ODatabaseForm extends TestCase { } for (int n = 1; n < (2 * (THRCNT + 1)); n++) { - log.println("adding INSTANCE" + n + + log.println("adding INSTANCE" + n + " as obj relation to environment"); - tEnv.addObjRelation("INSTANCE" + n, + tEnv.addObjRelation("INSTANCE" + n, FormTools.createControl(xTextDoc, "CheckBox")); } @@ -577,12 +577,12 @@ public class ODatabaseForm extends TestCase { final XResultSet xResSet = (XResultSet) UnoRuntime.queryInterface( XResultSet.class, oObj); final XResultSetUpdate xResSetUpdate = (XResultSetUpdate) UnoRuntime.queryInterface( - XResultSetUpdate.class, + XResultSetUpdate.class, oObj); final XRowSet xRowSet = (XRowSet) UnoRuntime.queryInterface( XRowSet.class, oObj); final PrintWriter logF = log; - tEnv.addObjRelation("XRowSetApproveBroadcaster.ApproveChecker", + tEnv.addObjRelation("XRowSetApproveBroadcaster.ApproveChecker", new ifc.sdb._XRowSetApproveBroadcaster.RowSetApproveChecker() { public void moveCursor() { try { @@ -657,12 +657,12 @@ public class ODatabaseForm extends TestCase { // Adding relation for XCompletedExecution tEnv.addObjRelation("InteractionHandlerChecker", new InteractionHandlerImpl()); - + // Adding for XWarningSupplier tEnv.addObjRelation("CheckWarningsSupplier", new Boolean(isMySQLDB)); // Adding relation for XDatabaseParameterBroadcaster - tEnv.addObjRelation("ParameterListenerChecker", new ODatabaseForm.ParameterListenerImpl()); + tEnv.addObjRelation("ParameterListenerChecker", new ODatabaseForm.ParameterListenerImpl()); XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface (XPropertySet.class, oObj) ; try { @@ -673,7 +673,7 @@ public class ODatabaseForm extends TestCase { else { xSetProp.setPropertyValue("Command", "SELECT \"_TEXT\" FROM \"ODatabaseForm_tmp0\" WHERE ( ( \"_TEXT\" = :param1 ) )"); } - + xSetProp.setPropertyValue("CommandType", new Integer(CommandType.COMMAND)) ; } @@ -685,7 +685,7 @@ public class ODatabaseForm extends TestCase { XRowUpdate.class, oObj); final XRow xRow = (XRow) UnoRuntime.queryInterface(XRow.class, oObj); - tEnv.addObjRelation("XResultSetUpdate.UpdateTester", + tEnv.addObjRelation("XResultSetUpdate.UpdateTester", new ifc.sdbc._XResultSetUpdate.UpdateTester() { String lastUpdate = null; @@ -731,15 +731,15 @@ public class ODatabaseForm extends TestCase { XRow row = (XRow) UnoRuntime.queryInterface(XRow.class, oObj); tEnv.addObjRelation("XRowUpdate.XRow", row); - + tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", "Cycle"); PropertyValue propVal = new PropertyValue(); propVal.Name = "Name"; propVal.Value = "Text since XPropertyAccess"; - + tEnv.addObjRelation("XPropertyAccess.propertyToChange", propVal); - + return tEnv; } // finish method getTestEnvironment @@ -768,8 +768,8 @@ public class ODatabaseForm extends TestCase { } catch (com.sun.star.lang.DisposedException e) { log.println("couldn't close data source"); } - - + + log.println("closing document..."); try { @@ -792,7 +792,7 @@ public class ODatabaseForm extends TestCase { throw new StatusException("Error while object test cleaning up", e); } } - + /** * Implementation of interface _XDatabaseParameterBroadcaster.CheckParameterListener * for the XDatabaseParameterBroadcaster test @@ -801,15 +801,15 @@ public class ODatabaseForm extends TestCase { public class ParameterListenerImpl implements _XDatabaseParameterBroadcaster.CheckParameterListener { boolean listenerWasCalled = false; PrintWriter log = new PrintWriter(System.out); - - /** + + /** * Return true, if the listener was called, false otherwise. * @return True, if any other method of the listener was called. */ public boolean checkListener() { return listenerWasCalled; } - + /** * Take the DataBaseParameterEvent and fill it with a meaningful value. * @param e The database parameter that will be filled with a value. @@ -835,7 +835,7 @@ public class ODatabaseForm extends TestCase { } return true; } - + /** * Dummy implemetnation. Do nothing, just log * @param o Ignore. @@ -843,7 +843,7 @@ public class ODatabaseForm extends TestCase { public void disposing(EventObject o) { log.println("### _XDatabaseParameterBroadcaster.ParameterListenerImpl: disposing"); } - + /** * Set a log writer, so messages go to log instead of Standard.out * @param log The log messages get printed to. @@ -851,10 +851,10 @@ public class ODatabaseForm extends TestCase { public void setLog(PrintWriter log) { this.log = log; } - + } - - + + /** * Implementation of interface _XCompletedExecution.CheckInteractionHandler * for the XCompletedExecution test @@ -863,11 +863,11 @@ public class ODatabaseForm extends TestCase { public class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler { private boolean handlerWasUsed = false; private PrintWriter log = new PrintWriter(System.out); - + public boolean checkInteractionHandler() { return handlerWasUsed; } - + public void handle(XInteractionRequest xInteractionRequest) { log.println("### _XCompletedExecution.InteractionHandlerImpl: handle called."); handlerWasUsed = true; @@ -892,10 +892,10 @@ public class ODatabaseForm extends TestCase { eI.printStackTrace(log); } } - + public void setLog(PrintWriter log) { this.log = log; } - + } } // finish class ODatabaseForm diff --git a/qadevOOo/tests/java/mod/_forms/ODateControl.java b/qadevOOo/tests/java/mod/_forms/ODateControl.java index e143929fa19d..4b37ec21c2cf 100644 --- a/qadevOOo/tests/java/mod/_forms/ODateControl.java +++ b/qadevOOo/tests/java/mod/_forms/ODateControl.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 @@ -163,7 +163,7 @@ public class ODateControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object anotherCtrl = null; @@ -173,16 +173,16 @@ public class ODateControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "DateField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -191,7 +191,7 @@ public class ODateControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the ODateControl @@ -224,14 +224,14 @@ public class ODateControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, anotherCtrl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/ODateModel.java b/qadevOOo/tests/java/mod/_forms/ODateModel.java index 297c5088937e..d692bb27d6bf 100644 --- a/qadevOOo/tests/java/mod/_forms/ODateModel.java +++ b/qadevOOo/tests/java/mod/_forms/ODateModel.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 @@ -133,25 +133,25 @@ public class ODateModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "Date"; - + super.m_kindOfControl="DateField"; - + super.m_ObjectName = "stardiv.one.form.component.DateField"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_DATE_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_DATE_F; super.m_propertiesToSet.add(DataField); - - NamedValue Date = new NamedValue(); - Date.Name = "Date"; - Date.Value = new Integer(DBTools.TST_DATE); + + NamedValue Date = new NamedValue(); + Date.Name = "Date"; + Date.Value = new Integer(DBTools.TST_DATE); super.m_propertiesToSet.add(Date); - + super.m_LCShape_Type = "FixedText"; } @@ -163,7 +163,7 @@ public class ODateModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -171,7 +171,7 @@ public class ODateModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OEditControl.java b/qadevOOo/tests/java/mod/_forms/OEditControl.java index ac56d9f0cf93..4204606d087e 100644 --- a/qadevOOo/tests/java/mod/_forms/OEditControl.java +++ b/qadevOOo/tests/java/mod/_forms/OEditControl.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 @@ -173,7 +173,7 @@ public class OEditControl extends TestCase { * of another component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XControl aControl = null; @@ -183,16 +183,16 @@ public class OEditControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -201,7 +201,7 @@ public class OEditControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OEditControl @@ -234,11 +234,11 @@ public class OEditControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // relations for XChangeBroadcaster - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); - tEnv.addObjRelation("Win1", - (XWindow) UnoRuntime.queryInterface(XWindow.class, + tEnv.addObjRelation("Win1", + (XWindow) UnoRuntime.queryInterface(XWindow.class, oObj)); tEnv.addObjRelation("Win2", forObjRel); tEnv.addObjRelation("CONTROL", aControl); @@ -249,7 +249,7 @@ public class OEditControl extends TestCase { tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/OEditModel.java b/qadevOOo/tests/java/mod/_forms/OEditModel.java index 4004b68d13a1..bcecd77550df 100644 --- a/qadevOOo/tests/java/mod/_forms/OEditModel.java +++ b/qadevOOo/tests/java/mod/_forms/OEditModel.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 @@ -129,22 +129,22 @@ public class OEditModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="TextField"; - + super.m_ObjectName = "stardiv.one.form.component.Edit"; - NamedValue myProp = new NamedValue(); - myProp.Name = "DataField"; - myProp.Value = DBTools.TST_STRING_F; + NamedValue myProp = new NamedValue(); + myProp.Name = "DataField"; + myProp.Value = DBTools.TST_STRING_F; super.m_propertiesToSet.add(myProp); - + super.m_LCShape_Type = "FixedText"; - + super.m_ChangePropertyName = "Text"; } /** @@ -155,7 +155,7 @@ public class OEditModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -163,7 +163,7 @@ public class OEditModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java index 3ece2f3a359e..b83e9ce007ee 100644 --- a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OFileControlModel.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 @@ -100,13 +100,13 @@ import com.sun.star.util.XCloseable; */ public class OFileControlModel extends TestCase { XComponent xDrawDoc; - + /** * Creates Draw document where controls are placed. */ protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) tParam.getMSF())); - + try { log.println("creating a draw document"); xDrawDoc = SOF.createDrawDoc(null); @@ -116,13 +116,13 @@ public class OFileControlModel extends TestCase { throw new StatusException(Status.failed("Can't create a document")); } } - + /** * Disposes Draw document. */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xDrawDoc "); - + try { XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, xDrawDoc); @@ -133,7 +133,7 @@ public class OFileControlModel extends TestCase { log.println("couldn't close document"); } } - + /** * Creating a Testenvironment for the interfaces to be tested. * Creates FileControl in the Form. <p> @@ -147,26 +147,26 @@ public class OFileControlModel extends TestCase { protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; - - + + // creation of testobject here // first we write what we are intend to do to log file log.println("creating a test environment"); - + //get FileControlModel String objName = "FileControl"; - + XControlShape aShape = null; - + Size size = new Size(); Point position = new Point(); XControlModel aControl = null; - + //get MSF XMultiServiceFactory oDocMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( XMultiServiceFactory.class, xDrawDoc); - + try { Object oInt = oDocMSF.createInstance( "com.sun.star.drawing.ControlShape"); @@ -187,16 +187,16 @@ public class OFileControlModel extends TestCase { log.println("Couldn't create a component " + e); throw new StatusException(Status.failed("Can't create component")); } - + aShape.setControl(aControl); - + DrawTools.getDrawPage(xDrawDoc, 0).add((XShape) aShape); oObj = aShape.getControl(); - + log.println("creating a new environment for drawpage object"); - + TestEnvironment tEnv = new TestEnvironment(oObj); - + tEnv.addObjRelation("OBJNAME", "stardiv.one.form.component." + objName); PropertyValue prop = new PropertyValue(); @@ -204,7 +204,7 @@ public class OFileControlModel extends TestCase { prop.Value = "new Help Text since XPropertyAccess"; tEnv.addObjRelation("XPropertyAccess.propertyToChange", prop); tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", "HelpText"); - + return tEnv; } // finish method getTestEnvironment } // finish class OFileControlModel diff --git a/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java b/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java index 5753da62d75a..c3a172eb746a 100644 --- a/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java +++ b/qadevOOo/tests/java/mod/_forms/OFixedTextModel.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 @@ -80,7 +80,7 @@ import lib.TestParameters; */ public class OFixedTextModel extends GenericModelTest { - + /** * Set some member variable of the super class <CODE>GenericModelTest</CODE>: * <pre> @@ -92,17 +92,17 @@ public class OFixedTextModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="FixedText"; - + super.m_ObjectName = "stardiv.one.form.component.FixedText"; - + super.m_LCShape_Type = "FixedText"; - + } /** * calls <CODE>cleanup()</CODE> from it's super class @@ -112,8 +112,8 @@ public class OFixedTextModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - - + + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class * @param Param the test parameter @@ -124,5 +124,5 @@ public class OFixedTextModel extends GenericModelTest { PrintWriter log) { return super.createTestEnvironment(Param, log); } - + } // finish class OFixedTextModel diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java index 4888caba5441..5a1a4c3d6bb1 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java +++ b/qadevOOo/tests/java/mod/_forms/OFormattedControl.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 @@ -160,7 +160,7 @@ public class OFormattedControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object anotherCtrl = null; @@ -170,16 +170,16 @@ public class OFormattedControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "FormattedField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -188,7 +188,7 @@ public class OFormattedControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OFormattedControl @@ -221,14 +221,14 @@ public class OFormattedControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, anotherCtrl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java b/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java index b51b4b575932..73d174eae99f 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java +++ b/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.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 @@ -123,20 +123,20 @@ public class OFormattedFieldWrapper extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "Text"; - + super.m_kindOfControl="DatabaseFormattedField"; - + super.m_ObjectName = "stardiv.one.form.component.Edit"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_STRING_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_STRING_F; super.m_propertiesToSet.add(DataField); - + super.m_LCShape_Type = "FixedText"; } /** @@ -147,7 +147,7 @@ public class OFormattedFieldWrapper extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -155,7 +155,7 @@ public class OFormattedFieldWrapper extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java index af94a546b004..a04e06bbf1a5 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java +++ b/qadevOOo/tests/java/mod/_forms/OFormsCollection.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 diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java index 65131dae1c46..92655bf9e2eb 100644 --- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.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 @@ -136,7 +136,7 @@ import com.sun.star.util.XCloseable; */ public class OGridControlModel extends GenericModelTest { - + /** * Set some member variable of the super class <CODE>GenericModelTest</CODE>: * <pre> @@ -148,17 +148,17 @@ public class OGridControlModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="GridControl"; - + super.m_ObjectName = "stardiv.one.form.component.Grid"; - + super.m_LCShape_Type = "GridControl"; - + } /** * calls <CODE>cleanup()</CODE> from it's super class @@ -168,8 +168,8 @@ public class OGridControlModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - - + + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class * @param Param the test parameter @@ -179,7 +179,7 @@ public class OGridControlModel extends GenericModelTest { protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { TestEnvironment tEnv = super.createTestEnvironment(Param, log); - + XInterface oObj = tEnv.getTestObject(); XPropertySet aControl = null; @@ -187,7 +187,7 @@ public class OGridControlModel extends GenericModelTest { XPropertySet aControl3 = null; XPropertySet aControl4 = null; XPropertySet aControl5 = null; - + try { XGridColumnFactory columns = (XGridColumnFactory) UnoRuntime.queryInterface( XGridColumnFactory.class, oObj); @@ -234,8 +234,8 @@ public class OGridControlModel extends GenericModelTest { tEnv.addObjRelation("INSTANCE1", aControl4); tEnv.addObjRelation("INSTANCE2", aControl5); - - tEnv.addObjRelation("Comparer", + + tEnv.addObjRelation("Comparer", new Comparator() { public int compare(Object o1, Object o2) { XNamed named1 = (XNamed) UnoRuntime.queryInterface( @@ -257,14 +257,14 @@ public class OGridControlModel extends GenericModelTest { // HashSet exclude = new HashSet(); -// +// // exclude.add("FormatKey"); // -// tEnv.addObjRelation("XUpdateBroadcaster.Checker", +// tEnv.addObjRelation("XUpdateBroadcaster.Checker", // new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue)); return tEnv; } - + } // finish class OButtonModelold @@ -324,7 +324,7 @@ class OGridControlModelold extends TestCase { * {@link ifc.container._XContainer} : a column instance. </li> * </ul> */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XInterface oInstance = null; @@ -342,8 +342,8 @@ class OGridControlModelold extends TestCase { //get GridControlModel String objName = "Grid"; - XControlShape shape = FormTools.insertControlShape(xDrawDoc, 5000, - 7000, 2000, 2000, + XControlShape shape = FormTools.insertControlShape(xDrawDoc, 5000, + 7000, 2000, 2000, "GridControl"); oObj = shape.getControl(); @@ -389,7 +389,7 @@ class OGridControlModelold extends TestCase { tEnv.addObjRelation("Selections", new Object[] { aControl, aControl2 }); // COMPARER - + int THRCNT = 1; String count = (String)Param.get("THRCNT"); if (count != null) @@ -401,7 +401,7 @@ class OGridControlModelold extends TestCase { try { for (int n = 1; n < (3 * THRCNT + 1); n++) { - log.println("adding INSTANCE" + n + + log.println("adding INSTANCE" + n + " as obj relation to environment"); oInstance = columns.createColumn("TextField"); tEnv.addObjRelation("INSTANCE" + n, oInstance); diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java index 7b4a6adea8be..c3707748fdf5 100644 --- a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.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 @@ -142,7 +142,7 @@ public class OGroupBoxControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object anotherCtrl = null; @@ -152,16 +152,16 @@ public class OGroupBoxControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 5000, - 7000, 2000, 2000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 5000, + 7000, 2000, 2000, "GroupBox"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -170,7 +170,7 @@ public class OGroupBoxControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OGroupBoxControl @@ -205,8 +205,8 @@ public class OGroupBoxControl extends TestCase { // Adding relation for XWindow - tEnv.addObjRelation("XWindow.AnotherWindow", - UnoRuntime.queryInterface(XWindow.class, + tEnv.addObjRelation("XWindow.AnotherWindow", + UnoRuntime.queryInterface(XWindow.class, anotherCtrl)); return tEnv; diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java index 8f8f227457c6..feb425c693df 100644 --- a/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.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 @@ -79,7 +79,7 @@ import lib.TestParameters; * @see ifc.lang._XComponent */ public class OGroupBoxModel extends GenericModelTest { - + /** * Set some member variable of the super class <CODE>GenericModelTest</CODE>: * <pre> @@ -91,17 +91,17 @@ public class OGroupBoxModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="GroupBox"; - + super.m_ObjectName = "stardiv.one.form.component.GroupBox"; - + super.m_LCShape_Type = "FixedText"; - + super.m_ChangePropertyName = "Text"; } /** @@ -112,8 +112,8 @@ public class OGroupBoxModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - - + + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class * @param Param the test parameter diff --git a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java index de2f93bc494c..f7557ca671d8 100644 --- a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java +++ b/qadevOOo/tests/java/mod/_forms/OHiddenModel.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 @@ -96,13 +96,13 @@ import com.sun.star.util.XCloseable; */ public class OHiddenModel extends TestCase { XComponent xDrawDoc; - + /** * Creates Drawing document. */ protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) tParam.getMSF())); - + try { log.println("creating a draw document"); xDrawDoc = SOF.createDrawDoc(null); @@ -112,13 +112,13 @@ public class OHiddenModel extends TestCase { throw new StatusException("Couldn't create document", e); } } - + /** * Disposes drawing document. */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xDrawDoc "); - + try { XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, xDrawDoc); @@ -129,7 +129,7 @@ public class OHiddenModel extends TestCase { log.println("couldn't close document"); } } - + /** * Creates hidden component, then adds Form into draw page, * and inserts the component into Form components' collection. @@ -143,28 +143,28 @@ public class OHiddenModel extends TestCase { protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; - - + + // creation of testobject here // first we write what we are intend to do to log file log.println("creating a test environment"); - + // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); String objName = "HiddenControl"; XInterface ctrl = SOF.createControl(xDrawDoc, objName); - + try { XDrawPage oDP = DrawTools.getDrawPage(xDrawDoc, 0); - + XNameContainer nc = FormTools.getForms(oDP); FormTools.insertForm(xDrawDoc, nc, "OHiddenModelForm"); - + Object frm = nc.getByName("OHiddenModelForm"); - + XNameContainer frmNC = (XNameContainer) UnoRuntime.queryInterface( XNameContainer.class, frm); - + frmNC.insertByName("OHiddenModel", ctrl); oObj = (XInterface) AnyConverter.toObject( new Type(XInterface.class), @@ -182,22 +182,22 @@ public class OHiddenModel extends TestCase { e.printStackTrace(log); throw new StatusException("Can't create and add control", e); } - + log.println("creating a new environment for drawpage object"); - + TestEnvironment tEnv = new TestEnvironment(oObj); - + util.dbg.getSuppServices(oObj); - + log.println("adding DrawDocument as obj relation to environment"); tEnv.addObjRelation("OBJNAME", "stardiv.one.form.component.Hidden"); - + PropertyValue prop = new PropertyValue(); prop.Name = "Name"; prop.Value = "new Text since XPropertyAccess"; tEnv.addObjRelation("XPropertyAccess.propertyToChange", prop); tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", "Name"); - + return tEnv; } // finish method getTestEnvironment } // finish class OHiddenModel diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java index 8d8744ed7377..60f208825863 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.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 @@ -147,7 +147,7 @@ public class OImageButtonControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object anotherCtrl = null; @@ -157,16 +157,16 @@ public class OImageButtonControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "ImageButton"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -175,7 +175,7 @@ public class OImageButtonControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OImageButtonControl @@ -209,7 +209,7 @@ public class OImageButtonControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, anotherCtrl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java b/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java index 9920e26feea9..3b5dbcded56f 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/OImageButtonModel.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 @@ -96,13 +96,13 @@ public class OImageButtonModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="ImageButton"; - + super.m_ObjectName = "stardiv.one.form.component.ImageButton"; super.m_LCShape_Type = "ImageButton"; @@ -116,7 +116,7 @@ public class OImageButtonModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -124,7 +124,7 @@ public class OImageButtonModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java index f8771e086ec2..4dcec1573015 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageControlControl.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 @@ -148,7 +148,7 @@ public class OImageControlControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -159,15 +159,15 @@ public class OImageControlControl extends TestCase { //Insert a ControlShape and get the ControlModel XControlShape aShape = FormTools.createControlShapeWithDefaultControl( - xTextDoc, 3000, 4500, 15000, 10000, + xTextDoc, 3000, 4500, 15000, 10000, "DatabaseImageControl"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -176,7 +176,7 @@ public class OImageControlControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OImageControlControl @@ -210,7 +210,7 @@ public class OImageControlControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlModel.java b/qadevOOo/tests/java/mod/_forms/OImageControlModel.java index 461b60fa52cd..0525f6ff6778 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OImageControlModel.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 @@ -124,18 +124,18 @@ public class OImageControlModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_kindOfControl= "DatabaseImageControl"; - + super.m_ObjectName = "stardiv.one.form.component.ImageControl"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_BINARY_STREAM_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_BINARY_STREAM_F; super.m_propertiesToSet.add(DataField); - + super.m_LCShape_Type = "FixedText"; } /** @@ -146,7 +146,7 @@ public class OImageControlModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -154,7 +154,7 @@ public class OImageControlModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java index 66dfaa38d777..5d014aa759ee 100644 --- a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OListBoxControl.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 @@ -80,7 +80,7 @@ public class OListBoxControl extends TestCase { } catch (com.sun.star.util.CloseVetoException e) { log.println("couldn't close document"); } catch (com.sun.star.lang.DisposedException e) { - log.println("couldn't close document"); + log.println("couldn't close document"); } } @@ -146,16 +146,16 @@ public class OListBoxControl extends TestCase { // Adding relation for XWindow XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, anotherCtrl); - + XWindow objWin = (XWindow) UnoRuntime.queryInterface(XWindow.class, oObj); tEnv.addObjRelation("XWindow.AnotherWindow",forObjRel); tEnv.addObjRelation("XWindow.ControlShape",aShape); - + tEnv.addObjRelation("Win1",objWin); tEnv.addObjRelation("Win2",forObjRel); - + tEnv.addObjRelation("CONTROL",anotherCtrl); // adding relation for XChangeBroadcaster diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java index ebfe3bf5a47f..c5aa052abbc0 100644 --- a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OListBoxModel.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 @@ -126,10 +126,10 @@ public class OListBoxModel extends GenericModelTest { * DataField.Value = DBTools.TST_DATE_F; * super.m_propertiesToSet.add(DataField); * - * NamedValue ListSource = new NamedValue(); - * ListSource.Name = "ListSource"; + * NamedValue ListSource = new NamedValue(); + * ListSource.Name = "ListSource"; * ListSource.Value = new String[] { - * "OListBoxModel1", "OListBoxModel2", "OListBoxModel3"}; + * "OListBoxModel1", "OListBoxModel2", "OListBoxModel3"}; * super.m_propertiesToSet.add(ListSource); * super.m_LCShape_Type = "FixedText"; * </pre> @@ -138,26 +138,26 @@ public class OListBoxModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "SelectedItems"; - + super.m_kindOfControl="ListBox"; - + super.m_ObjectName = "stardiv.one.form.component.ListBox"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_STRING_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_STRING_F; super.m_propertiesToSet.add(DataField); - - NamedValue ListSource = new NamedValue(); - ListSource.Name = "ListSource"; + + NamedValue ListSource = new NamedValue(); + ListSource.Name = "ListSource"; ListSource.Value = new String[] { - "OListBoxModel1", "OListBoxModel2", "OListBoxModel3"}; + "OListBoxModel1", "OListBoxModel2", "OListBoxModel3"}; super.m_propertiesToSet.add(ListSource); - + super.m_LCShape_Type = "FixedText"; } @@ -169,7 +169,7 @@ public class OListBoxModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -180,15 +180,15 @@ public class OListBoxModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { TestEnvironment tEnv = super.createTestEnvironment(Param, log); - tEnv.addObjRelation("XUpdateBroadcaster.Checker", + tEnv.addObjRelation("XUpdateBroadcaster.Checker", new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue)); return tEnv; } - + static class Checker implements UpdateChecker { private short lastItem = (short) 0; XLoadable formLoaderF = null; @@ -196,7 +196,7 @@ public class OListBoxModel extends GenericModelTest { XInterface ctrl = null; String ChangePropertyName = null; Object ChangePropertyValue = null; - + public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) { formLoaderF = xl; this.ps = ps; @@ -204,7 +204,7 @@ public class OListBoxModel extends GenericModelTest { this.ChangePropertyName=ChangePropertyName; this.ChangePropertyValue=ChangePropertyValue; } - + public void update() throws Exception { if (!formLoaderF.isLoaded()) { formLoaderF.load(); @@ -217,7 +217,7 @@ public class OListBoxModel extends GenericModelTest { XBoundComponent bound = (XBoundComponent) UnoRuntime.queryInterface( XBoundComponent.class, ctrl); XResultSetUpdate update = (XResultSetUpdate) UnoRuntime.queryInterface( - XResultSetUpdate.class, + XResultSetUpdate.class, formLoaderF); bound.commit(); @@ -232,5 +232,5 @@ public class OListBoxModel extends GenericModelTest { return (getS.length > 0) && (lastItem == getS[0]); } } - + } // finish class OListBoxModel diff --git a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java index f965a9c8af3f..eac8ce39cb4e 100644 --- a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java +++ b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.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 @@ -109,7 +109,7 @@ public class ONavigationBarControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -119,16 +119,16 @@ public class ONavigationBarControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "NavigationToolBar"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -137,7 +137,7 @@ public class ONavigationBarControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OButtonControl @@ -169,7 +169,7 @@ public class ONavigationBarControl extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java b/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java index ffe624ed8f5d..75b8c2089c45 100644 --- a/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java +++ b/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.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 @@ -32,7 +32,7 @@ import lib.TestEnvironment; import lib.TestParameters; public class ONavigationBarModel extends GenericModelTest { - + /** * Set some member variable of the super class <CODE>GenericModelTest</CODE>: * <pre> @@ -44,17 +44,17 @@ public class ONavigationBarModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); - + super.m_kindOfControl="NavigationToolBar"; - + super.m_ObjectName = "com.sun.star.form.component.NavigationToolBar"; - + super.m_LCShape_Type = "NavigationToolBar"; - + } /** * calls <CODE>cleanup()</CODE> from it's super class @@ -64,8 +64,8 @@ public class ONavigationBarModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - - + + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class * @param Param the test parameter @@ -76,6 +76,6 @@ public class ONavigationBarModel extends GenericModelTest { PrintWriter log) { return super.createTestEnvironment(Param, log); } - + } // finish class ONavigationBarModel diff --git a/qadevOOo/tests/java/mod/_forms/ONumericControl.java b/qadevOOo/tests/java/mod/_forms/ONumericControl.java index ce03616582b0..3a89d4639814 100644 --- a/qadevOOo/tests/java/mod/_forms/ONumericControl.java +++ b/qadevOOo/tests/java/mod/_forms/ONumericControl.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 @@ -163,7 +163,7 @@ public class ONumericControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object anotherCtrl = null; @@ -173,16 +173,16 @@ public class ONumericControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "NumericField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -191,7 +191,7 @@ public class ONumericControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the ONumericControl @@ -224,14 +224,14 @@ public class ONumericControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, anotherCtrl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/ONumericModel.java b/qadevOOo/tests/java/mod/_forms/ONumericModel.java index 8a2ba304283f..2e4a32bf9aa0 100644 --- a/qadevOOo/tests/java/mod/_forms/ONumericModel.java +++ b/qadevOOo/tests/java/mod/_forms/ONumericModel.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 @@ -121,20 +121,20 @@ public class ONumericModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "Value"; - + super.m_kindOfControl="NumericField"; - + super.m_ObjectName = "stardiv.one.form.component.NumericField"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_DOUBLE_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_DOUBLE_F; super.m_propertiesToSet.add(DataField); - + super.m_LCShape_Type = "FixedText"; } /** @@ -145,7 +145,7 @@ public class ONumericModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -153,7 +153,7 @@ public class ONumericModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/OPatternControl.java b/qadevOOo/tests/java/mod/_forms/OPatternControl.java index 34d325498c79..31046fab2eb0 100644 --- a/qadevOOo/tests/java/mod/_forms/OPatternControl.java +++ b/qadevOOo/tests/java/mod/_forms/OPatternControl.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 @@ -163,7 +163,7 @@ public class OPatternControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object anotherCtrl = null; @@ -173,16 +173,16 @@ public class OPatternControl extends TestCase { XGraphics aGraphic = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "PatternField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -191,7 +191,7 @@ public class OPatternControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OPatternControl @@ -224,14 +224,14 @@ public class OPatternControl extends TestCase { tEnv.addObjRelation("MODEL", the_Model); // Adding relation for XWindow - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, anotherCtrl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/OPatternModel.java b/qadevOOo/tests/java/mod/_forms/OPatternModel.java index cc80327ff20d..070ed5a9e870 100644 --- a/qadevOOo/tests/java/mod/_forms/OPatternModel.java +++ b/qadevOOo/tests/java/mod/_forms/OPatternModel.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 @@ -126,20 +126,20 @@ public class OPatternModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "Text"; - + super.m_kindOfControl="PatternField"; - + super.m_ObjectName = "stardiv.one.form.component.PatternField"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_STRING_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_STRING_F; super.m_propertiesToSet.add(DataField); - + super.m_LCShape_Type = "FixedText"; } /** @@ -150,7 +150,7 @@ public class OPatternModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -158,7 +158,7 @@ public class OPatternModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); } diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java index e013cb29cff8..52ff5ffb189e 100644 --- a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.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 @@ -151,7 +151,7 @@ public class ORadioButtonControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -161,16 +161,16 @@ public class ORadioButtonControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "RadioButton"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -179,7 +179,7 @@ public class ORadioButtonControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the ORadioButtonControl @@ -212,7 +212,7 @@ public class ORadioButtonControl extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java index 36e3927f46af..f846b3a8132d 100644 --- a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.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 @@ -122,21 +122,21 @@ public class ORadioButtonModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ - + protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "State"; - + super.m_kindOfControl="RadioButton"; - + super.m_ObjectName = "stardiv.one.form.component.RadioButton"; - NamedValue myProp = new NamedValue(); + NamedValue myProp = new NamedValue(); myProp.Name = "DataField"; - myProp.Value = DBTools.TST_STRING_F; + myProp.Value = DBTools.TST_STRING_F; super.m_propertiesToSet.add(myProp); - + super.m_LCShape_Type = "GroupBox"; } @@ -148,7 +148,7 @@ public class ORadioButtonModel extends GenericModelTest { protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } - + /** * calls <CODE>createTestEnvironment()</CODE> from it's super class @@ -156,17 +156,17 @@ public class ORadioButtonModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { TestEnvironment tEnv = super.createTestEnvironment(Param, log); - tEnv.addObjRelation("DataAwareControlModel.NewFieldName", + tEnv.addObjRelation("DataAwareControlModel.NewFieldName", DBTools.TST_INT_F); PropertyValue prop = new PropertyValue(); prop.Name = "HelpText"; prop.Value = "new Help Text since XPropertyAccess"; tEnv.addObjRelation("XPropertyAccess.propertyToChange", prop); tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", "HelpText"); - + return tEnv; } diff --git a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java index a847bfff055d..1104c65abd75 100644 --- a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java +++ b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.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 @@ -43,9 +43,9 @@ import util.FormTools; import util.WriterTools; public class OScrollBarModel extends TestCase { - + XTextDocument xTextDoc; - + /** * Creates Writer document. */ @@ -53,8 +53,8 @@ public class OScrollBarModel extends TestCase { log.println( "creating a textdocument" ); xTextDoc = WriterTools.createTextDoc(((XMultiServiceFactory) tParam.getMSF())); - } - + } + /** * Disposes the Writer document. */ @@ -68,10 +68,10 @@ public class OScrollBarModel extends TestCase { } catch (com.sun.star.util.CloseVetoException e) { log.println("couldn't close document"); } catch (com.sun.star.lang.DisposedException e) { - log.println("couldn't close document"); + log.println("couldn't close document"); } - } - + } + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -83,9 +83,9 @@ public class OScrollBarModel extends TestCase { oObj = aShape.getControl(); log.println( "creating a new environment for OScrollBarModel object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); - + System.out.println("Implementation Name: "+util.utils.getImplName(oObj)); - + String objName = "ScrollBar"; tEnv.addObjRelation("OBJNAME", "com.sun.star.form.component." + objName); PropertyValue prop = new PropertyValue(); @@ -95,5 +95,5 @@ public class OScrollBarModel extends TestCase { tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", "HelpText"); return tEnv; } - + } diff --git a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java index bde3fd640e52..c4a574755192 100644 --- a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.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 @@ -43,24 +43,24 @@ import util.FormTools; import util.WriterTools; public class OSpinButtonModel extends TestCase { - + XTextDocument xTextDoc; - + /** * Creates a Writer document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - + log.println( "creating a textdocument" ); xTextDoc = WriterTools.createTextDoc(((XMultiServiceFactory) tParam.getMSF())); } - + /** * Disposes the Writer document. */ protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); - + try { XCloseable closer = (XCloseable) UnoRuntime.queryInterface( XCloseable.class, xTextDoc); @@ -71,19 +71,19 @@ public class OSpinButtonModel extends TestCase { log.println("couldn't close document"); } } - - + + /** * Creating a Testenvironment for the interfaces to be tested. * Adds spin button into text and retrieves it's control model. */ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - + XInterface oObj = null; - + XControlShape aShape = FormTools.createControlShape( xTextDoc,3000,4500,15000,10000,"SpinButton"); - + WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); oObj = aShape.getControl(); log.println( "creating a new environment for OButtonModel object" ); @@ -94,9 +94,9 @@ public class OSpinButtonModel extends TestCase { prop.Value = "new Help Text since XPropertyAccess"; tEnv.addObjRelation("XPropertyAccess.propertyToChange", prop); tEnv.addObjRelation("XPropertyContainer.propertyNotRemovable", "HelpText"); - + System.out.println("Implementation name: "+util.utils.getImplName(oObj)); return tEnv; } // finish method getTestEnvironment - + } diff --git a/qadevOOo/tests/java/mod/_forms/OTimeControl.java b/qadevOOo/tests/java/mod/_forms/OTimeControl.java index f23d635de7df..30c457630c4c 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.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 @@ -164,7 +164,7 @@ public class OTimeControl extends TestCase { * component. </li> * </ul> */ - protected TestEnvironment createTestEnvironment(TestParameters Param, + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; @@ -174,16 +174,16 @@ public class OTimeControl extends TestCase { XControl aControl = null; //Insert a ControlShape and get the ControlModel - XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, + XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, "TimeField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); XControlModel the_Model = aShape.getControl(); - XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, - 4500, 5000, 10000, + XControlShape aShape2 = FormTools.createControlShape(xTextDoc, 3000, + 4500, 5000, 10000, "TextField"); WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); @@ -192,7 +192,7 @@ public class OTimeControl extends TestCase { //Try to query XControlAccess XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface( - XControlAccess.class, + XControlAccess.class, xTextDoc.getCurrentController()); //now get the OTimeControl @@ -224,14 +224,14 @@ public class OTimeControl extends TestCase { tEnv.addObjRelation("TOOLKIT", the_kit); tEnv.addObjRelation("MODEL", the_Model); - XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, + XWindow forObjRel = (XWindow) UnoRuntime.queryInterface(XWindow.class, aControl); tEnv.addObjRelation("XWindow.AnotherWindow", forObjRel); tEnv.addObjRelation("XWindow.ControlShape", aShape); // Adding relation for XTextListener - ifc.awt._XTextListener.TestTextListener listener = + ifc.awt._XTextListener.TestTextListener listener = new ifc.awt._XTextListener.TestTextListener(); XTextComponent textComp = (XTextComponent) UnoRuntime.queryInterface( XTextComponent.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java index de1e17332d7f..e77eff500152 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.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 @@ -135,20 +135,20 @@ public class OTimeModel extends GenericModelTest { * @param log the log writer */ protected void initialize(TestParameters tParam, PrintWriter log) { - + super.initialize(tParam, log); super.m_ChangePropertyName = "Time"; - + super.m_kindOfControl="TimeField"; - + super.m_ObjectName = "stardiv.one.form.component.TimeField"; - NamedValue DataField = new NamedValue(); - DataField.Name = "DataField"; - DataField.Value = DBTools.TST_INT_F; + NamedValue DataField = new NamedValue(); + DataField.Name = "DataField"; + DataField.Value = DBTools.TST_INT_F; super.m_propertiesToSet.add(DataField); - + super.m_LCShape_Type = "FixedText"; } /** @@ -169,19 +169,19 @@ public class OTimeModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, + protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { TestEnvironment tEnv = super.createTestEnvironment(Param, log); HashSet exclude = new HashSet(); - + exclude.add("FormatKey"); - tEnv.addObjRelation("XUpdateBroadcaster.Checker", + tEnv.addObjRelation("XUpdateBroadcaster.Checker", new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue)); return tEnv; } - + static class Checker implements UpdateChecker { private short lastItem = (short) 0; XLoadable formLoaderF = null; @@ -189,7 +189,7 @@ public class OTimeModel extends GenericModelTest { XInterface ctrl = null; String ChangePropertyName = null; Object ChangePropertyValue = null; - + public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) { formLoaderF = xl; this.ps = ps; @@ -197,7 +197,7 @@ public class OTimeModel extends GenericModelTest { this.ChangePropertyName=ChangePropertyName; this.ChangePropertyValue=ChangePropertyValue; } - + private int lastTime = 0; public void update() throws com.sun.star.uno.Exception { @@ -218,7 +218,7 @@ public class OTimeModel extends GenericModelTest { XBoundComponent bound = (XBoundComponent) UnoRuntime.queryInterface( XBoundComponent.class, ctrl); XResultSetUpdate update = (XResultSetUpdate) UnoRuntime.queryInterface( - XResultSetUpdate.class, + XResultSetUpdate.class, formLoaderF); bound.commit(); @@ -230,7 +230,7 @@ public class OTimeModel extends GenericModelTest { Integer getT = (Integer) ps.getPropertyValue("Time"); - return (getT != null) && + return (getT != null) && (Math.abs(getT.intValue() - lastTime) < 100); } } |