merge DEV300_m70

qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java

@@ -31,7 +31,7 @@
 package ifc.view;
 
 import com.sun.star.form.XForm;
-import com.sun.star.form.XFormController;
+import com.sun.star.form.runtime.XFormController;
 import lib.MultiMethodTest;
 
 import com.sun.star.view.XFormLayerAccess;

testautomation/chart2/required/includes/ch2_format.inc

@@ -798,6 +798,8 @@ endcase
 '-------------------------------------------------------------------------------
 '
 testcase tFormatAxisXAxis
+
+	Dim bAsianLanguage as boolean
     Dim iCountTabPg as integer
     iCountTabPg = 0
     
@@ -805,7 +807,9 @@ testcase tFormatAxisXAxis
     if fLoadVerySimpleChartAndSaveLocal() > 0 then
         warnlog "Loading test document seems to have failed -> Check this out!"
         goto endsub
-    endif   
+    endif
+    printlog " Enable language support for CJK (Tools-Options-Language Support)"
+    bAsianLanguage = ActiveDeactivateAsianSupport(TRUE)
     printlog "Select chart using navigator"
     call fSelectFirstOLE   
     printlog "Edit / Object / Edit"
@@ -834,10 +838,10 @@ testcase tFormatAxisXAxis
     printlog "Goto tab page Line"
     Kontext
     iCountTabPg = Active.GetPageCount
-    if iCountTabPg <> 7 then 
-        warnlog "Format::Axis::XAxis should have 7 tab pages but has " & iCountTabPg & "."            
+    if iCountTabPg <> 8 then 
+        warnlog "Format::Axis::XAxis should have 8 tab pages but has " & iCountTabPg & "."            
     else             
-        printlog "Format::Axis::XAxis has 7 tab pages."
+        printlog "Format::Axis::XAxis has 8 tab pages."
     endif    
     Active.SetPage TabFormatChartLine    
     printlog "Check if tab page Line exists"
@@ -879,7 +883,11 @@ testcase tFormatAxisXAxis
     Kontext "TabChartAxisNumbers"
     call DialogTest ( TabChartAxisNumbers )   
     printlog "Close dialog with cancel"
-    TabChartAxisNumbers.Cancel   
+    TabChartAxisNumbers.Cancel
+    printlog " Set support for CJK back to default (Tools – Options – Language Support)"
+    if bAsianLanguage = FALSE then
+        Call ActiveDeactivateAsianSupport(FALSE)
+    end if
     printlog "File / Close"
     Call hCloseDocument
 endcase
@@ -887,6 +895,8 @@ endcase
 '-------------------------------------------------------------
 '
 testcase tFormatAxisYAxis
+
+	Dim bAsianLanguage as boolean
     Dim iCountTabPg as integer
     Dim iCrossingEntries as integer
     Dim iCategoryEntries as integer
@@ -903,7 +913,9 @@ testcase tFormatAxisYAxis
     if fLoadVerySimpleChartAndSaveLocal() > 0 then
         warnlog "Loading test document seems to have failed -> Check this out!"
         goto endsub
-    endif   
+    endif
+    printlog " Enable language support for CJK (Tools-Options-Language Support)"
+    bAsianLanguage = ActiveDeactivateAsianSupport(TRUE)
     printlog "Select chart using navigator"
     call fSelectFirstOLE   
     printlog "Edit / Object / Edit"
@@ -931,10 +943,10 @@ testcase tFormatAxisYAxis
     FormatAxisYAxis   
     Kontext
     iCountTabPg = Active.GetPageCount
-    if iCountTabPg <> 7 then 
-        warnlog "Format::Axis::YAxis should have 7 tab pages but has " & iCountTabPg & "."            
+    if iCountTabPg <> 8 then 
+        warnlog "Format::Axis::YAxis should have 8 tab pages but has " & iCountTabPg & "."            
     else             
-        printlog "Format::Axis::YAxis has 7 tab pages."
+        printlog "Format::Axis::YAxis has 8 tab pages."
     endif          
     printlog "Goto tab page Characters"
     Active.SetPage TabFont    
@@ -1024,7 +1036,10 @@ testcase tFormatAxisYAxis
     endif
     Kontext "TabChartAxisPositioning"
     printlog "Leave dialog with Cancel."
