diff options
12 files changed, 209 insertions, 192 deletions
diff --git a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc index f360034d7433..694c3dec0de4 100755 --- a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc +++ b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc @@ -1049,7 +1049,7 @@ testcase tToolsAutocorrectOptions_8 firstLine = "1. FirstLine" testContent = "Test1" - hopeResult = "1.Test1" + hopeResult = "2. Test1" Call wTypeKeys firstLine Call wTypeKeys "<Return>" diff --git a/testautomation/writer/optional/includes/fields/w_fields5.inc b/testautomation/writer/optional/includes/fields/w_fields5.inc index 067366ddbe0e..334d01906307 100755 --- a/testautomation/writer/optional/includes/fields/w_fields5.inc +++ b/testautomation/writer/optional/includes/fields/w_fields5.inc @@ -667,7 +667,7 @@ endcase '----------------------------------------------------------------- testcase tVariablesDDEFieldManual - warnlog "#i112079#testcase must be reworked" + qaerrorlog "#i112079#testcase must be reworked" goto endsub Dim sDDEFile as String @@ -759,7 +759,7 @@ endcase '----------------------------------------------------------------- testcase tVariablesDDEFieldAutomatic - warnlog "#i112079#testcase must be reworked" + qaerrorlog "#i112079#testcase must be reworked" goto endsub qaerrorlog "#i102792# - tVariablesDDEFieldAutomatic outcommented. Fields not updated." diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc index 0bd255e472b3..84a5c5281f8b 100755..100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc @@ -53,18 +53,18 @@ testcase tFormatPage_1 PrintLog "- Open format/page dialog" '/// <b> Open format/page dialog </b> /// - + Call hNewDocument - + '/// 1. via Mouse clicks in Menu: Format-Page try fFormatPageWriter("TabSeite") TabSeite.Cancel catch endcatch - + '/// 2. via shortcuts in menu (manual test is needed) - + '/// 3. via Context menu when Cursor is in the document try hMenuSelectNr(5) @@ -77,7 +77,7 @@ testcase tFormatPage_1 TabSeite.Cancel catch endcatch - + Call hCloseDocument endcase @@ -125,21 +125,21 @@ endcase testcase tFormatPage_3 Dim iTextLength as integer - + PrintLog "- Test Landscape in tabpage Page" '/// Test Landscape in tabpage Page - + Call hNewDocument Call wOptionsUndo( "Grundschriften" ) - + '/// Input a long test string Call wTypeKeys "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQ" Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Shift End>" EditCopy iTextLength = Len(GetClipBoardtext) - + '/// Format/Page , tabpage page , check 'Landscape' fFormatPageWriter("TabSeite") Papierformat.Select 2 ' A4 Paper @@ -147,14 +147,14 @@ testcase tFormatPage_3 Quer.Check Wait 500 TabSeite.OK - + '/// Check if Checkbox -- Landscape works fine Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Shift End>" EditCopy wait 500 if Len(GetClipboardText) <= iTextLength then Warnlog "Checkbox Landscape doesn't work fine!" - + Call hCloseDocument endcase @@ -166,14 +166,14 @@ testcase tFormatPage_4 Dim iFormat as Integer Dim sWidth as String Dim sHeight as String - + iFormat = 2 'A4 paper - + PrintLog "- Width and Height boxes must change after changing between Portrait and Landscape" '/// Width and Height boxes must change after changing between Portrait and Landscape - + Call hNewDocument - + '/// Format/Page tabpage page , '/// + check 'Portrait' first and get width and height , '/// + then change from Portrait to Landscape @@ -185,13 +185,13 @@ testcase tFormatPage_4 Sleep 1 sWidth = Breite.GetText sHeight = Hoehe.GetText - + Quer.Check Sleep 1 if Breite.GetText <> sHeight then Warnlog "Width isn't changed when changing from Portrait to Landscape !" if Hoehe.GetText <> sWidth then Warnlog "Height isn't changed when changing from Portrait to Landscape !" TabSeite.Cancel - + '/// Format/Page tabpage page , '/// + check 'Landscape' first and get width and height , '/// + then change from Landscape to Portrait @@ -203,13 +203,13 @@ testcase tFormatPage_4 Sleep 1 sWidth = Breite.GetText sHeight = Hoehe.GetText - + Hoch.Check Sleep 1 if Breite.GetText <> sHeight then Warnlog "Width isn't changed when changing from Landscape to Portrait !" if Hoehe.GetText <> sWidth then Warnlog "Height isn't changed when changing from Landscape to Portrait !" TabSeite.Cancel - + Call hCloseDocument endcase @@ -222,28 +222,28 @@ testcase tFormatPage_5 Dim sWidth as String , sHeight as String Dim sLeft as String , sRight as String , sUp as String , sBottom as String ' set page size Dim sLeft1 as String , sRight1 as String , sUp1 as String , sBottom1 as String ' get page size - + iFormat = 2 'A4 paper sWidth = "20" + gSeperator + "00" + gMeasurementUnit sHeight = "25" + gSeperator + "00" + gMeasurementUnit - + sLeft = "15" + gSeperator + "00" + gMeasurementUnit sRight = "15" + gSeperator + "00" + gMeasurementUnit sUp = "15" + gSeperator + "00" + gMeasurementUnit sBottom = "15" + gSeperator + "00" + gMeasurementUnit - + sLeft1 = "15" + gSeperator + "00" + gMeasurementUnit sRight1 = "4" + gSeperator + "50" + gMeasurementUnit sUp1 = "15" + gSeperator + "00" + gMeasurementUnit sBottom1 = "9" + gSeperator + "50" + gMeasurementUnit - + PrintLog "- The sum of 'Left margin' and 'Right margin' must always stay below the Paper width." PrintLog " (Same for top/bottom and height)" '/// The sum of "Left margin" and "Right margin" must always stay below the Paper width. '/// (Same for top/bottom and height) - + Call hNewDocument - + '/// Format/Page , tabpage Page , set width and height , close the dialog fFormatPageWriter("TabSeite") Papierformat.Select iFormat @@ -255,7 +255,7 @@ testcase tFormatPage_5 Hoehe.SetText sHeight Wait 500 TabSeite.OK - + '/// Format/Page , tabpage Page , '/// + Set the sum of "Left margin" and "Right margin" more than Width fFormatPageWriter("TabSeite") @@ -264,13 +264,13 @@ testcase tFormatPage_5 Rechts.SetText sRight Wait 500 TabSeite.OK - + '/// Check if the setting is OK fFormatPageWriter("TabSeite") if Left$(Links.GetText,5) <> Left$(sLeft1,5) then Warnlog "The Margin(left) is wrong!" if Left$(Rechts.GetText,4) <> Left$(sRight1,4) then Warnlog "The Margin(right) is wrong!" TabSeite.Cancel - + '/// Format/Page , tabpage Page , '/// + Set the sum of "Up margin" and "Bottom margin" more than Heigth fFormatPageWriter("TabSeite") @@ -279,13 +279,13 @@ testcase tFormatPage_5 Unten.SetText sBottom Wait 500 TabSeite.OK - + '/// Check if the setting is OK fFormatPageWriter("TabSeite") if Left$(Oben.GetText,5) <> Left$(sUp1,5) then Warnlog "The Margin(Up) is wrong!" if Left$(Unten.GetText,4) <> Left$(sBottom1,4) then Warnlog "The Margin(Bottom) is wrong!" TabSeite.Cancel - + Call hCloseDocument endcase @@ -298,22 +298,22 @@ testcase tFormatPage_6 Dim iFormatLayout as Integer , iReferenceStyle as Integer Dim sWidth as String, sHeight as String Dim sLeft as String , sRight as String , sUp as String , sBottom as String - + iPaperTray = 1 : iPageLayout = 2 iFormatLayout = 2 : iReferenceStyle = 5 - + sWidth = "20" + gSeperator + "00" + gMeasurementUnit sHeight = "25" + gSeperator + "00" + gMeasurementUnit sLeft = "2" + gSeperator + "00" + gMeasurementUnit sRight = "2" + gSeperator + "00" + gMeasurementUnit sUp = "2" + gSeperator + "00" + gMeasurementUnit sBottom = "2" + gSeperator + "00" + gMeasurementUnit - + PrintLog "- Test Pre-defined formats" '/// Test Pre-defined formats - + Call hNewDocument - + '/// Format/Page , tabpage page , do some configuration fFormatPageWriter("TabSeite") Hoch.Check @@ -341,15 +341,15 @@ testcase tFormatPage_6 AbsatzVorlage.Select iReferenceStyle Wait 500 TabSeite.OK - + '/// Save the file , close the file and reload the file Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\tFormatPage_6.odt", "writer8") Call hCloseDocument - + Call hNewDocument - + Call hFileOpen(gOfficepath + "user\work\tFormatPage_6.odt") - + '/// Check if Pre-defined formats are correct fFormatPageWriter("TabSeite") if Hoch.IsChecked <> TRUE then Warnlog "Portrait should be checked!" @@ -365,7 +365,7 @@ testcase tFormatPage_6 if Einschalten.IsChecked <> TRUE then Warnlog "Portrait should be checked!" if AbsatzVorlage.GetSelIndex <> iReferenceStyle then Warnlog "The reference style is wrong!" TabSeite.Cancel - + Call hCloseDocument endcase @@ -378,22 +378,22 @@ testcase tFormatPage_7 Dim iFormatLayout as Integer , iReferenceStyle as Integer Dim sWidth as String , sHeight as String Dim sLeft as String , sRight as String , sUp as String , sBottom as String - + iPaperTray = 1 : iPageLayout = 2 iFormatLayout = 2 : iReferenceStyle = 5 - + sWidth = "20" + gSeperator + "00" + gMeasurementUnit sHeight = "25" + gSeperator + "00" + gMeasurementUnit sLeft = "2" + gSeperator + "00" + gMeasurementUnit sRight = "2" + gSeperator + "00" + gMeasurementUnit sUp = "2" + gSeperator + "00" + gMeasurementUnit sBottom = "2" + gSeperator + "00" + gMeasurementUnit - + PrintLog "- Test user defined formats" '/// Test user defined formats - + Call hNewDocument - + '/// Format/Page , tabpage page , do some configuration fFormatPageWriter("TabSeite") Hoch.Check @@ -421,7 +421,7 @@ testcase tFormatPage_7 AbsatzVorlage.Select iReferenceStyle Wait 500 TabSeite.OK - + '/// Check if user defined formats are correct fFormatPageWriter("TabSeite") if Hoch.IsChecked <> TRUE then Warnlog "Portrait should be checked!" @@ -437,7 +437,7 @@ testcase tFormatPage_7 if Einschalten.IsChecked <> TRUE then Warnlog "Portrait should be checked!" if AbsatzVorlage.GetSelIndex <> iReferenceStyle then Warnlog "The reference style is wrong!" TabSeite.Cancel - + Call hCloseDocument endcase @@ -479,7 +479,7 @@ testcase tFormatPage_8 Warnlog "Listbox 'Text Direction' is visible though asian support is disabled" end if TabSeite.Cancel - + if RecheckCTLSupport = True then Call ActiveDeactivateCTLSupport(TRUE) else @@ -551,16 +551,16 @@ testcase tFormatPage_10 Dim RecheckAsianSupport as string RecheckCTLSupport = gCTLSup RecheckAsianSupport = gAsianSup - + PrintLog "- when Asian support and CTL are all enabled , 3 entries should be in Text Direction listbox" '/// when Asian support and CTL are all enabled , 3 entries should be in Text Direction listbox - + Call hNewDocument - + '/// Set Asian support enabled and Set CTL enabled Call ActiveDeactivateAsianSupport(TRUE) Call ActiveDeactivateCTLSupport(TRUE) - + '/// Check if there are 3 entires in Text Direction listbox fFormatPageWriter("TabSeite") if Textfluss.GetItemCount <> 3 then @@ -578,7 +578,7 @@ testcase tFormatPage_10 else Call ActiveDeactivateAsianSupport(FALSE) end if - + Call hCloseDocument endcase @@ -843,6 +843,8 @@ testcase tFormatPage_15 sFormat = "Som sidformatmall" case 49: sType = "Seite" sFormat = "Wie Seitenvorlage" + case 50: sType = "Stran" + sFormat = "Kot predloga za stran" case 55 : sType = "Estatísticas" sFormat = "Como Estilo de Página" case 81 : sType = "ページ" @@ -856,12 +858,12 @@ testcase tFormatPage_15 case else : QAErrorLog "The test does not support the language " + iSprache Goto endsub end select - + PrintLog "- Insertfields / other / Document / Type/Page -> As page Style must be set." '/// Insertfield / other / Document / Type/Page -> As page Style must be set. - + Call hNewDocument - + '/// InsertFields / other , tabpage document , select page , '/// + check if Page format is right Call fInsertFieldsOther("TabDokumentFeldbefehle") diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc index 2d34c23d82fb..784f6dad28cc 100755..100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc @@ -641,6 +641,7 @@ testcase tFormatPage_37 case 39 : sHeader = "Riga d'intestazione" case 46 : sHeader = "Sidhuvud" case 49 : sHeader = "Kopfzeile" + case 50 : sHeader = "Glava" case 55 : sHeader = "Cabeçalho" case 81 : sHeader = "ヘッダ" case 82 : sHeader = "머리글" @@ -689,6 +690,7 @@ testcase tFormatPage_38 case 39 : sFooter = "Piè di pagina" case 46 : sFooter = "Sidfot" case 49 : sFooter = "Fußzeile" + case 50 : sFooter = "Noga" case 55 : sFooter = "Rodapé" case 81 : sFooter = "フッタ" case 82 : sFooter = "바닥글" @@ -866,23 +868,23 @@ testcase tFormatPage_41 Dim sWidthColumn1 as String Dim sWidthColumn2 as String Dim sWidthColumn3 as String - + sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatpage\testColumnInPage2.sxw") sColumn = "3" sWidthColumn1 = "2" + gSeperator + "00" sWidthColumn2 = "4" + gSeperator + "00" - + PrintLog "- create columns with different width " '/// create columns with different width - + Call hNewDocument - + '/// Open test file testColumnInPage2.sxw '/// + (The test file includes 2 pages , some text is '/// + in 1st page and another is in 2nd page) Call hFileOpen(sTestFile) Call sMakeReadOnlyDocumentEditable - + '/// Create 3 with different columns . formatPage , '/// + tabpage columns , set 3 columns Call fFormatPageWriter("TabSpalten") @@ -899,14 +901,14 @@ testcase tFormatPage_41 sWidthColumn3 = Spaltenbreite3.GetText wait 500 TabSpalten.OK - + '/// Check if columns' width is right fFormatPageWriter("TabSpalten") if Left$(Spaltenbreite1.GetText,4) <> sWidthColumn1 then Warnlog "the column1's width isn't set correctly !" if Left$(Spaltenbreite2.GetText,4) <> sWidthColumn2 then Warnlog "the column2's width isn't set correctly !" if Spaltenbreite3.GetText <> sWidthColumn3 then Warnlog "the column3's width isn't set correctly !" TabSpalten.Cancel - + 'detailed check for column1 Kontext EditSearchAndReplace @@ -916,12 +918,12 @@ testcase tFormatPage_41 SearchAll.Click Sleep 1 FindAndReplace.Close - + Call wTypeKeys "<Home>" Call wTypeKeys "<Shift End>" EditCopy if Len(GetClipboardText) > 8 then Warnlog "Something wrong in the column1" - + 'detailed check for column2 Kontext EditSearchAndReplace @@ -931,12 +933,12 @@ testcase tFormatPage_41 SearchAll.Click Sleep 1 FindAndReplace.Close - + Call wTypeKeys "<Home>" Call wTypeKeys "<Shift End>" EditCopy if Len(GetClipboardText) > 14 then Warnlog "Something wrong in the column2" - + printlog " Close active document " Do Until GetDocumentCount = 0 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc index 60b8182fd15d..9b800e3bad4b 100755..100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc @@ -58,32 +58,32 @@ testcase tFormatPage_48 printlog "No test with asian lovale, because checkbox 'Asian language support' is disabled by default!" goto endsub end select - + sTestText1 = "This is the test!" sTestText2 = "That isn't a test!" - + PrintLog "- Text flow direction test Right to Left (Vertical) - Paragraph" '/// Text flow direction test Right to Left (Vertical) - Paragraph - + Call hNewDocument - + '/// Set Asian language support enabled Call ActiveDeactivateCTLSupport(FALSE) Call ActiveDeactivateAsianSupport(TRUE) - + '/// Input some test words Call wTypeKeys sTestText1 Call wTypeKeys "<Return>" Call wTypeKeys sTestText2 Sleep 1 - + '/// formatPage , tabpage page, select right to left (vertical) fFormatPageWriter("TabSeite") Textfluss.Select 2 Sleep 1 TabSeite.OK Sleep 2 - + '/// Check if the direction of the test words is changed Call wTypeKeys "<MOD1 Home>" Call wTypeKeys "<Shift Down>", 4 @@ -92,7 +92,7 @@ testcase tFormatPage_48 if GetClipboardText <> "This" then Warnlog "Something wrong in first word - get " &GetClipboardText end if - + Call wTypeKeys "<Home><Left>" Call wTypeKeys "<Shift Down>" , 4 Sleep 1 @@ -100,11 +100,11 @@ testcase tFormatPage_48 if GetClipboardText <> "That" then Warnlog "Something wrong in second word - get " &GetClipboardText end if - + if RecheckAsianSupport = False then Call ActiveDeactivateAsianSupport(FALSE) end if - + Call hCloseDocument endcase @@ -116,32 +116,32 @@ testcase tFormatPage_49 Dim sTestText as String Dim RecheckAsianSupport as boolean RecheckAsianSupport = gAsianSup - + sTestText = "This is the test!" - + PrintLog "- Text flow direction test Right to Left (Vertical) - Section" '/// Text flow direction test Right to Left (Vertical) - Section - + Call hNewDocument - + '/// Set Asian language support enabled Call ActiveDeactivateAsianSupport(TRUE) - + '/// Insert a section fInsertSection("TabBereiche") TabBereiche.OK - + '/// insert something in the section Call wTypeKeys "<Up>" Call wTypeKeys sTestText - + '/// formatPage , tabpage page, select right to left (vertical) fFormatPageWriter("TabSeite") Textfluss.Select 2 Sleep 1 TabSeite.OK Sleep 2 - + '/// Check if the direction of the test words is changed Call wTypeKeys "<Home>" Call wTypeKeys "<Shift Down>" , 4 @@ -151,7 +151,7 @@ testcase tFormatPage_49 if RecheckAsianSupport = False then Call ActiveDeactivateAsianSupport(FALSE) end if - + Call hCloseDocument endcase @@ -165,12 +165,12 @@ testcase tFormatPage_50 PrintLog "- Text flow direction test Right to Left (Vertical) - Footnotes" '/// Text flow direction test Right to Left (Vertical) - Footnotes - + Call hNewDocument - + '/// Set Asian language support enabled Call ActiveDeactivateAsianSupport(TRUE) - + '/// Insert a footnotes InsertFootnote Kontext "FussnoteEinfuegen" @@ -179,17 +179,17 @@ testcase tFormatPage_50 Sleep 1 FussnoteEinfuegen.OK Sleep 1 - + Call wTypeKeys "<PageUp>" Sleep 1 - + '/// formatPage , tabpage page, select right to left (vertical) Call fFormatPageWriter("TabSeite") Textfluss.Select 2 Sleep 1 TabSeite.OK Sleep 2 - + '/// Check if the direction of the footnote is changed Call wTypeKeys "<Down>" try @@ -199,7 +199,7 @@ testcase tFormatPage_50 Warnlog "Should NOT execute edit/footnote when focus is under the footnote" catch endcatch - + Call wTypeKeys "<Up>" try EditFootnote @@ -212,7 +212,7 @@ testcase tFormatPage_50 if RecheckAsianSupport = False then Call ActiveDeactivateAsianSupport(FALSE) end if - + Call hCloseDocument endcase @@ -223,15 +223,15 @@ testcase tFormatPage_51 Dim RecheckAsianSupport as boolean RecheckAsianSupport = gAsianSup - + PrintLog "- Text flow direction test Right to Left (Vertical) - Endnotes" '/// Text flow direction test Right to Left (Vertical) - Endnotes - + Call hNewDocument - + '/// Set Asian language support enabled Call ActiveDeactivateAsianSupport(TRUE) - + '/// Insert a endnotes InsertFootnote Kontext "FussnoteEinfuegen" @@ -240,17 +240,17 @@ testcase tFormatPage_51 Sleep 1 FussnoteEinfuegen.OK Sleep 1 - + Call wTypeKeys "<PageUp>" Sleep 1 - + '/// formatPage , tabpage page, select right to left (vertical) Call fFormatPageWriter("TabSeite") Textfluss.Select 2 Sleep 1 TabSeite.OK Sleep 2 - + '/// Check if the direction of the endnote is changed Call wTypeKeys "<Down>" try @@ -260,7 +260,7 @@ testcase tFormatPage_51 Warnlog "Should NOT execute edit/footnote when focus is under the endnote" catch endcatch - + Call wTypeKeys "<Up>" try EditFootnote @@ -273,7 +273,7 @@ testcase tFormatPage_51 if RecheckAsianSupport = False then Call ActiveDeactivateAsianSupport(FALSE) end if - + Call hCloseDocument endcase @@ -285,20 +285,20 @@ testcase tFormatPage_52 Dim sTest1 as String , sTest2 as String , sTest3 as String Dim RecheckAsianSupport as boolean RecheckAsianSupport = gAsianSup - + sTest1 = "A1" : sTest2 = "B1" : sTest3 = "A2" - + PrintLog "- Text flow direction test Right to Left (Vertical) - Table" '/// Text flow direction test Right to Left (Vertical) - Table - + Call hNewDocument - + '/// Set Asian language support enabled Call ActiveDeactivateAsianSupport(TRUE) - + '/// Insert a table Call hTabelleEinfuegen - + '/// + input some string in the table , like '/// a1 b1 '/// a2 @@ -312,14 +312,14 @@ testcase tFormatPage_52 wait 500 Call wTypeKeys sTest3 Call wTypeKeys "<Up><Home>" 'so far, the focus should be in front of A1 - + '/// formatPage , tabpage page, select right to left (vertical) Call fFormatPageWriter("TabSeite") Textfluss.Select 2 Sleep 1 TabSeite.OK Sleep 2 - + '/// Check if the direction of the table is changed Call wTypeKeys "<Shift Down>" , 2 Sleep 1 @@ -327,7 +327,7 @@ testcase tFormatPage_52 if GetClipboardText <> sTest1 then Warnlog "1st word in table is wrong!" end if - + Call wTypeKeys "<Down>" Call wTypeKeys "<Shift Down>" , 2 Sleep 1 @@ -335,7 +335,7 @@ testcase tFormatPage_52 if GetClipboardText <> sTest2 then Warnlog "2nd word in table is wrong!" end if - + Call wTypeKeys "<Left><Up>" Call wTypeKeys "<Shift Home>" Sleep 1 @@ -347,7 +347,7 @@ testcase tFormatPage_52 if RecheckAsianSupport = False then Call ActiveDeactivateAsianSupport(FALSE) end if - + Call hCloseDocument endcase @@ -355,36 +355,36 @@ endcase '------------------------------------------------------------------------------------------- testcase tFormatPage_53 - + Dim sTest as String Dim sTestFile as String Dim RecheckAsianSupport as boolean RecheckAsianSupport = gAsianSup - + sTest = "Test" sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatpage\testColumnVertical.sxw") - + PrintLog "- Text flow direction test Right to Left (Vertical) - Column" '/// Text flow direction test Right to Left (Vertical) - Column - + Call hNewDocument - + '/// Set Asian language support enabled Call ActiveDeactivateAsianSupport(TRUE) - + '/// Open test file testColumnVertical.sxw '/// + There are 8 columns in the page , and a test '/// + word is in 3rd column Call hFileOpen(sTestFile) Call sMakeReadOnlyDocumentEditable - + '/// formatPage , tabpage page, select right to left (vertical) Call fFormatPageWriter("TabSeite") Textfluss.Select 2 Sleep 1 TabSeite.OK Sleep 2 - + '/// Check if the direction of the column is changed Kontext EditSearchAndReplace @@ -395,20 +395,20 @@ testcase tFormatPage_53 Sleep 1 FindAndReplace.Close Sleep 1 - + Call wTypeKeys "<Down>" Sleep 1 - + Call wTypeKeys "<Shift Up>" , 4 EditCopy if GetClipboardText <> sTest then Warnlog "the test word is wrong!" end if - + if RecheckAsianSupport = False then Call ActiveDeactivateAsianSupport(FALSE) end if - + printlog " Close active document " Do Until GetDocumentCount = 0 Call hCloseDocument @@ -626,6 +626,7 @@ testcase tFormatPage_58 case 39 : sDefaultShadowColor = "Grigio" case 46 : sDefaultShadowColor = "Grått" case 49 : sDefaultShadowColor = "Grau" + case 50 : sDefaultShadowColor = "Siva" case 55 : sDefaultShadowColor = "Cinza" case 81 : sDefaultShadowColor = "灰色" case 82 : sDefaultShadowColor = "회색" @@ -749,7 +750,7 @@ testcase tFormatPage_60 Oben.SetText sSpacingToContentsU Unten.SetText sSpacingToContentsB StilFarbe.Select iBorderColor 'set border color - + Position.TypeKeys "<Right>" , 4 Sleep 2 Groesse.SetText sShadowDistance diff --git a/testautomation/writer/optional/includes/number/w_206_.inc b/testautomation/writer/optional/includes/number/w_206_.inc index 70d47bd12bf4..ae7698017216 100755 --- a/testautomation/writer/optional/includes/number/w_206_.inc +++ b/testautomation/writer/optional/includes/number/w_206_.inc @@ -358,11 +358,11 @@ testcase tToolsNumbering6 Warnlog "First paragraph not 'This is the first' but: " & sClipBrd(0) end if Case 2 - if sClipBrd(1) <> "1.This is the second" then + if sClipBrd(1) <> "1. This is the second" then Warnlog "First paragraph not '1.This is the second' but: " & sClipBrd(1) end if Case 3 - if sClipBrd(2) <> "2.This is the third" then + if sClipBrd(2) <> "2. This is the third" then Warnlog "First paragraph not '2.This is the third' but: " & sClipBrd(2) end if end select @@ -472,12 +472,12 @@ testcase tToolsNumbering7 end if end if Case 2 - if sClipBrd(1) <> "1.1.My second number" then - Warnlog "#128041#First paragraph not '1.1.My second number' but: " & sClipBrd(1) + if sClipBrd(1) <> "1. 1.My second number" then + Warnlog "#128041#Second paragraph not '1. 1.My second number' but: " & sClipBrd(1) end if Case 3 - if sClipBrd(2) <> "2.2.My third number" then - Warnlog "#128041#First paragraph not '2.2.My third number' but: " & sClipBrd(2) + if sClipBrd(2) <> "2. 2.My third number" then + Warnlog "#128041#Third paragraph not '2. 2.My third number' but: " & sClipBrd(2) end if end select next i @@ -707,16 +707,16 @@ testcase tToolsNumbering11 For i = 1 to 3 Select Case i Case 1 - if sClipBrd(0) <> "11A new first paragraph" then - Warnlog "First Heading not: '11A new first paragraph' but: " & sClipBrd(0) + if sClipBrd(0) <> "1 1A new first paragraph" then + Warnlog "First Heading not: '1 1A new first paragraph' but: " & sClipBrd(0) end if Case 2 - if sClipBrd(1) <> "22" then - Warnlog "First paragraph not '22' but: " & sClipBrd(1) + if sClipBrd(1) <> "2 2" then + Warnlog "First paragraph not '2 2' but: " & sClipBrd(1) end if Case 3 - if sClipBrd(2) <> "33A new third paragraph" then - Warnlog "First paragraph not '33A new third paragraph' but: " & sClipBrd(2) + if sClipBrd(2) <> "3 3A new third paragraph" then + Warnlog "First paragraph not '3 3A new third paragraph' but: " & sClipBrd(2) end if end select next i diff --git a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc index 8412302d6c35..5e13f9353891 100755 --- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc +++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc @@ -467,11 +467,11 @@ testcase i103265 end if Case 2: if GetClipboardText <> "1. Test" then - Warnlog "First hyperlink not correctly jumped to. Not '# 1. Test' but " & GetClipboardtext + Warnlog "Second hyperlink not correctly jumped to. Not '# 1. Test' but " & GetClipboardtext end if Case 3: - if GetClipboardText <> "Test " then - Warnlog "First hyperlink not correctly jumped to. Not 'Test' but " & GetClipboardtext + if GetClipboardText <> "1 Test " then + Warnlog "Third hyperlink not correctly jumped to. Not '1 Test' but " & GetClipboardtext end if end select next i diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc index b1576b494469..886f7fa91967 100755..100644 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc @@ -57,7 +57,7 @@ testcase tToolsSpellcheckWithShortcut Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer." exit sub end if - + call hFileOpen (TheFile,false) Call sMakeReadOnlyDocumentEditable @@ -69,12 +69,13 @@ testcase tToolsSpellcheckWithShortcut case 39 : Call wTypeKeys ("Don Cara Mio, capitoliooo?<Home>") case 49 : Call wTypeKeys ("Dies ist ein Rechtschreibtexxxxt<Home>") case 46 : Call wTypeKeys ("Det här är en rättstavningstexxxxt<Home>") + case 50 : Call wTypeKeys ("To je test črkvana<Home>") case 07 : Printlog "- No Spellcheck in Russian!" goto endsub case 48 : Printlog "- No Spellcheck in Polish!" goto endsub case 55 : Printlog "- No Spellcheck in Brazilian!" - goto endsub + goto endsub case 81 : Printlog "- No Spellcheck in Japanese!" goto endsub case 82 : Printlog "- No Spellcheck in Korean!" @@ -92,10 +93,10 @@ testcase tToolsSpellcheckWithShortcut Call wTypeKeys "<HOME>" 'Setting cursor to beginning Call wTypeKeys "<F7>" 'Calling spellchecker with shortcut sleep (1) - + Kontext "Active" if Active.Exists(1) then 'checking if messagebox comes up - if Active.getRT = 304 then 'checking ressource type + if Active.getRT = 304 then 'checking ressource type Active.OK else printlog "No message Box!" @@ -178,6 +179,7 @@ testcase tToolsSpellcheckCorrect case 46 : FFText = "Den här filen innehåller viktig programinformation.<Return>" case 48 : FFText = "Nie wolno w zadnim wypadku przerywa uruchomionego serwisu !<Return>" case 49 : FFText = "Dies ist ein Text ohne Fehler.<Return>" + case 50 : FFText = "To je besedilo brez napake.<Return>" case 55 : FFText = "Ele ouviu passos silenciosos atrás dele. Isso não estava certo.<Return>" case else : QAErrorLog " - The language " + iSprache +" has no defined language text. No Test !" exit Sub @@ -263,6 +265,9 @@ testcase tToolsSpellcheck1Mistake case 49 : sErrorSampleText = "Diees ist ein Fehler." sWordToBeChecked = "Diees" sLanguageName = "Deutsch (Deutschland)" + case 50 : sErrorSampleText = "Tuki je nekaj narobe." + sWordToBeChecked = "Tuki" + sLanguageName = "Slovenščina" case 55 : sErrorSampleText = "Esta poderia ser a respista para suas preces?" sWordToBeChecked = "respista" sLanguageName = "Português (Brasil)" @@ -305,13 +310,13 @@ testcase tToolsSpellcheck1Mistake Call hCloseDocument goto endsub end if - printlog "Current selected dictionary language is: " & DictionaryLanguage.GetSelText + printlog "Current selected dictionary language is: " & DictionaryLanguage.GetSelText ' Dictionary Language is language dependend. Function to be created printlog " - check language" 'if DictionaryLanguage.GetSelText <> gLanguage then Warnlog "Dictionary language " + DictionaryLanguage.GetSelText +" selected" printlog " - replace wrong word with a suggestion" '/// replace wrong word with a suggestion /// - + if trim$(NotInDictionary.GetText) <> trim(sErrorSampleText) then warnlog " " & sErrorSampleText & " has not been detected as mistake. Detected mistake is:" & NotInDictionary.GetText end if @@ -343,7 +348,7 @@ testcase tToolsSpellcheck1Mistake Active.No endcatch end if - + Kontext "Spellcheck" if Spellcheck.Exists then SpellcheckClose.Click @@ -377,7 +382,7 @@ testcase tToolsSpellcheckForward QAErrorLog "The language " + iSprache +" has no defined Errortext. No test!" 'iSystemSprache goto endsub end select - + if gApplication = "MASTERDOCUMENT" then if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste @@ -387,7 +392,7 @@ testcase tToolsSpellcheckForward end if '/// point cursor to beginning of document and execute spellcheck /// Call wTypeKeys "<Mod1 Home>" - + select case iSprache case 01 : sDummy = "exprass" : sWordToBeAdded = "pablischer" case 07 : sDummy = "решаaт" : sWordToBeAdded = "кaнкретных" @@ -401,6 +406,7 @@ testcase tToolsSpellcheckForward case 46 : sDummy = "handbroken" : sWordToBeAdded = "viktikt" case 48 : sDummy = "znajdujacej" : sWordToBeAdded = "usuniete" case 49 : sDummy = "reichtt" : sWordToBeAdded = "viierter" + case 50 : sDummy = "Paglejmo" : sWordToBeAdded = "čtrto" case 55 : sDummy = "horat" : sWordToBeAdded = "dpa" end select @@ -537,7 +543,7 @@ testcase tToolsSpellcheckOnlyOneWord Dim InsFile as string Dim ReplacedWith as String Dim i as integer - + '/// Open specified document depending on language to check spellcheck /// '/// document has 1 defined wrong word /// PrintLog "- Tools / Spellchecking / Check only one word" @@ -550,7 +556,7 @@ testcase tToolsSpellcheckOnlyOneWord QAErrorLog "The language " + iSprache +" has no defined Errortext. No test!" goto endsub end select - + if gApplication = "MASTERDOCUMENT" then if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste @@ -559,7 +565,7 @@ testcase tToolsSpellcheckOnlyOneWord Call sMakeReadOnlyDocumentEditable end if Call wTypeKeys "<Mod1 Home>" - + select case iSprache case 01 : sWordToBeChecked = "excetionally" ' this word is wrong case 07 : sWordToBeChecked = "Кaнституции" @@ -573,6 +579,7 @@ testcase tToolsSpellcheckOnlyOneWord case 46 : sWordToBeChecked = "avrttades" ' this word is wrong case 48 : sWordToBeChecked = "stosowanei" ' this word is wrong case 49 : sWordToBeChecked = "georaphischen" ' this word is wrong + case 50 : sWordToBeChecked = "ssmo" ' this word is wrong case 55 : sWordToBeChecked = "Veigo" ' this word is wrong end select @@ -613,7 +620,7 @@ testcase tToolsSpellcheckOnlyOneWord ToolsSpellcheckWriter Kontext "Active" if Active.Exists then - if Active.GetRT = 304 then + if Active.GetRT = 304 then Warnlog "Spellcheck doesn't work correctly:" & Active.Gettext try Active.Ok @@ -659,11 +666,11 @@ testcase tToolsSpellcheckOnlyOneWord Warnlog Active.Gettext endcatch end if - end if - + end if + Kontext "Spellcheck" if Spellcheck.Exists then SpellcheckClose.Click - + Call wTypeKeys "<Mod1 Shift Left>" try EditCopy @@ -705,10 +712,10 @@ testcase tToolsSpellcheckOnlyOneWord Spellcheck.Close end if end if - + Kontext "Spellcheck" if Spellcheck.Exists then Spellcheck.Close - + '/// Close document /// Call hCloseDocument endcase @@ -738,8 +745,8 @@ testcase tToolsSpellcheckAutomatic Call sMakeReadOnlyDocumentEditable '/// Enable Auto-Spellcheck in options - Call wEnableAutoSpellcheck ( true ) - + Call wEnableAutoSpellcheck ( true ) + '/// Check Auto-Spellcheck and insert a sentence with 2 mistakes /// printlog " - write text" select case iSprache @@ -766,7 +773,7 @@ testcase tToolsSpellcheckAutomatic case 36 : wTypeKeys "A hétezres koszovói amerikai kontingens jelentos részét is a magyarországi bázison helyezi majd el." iError1 = 1 : iError2 = 4 sError1 = "hétezres" : sError1 = "jelentos" - sDefaultFormat = "Alapértelmezett" + sDefaultFormat = "Alapértelmezett" case 39 : wTypeKeys "La sfumaturar è statsi modificata senza salvare " iError1 = 1 : iError2 = 2 sError1 = "sfumaturar" : sError1 = "statsi" @@ -787,10 +794,14 @@ testcase tToolsSpellcheckAutomatic iError1 = 1 : iError2 = 2 sError1 = "hiaer" : sError1 = "swei" sDefaultFormat = "Standard" + case 50 : wTypeKeys "Tuki sta dve napki" + iError1 = 1 : iError2 = 2 + sError1 = "Tuki" : sError1 = "napki" + sDefaultFormat = "Standard" case 55 : wTypeKeys "Aqui poderá elimitnar componentes já instalados ou instalar novos compotentes numa " iError1 = 2 : iError2 = 7 sError1 = "elimitnar" : sError1 = "compotentes" - sDefaultFormat = "Padrão" + sDefaultFormat = "Padrão" case 81 : Printlog "- No Spellcheck in Japanese!" Call hCloseDocument goto endsub @@ -809,7 +820,7 @@ testcase tToolsSpellcheckAutomatic end select Call wTypeKeys "<Space><Return>" - + printlog " - relieve mistake" Call wTypeKeys "<Up><Home>" Call wTypeKeys "<Mod1 Right>", iError1 @@ -921,7 +932,7 @@ testcase tToolsSpellcheckChangeLanguageAttribute QAErrorLog "The language " + iSprache +" has no defined Errortext. No test!" 'iSystemSprache goto endsub end select - + if gApplication = "MASTERDOCUMENT" then if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste @@ -930,7 +941,7 @@ testcase tToolsSpellcheckChangeLanguageAttribute Call sMakeReadOnlyDocumentEditable end if Call wTypeKeys "<Mod1 Home>" - + select case iSprache case 01 : sWordToBeChecked = "excetionally" ' this word is wrong case 03 : sWordToBeChecked = "semstre" ' this word is wrong @@ -944,6 +955,7 @@ testcase tToolsSpellcheckChangeLanguageAttribute case 46 : sWordToBeChecked = "avrttades" ' this word is wrong case 48 : sWordToBeChecked = "stosowanei" ' this word is wrong case 49 : sWordToBeChecked = "georaphischen" ' this word is wrong + case 50 : sWordToBeChecked = "ssmo" ' this word is wrong case 55 : sWordToBeChecked = "Veigo" ' this word is wrong end select @@ -1011,7 +1023,7 @@ testcase tToolsSpellcheckChangeLanguageAttribute Suggestions.Select 1 ReplacedWith = Suggestions.GetSelText printlog "- replace with word: " & ReplacedWith - i = DictionaryLanguage.GetItemCount + 1 + i = DictionaryLanguage.GetItemCount + 1 end if end if next i @@ -1045,7 +1057,7 @@ testcase tToolsSpellcheckChangeLanguageAttribute wait 500 Call wTypeKeys "<Mod1 Home>" printlog "- find replaced word" - + EditSearchAndReplace Kontext "FindAndReplace" try @@ -1073,7 +1085,7 @@ testcase tToolsSpellcheckChangeLanguageAttribute Kontext Active.Setpage TabFont Kontext "TabFont" - try + try if Language.GetSelText <> CurrentLanguage then if Language.GetSelText = PriorLanguage then Warnlog "Language Attributes has not been set to" & CurrentLanguage @@ -1118,7 +1130,7 @@ testcase tToolsSpellcheckButtonChange QAErrorLog "The language " + iSprache +" has no defined Errortext. No test!" 'iSystemSprache goto endsub end select - + if gApplication = "MASTERDOCUMENT" then if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste @@ -1185,7 +1197,7 @@ testcase tToolsSpellcheckButtonChangeAll QAErrorLog "The language " + iSprache +" has no defined Errortext. No test!" 'iSystemSprache goto endsub end select - + if gApplication = "MASTERDOCUMENT" then if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste @@ -1222,7 +1234,7 @@ testcase tToolsSpellcheckButtonChangeAll end if '/// Close document Call hCloseDocument - + endcase ' ******************************************************************* @@ -1257,6 +1269,7 @@ testcase tToolsThesaurus case 46 : sWordInitial = "Däng" case 48 : sWordInitial = "wypowiedź" case 49 : sWordInitial = "Mann" + case 50 : sWordInitial = "smisel" case 55 : Printlog "- No Thesaurus in Portuguese (Brazil) !" goto endsub case 81 : Printlog "- No Thesaurus in Japanese!" @@ -1282,7 +1295,7 @@ testcase tToolsThesaurus '/// Call Thesaurus without a written word /// ToolsLanguageThesaurus Kontext "Thesaurus" - if CurrentWord.GetSelText <> "" then Warnlog "- Though no word has been selected Current Word textfield is filled !" + if CurrentWord.GetSelText <> "" then Warnlog "- Though no word has been selected Current Word textfield is filled !" if ReplaceWith.GetText <> "" then Warnlog "- Though no word has been selected there is a replacetext in the textfield!" printlog "Set language dependent word in textfield Current Word" CurrentWord.Settext sWordInitial @@ -1307,11 +1320,11 @@ testcase tToolsThesaurus end if Call hCloseDocument wait 500 - + printlog " Open new preformatted-document where the formatting is set to the language we wish to test." call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable - + Call sMakeReadOnlyDocumentEditable + Call wTypeKeys sWordInitial Call wTypeKeys "<Home><Right><Right>" @@ -1320,12 +1333,12 @@ testcase tToolsThesaurus Kontext "Thesaurus" wait 500 if CurrentWord.GetSeltext = sWordInitial then - sWordToBeFound = ReplaceWith.Gettext + sWordToBeFound = ReplaceWith.Gettext if Alternatives.GetItemCount > 0 then printlog "Select last entry in alternatives list" Alternatives.Select Alternatives.GetItemCount Alternatives.TypeKeys "<Space>" - if ReplaceWith.Gettext = sWordToBeFound then + if ReplaceWith.Gettext = sWordToBeFound then Warnlog "Though alternative was selected replace with was not changed" else sWordToBeFound = ReplaceWith.Gettext @@ -1344,21 +1357,22 @@ testcase tToolsThesaurus end if Call wTypeKeys "<Home><Shift End><Delete>" - Call wTypeKeys sWordInitial - + Call wTypeKeys sWordInitial + printlog "- Replace unchecked ( Cursor at words end )" ToolsLanguageThesaurus Kontext "Thesaurus" wait 500 if CurrentWord.GetSeltext = sWordInitial then - sWordToBeFound = ReplaceWith.Gettext - if Alternatives.GetItemCount > 0 then + sWordToBeFound = ReplaceWith.Gettext + if Alternatives.GetItemCount > 0 then printlog "Select last entry in alternatives list" Alternatives.Select Alternatives.GetItemCount - Alternatives.TypeKeys "<Space>" - if ReplaceWith.Gettext = sWordToBeFound then + + if ReplaceWith.Gettext = sWordToBeFound then Warnlog "Though alternative was selected replace with was not changed" else + Alternatives.TypeKeys "<Space>" sWordToBeFound = ReplaceWith.Gettext end if Thesaurus.OK @@ -1373,7 +1387,7 @@ testcase tToolsThesaurus else Warnlog "Current word is not selected word !" end if - + '/// Close thesaurus and writerdocument /// Call hCloseDocument endcase @@ -1411,6 +1425,7 @@ testcase tToolsThesaurusSynonyms case 46 : sWordInitial = "Däng" case 48 : sWordInitial = "wypowiedź" case 49 : sWordInitial = "Mann" + case 50 : sWordInitial = "smisel" case 55 : Printlog "- No Thesaurus in Portuguese (Brazil) !" goto endsub case 81 : Printlog "- No Thesaurus in Japanese!" @@ -1460,6 +1475,3 @@ testcase tToolsThesaurusSynonyms Call hCloseDocument endcase - - - diff --git a/testautomation/writer/optional/input/linguistik/050.odt b/testautomation/writer/optional/input/linguistik/050.odt Binary files differnew file mode 100755 index 000000000000..3a90c03e99aa --- /dev/null +++ b/testautomation/writer/optional/input/linguistik/050.odt diff --git a/testautomation/writer/optional/input/spellcheck/Language_Guessing_Sample_Texts.odt b/testautomation/writer/optional/input/spellcheck/Language_Guessing_Sample_Texts.odt Binary files differindex e66f7a3d6c43..ae765bd5f220 100755 --- a/testautomation/writer/optional/input/spellcheck/Language_Guessing_Sample_Texts.odt +++ b/testautomation/writer/optional/input/spellcheck/Language_Guessing_Sample_Texts.odt diff --git a/testautomation/writer/optional/input/spellcheck/spellcheck_50.odt b/testautomation/writer/optional/input/spellcheck/spellcheck_50.odt Binary files differnew file mode 100755 index 000000000000..30f9d7cdc76b --- /dev/null +++ b/testautomation/writer/optional/input/spellcheck/spellcheck_50.odt diff --git a/testautomation/writer/optional/input/spellcheck/st1_2_50.odt b/testautomation/writer/optional/input/spellcheck/st1_2_50.odt Binary files differnew file mode 100755 index 000000000000..7402e851bb65 --- /dev/null +++ b/testautomation/writer/optional/input/spellcheck/st1_2_50.odt |