INTEGRATION: CWS qadev11 (1.2.14); FILE MERGED

2003/09/03 15:29:51 sw 1.2.14.1: #112049#

2 files changed, 80 insertions, 62 deletions

diff --git a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java
index b4254c30c664..8927964d018e 100644
--- a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java
+++ b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Toolkit.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-05-27 14:00:56 $
+ *  last change:$Date: 2003-09-08 13:03:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,27 +61,28 @@
 
 package mod._toolkit;
 
-import com.sun.star.awt.XControl;
-import com.sun.star.lang.XMultiServiceFactory;
+import java.io.PrintWriter;
+
+import lib.StatusException;
+import lib.TestCase;
+import lib.TestEnvironment;
+import lib.TestParameters;
+import util.FormTools;
+import util.SOfficeFactory;
+import util.WriterTools;
+import util.utils;
+
 import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
 import com.sun.star.drawing.XShape;
 import com.sun.star.frame.XController;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.view.XControlAccess;
-import java.io.PrintWriter;
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.FormTools;
-import util.SOfficeFactory;
-import util.WriterTools;
-import util.utils;
 
 /**
 * Test for <code>com.sun.star.awt.Toolkit</code> service.
@@ -134,7 +135,6 @@ public class Toolkit extends TestCase {
 
         //now get the toolkit
         try {
-            XControl ctrl = the_access.getControl(the_Model) ;
             win = cntrlr.getFrame().getContainerWindow();
             //win = (XWindow) UnoRuntime.queryInterface(XWindow.class, ctrl) ;
             the_win = the_access.getControl(the_Model).getPeer();
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java
index 73985251827c..da40cbae1466 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoControlButton.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-05-27 14:01:08 $
+ *  last change:$Date: 2003-09-08 13:03:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,11 +58,20 @@
  *
  *
  ************************************************************************/
-
 package mod._toolkit;
 
+import java.io.PrintWriter;
+
+import lib.StatusException;
+import lib.TestCase;
+import lib.TestEnvironment;
+import lib.TestParameters;
+import util.FormTools;
+import util.SOfficeFactory;
+import util.WriterTools;
+import util.utils;
+
 import com.sun.star.awt.XControlModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.awt.XDevice;
 import com.sun.star.awt.XGraphics;
 import com.sun.star.awt.XToolkit;
@@ -72,56 +81,64 @@ import com.sun.star.drawing.XControlShape;
 import com.sun.star.drawing.XShape;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XFrame;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
+import com.sun.star.util.XCloseable;
 import com.sun.star.view.XControlAccess;
-import java.io.PrintWriter;
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.FormTools;
-import util.SOfficeFactory;
-import util.WriterTools;
-import util.utils;
 
-public class UnoControlButton extends TestCase {
 
+public class UnoControlButton extends TestCase {
     XTextDocument xTextDoc;
     XTextDocument xTD2;
 
-    protected void initialize ( TestParameters Param, PrintWriter log) {
-        SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() );
+    protected void initialize(TestParameters Param, PrintWriter log) {
+        SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF());
 
         try {
-            log.println( "creating a textdocument" );
-            xTextDoc = SOF.createTextDoc( null );
-            xTD2 = WriterTools.createTextDoc((XMultiServiceFactory)Param.getMSF());
-        } catch ( com.sun.star.uno.Exception e ) {
+            log.println("creating a textdocument");
+            xTextDoc = SOF.createTextDoc(null);
+            xTD2 = WriterTools.createTextDoc( (XMultiServiceFactory) Param.getMSF());
+        } catch (com.sun.star.uno.Exception e) {
             // Some exception occures.FAILED
-            e.printStackTrace( log );
-            throw new StatusException( "Couldn't create document", e );
+            e.printStackTrace(log);
+            throw new StatusException("Couldn't create document", e);
         }
     }
 
-    protected void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    disposing xTextDoc " );
-        xTextDoc.dispose();
-        xTD2.dispose();
+    protected void cleanup(TestParameters tParam, PrintWriter log) {
+        log.println("    disposing xTextDoc ");
+
+        try {
+            XCloseable closer = (XCloseable) UnoRuntime.queryInterface(
+                                        XCloseable.class, xTextDoc);
+            closer.close(true);
+            closer = (XCloseable) UnoRuntime.queryInterface(XCloseable.class,
+                                                            xTD2);
+            closer.close(true);
+        } 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");
+        }
     }
 