-    TabChartAxisPositioning.Cancel    
+    TabChartAxisPositioning.Cancel
+    if bAsianLanguage = FALSE then
+        Call ActiveDeactivateAsianSupport(FALSE)
+    end if
     printlog "File / Close"   
     Call hCloseDocument
 endcase
@@ -1113,14 +1128,18 @@ endcase
 '-------------------------------------------------------------
 '
 testcase tFormatAxisSecondaryXAxis
-    Dim iCountTabPg as integer
+    
+	Dim bAsianLanguage as boolean
+	Dim iCountTabPg as integer
     iCountTabPg = 0
 
     printlog "Load simple chart document"
     if fLoadVerySimpleChartAndSaveLocal() > 0 then
         warnlog "Loading test document seems to have failed -> Check this out!"
         goto endsub
-    endif    
+    endif
+	printlog " Enable language support for CJK (Tools-Options-Language Support)"
+    bAsianLanguage = ActiveDeactivateAsianSupport(TRUE)
     printlog "Select chart using navigator"
     call fSelectFirstOLE   
     printlog "Edit / Object / Edit"
@@ -1168,10 +1187,10 @@ testcase tFormatAxisSecondaryXAxis
     printlog "Goto tab page Line"
     Kontext
     iCountTabPg = Active.GetPageCount
-    if iCountTabPg <> 7 then 
-        warnlog "Format::Axis::XAxis should have 7 tab pages but has " & iCountTabPg & "."            
+    if iCountTabPg <> 8 then 
+        warnlog "Format::Axis::XAxis should have 8 tab pages but has " & iCountTabPg & "."            
     else             
-        printlog "Format::Axis::XAxis has 7 tab pages."
+        printlog "Format::Axis::XAxis has 8 tab pages."
     endif    
     Active.SetPage TabFormatChartLine    
     printlog "Check if tab page Line exists"
@@ -1213,7 +1232,10 @@ testcase tFormatAxisSecondaryXAxis
     Kontext "TabChartAxisNumbers"
     call DialogTest ( TabChartAxisNumbers )   
     printlog "Close dialog with cancel"
-    TabChartAxisNumbers.Cancel   
+    TabChartAxisNumbers.Cancel
+    if bAsianLanguage = FALSE then
+        Call ActiveDeactivateAsianSupport(FALSE)
+    end if
     printlog "File / Close"
     Call hCloseDocument   
 endcase
@@ -1221,14 +1243,18 @@ endcase
 '-------------------------------------------------------------
 '
 testcase tFormatAxisSecondaryYAxis
-    Dim iCountTabPg as integer
+    
+	Dim bAsianLanguage as boolean
+	Dim iCountTabPg as integer
     iCountTabPg = 0
 
     printlog "Load simple chart document"
     if fLoadVerySimpleChartAndSaveLocal() > 0 then
         warnlog "Loading test document seems to have failed -> Check this out!"
         goto endsub
-    endif    
+    endif
+    printlog " Enable language support for CJK (Tools-Options-Language Support)"
+    bAsianLanguage = ActiveDeactivateAsianSupport(TRUE)
     printlog "Select chart using navigator"
     call fSelectFirstOLE    
     printlog "Edit / Object / Edit"
@@ -1258,10 +1284,10 @@ testcase tFormatAxisSecondaryYAxis
     printlog "Goto tab page Line"
     Kontext
     iCountTabPg = Active.GetPageCount
-    if iCountTabPg <> 7 then 
-        warnlog "Format::Axis::XAxis should have 7 tab pages but has " & iCountTabPg & "."            
+    if iCountTabPg <> 8 then 
+        warnlog "Format::Axis::XAxis should have 8 tab pages but has " & iCountTabPg & "."            
     else             
-        printlog "Format::Axis::XAxis has 7 tab pages."
+        printlog "Format::Axis::XAxis has 8 tab pages."
     endif    
     Active.SetPage TabFormatChartLine    
     printlog "Check if tab page Line exists"
@@ -1303,7 +1329,11 @@ testcase tFormatAxisSecondaryYAxis
     Kontext "TabChartAxisNumbers"
     call DialogTest ( TabChartAxisNumbers )   
     printlog "Close dialog with cancel"
