CWS-TOOLING: integrate CWS automation310wg_DEV300

2009-04-09 11:16:42 +0200 wg  r270684 : i100917
2009-04-09 10:34:47 +0200 msc  r270681 : #i100975#
2009-04-09 09:05:27 +0200 hde  r270679 : #100952
2009-04-09 08:53:54 +0200 hde  r270678 : #100952
2009-04-09 08:41:36 +0200 hde  r270677 : #100952
2009-04-09 08:38:09 +0200 hde  r270676 : #100952
2009-04-08 19:59:39 +0200 hde  r270659 : #i100955#
2009-04-08 14:12:21 +0200 wg  r270647 : i100917
2009-04-08 13:46:04 +0200 wg  r270643 : i100917
2009-04-08 10:56:51 +0200 wg  r270625 : i100917

3 files changed, 11 insertions, 7 deletions

diff --git a/testautomation/dbaccess/optional/includes/ctrl_General.inc b/testautomation/dbaccess/optional/includes/ctrl_General.inc
index 485b78971c76..5fc684f8f540 100755
--- a/testautomation/dbaccess/optional/includes/ctrl_General.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_General.inc
@@ -1027,7 +1027,7 @@ testcase tAddFields
         Liste.TypeKeys "<DOWN>" , 4, true   	    
         sControlName2 = Liste.getSelText
         if sControlName1 <> sControlName2 then
-            warnlog "#i98316# The control name is not the same as the fieldname."
+            qaerrorlog "#i98316# The control name is not the same as the fieldname."
         endif
         
     sleep (2)    
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
index fbeab1c4f1d1..11cae40e2689 100755
--- a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
@@ -120,7 +120,7 @@ testcase tGroupBoxWithDatasource
      printlog "set the table TT_Control"    
 	 Content.setText("TT_Control")     
  	 'WORKAROUND: for bug 106538
-     TabDataForm.TypeKeys "<RETURN>" , true       
+     Content.TypeKeys "<RETURN>" , true       
   	Kontext "ControlPropertiesDialog"
    	 ControlPropertiesDialog.Close
    	sleep(3)
@@ -246,7 +246,7 @@ testcase tGroupBoxWithDatasource
      sleep(1)
      HelpURL.setText "HID:123456"
      sleep(1)
-     TabGeneralControl.TypeKeys "<RETURN>"
+     HelpURL.TypeKeys "<RETURN>",true
      sleep(1)
     Kontext "ControlPropertiesDialog" 
      ControlPropertiesDialog.close
@@ -284,7 +284,7 @@ testcase tGroupBoxWithDatasource
      sleep(1)
      HelpURL.setText "HID:1234567"
      sleep(1)
-     TabGeneralControl.TypeKeys "<RETURN>"     
+     HelpURL.TypeKeys "<RETURN>",true     
      sleep(1)
     Kontext "ControlPropertiesDialog" 
      ControlPropertiesDialog.close
@@ -324,7 +324,7 @@ testcase tGroupBoxWithDatasource
      'sleep(1)
      HelpURL.setText "HID:12345678"
      'sleep(1)
-     TabGeneralControl.TypeKeys "<RETURN>"
+     HelpURL.TypeKeys "<RETURN>",true
      sleep(1)
     Kontext "ControlPropertiesDialog" 
      ControlPropertiesDialog.close     
diff --git a/testautomation/dbaccess/tools/controltools.inc b/testautomation/dbaccess/tools/controltools.inc
index f7614cba40b3..3c7e2b3287a8 100755
--- a/testautomation/dbaccess/tools/controltools.inc
+++ b/testautomation/dbaccess/tools/controltools.inc
@@ -136,6 +136,7 @@ function fSetControlProperty(sControlType, sPropertyName, sPropertyValue as stri
                         ControlPropertiesTabControl.setPage TabDataControl
                     Kontext "TabDataControl"
                         CellBound.setText(sPropertyValue)
+                        CellBound.typeKeys("<RETURN>",true)
                     Kontext "ControlPropertiesTabControl"
                         ControlPropertiesTabControl.setPage TabGeneralControl
                 elseif sPropertyName = "CellRange" then
@@ -143,6 +144,7 @@ function fSetControlProperty(sControlType, sPropertyName, sPropertyValue as stri
                         ControlPropertiesTabControl.setPage TabDataControl
                     Kontext "TabDataControl"
                         CellRange.setText(sPropertyValue)
+                        CellRange.typeKeys("<RETURN>",true)
                     Kontext "ControlPropertiesTabControl"
                         ControlPropertiesTabControl.setPage TabGeneralControl
                 elseif sPropertyName = "CurrSymPosition" then
@@ -167,7 +169,7 @@ function fSetControlProperty(sControlType, sPropertyName, sPropertyValue as stri
                 elseif sPropertyName = "DefaultValue" then                    
                     TabGeneralControl.MouseDown 1,1,1,true
                     sleep(1)
-                    TabGeneralControl.TypeKeys "<TAB>" , 10 , true
+                    TabGeneralControl.TypeKeys "<TAB>" , 11 , true
                     sleep(1)
                     TabGeneralControl.TypeKeys sPropertyValue , true                    
                     sleep(1)
@@ -196,6 +198,7 @@ function fSetControlProperty(sControlType, sPropertyName, sPropertyValue as stri
                     HelpText.setText(sPropertyValue)
                 elseif sPropertyName = "HelpURL" then
                     HelpURL.setText(sPropertyValue)
+                    HelpURL.TypeKeys "<RETURN>",true
                 elseif sPropertyName = "HiddenValue" then
                     HiddenValue.setText(sPropertyValue)
                 elseif sPropertyName = "HideSelection" then
@@ -225,6 +228,7 @@ function fSetControlProperty(sControlType, sPropertyName, sPropertyValue as stri
                     Multiselection.select(Cint(sPropertyValue))
                 elseif sPropertyName = "NameText" then
                     NameText.setText(sPropertyValue)
+                    NameText.typeKeys("<RETURN>",true)
                 elseif sPropertyName = "Navigation" then
                     Navigation.select(Cint(sPropertyValue))
                 elseif sPropertyName = "NavigationBar" then
@@ -826,4 +830,4 @@ function fOpenMoreControlsToolBar
             MoreControls.Click
         Kontext "MoreControls"    
     endif   
-end function
+End function