CWS-TOOLING: integrate CWS fs33a

4 files changed, 19 insertions, 12 deletions

diff --git a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
index bdcf1c4bc63b..74edeb1df3aa 100755
--- a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
+++ b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
@@ -47,7 +47,9 @@ testcase tLoadForm
 	Kontext "DocumentWriter"
     '/// press CTRL + F5 to get into the first textbox
     printlog "press CTRL + F5 to get into the first textbox"
-	DocumentWriter.TypeKeys "<MOD1 F5>" , true
+	DocumentWriter.TypeKeys "<MOD1 F6>" , true
+        wait(1000)
+        DocumentWriter.TypeKeys "<MOD1 F5>" , true
 	'sleep(1)
 	'DocumentWriter.TypeKeys "<MOD1 C>" , true
 	'sleep(1)
@@ -59,6 +61,8 @@ testcase tLoadForm
 	wait(1000)
     '/// insert 2 in the first textbox
     printlog "insert 2 in the first textbox"
+        DocumentWriter.TypeKeys "<MOD1 F6>" , true
+        wait(1000)
         DocumentWriter.TypeKeys "<MOD1 F5>" , true
         sleep(1)
 	DocumentWriter.TypeKeys "2" , true
@@ -69,7 +73,7 @@ testcase tLoadForm
 	FM_FF_Execute
 	wait(1000)
     printlog "workaround issue 102010"
-	DocumentWriter.TypeKeys "<MOD1 F6>" , true
+    DocumentWriter.TypeKeys "<MOD1 F6>" , true
     sleep(1)
     DocumentWriter.TypeKeys "<MOD1 F5>" , true   
     sleep(1)
@@ -94,6 +98,8 @@ testcase tLoadForm
 	wait(1000)
     '/// insert into the second textbox like '%2'
     printlog "insert into the second textbox like '%2'"
+        DocumentWriter.TypeKeys "<MOD1 F6>" , true
+        wait(1000)
         DocumentWriter.TypeKeys "<MOD1 F5>" , true
 	sleep(1)
         DocumentWriter.TypeKeys "<TAB>" , true
diff --git a/testautomation/dbaccess/optional/includes/frm_Forms.inc b/testautomation/dbaccess/optional/includes/frm_Forms.inc
index b31a064e60ee..630e1920cbce 100755
--- a/testautomation/dbaccess/optional/includes/frm_Forms.inc
+++ b/testautomation/dbaccess/optional/includes/frm_Forms.inc
@@ -173,7 +173,7 @@ testcase tCreateForm
    	'/// insert a textfield
     printlog "insert a textfield"        
     Edit.Click
-   	call hDrawingWithSelection ( 50, 20, 60, 30 )
+   	call hDrawingWithSelection ( 50, 30, 60, 40 )
    	sleep(1)
     
     Kontext "FormControls"
@@ -543,7 +543,7 @@ testcase tCreateSubForms
    	'/// insert a textfield
     printlog "insert a textfield"        
     Edit.Click
-   	call hDrawingWithSelection ( 50, 20, 60, 30 )
+   	call hDrawingWithSelection ( 50, 30, 60, 40 )
    	sleep(1)
     
     Kontext "FormControls"
@@ -638,7 +638,7 @@ testcase tCreateSubForms
        '/// insert a textfield
        printlog "insert a textfield"
        'Edit.Click
-   	 call hDrawingWithSelection ( 50, 40, 60, 50 )
+   	 call hDrawingWithSelection ( 50, 50, 60, 60 )
    	 sleep(1)
     
     Kontext "FormControls"
@@ -672,6 +672,8 @@ testcase tCheckSubForm
     '/// set cursor into the first control
     printlog "set cursor into the first control"   
     Kontext "DocumentWriter"
+        DocumentWriter.TypeKeys "<MOD1 F6>" , true
+        wait(1000)
         DocumentWriter.TypeKeys "<MOD1 F5>" , true
         sleep(1)
            
@@ -749,7 +751,7 @@ testcase tCreateSubFormsNewMethod
         '/// insert a textfield
         printlog "insert a textfield"        
         Edit.Click
-        call hDrawingWithSelection ( 50, 20, 60, 30 )
+        call hDrawingWithSelection ( 50, 30, 60, 40 )
         sleep(1)
     
     Kontext "FormControls"
diff --git a/testautomation/dbaccess/optional/includes/xf_Submission.inc b/testautomation/dbaccess/optional/includes/xf_Submission.inc
index ad24c621b867..05f0da768cdf 100755
--- a/testautomation/dbaccess/optional/includes/xf_Submission.inc
+++ b/testautomation/dbaccess/optional/includes/xf_Submission.inc
@@ -41,6 +41,8 @@ end sub
 '-------------------------------------------------------------------------
 testcase tDataNavigatorSubmission    
     
+    Dim sSubmitPath as string
+
     '/// open new XML Form
     printlog "open new XML Form"
     
@@ -101,11 +103,8 @@ testcase tDataNavigatorSubmission
     '/// add a submission
     Kontext "XFormAddSubmission"
         SubmitName.setText("submission1")
-        if ( gPlatgroup = "w95" ) then
-            SubmitAction.setText("file:///" + ConvertPath(gOfficePath,"lin") + "user/work/test.xml")
-        else
-            SubmitAction.setText("file://" + gOfficePath + "user/work/test.xml")
-        endif
+        sSubmitPath = "file:///" + gOfficePath + "user/work/test.xml"
+        SubmitAction.setText( hStringReplaceChar( sSubmitPath, "\", "/" ) )
         SubmitMethod.select 2            
             
     '/// close the add submission dialog
diff --git a/testautomation/framework/optional/includes/security_certification_dialogs.inc b/testautomation/framework/optional/includes/security_certification_dialogs.inc
index ee7605ad1cce..c367285956ae 100755
--- a/testautomation/framework/optional/includes/security_certification_dialogs.inc
+++ b/testautomation/framework/optional/includes/security_certification_dialogs.inc
@@ -86,7 +86,7 @@ testcase tCertificationDialogs
     kontext "DigitalSignature"
     if ( DigitalSignature.exists( 2 ) ) then
         printlog( CFN & "Digital signatures is open" )
-        DigitalSignature.cancel()
+        DigitalSignature.close()
     else
         if ( gApplication <> "MASTERDOCUMENT" ) then
             warnlog( CFN & "Digital Signatures Dialog is not open" )