-    TabChartAxisNumbers.Cancel   
+    TabChartAxisNumbers.Cancel
+    printlog " Set support for CJK back to default (Tools – Options – Language Support)"
+    if bAsianLanguage = FALSE then
+        Call ActiveDeactivateAsianSupport(FALSE)
+    end if
     printlog "File / Close"
     Call hCloseDocument   
 endcase

testautomation/chart2/tools/ch_tools_statistics.inc

@@ -88,7 +88,7 @@ function fInvokeTrendlinesDialog() as INTEGER
     
     '/// Lookup if call was successful
 	Kontext
-	active.SetPage "TabTrendLineType"
+	active.SetPage (TabTrendLineType)
     Kontext "TabTrendLineType"
     if TabTrendLineType.exists(2) then
         printlog ">> Trend lines dialog is visible now."

testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc

@@ -409,6 +409,7 @@ testcase tForms
         '/// set encoding to Multipart
         printlog "set encoding to Multipart"
         Encoding.select 2
+        sleep(1)
         '/// check if the SubmitMethod get enabled
         printlog "check if the SubmitMethod get enabled"        
         if SubmitMethod.isEnabled then
@@ -417,6 +418,7 @@ testcase tForms
         '/// set encoding to URL
         printlog "set encoding to URL"        
         Encoding.select 1
+        sleep(1)
         '/// check if the SubmitMethod get disabled
         printlog "check if the SubmitMethod get disabled"        
         if NOT SubmitMethod.isEnabled then

testautomation/dbaccess/optional/includes/ctrl_Wizards.inc

@@ -96,7 +96,8 @@ testcase tGroupBoxWithDatasource
    	 '/// set the datasource TT
      printlog "set the datasource TT"
      DataSource.setText(sDSName)
-	 DataSource.TypeKeys "<RETURN>" , true
+     DataSource.TypeKeys "<RETURN>" , true
+     sleep(1)
      '/// insert password 'testtool' into login dialog
      printlog "insert password 'testtool' into login dialog"
      Kontext "LoginDialog"

testautomation/extensions/optional/includes/extensions.inc

@@ -371,11 +371,18 @@ testcase tExtensionsFunction
             kontext
             if active.exists(5) then
                 sTemp = active.getText
-                try
-                    active.yes
-                catch
-                    warnlog( "Try...catch: Failed to click Yes-button" )
-                endcatch
+                printlog "Messagebox: " + sTemp
+                ' We only want to handle the installation target here which only 
+                ' pops up if we have the choice (rights to write to shared layer)
+                if active.getButtonCount = 3 then 
+                    try
+                        active.yes
+                    catch
+                        warnlog( "Try...catch: Failed to click Yes-button" )
+                    endcatch
+                else
+                    printlog "No installation target message (this is probably a root-installation)" 
+                endif
             endif
 
             '/// Progress dialog comes up ///'

testautomation/extensions/optional/includes/publisher.inc

@@ -56,15 +56,16 @@ testcase tExtensionPublisher
         cBasePath = convertpath( cBasePath )
     
     ' Modify this file to add test cases or attributes
-    dim cInfoFile as string
-        cinfoFile = cBasePath & "extension.info"
+    dim cInfoFile as string : cinfoFile = cBasePath & "extension.info"
         
     ' The number of files to test. Information about this is stored in the file
     ' specified by cInfoFile
     dim iFileCount as integer
     dim iCurrentFile as integer
-    dim iExitCounter as integer
     dim iExtensionCount as integer
+    dim iExitCounter as integer
+    dim iCurrentExtensionCount as integer : iCurrentExtensionCount = 0
+    dim iTry as integer
     
     ' This is the data we get from the configuration file
     dim cCurrentFileName as string
@@ -78,6 +79,7 @@ testcase tExtensionPublisher
     dim cConfigArray( 60 ) as string
     
     dim cTestString as string
+    dim bInstallationComplete as boolean : bInstallationComplete = false
     
     iExtensionCount = hGetExtensionCount()
     
@@ -85,6 +87,9 @@ testcase tExtensionPublisher
     hGetDataFileSection( cInfoFile, cConfigArray(), "info", "", "" )
     iFileCount = int( hGetValueForKeyAsString( cConfigArray() , "filecount" ) )
     printlog( cInfoFile & " specifies " & iFileCount & " documents to load" )