-    public TestEnvironment createTestEnvironment
-            (TestParameters Param,PrintWriter log ) {
+    public TestEnvironment createTestEnvironment(TestParameters Param,
+                                                 PrintWriter log) {
         XInterface oObj = null;
         XWindowPeer the_win = null;
         XToolkit the_kit = null;
         XDevice aDevice = null;
         XGraphics aGraphic = null;
         XWindow anotherWindow = null;
+
         //Insert a ControlShape and get the ControlModel
-        XControlShape aShape = FormTools.createUnoControlShape(
-            xTextDoc,3000,4500,15000,10000,"CommandButton","UnoControlButton");
+        XControlShape aShape = FormTools.createUnoControlShape(xTextDoc, 3000,
+                                                               4500, 15000,
+                                                               10000,
+                                                               "CommandButton",
+                                                               "UnoControlButton");
 
         WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
 
@@ -129,52 +146,53 @@ public class UnoControlButton extends TestCase {
 
         //Try to query XControlAccess
         XControlAccess the_access = (XControlAccess) UnoRuntime.queryInterface(
-                        XControlAccess.class,xTextDoc.getCurrentController());
+                                            XControlAccess.class,
+                                            xTextDoc.getCurrentController());
 
         //get the ButtonControl for the needed Object relations
         try {
             oObj = the_access.getControl(the_Model);
             the_win = the_access.getControl(the_Model).getPeer();
             the_kit = the_win.getToolkit();
-            aDevice = the_kit.createScreenCompatibleDevice(200,200);
+            aDevice = the_kit.createScreenCompatibleDevice(200, 200);
             aGraphic = aDevice.createGraphics();
         } catch (Exception e) {
             log.println("Couldn't get ButtonControl");
             e.printStackTrace(log);
-                throw new StatusException("Couldn't get ButtonControl", e );
+            throw new StatusException("Couldn't get ButtonControl", e);
         }
 
-        log.println( "creating a new environment for UnoControlButton object" );
-        TestEnvironment tEnv = new TestEnvironment( oObj );
+        log.println("creating a new environment for UnoControlButton object");
+
+        TestEnvironment tEnv = new TestEnvironment(oObj);
+
 
         //Adding ObjRelation for XView
-        tEnv.addObjRelation("GRAPHICS",aGraphic);
+        tEnv.addObjRelation("GRAPHICS", aGraphic);
+
 
         //Adding ObjRelation for XControl
-        tEnv.addObjRelation("CONTEXT",xTextDoc);
-        tEnv.addObjRelation("WINPEER",the_win);
-        tEnv.addObjRelation("TOOLKIT",the_kit);
-        tEnv.addObjRelation("MODEL",the_Model);
+        tEnv.addObjRelation("CONTEXT", xTextDoc);
+        tEnv.addObjRelation("WINPEER", the_win);
+        tEnv.addObjRelation("TOOLKIT", the_kit);
+        tEnv.addObjRelation("MODEL", the_Model);
 
-        System.out.println("ImplementationName: "+utils.getImplName(oObj));
+        System.out.println("ImplementationName: " + utils.getImplName(oObj));
 
         try {
             XController aController = xTD2.getCurrentController();
             XFrame aFrame = aController.getFrame();
             anotherWindow = aFrame.getComponentWindow();
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace(log);
             throw new StatusException("Couldn't create XWindow", e);
         }
 
+
         // Object Relation for XWindow
         tEnv.addObjRelation("XWindow.AnotherWindow", anotherWindow);
-        tEnv.addObjRelation("XWindow.ControlShape",aShape);
+        tEnv.addObjRelation("XWindow.ControlShape", aShape);
 
         return tEnv;
     } // finish method getTestEnvironment
-
-}    // finish class UnoControlButton
-
-
+} // finish class UnoControlButton