findbar01: #i111912 - Modified g_findbar.inc to make the CWS pass in reasonable timeframe. Followup-issues are #i111984 and #i112026. Integration is postponed due to massive conflicts with CWS vitomation01

1 files changed, 36 insertions, 30 deletions

diff --git a/testautomation/global/required/includes/g_findbar.inc b/testautomation/global/required/includes/g_findbar.inc
index 5e32b95b1b2d..38af3edd28aa 100644
--- a/testautomation/global/required/includes/g_findbar.inc
+++ b/testautomation/global/required/includes/g_findbar.inc
@@ -33,6 +33,9 @@
 
 testcase tUpdtFindBar()
 
+    ' This test is incomplete. It needs to be integrated into all update tests
+    ' and it needs to be added to the toolbar management functions
+
     printlog( "Update test for the findbar" )
 
     const TEST_STRING = "VCL Testtool"
@@ -42,8 +45,6 @@ testcase tUpdtFindBar()
         kontext "FindBar"
         if ( FindBar.exists() ) then
             warnlog( "The FindBar should not be visible by default" )
-        else
-            ' Toggle FindBar
         endif
     end select
 
@@ -86,42 +87,47 @@ testcase tUpdtFindBar()
             warnlog( "Messagebox missing <No matches found>" )
         endif
 
-        printlog( "Search dialog button may not be visible by default" )
-        kontext "FindBar"
-        if ( SearchDialog.exists() ) then
-            if ( SearchDialog.isVisible() ) then
-                SearchDialog.click()
-                warnlog( "Button <Search Dialog> is visible, it should be hidden by default" )
+        warnlog( "#i111984 - exclude <SearchDialog> button from testing" )
+        goto skip_SearchDialog
+
+            printlog( "Search dialog button may not be visible by default" )
+            kontext "FindBar"
+            if ( SearchDialog.exists() ) then
+                if ( SearchDialog.isVisible() ) then
+                    SearchDialog.click()
+                    warnlog( "Button <Search Dialog> is visible, it should be hidden by default" )
+                else
+                    printlog( "Button <Search Dialog> is hidden, good" )
+                endif
             else
-                printlog( "Button <Search Dialog> is hidden, good" )
+                warnlog( "<Search Dialog> button should not be visible" )
             endif
-        else
-            warnlog( "<Search Dialog> button should not be visible" )
-        endif
 
-        printlog( "Add <Search Dialog> button to toolbar" )
-        hToggleSearchDialog()
+            printlog( "Add <Search Dialog> button to toolbar" )
+            hToggleSearchDialog()
 
-        kontext "FindBar"
-        SearchDialog.click()
-
-        kontext "FindAndReplace"
-        if ( FindAndReplace.exists( 1 ) ) then
-            call DialogTest( FindAndReplace )
+            kontext "FindBar"
+            SearchDialog.click()
 
             kontext "FindAndReplace"
-            if ( SearchFor.getSelText() = TEST_STRING ) then
-                printlog( "Test string has been inserted into <SearchFor> Listbox. Good." )
+            if ( FindAndReplace.exists( 1 ) ) then
+                call DialogTest( FindAndReplace )
+
+                kontext "FindAndReplace"
+                if ( SearchFor.getSelText() = TEST_STRING ) then
+                    printlog( "Test string has been inserted into <SearchFor> Listbox. Good." )
+                else
+                    warnlog( "Search string should have been copied from findbar to search dialog" )
+                endif
+                FindAndReplace.close()
             else
-                warnlog( "Search string should have been copied from findbar to search dialog" )
+                warnlog( "Dialog <Search And Replace> is missing" )
             endif
-            FindAndReplace.close()
-        else
-            warnlog( "Dialog <Search And Replace> is missing" )
-        endif
-        
-        printlog( "Remove <Search Dialog> button from toolbar" )
-        hToggleSearchDialog()
+
+            printlog( "Remove <Search Dialog> button from toolbar" )
+            hToggleSearchDialog()
+            
+        skip_SearchDialog:
 
     else
         warnlog( "FindBar is not visible" )