+    
+    iExtensionCount = iExtensionCount + iFileCount
+    printlog( "Expected number of extensions after installation: " & iExtensionCount )
 
     printlog( "Installing extensions" )
     for iCurrentFile = 1 to iFileCount
@@ -93,41 +98,51 @@ testcase tExtensionPublisher
         cCurrentFileName = hGetValueForKeyAsString( cConfigArray() , "file" )
         cCurrentFileName = cBasePath & cCurrentFileName
         sExtensionCLI( "add" , cCurrentFileName )
-        WaitSlot( 5000 )
+        wait 1000 ' This is required, sExtensionCLI is asynchronous.
         
     next iCurrentFile
-    printlog( "Finished installing extensions" )
-
+    printlog( "Finished installing extensions, now verifying..." )
+    
+    hNewDocument()
+    ToolsPackageManager
+   
     kontext "PackageManager"
-    if ( not PackageManager.exists() ) then
-        ToolsPackageManager
-        kontext "PackageManager"
-        if ( PackageManager.exists( 2 ) ) then
-            printlog( "Extension Manager UI has been opened" )
-        else
-            warnlog( "Failed to open Extension Manager UI" )
+    if ( PackageManager.exists( 3 ) ) then
+    
+        for iTry = 1 to 30 
+        
+            iCurrentExtensionCount = BrowsePackages.getItemCount()
+            
+            if ( iCurrentExtensionCount = iExtensionCount ) then
+                printlog( "All extensions have been installed, good." )
+                bInstallationComplete = true
+                exit for
+            endif
+            
+            printlog( "Waiting for listbox: Number of extensions: " & iCurrentExtensionCount )
+            
+        next iTry
+        
+        ' If one or more extensions have not been added to the list we better abort the
+        ' test as the remaining parts need all extensions to be installed causing
+        ' lots of cryptig errors to appear in the log.
+        if ( not bInstallationComplete ) then
+            warnlog( "Not all extensions have been installed. Aborting test." )
+            kontext "PackageManager" 
+            if ( PackageManager.exists() ) then
+                PackageManager.cancel()
+                PackageManager.notExists( 2 ) 
+            endif
             goto endsub
         endif
     else
-        warnlog( "#i84786# Unopkg processes block UI" )
+        warnlog( "The Extension Manager did not open, Aborting test" )
         goto endsub
     endif
+            
     
-    iExitCounter = 0
-    kontext "PackageManager"
-    WaitSlot()
-    do while ( BrowsePackages.getItemCount() < ( iExtensionCount + iFileCount ) )
-        printlog( "Waiting for Extensions List to populate..." )
-        Wait( 1000 )
-        iExitCounter = iExitCounter + 1
-        if ( iExitCounter = 30 ) then
-            kontext "PackageManager"
-            PackageManager.cancel()
-            goto endsub
-        endif
-    loop
- 
     kontext "PackageManager"
+    printlog( "Going for the update-dialog" )
     if ( Updates.isEnabled() ) then
     
         printlog( "Updates-button is enabled" )
@@ -142,11 +157,14 @@ testcase tExtensionPublisher
                 wait( 1000 )
                 iExitCounter = iExitCounter + 1
                 if ( iExitCounter = 200 ) then 
-                    warnlog( "Update list for extensions is stalled (expected: 7), found: " & AvailableUpdatesList.getItemCount() )
+                    warnlog( "Update list for extensions is stalled (expected: 7), " & _
+                             "found: " & AvailableUpdatesList.getItemCount() )
                     kontext "ExtensionUpdate"
                     ExtensionUpdate.cancel()
+                    ExtensionUpdate.notExists( 2 )
                     kontext "PackageManager"
                     PackageManager.cancel()
+                    PackageManager.notExists( 2 )
                     goto endsub
                 endif
             loop
@@ -246,6 +264,7 @@ testcase tExtensionPublisher
 
             kontext "ExtensionUpdate"
             ExtensionUpdate.cancel()
+            ExtensionUpdate.notExists( 2 )
         else
             warnlog( "Extension Update dialog is not open" )
         endif
@@ -256,6 +275,7 @@ testcase tExtensionPublisher
     
     kontext "PackageManager"
     PackageManager.close()
