i115106,[Automation]: [Automation] General Cat 1-3 test case fixing

4 files changed, 57 insertions, 51 deletions

diff --git a/testautomation/graphics/optional/includes/global/g_find_replace.inc b/testautomation/graphics/optional/includes/global/g_find_replace.inc
index 4f6a045578e0..b96099be71ab 100644
--- a/testautomation/graphics/optional/includes/global/g_find_replace.inc
+++ b/testautomation/graphics/optional/includes/global/g_find_replace.inc
@@ -36,6 +36,8 @@
 '*
 '\**********************************************************************************
 testcase tiEditSearchAndReplace
+    qaerrorlog "#i115121# Find and replace: wrong replacement"
+    goto endsub
    '/// This test tests the 'Search and Replace' -dialogue. ///'
    Dim sFile  'as string
    Dim sExpression(2) as string  ' Expression to look for: ... Replace with
diff --git a/testautomation/graphics/optional/includes/global/g_paneview.inc b/testautomation/graphics/optional/includes/global/g_paneview.inc
index a2e7bdb87266..fb3620496759 100644
--- a/testautomation/graphics/optional/includes/global/g_paneview.inc
+++ b/testautomation/graphics/optional/includes/global/g_paneview.inc
@@ -78,7 +78,7 @@ testcase tiMinimize_Maximize_Docking_SlidePane
         Sleep 1
         Slides.Size 300, 400
         Sleep 1
-        Slides.Size 150, 250
+        Slides.Size 170, 250
         Sleep 1
         Slides.Size xSize%, ySize%
         Sleep 1
@@ -451,7 +451,7 @@ testcase tdMinimize_Maximize_Docking_Pagepane
         Sleep 1
         Pagepane.Size 300, 400
         Sleep 1
-        Pagepane.Size 150, 250
+        Pagepane.Size 170, 250
         Sleep 1
         Pagepane.Size xSize%, ySize%
         Sleep 1
diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
index f46c75f3e497..a514db14d783 100644
--- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc
+++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
@@ -136,7 +136,7 @@ endcase 'tiToolsSpellcheckCorrect
 testcase tiToolsSpellcheckError
     if iSprache = 48 then
         qaerrorlog "This test is not adapted for polish, 48."
-        got endsub
+        goto endsub
     endif
     Dim Fehler$
     Dim Sprachenname$
@@ -155,7 +155,7 @@ testcase tiToolsSpellcheckError
     case 39 : FehlerText$ = "Ringrarziamo per l'interessa mostrato a collaborare con la firma." : Fehler$ = "Ringrarziamo" : Sprachenname$ = "Italienisch"
     case 46 : FehlerText$ = "Detd varierar vad som behandlas och ur vilket perspektiv."         : Fehler$ = "Detd"         : Sprachenname$ = "Schwedisch"
     case 49 : FehlerText$ = "Diees ist ein Fehler."                         : Fehler$ = "Diees" : Sprachenname$ = "Deutsch"
-    case 50 : FehlerText$ = "Toje napaka, ker manjka presledek."            : Fehler$ = "Toje" : Sprachenname$ = "Slovenš�?ina"
+    case 50 : FehlerText$ = "Toje napaka, ker manjka presledek."            : Fehler$ = "Toje" : Sprachenname$ = "Slovenš�?ina"
     case 55 : FehlerText$ = "Eesta poderia ser a resposta para suas preces?": Fehler$ = "Eesta" : Sprachenname$ = "Portugiesisch"
     case else :
         if bAsianLan then
@@ -328,7 +328,7 @@ testcase tiToolsSpellcheckCheck_Change
     printlog "Close document"
     Call hCloseDocument
 
-endcase
+endcase 'tiToolsSpellcheckCheck_Change
 '-------------------------------------------------------------------------------
 testcase tiToolsSpellcheckCheck_ChangeAll
 
@@ -374,8 +374,10 @@ testcase tiToolsSpellcheckCheck_ChangeAll
     printlog "Close document"
     Call hCloseDocument
 
-endcase
+endcase 'tiToolsSpellcheckCheck_ChangeAll
+
 '-------------------------------------------------------------------------------
+
 function delete_all_added_words(aWords)
 
     '/// this function delete the words in sWords in all user dictionaries
@@ -384,44 +386,7 @@ function delete_all_added_words(aWords)
     Dim iWordCounter as integer
     Dim iBooks as integer
 
