CWS-TOOLING: integrate CWS dba34a

5 files changed, 111 insertions, 18 deletions

diff --git a/qadevOOo/runner/stats/Summarizer.java b/qadevOOo/runner/stats/Summarizer.java
index 2d28ea1fe..16fb3d880 100644
--- a/qadevOOo/runner/stats/Summarizer.java
+++ b/qadevOOo/runner/stats/Summarizer.java
@@ -78,7 +78,7 @@ public class Summarizer
             {
                 if (states.elementAt(j).equals("not part of the job"))
                 {
-                    state = "Not possible since not all Interfaces/Services have been checked";
+                    state = "PASSED(some interfaces/services not tested).OK";
                 }
                 else
                 {
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
index 8ddbbc293..f3657e6ac 100644
--- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
+++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
@@ -27,6 +27,7 @@
 package mod._forms;
 import com.sun.star.beans.NamedValue;
 import com.sun.star.beans.PropertyValue;
+import com.sun.star.container.XIndexAccess;
 import java.io.PrintWriter;
 
 import lib.StatusException;
@@ -251,11 +252,10 @@ public class GenericModelTest extends TestCase {
         if (m_ConnectionColsed) return;
         
         try {
+            XIndexAccess forms = UnoRuntime.queryInterface( XIndexAccess.class,
+                FormTools.getForms( WriterTools.getDrawPage( m_xTextDoc ) ) );
             XForm myForm = (XForm) AnyConverter.toObject(new Type(XForm.class), 
-                                                 (FormTools.getForms(
-                                                         WriterTools.getDrawPage(
-                                                                 m_xTextDoc)))
-                                                     .getByName("Standard"));
+                                                 forms.getByIndex(0));
             
             if (debug){
                 if (myForm == null){
@@ -269,18 +269,20 @@ public class GenericModelTest extends TestCase {
                 
             }
             
-            XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface(
-                                            XPropertySet.class, myForm);
-            XConnection connection = (XConnection) AnyConverter.toObject(
-                                 new Type(XConnection.class), 
-                                 xSetProp.getPropertyValue("ActiveConnection"));
-            if (debug && connection == null){
-                log.println("ERROR: could not get property 'ActiveConnection' from the XForm");
+            XPropertySet xSetProp = UnoRuntime.queryInterface( XPropertySet.class, myForm );
+            XConnection connection = UnoRuntime.queryInterface( XConnection.class, xSetProp.getPropertyValue( "ActiveConnection" ) );
+            if ( connection == null )
+            {
+                if ( debug )
+                    log.println("ERROR: could not get property 'ActiveConnection' from the XForm");
+            }
+            else
+            {
+                connection.close();
             }
-            
-            connection.close();
         } catch (Exception e) {
             log.println("ERROR: Can't close the connection: " + e.toString());
+            e.printStackTrace( log );
         }
 
         log.println("closing data source...");
diff --git a/testautomation/dbaccess/optional/includes/ctrl_General.inc b/testautomation/dbaccess/optional/includes/ctrl_General.inc
index 9e137f4c7..b0ee0bea8 100644
--- a/testautomation/dbaccess/optional/includes/ctrl_General.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_General.inc
@@ -38,13 +38,14 @@ sub ctrl_General
     call tPosAndSize_Protect_Position
     call tPosAndSize_Protect_Size
     call tPosAndSize_Keyboard
-    call tPosAndSize_Dialog    
+    call tPosAndSize_Dialog
     call tPosAndSize_KeepRatio
     'TODO Control the Setting on tabpage Rotation & Slant (should be inactive).
     
     call tTabStop
     call tActivationOrder
     call tAddFields
+    call tLabelFieldSelection
 
 end sub
 
@@ -1033,7 +1034,96 @@ testcase tAddFields
     call hCloseDocument
     
 endcase
+'-------------------------------------------------------------------------
+testcase tLabelFieldSelection
+    ' check if the assignment of lables to text fields work
+    dim sLabelText as String
+
+    printlog "Open a new document,"
+    call hNewDocument
+    Kontext "DocumentWriter"       
+    DocumentWriter.TypeKeys "tt_doc" , true
+    sleep(1)
+
+    printlog "open the form control toolbar"
+    call hToolbarSelect("FormControls",true)
+    
+    Kontext "FormControls"   	
+    Label.Click
+    sleep(1)
+    
+    printlog "insert a label field"
+    call hDrawingWithSelection ( 20, 20, 30, 30 )
+    sleep(2)
+
+    Kontext "FormControls"   	
+    Edit.Click
+    sleep(1)
+    
+    printlog "insert a text field"
+    call hDrawingWithSelection ( 40, 40, 50, 50 )
+    sleep(2)
+
+    printlog "open the control property browser"
+    call fOpenControlPropertyBrowser
+
+    Kontext "ControlPropertiesTabControl"
+        ControlPropertiesTabControl.setPage TabGeneralControl       'make shure that tabpage general in property is choosen
+        sleep(2)
+
+    printlog "click on button behind the lable field to open the field selection dialog"
+    Kontext "TabGeneralControl"
+        LabelFieldButton.Click
+        sleep(1)
+
+    printlog "select the lable fiiel in the tree list box"
+    Kontext "LabelFieldSelection"
+        LabelFieldSelection.TypeKeys "<DOWN>",TRUE
+        LabelFieldSelection.TypeKeys "<DOWN>",TRUE
+        sleep(1)
+        printlog "close the field selection dialog"
+        LabelFieldSelection.OK
+        sleep(1)
 
+    printlog "check if the lable field property contains some text"
+    'TODO: check for the correct text this has a language dependencie
+    Kontext "TabGeneralControl"        
+        sLabelText = LabelField.getText()
+        if(sLabelText = "") then
+            warnlog "the lable for a text field is not set"
+        else
+            printlog "the label for the text field is set"
+        endif
+
+    printlog "click on button behind the lable field to open the field selection dialog"
+    Kontext "TabGeneralControl"
+        LabelFieldButton.Click
+        sleep(1)
+
+    Kontext "LabelFieldSelection"    
+        LabelFieldSelection.TypeKeys "<DOWN>",TRUE
+        LabelFieldSelection.TypeKeys "<DOWN>",TRUE
+        sleep(1)
+        printlog "select the lable field and check the checkbox 'no assignment'"
+        CBNoAssignment.check
+        printlog "close the field selection dialog"
+        LabelFieldSelection.OK
+        sleep(1)
+
+    printlog "check if the lable field property contains no text"
+    Kontext "TabGeneralControl"        
+        sLabelText = LabelField.getText()
+        if(sLabelText <> "") then
+            warnlog "the lable for a text field is not deleted"
+        else
+            printlog "the label for the text field is deleted"
+        endif    
+
+    printlog "close the document"
+    call hCloseDocument
+
+endcase
+'-------------------------------------------------------------------------
 function fOpenPositionAndSizeDialog
 
     call hToolbarSelect("FormDesignTools",true)  	
diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win
index ca8fb3659..39d90d8d1 100644
--- a/testautomation/global/win/edia_i_o.win
+++ b/testautomation/global/win/edia_i_o.win
@@ -154,6 +154,7 @@ RightFieldCell sym:DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL
 
 
 *LabelFieldSelection sym:extensions:ModalDialog:RID_DLG_SELECTLABELCONTROL
+CBNoAssignment sym:extensions:CheckBox:RID_DLG_SELECTLABELCONTROL:1
 
 *JPGOptions sym:svtools:ModalDialog:DLG_EXPORT
 Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc
index 744c24fb9..267443303 100644
--- a/testautomation/graphics/required/includes/impress/im_003_.inc
+++ b/testautomation/graphics/required/includes/impress/im_003_.inc
@@ -201,14 +201,14 @@ testcase tiViewToolbar_1
 
     printlog "open application "
     Call hNewDocument
+
+    printlog "use the empty layout"
     Call sSelectEmptyLayout
+
     printlog "delete default content"
     hUseAsyncSlot( "EditSelectAll" )
     Kontext "DocumentImpress"
     DocumentImpress.typeKeys("<DELETE>",true)
-    
-    printlog "use the empty layout"
-    call sSelectEmptyLayout
 
     printlog "Insert->Graphic... : global\input\graf_inp\desp.bmp "
     hUseAsyncSlot( "InsertGraphicsFromFile" )