+    PackageManager.notExists( 2 )
     
     printlog( "Removing extensions" )
     for iCurrentFile = 1 to iFileCount
@@ -264,6 +284,8 @@ testcase tExtensionPublisher
         sExtensionCLI( "remove" , cCurrentFileName )
     next iCurrentFile
     printlog( "Finished removing extensions" )
+    
+    hFileCloseAll()
 
 endcase
 

testautomation/extensions/optional/input/files.txt

@@ -26,11 +26,11 @@ dependencies\version10000.oxt;1,0,0,0,0
 dependencies\version21ns.oxt;0,0,1,0,0
 dependencies\version21other.oxt;1,0,0,0,0
 dependencies\version25.oxt;0,0,1,0,0
-dependencies\version30b.oxt;0,0,1,0,0
+dependencies\version30.oxt;0,0,1,0,0
 dependencies\version300.oxt;0,0,1,0,0
 dependencies\version301.oxt;0,0,1,0,0
 dependencies\versionempty.oxt;0,0,1,0,0
-dependencies\version31b.oxt;1,0,0,0,0
+dependencies\version31.oxt;1,0,0,0,0
 dependencies\version937.oxt;1,0,0,0,0
 dependencies\versionnone.oxt;0,0,1,0,0
 versions/plain.oxt;0,0,1,0,0

testautomation/framework/optional/f_CJK_GridLayout.bas

@@ -43,7 +43,7 @@ sub main
     PrintLog "---------------------------------------------------------------------"
     Printlog "-----                    Grid Layout for CJK  in Writer         -----"
     PrintLog "---------------------------------------------------------------------"
-
+    
     use "framework\optional\includes\w_grid_layout1.inc"
    
     sAsianLanguageFlag = CheckAsianLanguageSupport("Current")
@@ -60,17 +60,12 @@ sub main
 
        Call tGridDisplay_1            'Printgrid: The grid lines will be printed. (vice versa)
 
-       Call tUserDefineLayout_1       'Decrease characters per line will cause lines per page decrease accordingly
-
        Call tFontSizeChanges_1        'Change the font size to bigger enough will change the layout 
      
        Call tRubyText_1               'If Ruby Text is applied and longer than its Base Text it will stretch over more grid cells than the base text itself.
 
        Call tIndentsTest_1            'Indents should work and always indenting as close as possible to their measurements by snapping to the appropriate grid cell. Tabs therefore will be ignored.
 
-       'Excluded until errors resolved by HLI.
-       'Call tObjectsTest_1            'If objects are anchored to text they will "wander" with its surrounding text. If they are anchored as character they will snap to the appropriate grid cell (since they are a character).
-    
     Call hStatusOut
 
     if sAsianLanguageFlag = "Off" Then  
@@ -81,16 +76,13 @@ sub main
 end sub
 
 sub LoadIncludeFiles
-
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    
     use "global\tools\includes\required\t_doc1.inc"
     use "global\tools\includes\required\t_tools1.inc"
+    use "global\tools\includes\optional\t_docfuncs.inc"
    
-    use "framework\tools\includes\CJK_tools.inc"    
-
+    use "framework\tools\includes\CJK_tools.inc"   
     gApplication   = "WRITER"
     Call GetUseFiles
-    
-End sub
+end sub

testautomation/framework/optional/includes/basic_package_export.inc

@@ -45,7 +45,7 @@ testcase tBasicPackageExport
     const PACKAGE_NAME = "tBasicExport.oxt"
     const LIBRARY_NAME = "tBasicExport"
     const DOCUMENT_POSITION = 4
-    const PACKAGE_SIZE = 2000
+    const PACKAGE_SIZE = 1325
     
     dim cDocumentName as string
     dim cLibraryName as string
@@ -162,16 +162,17 @@ testcase tBasicPackageExport
             Export.click()
             
             kontext "ExportBasicLibraryDlg"
-            if ( ExportBasicLibraryDlg.exists( 1 ) ) then
-                printlog( "Select to export as package" )
+            if ( ExportBasicLibraryDlg.exists( 3 ) ) then
+                printlog( "Select to export as extension" )
                 ExportAsPackage.check()
                 ExportBasicLibraryDlg.ok()
                 
                 kontext "SpeichernDlg"
