vitomation01: #i109562 - Use hClickButton whereever possible (get rid of duplicate functionality from hClickNextButton())

5 files changed, 33 insertions, 51 deletions

diff --git a/testautomation/framework/required/includes/wizard_agenda.inc b/testautomation/framework/required/includes/wizard_agenda.inc
index b1b099e07c88..d320234fd40b 100644
--- a/testautomation/framework/required/includes/wizard_agenda.inc
+++ b/testautomation/framework/required/includes/wizard_agenda.inc
@@ -56,23 +56,23 @@ testcase tUpdtWizardAgenda
         Kontext "AutopilotAgenda"
         call DialogTest( AutopilotAgenda, 1 )
         PageDesignList.select( 3 )
-        hClickNextButton()
+        hClickButton( NextButton )
         
         Kontext "AutopilotAgenda"
         call DialogTest( AutopilotAgenda, 2 )
-        hClickNextButton()
+        hClickButton( NextButton )
         
         Kontext "AutopilotAgenda"
         call DialogTest( AutopilotAgenda, 3 )
-        hClickNextButton()
+        hClickButton( NextButton )
 
         Kontext "AutopilotAgenda"
         call DialogTest( AutopilotAgenda, 4 )
-        hClickNextButton()
+        hClickButton( NextButton )
 
         Kontext "AutopilotAgenda"
         call DialogTest( AutopilotAgenda, 5 )
-        hClickNextButton()
+        hClickButton( NextButton )
 
         Kontext "AutopilotAgenda"
         call DialogTest( AutopilotAgenda, 6 )
@@ -91,15 +91,9 @@ testcase tUpdtWizardAgenda
         endif    
         
         brc = hDestroyDocument()
-        if ( not brc ) then
-            qaerrorlog( "#i59233# The wizard does not display the new template" )
-        endif
-        
-        do while( getDocumentCount() > 0 )
-            call hCloseDocument()
-        loop
-        
-            
+        if ( not brc ) then qaerrorlog( "#i59233# The wizard does not display the new template" )
+
+        hFileCloseAll()
         hDeleteFile( cTemplatePath )
     else
         warnlog ( "The Agenda wizard did not open/timelimit exceeded" )
diff --git a/testautomation/framework/required/includes/wizard_fax.inc b/testautomation/framework/required/includes/wizard_fax.inc
index 433a9bb7a593..b970d8754c5d 100644
--- a/testautomation/framework/required/includes/wizard_fax.inc
+++ b/testautomation/framework/required/includes/wizard_fax.inc
@@ -53,19 +53,19 @@ testcase tUpdtWizardFax
     
         kontext "AutopilotFax"    
         call DialogTest( AutopilotFax, 1 )
-        hClickNextButton()
+        hClickButton( NextButton )
 
         kontext "AutopilotFax"    
         call DialogTest( AutopilotFax, 2 )
-        hClickNextButton()
+        hClickButton( NextButton )
 
         kontext "AutopilotFax"    
         call DialogTest( AutopilotFax, 3 )
-        hClickNextButton()
+        hClickButton( NextButton )
 
         kontext "AutopilotFax"    
         call DialogTest( AutopilotFax, 4 )
-        hClickNextButton()
+        hClickButton( NextButton )
         
         kontext "AutopilotFax"
         call DialogTest( AutopilotFax, 5 )
@@ -81,9 +81,7 @@ testcase tUpdtWizardFax
         hWaitForObject( Speichern, 5000 )
        
         brc = hDestroyDocument()
-        if ( not brc ) then
-            qaerrorlog( "#i59233# The wizard does not display the new template" )
-        endif   
+        if ( not brc ) then qaerrorlog( "#i59233# The wizard does not display the new template" )
         
         printlog( "Delete the user-template: " & cTemplatePath )
         hDeleteFile( cTemplatePath )
@@ -92,9 +90,7 @@ testcase tUpdtWizardFax
         warnlog( "Fax wizard did not open/exceeded timeout" )
     endif
         
-    while( getDocumentCount() > 0 ) 
-        hDestroyDocument()
-    wend
+    hFileCloseAll()
     
     
 endcase
diff --git a/testautomation/framework/required/includes/wizard_letter.inc b/testautomation/framework/required/includes/wizard_letter.inc
index 19afe2a96f90..267efcefd18a 100644
--- a/testautomation/framework/required/includes/wizard_letter.inc
+++ b/testautomation/framework/required/includes/wizard_letter.inc
@@ -89,7 +89,7 @@ testcase tUpdtWizardLetter
         kontext "AutopilotLetter"
         LetterHead.Check()
 
-        hClickNextButton()
+        hClickButton( NextButton )
 
         kontext "AutopilotLetter"
         call DialogTest( AutopilotLetter, 2 )
