dba33e: #108973# refactor and code cleanup and minor fixes

3 files changed, 17 insertions, 14 deletions

diff --git a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
index ae090136d2ee..4fbd36119909 100755
--- a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
@@ -102,7 +102,7 @@ testcase tGroupBoxWithDatasource
      printlog "insert password 'testtool' into login dialog"
      Kontext "LoginDialog"
         if LoginDialog.Exists then
-         	Password.setText "testtool"
+         	LoginPassword.setText "testtool"
          	LoginDialog.OK
             sleep(1)
         else
@@ -110,7 +110,7 @@ testcase tGroupBoxWithDatasource
         endif
      Kontext "LoginDialog"
         if LoginDialog.Exists then
-         	Password.setText "testtool"
+         	LoginPassword.setText "testtool"
          	LoginDialog.OK
             sleep(1)
         else
@@ -118,9 +118,10 @@ testcase tGroupBoxWithDatasource
         endif
     Kontext "TabDataForm"         
     '/// set the table TT_Control
-     printlog "set the table TT_Control"    
-	 Content.setText("TT_Control")
-     Content.TypeKeys "<RETURN>" , true       
+    printlog "set the table TT_Control"    
+    Content.setText("TT_Control")
+    Content.TypeKeys "<RETURN>" , true
+    sleep(1)
   	Kontext "ControlPropertiesDialog"
    	 ControlPropertiesDialog.Close
    	sleep(3)
@@ -596,7 +597,7 @@ testcase tListBox
 		Kontext "LoginDialog"
         if LoginDialog.Exists(3) then
         	printlog "login dialog"
-            Password.SetText "testtool"
+                LoginPassword.SetText "testtool"
 	        LoginDialog.OK
 	        sleep 1
         end if	    
@@ -820,7 +821,7 @@ testcase tTableControl
 		Kontext "LoginDialog"
         if LoginDialog.Exists(3) then
         	printlog "login dialog"
-            Password.SetText "testtool"
+                LoginPassword.SetText "testtool"
 	        LoginDialog.OK
 	        sleep (1)
         end if	    
diff --git a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
index 2fd7efa31b8c..495c22117149 100755
--- a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
+++ b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
@@ -147,11 +147,7 @@ testcase tFF_Navigator
     printlog "activate the form based filter"    
 	FM_FormFilter_Start
 	wait(1000)
-    '/// open the FormFilterNavigator
-    printlog "open the FormFilterNavigator"    
-	FM_FF_Navigator
-	wait(1000)
-	Kontext "DocumentWriter"
+    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
@@ -167,7 +163,13 @@ testcase tFF_Navigator
 	DocumentWriter.TypeKeys "like '%value%'" , true
 	DocumentWriter.TypeKeys "<RETURN>" , true
 	wait(1000)
-	Kontext "FilterNavigator"
+    Kontext "FilterNavigator"
+    '/// open the FormFilterNavigator
+    printlog "open the FormFilterNavigator"
+    if( NOT FilterNavigator.exists(3)) then
+	FM_FF_Navigator
+    endif
+    wait(1000)
     '/// check if the filter criterion is insert in the form filter navigator
     printlog "check if the filter criterion is insert in the form filter navigator"    
 	FilterNavigator.TypeKeys "<END>"
diff --git a/testautomation/dbaccess/tools/dbtools.inc b/testautomation/dbaccess/tools/dbtools.inc
index 0f37061b7ae4..e44ac7fe9588 100755
--- a/testautomation/dbaccess/tools/dbtools.inc
+++ b/testautomation/dbaccess/tools/dbtools.inc
@@ -100,7 +100,7 @@ function fConnectToDatasourceInBeamer(sDSName , sPWD, optional bNewDoc)
         DatabaseSelection.TypeKeys "<ADD>"                
         Kontext "LoginDialog"
             if LoginDialog.Exists(3) then
-                Password.SetText sPWD
+                LoginPassword.SetText sPWD
                 LoginDialog.OK                
             end if
         bConnect = true