CWS-TOOLING: integrate CWS printerpullpages

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/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")
@@ -80,7 +80,9 @@ sub LoadIncludeFiles
     use "global\system\includes\gvariabl.inc"
     use "global\tools\includes\required\t_doc1.inc"
     use "global\tools\includes\required\t_tools1.inc"
-    use "framework\tools\includes\CJK_tools.inc"    
+    use "global\tools\includes\optional\t_docfuncs.inc"
+   
+    use "framework\tools\includes\CJK_tools.inc"   
     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/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