autorecovery: merge latest changes from CWS dba33e

3 files changed, 78 insertions, 75 deletions

diff --git a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
index acfa8a62ac7e..7c48e78e149d 100644
--- a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
@@ -112,9 +112,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)
@@ -787,72 +788,72 @@ endcase
 
 testcase tTableControl
 
-    printlog "- Formular toolbox: Tablecontrol element (" & gApplication & ")"
-    '/// open a new textdocument & insert a table control
-    call hNewDocument
-    sleep(1)
-
-    call hToolbarSelect("MoreControls",true)
-
-    Kontext "MoreControls"
-    Grid.Click
-    call hDrawingWithSelection ( 40, 20, 60, 40 )
-    sleep(10)
-    '/// take as datasource table biblio, mark it & next
-    '/// select some fields (in both directions) & create
-    '/// switch off the design view & open the database beamer (TODO)
-    '/// compare the header & the contents with the table control (TODO)
-    Dim k as integer
-    Kontext "AutopilotTableElement"
-    AutopilotTableElement.MouseDown (10,10)
-    AutopilotTableElement.MouseUp (10,10)
-    if AutopilotTableElement.Exists(3) then
-    printlog "  - Autopilot Table Element: Page 1/2"
-    Kontext "TabListBoxData"
-    DataSource.Select(sDSName)
-    sleep (1)
-    Kontext "LoginDialog"
-    if LoginDialog.Exists(3) then
-        printlog "login dialog"
-        LoginPassword.SetText "testtool"
-        LoginDialog.OK
+  printlog "- Formular toolbox: Tablecontrol element (" & gApplication & ")"
+  '/// open a new textdocument & insert a table control
+  call hNewDocument
+  sleep(1)
+    
+  call hToolbarSelect("MoreControls",true)
+
+  Kontext "MoreControls"
+   Grid.Click
+   call hDrawingWithSelection ( 40, 20, 60, 40 )
+   sleep(10)
+   '/// take as datasource table biblio, mark it & next
+   '/// select some fields (in both directions) & create
+   '/// switch off the design view & open the database beamer (TODO)
+   '/// compare the header & the contents with the table control (TODO)
+	Dim k as integer
+	Kontext "AutopilotTableElement"
+	AutopilotTableElement.MouseDown (10,10)
+	AutopilotTableElement.MouseUp (10,10)
+	if AutopilotTableElement.Exists(3) then
+    	printlog "  - Autopilot Table Element: Page 1/2"
+		Kontext "TabListBoxData"
+		DataSource.Select(sDSName)
+		sleep (1)
+		Kontext "LoginDialog"
+        if LoginDialog.Exists(3) then
+        	printlog "login dialog"
+                LoginPassword.SetText "testtool"
+	        LoginDialog.OK
+	        sleep (1)
+        end if	    
         sleep (1)
-    end if
-    sleep (1)
-    Kontext "TabListBoxData"
-    Table.Select("TT_Control")
-    sleep(3)
-    Kontext "AutopilotTableElement"
-    if NextButton.IsEnabled then
-        NextButton.Click
-    else
-        warnlog "In first window the 'Next'-button is disabled!"
-        AutopilotTableElement.Cancel
-    end if
-    sleep(1)
-    printlog "  - Autopilot Table Element: Page 2/2"
-    Kontext "TabTableFieldSelection"
-    ExistingFields.Select("ID")
-    AddTo.Click
-    ExistingFields.Select("Colors")
-    AddTo.Click
-    ExistingFields.Select("InfoColor")
-    AddTo.Click
-    sleep(1)
-    Kontext "AutopilotTableElement"
-    if CreateButton.IsEnabled then
-        CreateButton.Click
-    else
-        warnlog "In fourth window the 'Create'-button is disabled!"
-        AutopilotTableElement.Cancel
-    end if
-    else
-        warnlog "- Autopilot for Table Element didn't appear!"
-    end if
-    sleep(2)
-
-    hCloseDocument
-
+   		Kontext "TabListBoxData"
+		Table.Select("TT_Control")
+		sleep(3)
+		Kontext "AutopilotTableElement"
+    	if NextButton.IsEnabled then
+			NextButton.Click
+		else
+			warnlog "In first window the 'Next'-button is disabled!"
+       		AutopilotTableElement.Cancel
+		end if
+		sleep(1)
+		printlog "  - Autopilot Table Element: Page 2/2"
+		Kontext "TabTableFieldSelection"
+		ExistingFields.Select("ID")
+		AddTo.Click
+		ExistingFields.Select("Colors")
+		AddTo.Click
+		ExistingFields.Select("InfoColor")
+		AddTo.Click
+		sleep(1)
+		Kontext "AutopilotTableElement"
+		if CreateButton.IsEnabled then
+			CreateButton.Click
+		else
+			warnlog "In fourth window the 'Create'-button is disabled!"
+			AutopilotTableElement.Cancel
+		end if
+	else
+		warnlog "- Autopilot for Table Element didn't appear!"
+	end if
+	sleep(2)
+	
+	hCloseDocument
+	
 endcase
 
 '-------------------------------------------------------------------------
diff --git a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
index f6e560657d2a..7a73842c62eb 100644
--- a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
+++ b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
@@ -141,11 +141,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
@@ -161,7 +157,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 b7548504e752..dd884d2cab1c 100644
--- a/testautomation/dbaccess/tools/dbtools.inc
+++ b/testautomation/dbaccess/tools/dbtools.inc
@@ -370,4 +370,4 @@ function fgetGenericDatabaseProperties(sDBConfigFileName as string, sType as Str
 
     fgetGenericDatabaseProperties = b()
 
-end function
\ No newline at end of file
+end function