-    Select Case Ucase(gApplication)
-    case "DRAW"         : sExt = ".odg"
-    case "IMPRESS"      : sExt = ".odp"
-    end select
-
-    printlog "Load prepared document containing 4 errors : graphics\\required\\input\\recht_" & iSprache & sExt
-    if (not bAsianLan) then
-        printlog "Check if the document is writable."
-        Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_"+iSprache+sExt)
-    else
-        Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_1"+sExt)
-    end if
-    if fIsDocumentWritable = false then
-        printlog "Make the document writable and check if it's succesfull."
-        if fMakeDocumentWritable = false then
-            warnlog "The document can't be make writeable. Test stopped."
-            goto endsub
-        end if
-    end if
-    select case iSprache  ' sWord(1)=red     : sWord(2)=turquoise
-    case 01 : sWord(1) = "documente"     : sWord(2) = "expriss"
-    case 33 : sWord(1) = "intercu"       : sWord(2) = "Lees"
-    case 34 : sWord(1) = "afekto"        : sWord(2) = "fratternal"
-    case 36 : sWord(1) = "szeerint"       : sWord(2) = "tervvezi"
-    case 39 : sWord(1) = "Millano"       : sWord(2) = "tarrget"
-    case 46 : sWord(1) = "desa"          : sWord(2) = "occh"
-    case 49 : sWord(1) = "Texxt"         : sWord(2) = "reichtt"
-    case 50 : sWord(1) = "Bsedilo"       : sWord(2) = "zados�?a"
-    case 55 : sWord(1) = "esktava"         : sWord(2) = "noitee"
-    case else :
-        if bAsianLan then
-            sWord(1) = "documente"     : sWord(2) = "expriss"
-        else
-            Warnlog "For the language  " + iSprache +" nothing is prepared yet: insert text here and create the file"
-        end if
-    end select
-    sleep 2
-
+    Printlog "Delete the given words from dictionaries."
     printlog "Call Tools->Options."
     ToolsOptions
     printlog "Select in category 'Languagesettings' entry 'Writing Aids.'"
@@ -436,7 +401,7 @@ function delete_all_added_words(aWords)
     Kontext "BenutzerwoerterbuchBearbeiten"
     sleep 1
     printlog "Check every book, if it contains the words."
-    iBooks = Buch.getItemCount    
+    iBooks = Buch.getItemCount
     for iBookCounter = 1 to iBooks
         Buch.select(iBookCounter)
         printlog "Items in Booklist: " & WordList.getItemCount
@@ -457,8 +422,10 @@ function delete_all_added_words(aWords)
     printlog "Press button 'OK' on dialog 'Writing Aids'."
     ExtrasOptionenDlg.OK
     
-end function
+end function 'delete_all_added_words
+
 '-------------------------------------------------------------------------------
+
 function delete_word_from_dictionary(sWord as String, sDictionary as String)
 
     '/// this function delete the words in sWords in all user dictionaries
@@ -498,7 +465,9 @@ function delete_word_from_dictionary(sWord as String, sDictionary as String)
     printlog "Press button 'OK' on dialog 'Writing Aids'."
     ExtrasOptionenDlg.OK
 
-end function
+end function 'delete_word_from_dictionary
+
+'-------------------------------------------------------------------------------
 
 function fSelectWithString(oControl as Object,sText as String)
 
@@ -513,8 +482,9 @@ function fSelectWithString(oControl as Object,sText as String)
         endif
     next
 
-end function
+end function 'fSelectWithString
 
+'-------------------------------------------------------------------------------
 
 function getWordsForLanguage()
 
@@ -563,4 +533,4 @@ function getWordsForLanguage()
 
     getWordsForLanguage = aWords
 
-end function
+end function 'getWordsForLanguage
diff --git a/testautomation/graphics/optional/includes/global/g_stylist.inc b/testautomation/graphics/optional/includes/global/g_stylist.inc
index fab547eb5d3b..f09e6c0fd433 100644
--- a/testautomation/graphics/optional/includes/global/g_stylist.inc
+++ b/testautomation/graphics/optional/includes/global/g_stylist.inc
@@ -518,8 +518,10 @@ testcase tiFormatStylist
         goto endsub
     end select
 
+    printlog "Open new doc"
     Call hNewDocument
     sleep 2
+    printlog "call the navigator"
     Kontext "Gestalter"
     if Gestalter.Exists Then
         Warnlog "- Stylist exists, perhaps not closed last time a Impress doc was open"
@@ -529,11 +531,14 @@ testcase tiFormatStylist
 
     FormatStylist
     Kontext "Gestalter"
+    printlog "opening graphics styles"
     Grafikvorlagen.Click
     sleep 1
+    printlog "Select number 1"
     Vorlagenliste.Select Num1        ' num1
     sleep 1
     Printlog "- open Grafic template Dialogs using the context menue , checking if all resources exist"
+    printlog "Opening context menu"
     Vorlagenliste.OpenContextMenu
     sleep 1
     hMenuSelectNr (2)
@@ -543,6 +548,7 @@ testcase tiFormatStylist
     Messagebox.SetPage TabText
     Kontext "TabText"
     sleep 1