-                if ( SpeichernDlg.exists( 1 ) ) then
-                    printlog( "Save the file, automatic filename extension must be checked" )
-                    DateiName.setText( hGetWorkPath() & LIBRARY_NAME ) ' automatic filename extension/uno-pkg is default
+                if ( SpeichernDlg.exists( 3 ) ) then
+                    printlog( "Save the file, suffix will be added automatically." )
+                    DateiName.setText( hGetWorkPath() & LIBRARY_NAME )
                     Speichern.click()
+                    Speichern.notExists( 1 )
                 else
                     warnlog( "Dialog <File Save> did not open" )
                 endif
@@ -182,6 +183,7 @@ testcase tBasicPackageExport
             kontext "TabBibliotheken"
             printlog( "Close libraires tabpage" )
             TabBibliotheken.cancel()
+            TabBibliotheken.notExists( 1 )
         else
             warnlog( "Dialog <TabBibliotheken> is not available" )
         endif
@@ -189,6 +191,7 @@ testcase tBasicPackageExport
         kontext "Makro"
         printlog( "Close BASIC organizer" )
         Makro.cancel()
+        Makro.notExists( 1 )
     else
         warnlog( "Dialog <Makro> did not open" )
     endif
@@ -197,6 +200,7 @@ testcase tBasicPackageExport
     hFileCloseAll()   
     
     printlog( "Verify automatic filename extension (dialog should append .oxt)" )
+    printlog( "Checking for file: " & cFile )
     if ( FileExists( cFile ) ) then
         printlog( "The test-package was saved with .oxt extension, good." )
         cPackageFileName = cFile
@@ -211,17 +215,11 @@ testcase tBasicPackageExport
     endif
     
     printlog( "Verify file size" )
-'    if ( FileLen( cPackageFileName ) <> PACKAGE_SIZE ) then
-'        warnlog( "#i105719# - The exported test-package has an incorrect file size." )
-        if ( FileLen( cPackageFileName ) = 0 ) then
-            printlog( "File has zero bytes, it is empty." )
-        else
-            printlog( "Size is.: " & FileLen( cPackageFileName ) )
-            printlog( "Expected: " & PACKAGE_SIZE )
-        endif
-'    else
-'        printlog( "File has correct size" )
-'    endif
+    if ( FileLen( cPackageFileName ) <> PACKAGE_SIZE ) then
+        warnlog( "#i105719# - The exported test-package has an incorrect file size." )
+    else
+        printlog( "File has correct size." )
+    endif
     
 endcase
 

testautomation/framework/required/f_first.bas

@@ -39,7 +39,6 @@
 
 
 sub main
-
     ' Disable sleep() calls. If you encounter unexpected test interruptions
     ' you should try to outcomment this or set the value to FALSE.
     GLOBAL_USE_NEW_SLEEP = TRUE
@@ -58,22 +57,14 @@ sub main
     
     gApplication = "WRITER"
     call tToolsOptionsTestFirst
-    call tToolsOptionsImprovementProgram
     call tDatabaseCheck
     call tHelpRegistration
     call hStatusOut   
-    
 end sub
 
-'*******************************************************************************
-
 sub LoadIncludeFiles
-
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    
-    use "global\required\includes\g_option.inc"
-    
     use "global\tools\includes\optional\t_ui_filters.inc"
     use "global\tools\includes\optional\t_filetools.inc"
     use "global\tools\includes\optional\t_docfuncs.inc"
@@ -81,8 +72,5 @@ sub LoadIncludeFiles
 
     gApplication = "WRITER"
     call GetUseFiles()
-    
 end sub
 
-'-------------------------------------------------------------------------
-

testautomation/framework/required/includes/help_browser.inc

@@ -41,9 +41,7 @@ testcase tHelp_DialogTest
 
     printlog( "Resource test for the Help Browser" )
 
-    Dim i as Integer
     dim brc as boolean
-    printlog "- open the help"
 
     brc = hOpenHelp()
     if ( not brc ) then
@@ -56,6 +54,11 @@ testcase tHelp_DialogTest
         goto endsub
     endif
 