@@ -123,7 +123,7 @@ testcase tUpdtWizardLetter
             warnlog( "FooterHeight should not be enabled in this configuration" )
         endif
         
-        hClickNextButton()
+        hClickButton( NextButton )
 
         kontext "AutopilotLetter"
         call DialogTest( AutopilotLetter, 3 )    
@@ -136,11 +136,11 @@ testcase tUpdtWizardLetter
         
         printlog( "   * change Complimentary Close to second entry" )
         ListGreetings.select( 2 )
-        hClickNextButton()
+        hClickButton( NextButton )
 
         kontext "AutopilotLetter"
         call DialogTest( AutopilotLetter, 4 )
-        hClickNextButton()
+        hClickButton( NextButton )
 
         kontext "AutopilotLetter"
         call DialogTest( AutopilotLetter, 5 )    
@@ -150,7 +150,7 @@ testcase tUpdtWizardLetter
         
         printlog( "   * check Include only on second ..." )
         IncludeFromPage2.check()
-        hClickNextButton()
+        hClickButton( NextButton )
 
         kontext "AutopilotLetter"
         call DialogTest( AutopilotLetter, 6 )   
@@ -178,9 +178,7 @@ testcase tUpdtWizardLetter
         endif
         
         brc = hDestroyDocument()
-        if ( not brc ) then
-            qaerrorlog( "#i59233# The wizard does not display the new template" )
-        endif   
+        if ( not brc ) then qaerrorlog( "#i59233# The wizard does not display the new template" )
     else
         warnlog( "Autopilot Letter not open/exceeded timeout" )
     endif
@@ -192,9 +190,7 @@ testcase tUpdtWizardLetter
         printlog( "Unexpectedly deleted user template(s), please check")
     endif
     
-    do while( getDocumentCount() > 0 )
-        call hCloseDocument()
-    loop
+    hFileCloseAll()
 
 endcase
 
diff --git a/testautomation/framework/required/includes/wizard_mailmerge.inc b/testautomation/framework/required/includes/wizard_mailmerge.inc
index d6dbe9ae826c..45b8947eec38 100644
--- a/testautomation/framework/required/includes/wizard_mailmerge.inc
+++ b/testautomation/framework/required/includes/wizard_mailmerge.inc
@@ -60,36 +60,36 @@ testcase tUpdtWizardMailMerge
     endif
     
     Kontext "MailMergeWizard"
-    brc = hClickNextButton()
+    hClickButton( NextButton )
     hUpdtMMWPage2()
     
     Kontext "MailMergeWizard"
-    brc = hClickNextButton()
-	hUpdtMMWpage3()
+    hClickButton( NextButton )
+    hUpdtMMWpage3()
     
     Kontext "MailMergeWizard"
-    brc = hClickNextButton()
+    hClickButton( NextButton )
     hUpdtMMWPage4()
     
     Kontext "MailMergeWizard"
-    brc = hClickNextButton()
+    hClickButton( NextButton )
     hUpdtMMWPage5()
 
     Kontext "MailMergeWizard"
-    brc = hClickNextButton()
+    hClickButton( NextButton )
     hUpdtMMWPage6()
     
     Kontext "MailMergeWizard"
-    brc = hClickNextButton()
+    hClickButton( NextButton )
     hUpdtMMWPage7()
     
     Kontext "MailMergeWizard"
-    brc = hClickNextButton()
+    hClickNextButton()
     hUpdtMMWPage8()
     
     printlog( "close the wizard" )
     Kontext "MailMergeWizard"
-    MailMergeWizard.cancel()
+    hCloseDialog( MailMergeWizard, "cancel" )
 
     hRemoveDatabaseConnections()
     hCloseDocument()
diff --git a/testautomation/framework/required/includes/wizard_presentation.inc b/testautomation/framework/required/includes/wizard_presentation.inc
index 2c06a00e1971..59544e0fb48e 100644
--- a/testautomation/framework/required/includes/wizard_presentation.inc
+++ b/testautomation/framework/required/includes/wizard_presentation.inc
@@ -47,14 +47,12 @@ testcase tUpdtWizardPresentation
         
         printlog( "Page 1" )
         call Dialogtest( AutopilotPraesentation1 )
-        
-        hClickNextButton()
+        hClickButton( NextButton )
         
         printlog( "Page 2" )
         kontext "AutopilotPraesentation2"
         call DialogTest( AutopilotPraesentation2 )
-        
-        hClickNextButton()
+        hClickButton( NextButton )
         
         printlog( "Page 3" )
         kontext "AutopilotPraesentation3" 
@@ -65,9 +63,7 @@ testcase tUpdtWizardPresentation
         warnlog( "Presentation wizard not open/exceeded timeout" )
     endif
     
-    do while( getDocumentCount() > 0 )
-        call hCloseDocument()
-    loop
+    hFileCloseAll()
 
     gApplication = "WRITER"