+    printlog "Canceling dialog"
     TabText.Cancel
     sleep 1
 
@@ -550,18 +556,21 @@ testcase tiFormatStylist
         Kontext "Gestalter"
         Printlog "- presentation templates"
         sleep 1
+        printlog "presentation styles"
         Praesentationsvorlagen.Click
 
         Vorlagenliste.Select Num2
         sleep 1
+        printlog "opening context menu"
         Vorlagenliste.OpenContextMenu
         sleep 1
+        printlog "selecting modify"
         hMenuSelectNr (1)
         sleep 1
         Kontext
         if Messagebox.exists (5) then
             try
-                '                    Messagebox.SetPage TabArea
+                printlog "Messagebox.SetPage TabArea"
                 Kontext "TabArea"
                 if TabArea.Exists = false then
                     warnlog "Where is TabArea?"
@@ -578,86 +587,111 @@ testcase tiFormatStylist
         Kontext "Gestalter"
         sleep 1
 
+        printlog "Select number 3"
         Vorlagenliste.Select Num3
         sleep 1
+        printlog "opening context menu of number 3"
         Vorlagenliste.OpenContextMenu
         sleep 1
         hMenuSelectNr (1)
         sleep 1
+        printlog "Check the styles..."
         call hWalkTheStyles (1,1)
         Kontext
+        printlog "setting tabpage indents and spacing"
         Messagebox.SetPage TabEinzuegeUndAbstaende
         Kontext "TabEinzuegeUndAbstaende"
         sleep 1
+        printlog "Canceling tabpage"
         TabEinzuegeUndAbstaende.Cancel
         sleep 1
         Kontext "Gestalter"
         sleep 1
 
+        printlog "Select number 4"
         Vorlagenliste.Select Num4
         sleep 1
+        printlog "opening context menu of number 4"
         Vorlagenliste.OpenContextMenu
         sleep 1
         hMenuSelectNr (1)
         sleep 1
         Kontext
+        printlog "setting tabpage TabFont"
         Messagebox.SetPage TabFont
         kontext "TabFont"
         Kontext
+        printlog "setting tabpage TabFontEffects"
         Messagebox.SetPage TabFontEffects
         kontext "TabFontEffects"
         Kontext
+        printlog "setting tabpage TabIndents and Spacing"
         Messagebox.SetPage TabEinzuegeUndAbstaende
         kontext "TabEinzuegeUndAbstaende"
         sleep 1
+        printlog "canceling TabIndents and Spacing"
         TabEinzuegeUndAbstaende.Cancel
         sleep 1
         Kontext "Gestalter"
         sleep 1
 
+        printlog "opening context menu of number 5"
         Vorlagenliste.Select Num5
         sleep 1
+        printlog "opening context menu of number 5"
         Vorlagenliste.OpenContextMenu
         sleep 1
         hMenuSelectNr (1)
         sleep 1
         Kontext
+        printlog "setting tabpage Tab Font"
         Messagebox.SetPage TabFont
         kontext "TabFont"
         Kontext
+        printlog "setting tabpage Tab FontEffects"
         Messagebox.SetPage TabFontEffects
         kontext "TabFontEffects"
         Kontext
+        printlog "setting tabpage TabIndents and Spacing"
         Messagebox.SetPage TabEinzuegeUndAbstaende
         kontext "TabEinzuegeUndAbstaende"
         sleep 1
         Kontext
+        printlog "setting tabpage Tab Bullets"
         Messagebox.SetPage TabBullet
         Kontext "TabBullet"
         sleep 1
         Kontext
+        printlog "setting tabpage Tab Numbering Type"
         Messagebox.SetPage TabNumerierungsart
         Kontext "TabNumerierungsart"
         sleep 1
         Kontext
+        printlog "setting tabpage Tab Graphics"
         Messagebox.SetPage TabGrafiken
         Kontext "TabGrafiken"
         sleep 1
         Kontext
+        printlog "setting tabpage Tab Numbering options"
         Messagebox.SetPage TabOptionenNumerierung
         Kontext "TabOptionenNumerierung"
         sleep 1
+        printlog "Canceling..."
         TabOptionenNumerierung.Cancel
         sleep 1
     endif
+    kontext "DocumentImpress"
+    printlog "Closing Stylist"
     if lcase(gPlatform) = "osx" then
         hTypekeys "<mod1 t>"
     else
-        hTypeKeys "<F11>"
+        Kontext "Gestalter"
+        Gestalter.Close 
     end if
     sleep 1
     Kontext "Gestalter"
     if Gestalter.Exists Then Warnlog "- Stylist could not be closed pressing F11"
+    printlog "Closing doc."
     Call hCloseDocument
 
 endcase 'tiFormatStylist