+    hSelectHelpTab( "content" )
+    hSelectHelpTab( "index" )
+    hSelectHelpTab( "find" )
+    hSelectHelpTab( "bookmarks" )
+    
 
     brc = hSelectHelpTab( "content" )
     call DialogTest( ContentPage )
@@ -78,8 +81,10 @@ endcase
 
 testcase tHelp_ToolBar
 
-    Dim i as Integer
+    printlog( "Resource test for the help toolbar" )
+    
     dim brc as boolean
+    dim iExitCounter as integer : iExitCounter = 0
 
     brc = hOpenHelp()
     if ( not brc ) then
@@ -104,9 +109,13 @@ testcase tHelp_ToolBar
     ' Backward- and Forward-button
     printlog "- activate 'Index'-page"
     brc = hSelectHelpTab( "index" )
-    sleep( 2 )
+    
+    do while( SearchIndex.getItemCount() < 100 )
+        iExitCounter = iExitCounter + 1 : if ( iExitCounter = 20 ) then exit do
+        wait( 100 )
+    loop
 
-    SearchIndex.Select 4
+    SearchIndex.Select( 4 )
     DisplayIndex.Click()
     waitslot
 
@@ -126,37 +135,25 @@ testcase tHelp_ToolBar
     PrintButton.Click()
 
     kontext "active"
-
-    if Active.Exists ( 1 ) then
-
-        if Active.getRT() = 304 then
-            qaerrorlog "- Printing failed: Did you define a default printer?"
-            Active.OK()
-            
-            Kontext "DruckenDlg"
-            if ( druckenDlg.exists() ) then
-                printlog( "Printer dialog is still open, closing with cancel" )
-                druckenDlg. cancel()
-            endif
-            
-        endif
-
+    if ( Active.Exists ( 1 ) ) then
+        qaerrorlog( "Unexpected messagebox: " & Active.getText() )
+        qaerrorlog( "Probably missing default printer on this system, fix it!" )
+        Active.OK()
+    endif
+    
+    kontext "Printing"
+    if ( Printing.exists( 2 ) ) then
+        printlog( "Print dialog open, good." )
+        Printing.cancel()
     else
-        kontext "druckendlg"
-        if DruckenDlg.NotExists (2) then
-            warnlog "No print-dialog is open. => direct printing? - bug 93788!"
-        else
-            DruckenDlg.Cancel()
-        endif
-
+        warnlog( "Print dialog not open" )
     endif
     
-    printlog "- Set Bookmark"
-
     kontext "tb_help"
+    printlog "- Set Bookmark"
     SetBookmarks.Click()
 
-    kontext "addbookmark"
+    kontext "AddBookmark"
     call DialogTest ( AddBookmark )
     AddBookmark.Cancel()
 

testautomation/framework/required/includes/wizard_documentconverter.inc

@@ -46,7 +46,6 @@ testcase tUpdtWizardDocumentConverter
     dim iDialog as integer
     dim iDocumentType as integer
     dim iWait as integer
-    dim sKeys as string
     dim sSourcePathWriter as string
         sSourcePathWriter = gTesttoolpath & "framework\required\input\document_converter\"
         sSourcePathWriter = convertpath( sSourcePathWriter )
@@ -132,12 +131,14 @@ testcase tUpdtWizardDocumentConverter
     Kontext "DocumentConverter"
     printlog( "Page 7" )
     
-    sKeys = hGetAccel( "DocumentConverter_ShowLog" )
     qaerrorlog( "#i54265# Show Logfile button has no HID, using accelerator instead" )
     
     iWait = 0
     do while ( DocumentConverter.exists() )
-        DocumentConverter.TypeKeys( sKeys )
+        try
+            ContinueButton.click()
+        catch
+        endcatch
         Wait( 1 )
         iWait = iWait + 1
         if ( iWait = 20000 ) then

testautomation/framework/tools/includes/CJK_tools.inc

@@ -37,10 +37,6 @@
 '*
 '\***********************************************************************
 
-
-'******************************************************************************
-' This function will check Asina Language Support on/off based on the parameter
-'******************************************************************************
 function CheckAsianLanguageSupport( sSupport as String )  as String
 
     ToolsOptions
@@ -67,11 +63,8 @@ function CheckAsianLanguageSupport( sSupport as String )  as String
     
 end function
 
