diff options
Diffstat (limited to 'qadevOOo/tests/java/mod/_forms')
38 files changed, 198 insertions, 584 deletions
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java index 67b4f7eb7c0b..98320140b1f0 100644 --- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java +++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java @@ -369,53 +369,40 @@ public class GenericModelTest extends TestCase { */ @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; XControlShape aShape = null; XMultiServiceFactory xMSF = Param.getMSF(); - try{ - log.println("adding contol shape '" + m_kindOfControl + "'"); - 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): '" + - m_kindOfControl + "': ", e); - - } + log.println("adding contol shape '" + m_kindOfControl + "'"); + aShape = FormTools.createControlShape(m_xTextDoc, 3000, + 4500, 15000, 10000, + m_kindOfControl); WriterTools.getDrawPage(m_xTextDoc).add(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"); + 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); + log.println("copy '"+sourceTestDB + "' -> '" + destTestDB + "'"); + utils.copyFile(xMSF, sourceTestDB, destTestDB); - m_dbTools = new DBTools( xMSF ); - String tmpDir = utils.getOfficeTemp((xMSF)); + m_dbTools = new DBTools( xMSF ); + String tmpDir = utils.getOfficeTemp((xMSF)); - DBTools.DataSourceInfo srcInf = m_dbTools.newDataSourceInfo(); - srcInf.URL = "sdbc:dbase:" + DBTools.dirToUrl(tmpDir); - log.println("data source: " + srcInf.URL); + DBTools.DataSourceInfo srcInf = m_dbTools.newDataSourceInfo(); + srcInf.URL = "sdbc:dbase:" + DBTools.dirToUrl(tmpDir); + log.println("data source: " + srcInf.URL); - m_dbSrc = srcInf.getDataSourceService(); - m_dbTools.reRegisterDB(m_dbSourceName, m_dbSrc); + m_dbSrc = srcInf.getDataSourceService(); + m_dbTools.reRegisterDB(m_dbSourceName, m_dbSrc); - m_XFormLoader = FormTools.bindForm(m_xTextDoc, m_dbSourceName, - m_TestDB); - } catch (com.sun.star.uno.Exception e) { - log.println("!!! Can't access TestDB !!!"); - e.printStackTrace(log); - throw new StatusException("Can't access TestDB", e); - } + m_XFormLoader = FormTools.bindForm(m_xTextDoc, m_dbSourceName, + m_TestDB); log.println("creating a new environment for object"); @@ -433,29 +420,12 @@ public class GenericModelTest extends TestCase { int i = 0; NamedValue prop = null; - try { - for (i = 0; i < m_propertiesToSet.size(); i++){ - prop = m_propertiesToSet.get(i); + for (i = 0; i < m_propertiesToSet.size(); i++){ + prop = m_propertiesToSet.get(i); - log.println("setting property: '"+prop.Name+"' to value '"+prop.Value.toString()+"'"); + 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) { - e.printStackTrace(log); - throw new StatusException("Couldn't set property '" + prop.Name + "': ", e); - } catch (com.sun.star.lang.IllegalArgumentException e) { - e.printStackTrace(log); - throw new StatusException("Couldn't set property '" + prop.Name + "': ", e); - } catch (com.sun.star.beans.PropertyVetoException e) { - e.printStackTrace(log); - throw new StatusException("Couldn't set property '" + prop.Name + "': ", e); - } catch (com.sun.star.beans.UnknownPropertyException e) { - e.printStackTrace(log); - throw new StatusException("Couldn't set property '" + prop.Name + "': ", e); - } catch (java.lang.ClassCastException e) { - e.printStackTrace(log); - throw new StatusException("Couldn't get property on index '" + i + "': ", e); + m_XPS.setPropertyValue(prop.Name, prop.Value); } // added LabelControl for 'DataAwareControlModel' @@ -467,7 +437,7 @@ 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 diff --git a/qadevOOo/tests/java/mod/_forms/OButtonControl.java b/qadevOOo/tests/java/mod/_forms/OButtonControl.java index ea9fe395a550..9d604830bf4a 100644 --- a/qadevOOo/tests/java/mod/_forms/OButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/OButtonControl.java @@ -145,7 +145,7 @@ public class OButtonControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; XWindowPeer the_win = null; XToolkit the_kit = null; @@ -176,18 +176,12 @@ public class OButtonControl extends TestCase { xTextDoc.getCurrentController()); //now get the OButtonControl - try { - oObj = the_access.getControl(the_Model); - aControl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get OButtonControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get OButtonControl", e); - } + oObj = the_access.getControl(the_Model); + aControl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println("creating a new environment for OButtonControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/OButtonModel.java b/qadevOOo/tests/java/mod/_forms/OButtonModel.java index 2365ac47bb4d..791378206e73 100644 --- a/qadevOOo/tests/java/mod/_forms/OButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/OButtonModel.java @@ -19,7 +19,6 @@ package mod._forms; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; /** @@ -104,16 +103,4 @@ public class OButtonModel extends GenericModelTest { } - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - 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 64be708cf28c..1b477d4059be 100644 --- a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java @@ -155,7 +155,7 @@ public class OCheckBoxControl extends TestCase { * </ul> */ @Override - protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception { XInterface oObj = null; XWindowPeer the_win = null; XToolkit the_kit = null; @@ -182,18 +182,12 @@ public class OCheckBoxControl extends TestCase { XControlAccess.class,xTextDoc.getCurrentController()); //now get the OButtonControl - try { - oObj = the_access.getControl(the_Model); - aControl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200,200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get OCheckBoxControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get OCheckBoxControl", e ); - } + oObj = the_access.getControl(the_Model); + aControl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200,200); + aGraphic = aDevice.createGraphics(); log.println( "creating a new environment for OCheckBoxControl object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java index aaf241180351..da579f86343f 100644 --- a/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java @@ -19,7 +19,6 @@ package mod._forms; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; @@ -118,16 +117,5 @@ public class OCheckBoxModel extends GenericModelTest { } - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { - return super.createTestEnvironment(Param, log); - } } // finish class OCheckBoxModel diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java index 43b755ed87dc..a740b136df7b 100644 --- a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java @@ -157,7 +157,7 @@ public class OComboBoxControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; XWindowPeer the_win = null; XToolkit the_kit = null; @@ -188,18 +188,12 @@ public class OComboBoxControl extends TestCase { xTextDoc.getCurrentController()); //now get the OButtonControl - try { - oObj = the_access.getControl(the_Model); - aControl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get OCheckBoxControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get OComboBoxControl", e); - } + oObj = the_access.getControl(the_Model); + aControl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println("creating a new environment for OComboBoxControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java b/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java index 524a95e0d245..571ba1baeaaf 100644 --- a/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java @@ -19,7 +19,6 @@ package mod._forms; import com.sun.star.beans.NamedValue; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; import util.DBTools; @@ -133,16 +132,4 @@ public class OComboBoxModel extends GenericModelTest { } - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { - return super.createTestEnvironment(Param, log); - } - } // finish class OComboBoxModel diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java index d0d5dc1e4328..9f3d82843f23 100644 --- a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java +++ b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java @@ -160,7 +160,7 @@ public class OCurrencyControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; XWindowPeer the_win = null; XToolkit the_kit = null; @@ -191,18 +191,12 @@ public class OCurrencyControl extends TestCase { xTextDoc.getCurrentController()); //now get the OCurrencyControl - try { - oObj = the_access.getControl(the_Model); - aControl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get OCurrencyControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get OCurrencyControl", e); - } + oObj = the_access.getControl(the_Model); + aControl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println("creating a new environment for OCurrencyControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java index baa141119876..9e54e481aa77 100644 --- a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java +++ b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java @@ -19,7 +19,6 @@ package mod._forms; import com.sun.star.beans.NamedValue; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; @@ -129,15 +128,4 @@ public class OCurrencyModel extends GenericModelTest { } - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { - return super.createTestEnvironment(Param, log); - } } // finish class OCurrencyModel diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index fcaf12b492c6..7a7e6b3af2d1 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -22,7 +22,6 @@ import ifc.sdb._XCompletedExecution; import java.io.PrintWriter; import java.util.ArrayList; -import lib.Status; import lib.StatusException; import lib.TestCase; import lib.TestEnvironment; @@ -307,7 +306,7 @@ public class ODatabaseForm extends TestCase { */ @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { if (xTextDoc != null) { try { XCloseable closer = UnoRuntime.queryInterface( @@ -327,13 +326,7 @@ public class ODatabaseForm extends TestCase { //initialize test table if (isMySQLDB) { - try { - dbTools.initTestTableUsingJDBC(tableName, srcInf); - } catch (java.sql.SQLException e) { - throw new StatusException(e, Status.failed("Couldn't " + " init test table. SQLException...")); - } catch (java.lang.ClassNotFoundException e) { - throw new StatusException(e, Status.failed("Couldn't " + "register mysql driver")); - } + dbTools.initTestTableUsingJDBC(tableName, srcInf); } XInterface oObj = null; @@ -368,15 +361,8 @@ public class ODatabaseForm extends TestCase { XLoadable formLoader = null; - try { - formLoader = FormTools.bindForm(xTextDoc, "MyForm", dbSourceName, - tableName); - } catch (com.sun.star.uno.Exception e) { - log.println("Cann't bind the form to source '" + dbSourceName + - "', table '" + tableName + "' :"); - e.printStackTrace(log); - throw new StatusException("Cann't bind a form", e); - } + formLoader = FormTools.bindForm(xTextDoc, "MyForm", dbSourceName, + tableName); // DEBUG @@ -489,14 +475,8 @@ public class ODatabaseForm extends TestCase { XControl cntrl = null; //now get the OEditControl - try { - cntrl = the_access.getControl(the_Model); - log.println(cntrl.getClass().getName()); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get OEditControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get OEditControl", e); - } + cntrl = the_access.getControl(the_Model); + log.println(cntrl.getClass().getName()); XResultSet the_set = UnoRuntime.queryInterface( XResultSet.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/ODateControl.java b/qadevOOo/tests/java/mod/_forms/ODateControl.java index af54d68f7af1..c8a233391919 100644 --- a/qadevOOo/tests/java/mod/_forms/ODateControl.java +++ b/qadevOOo/tests/java/mod/_forms/ODateControl.java @@ -156,7 +156,7 @@ public class ODateControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; Object anotherCtrl = null; XWindowPeer the_win = null; @@ -187,18 +187,12 @@ public class ODateControl extends TestCase { xTextDoc.getCurrentController()); //now get the ODateControl - try { - oObj = the_access.getControl(the_Model); - anotherCtrl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get ODateControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get ODateControl", e); - } + oObj = the_access.getControl(the_Model); + anotherCtrl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println("creating a new environment for ODateControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/ODateModel.java b/qadevOOo/tests/java/mod/_forms/ODateModel.java index 15a17095c931..aad8154c5343 100644 --- a/qadevOOo/tests/java/mod/_forms/ODateModel.java +++ b/qadevOOo/tests/java/mod/_forms/ODateModel.java @@ -20,7 +20,6 @@ package mod._forms; import com.sun.star.beans.NamedValue; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; import util.DBTools; @@ -148,16 +147,4 @@ public class ODateModel extends GenericModelTest { } - - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { - return super.createTestEnvironment(Param, log); - } } // finish class ODateModel diff --git a/qadevOOo/tests/java/mod/_forms/OEditControl.java b/qadevOOo/tests/java/mod/_forms/OEditControl.java index 8e032e39e472..f3f06ce276e9 100644 --- a/qadevOOo/tests/java/mod/_forms/OEditControl.java +++ b/qadevOOo/tests/java/mod/_forms/OEditControl.java @@ -166,7 +166,7 @@ public class OEditControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; XControl aControl = null; XWindowPeer the_win = null; @@ -197,18 +197,12 @@ public class OEditControl extends TestCase { xTextDoc.getCurrentController()); //now get the OEditControl - try { - oObj = the_access.getControl(the_Model); - aControl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get OEditControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get OEditControl", e); - } + oObj = the_access.getControl(the_Model); + aControl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println("creating a new environment for OEditControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/OEditModel.java b/qadevOOo/tests/java/mod/_forms/OEditModel.java index d020d3acc75b..3a9bec8f93c1 100644 --- a/qadevOOo/tests/java/mod/_forms/OEditModel.java +++ b/qadevOOo/tests/java/mod/_forms/OEditModel.java @@ -20,7 +20,6 @@ package mod._forms; import com.sun.star.beans.NamedValue; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; import util.DBTools; @@ -140,15 +139,4 @@ public class OEditModel extends GenericModelTest { super.m_ChangePropertyName = "Text"; } - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { - return super.createTestEnvironment(Param, log); - } } // finish class OEditModel diff --git a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java index c7064d3dfbaf..05e54558b1b9 100644 --- a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java @@ -136,7 +136,7 @@ public class OFileControlModel extends TestCase { */ @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; @@ -158,24 +158,20 @@ public class OFileControlModel extends TestCase { XMultiServiceFactory.class, xDrawDoc); - try { - Object oInt = oDocMSF.createInstance( - "com.sun.star.drawing.ControlShape"); - Object aCon = oDocMSF.createInstance( - "com.sun.star.form.component." + objName); - aControl = UnoRuntime.queryInterface( - XControlModel.class, aCon); - aShape = UnoRuntime.queryInterface( - XControlShape.class, oInt); - size.Height = 1500; - size.Width = 3000; - position.X = 1000; - position.Y = 1000; - aShape.setSize(size); - aShape.setPosition(position); - } catch (com.sun.star.uno.Exception e) { - throw new StatusException(e, Status.failed("Can't create component")); - } + Object oInt = oDocMSF.createInstance( + "com.sun.star.drawing.ControlShape"); + Object aCon = oDocMSF.createInstance( + "com.sun.star.form.component." + objName); + aControl = UnoRuntime.queryInterface( + XControlModel.class, aCon); + aShape = UnoRuntime.queryInterface( + XControlShape.class, oInt); + size.Height = 1500; + size.Width = 3000; + position.X = 1000; + position.Y = 1000; + aShape.setSize(size); + aShape.setPosition(position); aShape.setControl(aControl); diff --git a/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java b/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java index 95ef1bba203c..754df511b4c7 100644 --- a/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java +++ b/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java @@ -19,7 +19,6 @@ package mod._forms; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; @@ -97,16 +96,4 @@ public class OFixedTextModel extends GenericModelTest { } - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - 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 9400c2283e71..cb812c5a73d7 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java +++ b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java @@ -153,7 +153,7 @@ public class OFormattedControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; Object anotherCtrl = null; XWindowPeer the_win = null; @@ -184,18 +184,12 @@ public class OFormattedControl extends TestCase { xTextDoc.getCurrentController()); //now get the OFormattedControl - try { - oObj = the_access.getControl(the_Model); - anotherCtrl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get OFormattedControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get OFormattedControl", e); - } + oObj = the_access.getControl(the_Model); + anotherCtrl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println("creating a new environment for OFormattedControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java b/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java index e55f6d282b31..2223ebcf881a 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java +++ b/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java @@ -20,7 +20,6 @@ package mod._forms; import com.sun.star.beans.NamedValue; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; import util.DBTools; @@ -133,15 +132,4 @@ public class OFormattedFieldWrapper extends GenericModelTest { } - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { - return super.createTestEnvironment(Param, log); - } } // finish class OFormattedFieldWrapper diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java index 3804bbe20fa0..4b27c4844326 100644 --- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java @@ -161,7 +161,7 @@ public class OGridControlModel extends GenericModelTest { */ @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { TestEnvironment tEnv = super.createTestEnvironment(Param, log); XInterface oObj = tEnv.getTestObject(); @@ -172,39 +172,19 @@ public class OGridControlModel extends GenericModelTest { XPropertySet aControl4 = null; XPropertySet aControl5 = null; - try { - XGridColumnFactory columns = UnoRuntime.queryInterface( - XGridColumnFactory.class, oObj); - aControl = columns.createColumn("TextField"); - aControl2 = columns.createColumn("DateField"); - aControl3 = columns.createColumn("TextField"); - aControl4 = columns.createColumn("TextField"); - aControl5 = columns.createColumn("TextField"); - } catch (com.sun.star.lang.IllegalArgumentException e) { - // Some exception occurs.FAILED - log.println("!!! Couldn't create instance : " + e); - throw new StatusException("Can't create column instances.", e); - } + XGridColumnFactory columns = UnoRuntime.queryInterface( + XGridColumnFactory.class, oObj); + aControl = columns.createColumn("TextField"); + aControl2 = columns.createColumn("DateField"); + aControl3 = columns.createColumn("TextField"); + aControl4 = columns.createColumn("TextField"); + aControl5 = columns.createColumn("TextField"); XNameContainer aContainer = UnoRuntime.queryInterface( XNameContainer.class, oObj); - try { - aContainer.insertByName("First", aControl); - aContainer.insertByName("Second", aControl2); - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("!!! Could't insert column Instance"); - e.printStackTrace(log); - throw new StatusException("Can't insert columns", e); - } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("!!! Could't insert column Instance"); - e.printStackTrace(log); - throw new StatusException("Can't insert columns", e); - } catch (com.sun.star.container.ElementExistException e) { - log.println("!!! Could't insert column Instance"); - e.printStackTrace(log); - throw new StatusException("Can't insert columns", e); - } + aContainer.insertByName("First", aControl); + aContainer.insertByName("Second", aControl2); //Relations for XSelectionSupplier tEnv.addObjRelation("Selections", new Object[] { aControl, aControl2 }); @@ -302,7 +282,7 @@ class OGridControlModelold extends TestCase { */ @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; XInterface oInstance = null; XPropertySet aControl = null; @@ -325,39 +305,19 @@ class OGridControlModelold extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - try { - columns = UnoRuntime.queryInterface( - XGridColumnFactory.class, oObj); - aControl = columns.createColumn("TextField"); - aControl2 = columns.createColumn("DateField"); - aControl3 = columns.createColumn("TextField"); - aControl4 = columns.createColumn("TextField"); - columns.createColumn("TextField"); - } catch (com.sun.star.lang.IllegalArgumentException e) { - // Some exception occurs.FAILED - log.println("!!! Couldn't create instance : " + e); - throw new StatusException("Can't create column instances.", e); - } + columns = UnoRuntime.queryInterface( + XGridColumnFactory.class, oObj); + aControl = columns.createColumn("TextField"); + aControl2 = columns.createColumn("DateField"); + aControl3 = columns.createColumn("TextField"); + aControl4 = columns.createColumn("TextField"); + columns.createColumn("TextField"); XNameContainer aContainer = UnoRuntime.queryInterface( XNameContainer.class, oObj); - try { - aContainer.insertByName("First", aControl); - aContainer.insertByName("Second", aControl2); - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("!!! Could't insert column Instance"); - e.printStackTrace(log); - throw new StatusException("Can't insert columns", e); - } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("!!! Could't insert column Instance"); - e.printStackTrace(log); - throw new StatusException("Can't insert columns", e); - } catch (com.sun.star.container.ElementExistException e) { - log.println("!!! Could't insert column Instance"); - e.printStackTrace(log); - throw new StatusException("Can't insert columns", e); - } + aContainer.insertByName("First", aControl); + aContainer.insertByName("Second", aControl2); //Relations for XSelectionSupplier tEnv.addObjRelation("Selections", new Object[] { aControl, aControl2 }); @@ -373,16 +333,11 @@ class OGridControlModelold extends TestCase { // INSTANCEn : _XNameContainer; _XNameReplace log.println("adding INSTANCEn as obj relation to environment"); - try { - for (int n = 1; n < (3 * THRCNT + 1); n++) { - log.println("adding INSTANCE" + n + - " as obj relation to environment"); - oInstance = columns.createColumn("TextField"); - tEnv.addObjRelation("INSTANCE" + n, oInstance); - } - } catch (com.sun.star.lang.IllegalArgumentException e) { - e.printStackTrace(log); - throw new StatusException("Can't create 'INSTANCEn' relations", e); + for (int n = 1; n < (3 * THRCNT + 1); 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 06688dcc5e6b..0423dddb32d1 100644 --- a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java @@ -135,7 +135,7 @@ public class OGroupBoxControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; Object anotherCtrl = null; XWindowPeer the_win = null; @@ -166,18 +166,12 @@ public class OGroupBoxControl extends TestCase { xTextDoc.getCurrentController()); //now get the OGroupBoxControl - try { - oObj = the_access.getControl(the_Model); - anotherCtrl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get OGroupBoxControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get OGroupBoxControl", e); - } + oObj = the_access.getControl(the_Model); + anotherCtrl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println("creating a new environment for OGroupBoxControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java index d175977d3f04..75de4dc0cb4e 100644 --- a/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java @@ -19,7 +19,6 @@ package mod._forms; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; @@ -97,16 +96,4 @@ public class OGroupBoxModel extends GenericModelTest { super.m_ChangePropertyName = "Text"; } - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { - return super.createTestEnvironment(Param, log); - } - } // finish class OGroupBoxModel diff --git a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java index 81b194e2f41d..aa6bf87cf001 100644 --- a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java +++ b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java @@ -134,7 +134,7 @@ public class OHiddenModel extends TestCase { */ @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; @@ -147,34 +147,20 @@ public class OHiddenModel extends TestCase { String objName = "HiddenControl"; XInterface ctrl = SOF.createControl(xDrawDoc, objName); - try { - XDrawPage oDP = DrawTools.getDrawPage(xDrawDoc, 0); + XDrawPage oDP = DrawTools.getDrawPage(xDrawDoc, 0); - XNameContainer nc = FormTools.getForms(oDP); - FormTools.insertForm(xDrawDoc, nc, "OHiddenModelForm"); + XNameContainer nc = FormTools.getForms(oDP); + FormTools.insertForm(xDrawDoc, nc, "OHiddenModelForm"); - Object frm = nc.getByName("OHiddenModelForm"); + Object frm = nc.getByName("OHiddenModelForm"); - XNameContainer frmNC = UnoRuntime.queryInterface( - XNameContainer.class, frm); + XNameContainer frmNC = UnoRuntime.queryInterface( + XNameContainer.class, frm); - frmNC.insertByName("OHiddenModel", ctrl); - oObj = (XInterface) AnyConverter.toObject( - new Type(XInterface.class), - frmNC.getByName("OHiddenModel")); - } catch (com.sun.star.lang.WrappedTargetException e) { - e.printStackTrace(log); - throw new StatusException("Can't create and add control", e); - } catch (com.sun.star.lang.IllegalArgumentException e) { - e.printStackTrace(log); - throw new StatusException("Can't create and add control", e); - } catch (com.sun.star.container.NoSuchElementException e) { - e.printStackTrace(log); - throw new StatusException("Can't create and add control", e); - } catch (com.sun.star.container.ElementExistException e) { - e.printStackTrace(log); - throw new StatusException("Can't create and add control", e); - } + frmNC.insertByName("OHiddenModel", ctrl); + oObj = (XInterface) AnyConverter.toObject( + new Type(XInterface.class), + frmNC.getByName("OHiddenModel")); log.println("creating a new environment for drawpage object"); diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java index ec143bdafb1a..bb7ce361b836 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java @@ -140,7 +140,7 @@ public class OImageButtonControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; Object anotherCtrl = null; XWindowPeer the_win = null; @@ -171,18 +171,12 @@ public class OImageButtonControl extends TestCase { xTextDoc.getCurrentController()); //now get the OImageButtonControl - try { - oObj = the_access.getControl(the_Model); - anotherCtrl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get OImageButtonControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get OImageButtonControl", e); - } + oObj = the_access.getControl(the_Model); + anotherCtrl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println( "creating a new environment for OImageButtonControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java b/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java index 21d5f7a7a3b3..15294202e11e 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java @@ -18,7 +18,6 @@ package mod._forms; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; /** @@ -101,16 +100,4 @@ public class OImageButtonModel extends GenericModelTest { } - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { - return super.createTestEnvironment(Param, log); - } - } // finish class OImageButtonModel diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java index aa700ce29c2f..e76af7e202de 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java @@ -141,7 +141,7 @@ public class OImageControlControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; XWindowPeer the_win = null; XToolkit the_kit = null; @@ -172,18 +172,12 @@ public class OImageControlControl extends TestCase { xTextDoc.getCurrentController()); //now get the OImageControlControl - try { - oObj = the_access.getControl(the_Model); - the_win = the_access.getControl(the_Model).getPeer(); - aControl = the_access.getControl(the_Model2); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get OImageControlControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get OImageControlControl", e); - } + oObj = the_access.getControl(the_Model); + the_win = the_access.getControl(the_Model).getPeer(); + aControl = the_access.getControl(the_Model2); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println( "creating a new environment for OImageControlControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlModel.java b/qadevOOo/tests/java/mod/_forms/OImageControlModel.java index 8014f9a4a2d1..fabfde66c7c6 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OImageControlModel.java @@ -20,7 +20,6 @@ package mod._forms; import com.sun.star.beans.NamedValue; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; import util.DBTools; @@ -132,15 +131,4 @@ public class OImageControlModel extends GenericModelTest { } - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { - return super.createTestEnvironment(Param, log); - } } // finish class OImageControlModel diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java index c0862484ba58..cd422b7fbf09 100644 --- a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java @@ -76,7 +76,7 @@ public class OListBoxControl extends TestCase { } @Override - protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { + protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception { XInterface oObj = null; Object anotherCtrl = null ; XWindowPeer the_win = null; @@ -103,18 +103,12 @@ public class OListBoxControl extends TestCase { XControlAccess.class,xTextDoc.getCurrentController()); //now get the OListBoxControl - try { - oObj = the_access.getControl(the_Model); - anotherCtrl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200,200); - aGraphic = aDevice.createGraphics(); - } catch (Exception e) { - log.println("Couldn't get OListBoxControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get OListBoxControl", e ); - } + oObj = the_access.getControl(the_Model); + anotherCtrl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200,200); + aGraphic = aDevice.createGraphics(); log.println( "creating a new environment for OListBoxControl object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java index 160ea8cbe3e4..7a8bfeb475e5 100644 --- a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java @@ -25,7 +25,6 @@ import com.sun.star.form.XLoadable; import com.sun.star.sdbc.SQLException; import com.sun.star.sdbc.XResultSetUpdate; -import com.sun.star.uno.Exception; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import ifc.form._XUpdateBroadcaster.UpdateChecker; @@ -165,7 +164,7 @@ public class OListBoxModel extends GenericModelTest { */ @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { TestEnvironment tEnv = super.createTestEnvironment(Param, log); tEnv.addObjRelation("XUpdateBroadcaster.Checker", @@ -187,7 +186,7 @@ public class OListBoxModel extends GenericModelTest { this.ChangePropertyName=ChangePropertyName; } - public void update() throws Exception { + public void update() throws com.sun.star.uno.Exception { if (!formLoaderF.isLoaded()) { formLoaderF.load(); } @@ -206,7 +205,7 @@ public class OListBoxModel extends GenericModelTest { update.updateRow(); } - public boolean wasCommited() throws Exception { + public boolean wasCommited() throws com.sun.star.uno.Exception { formLoaderF.reload(); short[] getS = (short[]) ps.getPropertyValue(ChangePropertyName); diff --git a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java index 837fb706caef..a1e2d2aa219a 100644 --- a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java +++ b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java @@ -102,7 +102,7 @@ public class ONavigationBarControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; XWindowPeer the_win = null; XToolkit the_kit = null; @@ -133,18 +133,12 @@ public class ONavigationBarControl extends TestCase { xTextDoc.getCurrentController()); //now get the OButtonControl - try { - oObj = the_access.getControl(the_Model); - aControl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get ONavigationBarControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get ONavigationBarControl", e); - } + oObj = the_access.getControl(the_Model); + aControl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println("creating a new environment for ONavigationBarControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java b/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java index 81192481ca65..89b81f6f75aa 100644 --- a/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java +++ b/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java @@ -19,7 +19,6 @@ package mod._forms; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; public class ONavigationBarModel extends GenericModelTest { @@ -49,17 +48,5 @@ public class ONavigationBarModel extends GenericModelTest { } - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - 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 aa67fb599219..8be65237de4b 100644 --- a/qadevOOo/tests/java/mod/_forms/ONumericControl.java +++ b/qadevOOo/tests/java/mod/_forms/ONumericControl.java @@ -156,7 +156,7 @@ public class ONumericControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; Object anotherCtrl = null; XWindowPeer the_win = null; @@ -187,18 +187,12 @@ public class ONumericControl extends TestCase { xTextDoc.getCurrentController()); //now get the ONumericControl - try { - oObj = the_access.getControl(the_Model); - anotherCtrl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get ONumericControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get ONumericControl", e); - } + oObj = the_access.getControl(the_Model); + anotherCtrl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println("creating a new environment for ONumericControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/ONumericModel.java b/qadevOOo/tests/java/mod/_forms/ONumericModel.java index b8e085c0a4dc..8b6405401f8c 100644 --- a/qadevOOo/tests/java/mod/_forms/ONumericModel.java +++ b/qadevOOo/tests/java/mod/_forms/ONumericModel.java @@ -20,7 +20,6 @@ package mod._forms; import com.sun.star.beans.NamedValue; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; import util.DBTools; @@ -131,15 +130,4 @@ public class ONumericModel extends GenericModelTest { } - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { - return super.createTestEnvironment(Param, log); - } } // finish class ONumericModel diff --git a/qadevOOo/tests/java/mod/_forms/OPatternControl.java b/qadevOOo/tests/java/mod/_forms/OPatternControl.java index 7f8fabeac0bd..4b1f11d927b1 100644 --- a/qadevOOo/tests/java/mod/_forms/OPatternControl.java +++ b/qadevOOo/tests/java/mod/_forms/OPatternControl.java @@ -156,7 +156,7 @@ public class OPatternControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; Object anotherCtrl = null; XWindowPeer the_win = null; @@ -187,18 +187,12 @@ public class OPatternControl extends TestCase { xTextDoc.getCurrentController()); //now get the OPatternControl - try { - oObj = the_access.getControl(the_Model); - anotherCtrl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get OPatternControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get OPatternControl", e); - } + oObj = the_access.getControl(the_Model); + anotherCtrl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println("creating a new environment for OPatternControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/OPatternModel.java b/qadevOOo/tests/java/mod/_forms/OPatternModel.java index 950d66207be5..65039cf2fcc2 100644 --- a/qadevOOo/tests/java/mod/_forms/OPatternModel.java +++ b/qadevOOo/tests/java/mod/_forms/OPatternModel.java @@ -20,7 +20,6 @@ package mod._forms; import com.sun.star.beans.NamedValue; import java.io.PrintWriter; -import lib.TestEnvironment; import lib.TestParameters; import util.DBTools; @@ -136,16 +135,4 @@ public class OPatternModel extends GenericModelTest { } - /** - * calls <CODE>createTestEnvironment()</CODE> from it's super class - * @param Param the test parameter - * @param log the log writer - * @return lib.TestEnvironment - */ - @Override - protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { - return super.createTestEnvironment(Param, log); - } - } // finish class OPatternModel diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java index 670c10b1b66a..21e358bfc946 100644 --- a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java @@ -144,7 +144,7 @@ public class ORadioButtonControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; XWindowPeer the_win = null; XToolkit the_kit = null; @@ -175,18 +175,12 @@ public class ORadioButtonControl extends TestCase { xTextDoc.getCurrentController()); //now get the ORadioButtonControl - try { - oObj = the_access.getControl(the_Model); - aControl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get ORadioButtonControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get ORadioButtonControl", e); - } + oObj = the_access.getControl(the_Model); + aControl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println( "creating a new environment for ORadioButtonControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java index 7794d7f0e24c..14af07ca06f1 100644 --- a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java @@ -141,7 +141,7 @@ public class ORadioButtonModel extends GenericModelTest { */ @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { TestEnvironment tEnv = super.createTestEnvironment(Param, log); tEnv.addObjRelation("DataAwareControlModel.NewFieldName", DBTools.TST_INT_F); diff --git a/qadevOOo/tests/java/mod/_forms/OTimeControl.java b/qadevOOo/tests/java/mod/_forms/OTimeControl.java index 41fda5679d00..7526f4c6f9f6 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.java @@ -157,7 +157,7 @@ public class OTimeControl extends TestCase { */ @Override protected TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { XInterface oObj = null; XWindowPeer the_win = null; XToolkit the_kit = null; @@ -188,18 +188,12 @@ public class OTimeControl extends TestCase { xTextDoc.getCurrentController()); //now get the OTimeControl - try { - oObj = the_access.getControl(the_Model); - aControl = the_access.getControl(the_Model2); - the_win = the_access.getControl(the_Model).getPeer(); - the_kit = the_win.getToolkit(); - aDevice = the_kit.createScreenCompatibleDevice(200, 200); - aGraphic = aDevice.createGraphics(); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get OTimeControl"); - e.printStackTrace(log); - throw new StatusException("Couldn't get OTimeControl", e); - } + oObj = the_access.getControl(the_Model); + aControl = the_access.getControl(the_Model2); + the_win = the_access.getControl(the_Model).getPeer(); + the_kit = the_win.getToolkit(); + aDevice = the_kit.createScreenCompatibleDevice(200, 200); + aGraphic = aDevice.createGraphics(); log.println("creating a new environment for OTimeControl object"); diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java index 7ffa83c7d510..7bbc5a389a5e 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java @@ -156,7 +156,7 @@ public class OTimeModel extends GenericModelTest { */ @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, - PrintWriter log) { + PrintWriter log) throws Exception { TestEnvironment tEnv = super.createTestEnvironment(Param, log); HashSet<String> exclude = new HashSet<String>(); |