+'******************************************************************************'
 
-
-'***************************************************************
-' Start up Navigator , and set focus to the correct position
-'**************************************************************
 function fStartupNavigator(navigatorItem as String , subItemNum as Integer)
     Dim j as Integer
     
@@ -117,28 +110,8 @@ function fStartupNavigator(navigatorItem as String , subItemNum as Integer)
     sleep 1
 end function
 
+'******************************************************************************'
 
-'******************
-'Close Navigator
-'******************
-function fCloseNavigator
-    '/// This function  will close Navigator dialogure
-    
-    Kontext
-    Kontext "Navigator"
-    if ( Navigator.exists() ) then
-        Navigator.Close()
-        printlog( "Closed navigator" )
-    else
-        printlog( "Navigator not open." )
-    endif
-    
-end function
-
-
-'****************************************************************************
-' This routine will return the Country name based on CountryID
-'*****************************************************************************
 function fGetCountryName( CountryID as Integer ) as String
     
     select case iSprache

testautomation/framework/tools/includes/customize_tools.inc

@@ -113,9 +113,6 @@ function hToolsCustomizeSelectTab( cTab as string ) as boolean
 
     '///+<li>Switch to one of the four available tabpages</li>
     '///<ol>
-    kontext
-    active.setPage
-
     kontext
     
     try
@@ -193,8 +190,7 @@ function hToolsCustomizeClose( iMode as integer  ) as boolean
     '///<ul>
     
     const CFN = "hToolsCustomizeClose::"
-    dim brc as boolean
-        brc = true
+    dim brc as boolean : brc = true
 
     kontext 
 
@@ -213,8 +209,11 @@ function hToolsCustomizeClose( iMode as integer  ) as boolean
     end select
     '///</ol>
     
+    
+    
     '///+<li>Verify that the dialog has indeed been closed</li>
     kontext "TabCustomizeEvents"
+    TabCustomizeEvents.notExists( 3 )
     if ( TabCustomizeEvents.exists() ) then
         brc = false
     endif

testautomation/framework/tools/includes/fileoperations.inc

@@ -872,6 +872,8 @@ function hFindFileObjectViaFileOpen( cName as string ) as integer
     dim iPathItems as integer
     dim asPathList( 100 ) as string
     
+    dim iWait as integer ' some increment variable
+    
     printlog( CFN & "Enter with option (File): " & cName )
 
     '///+<li>If a fully qualified path has been provided we have to split it up</li>
@@ -899,6 +901,21 @@ function hFindFileObjectViaFileOpen( cName as string ) as integer
         
     '///+<li>get the number of items in the filepicker</li>
     kontext "OeffnenDlg"
+    iWait = 0
+    while ( DateiAuswahl.getItemCount() = 0 )
+        wait( 100 )
+        iWait = iWait + 1
+        if ( iWait = 10 ) then
+            warnlog( "Filepicker is not populated within reasonable timeframe, aborting" )
+            kontext "OeffnenDlg"
+            OeffnenDlg.Close()
+            hFindFileObjectViaFileOpen() = 0
+            exit function
+        else
+            printlog( "Waiting for filepicker list to populate..." )
+        endif
+    wend
+    
     iFileOpenItemCount = DateiAuswahl.getItemCount()
     
     '///+<li>Jump to the first item in the filelist and select it with SPACE</li>

testautomation/framework/tools/includes/help_tools.inc

@@ -199,18 +199,22 @@ function hSelectHelpTab( cTab as string ) as boolean
     select case cTabName
     case "content"       : TabControl.setPage( ContentPage )
                            if ( SearchContent.isVisible() ) then
+                               call DialogTest( ContentPage )
                                brc = true
                            endif
     case "index"         : TabControl.setPage( IndexPage )
                            if ( SearchIndex.isVisible() ) then
+                               call DialogTest( IndexPage )
                                brc = true
                            endif
     case "find"          : TabControl.setPage( FindPage )
                            if ( SearchFind.isVisible() ) then
+                               call DialogTest( FindPage )
                                brc = true
                            endif
     case "bookmarks"     : TabControl.setPage( BookmarksPage )
                            if ( Bookmarks.isVisible() ) then
+                               call DialogTest( BookmarksPage )
                                brc = true
                            endif
     case else