diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-14 19:11:13 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-14 19:11:13 +0100 |
| commit | 044b3ebb513cbd89d8cb22fe61c1090e54d85c54 (patch) | |
| tree | e7111c8a9e02b3b8fcca29d8e39785fb27c2407f /testautomation/writer/optional/includes | |
| parent | printerpullpages:i108219 checkbox 'LeereZellenDrucken' was removed from tabpage (diff) | |
| parent | CWS-TOOLING: integrate CWS cmcfixes68 (diff) | |
| download | core-044b3ebb513cbd89d8cb22fe61c1090e54d85c54.tar.gz core-044b3ebb513cbd89d8cb22fe61c1090e54d85c54.zip | |
rebase to DEV300_m69
Diffstat (limited to 'testautomation/writer/optional/includes')
12 files changed, 976 insertions, 1054 deletions
diff --git a/testautomation/writer/optional/includes/clipboard/w_216_.inc b/testautomation/writer/optional/includes/clipboard/w_216_.inc index d285a3e12190..f85736751d34 100755 --- a/testautomation/writer/optional/includes/clipboard/w_216_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_216_.inc @@ -59,6 +59,9 @@ testcase HTMLToWRITERText Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) Call sMakeReadOnlyDocumentEditable sleep (3) + if GetDocumentCount() = 2 then + Warnlog "#i104365#read only document remains opened" + endif printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Shift Down><Shift End>" @@ -112,7 +115,9 @@ testcase HTMLToWRITERText goto endsub end if printlog " Close saved document " - Call hCloseDocument + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase ' ---------------------------------------------------------------------------------------------- @@ -125,6 +130,9 @@ testcase HTMLToWRITERField printlog " Copy selected text " Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") Call sMakeReadOnlyDocumentEditable + if GetDocumentCount() = 2 then + Warnlog "#i104365#read only document remains opened" + endif printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Down>",2 @@ -177,7 +185,9 @@ testcase HTMLToWRITERField goto endsub end if printlog " Close saved document " - Call hCloseDocument + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase ' ---------------------------------------------------------------------------------------------- @@ -190,6 +200,9 @@ testcase HTMLToWRITERTable printlog " Copy selected table " Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) Call sMakeReadOnlyDocumentEditable + if GetDocumentCount() = 2 then + Warnlog "#i104365#read only document remains opened" + endif printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys "<Down>",5 @@ -242,7 +255,9 @@ testcase HTMLToWRITERTable goto endsub end if printlog " Close saved document " - Call hCloseDocument + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase ' ---------------------------------------------------------------------------------------------- @@ -255,6 +270,9 @@ testcase HTMLToWRITERGraphicLinked printlog " Copy selected Linked Graphic " Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) Call sMakeReadOnlyDocumentEditable + if GetDocumentCount() = 2 then + Warnlog "#i104365#read only document remains opened" + endif printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -296,7 +314,9 @@ testcase HTMLToWRITERGraphicLinked goto endsub end if printlog " Close saved document " - Call hCloseDocument + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase ' ---------------------------------------------------------------------------------------------- @@ -309,6 +329,9 @@ testcase HTMLToWRITERControl printlog " Copy selected Control " Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) Call sMakeReadOnlyDocumentEditable + if GetDocumentCount() = 2 then + Warnlog "#i104365#read only document remains opened" + endif printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -351,7 +374,9 @@ testcase HTMLToWRITERControl goto endsub end if printlog " Close saved document " - Call hCloseDocument + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase ' ---------------------------------------------------------------------------------------------- @@ -364,6 +389,9 @@ testcase HTMLToWRITERFloatingFrame printlog " Copy selected Floating Frame " Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) Call sMakeReadOnlyDocumentEditable + if GetDocumentCount() = 2 then + Warnlog "#i104365#read only document remains opened" + endif printlog " Jump to beginning of document " Call wTypeKeys "<Mod1 Home>" Call wTypeKeys ( "<Shift F4>" ) @@ -412,5 +440,7 @@ testcase HTMLToWRITERFloatingFrame goto endsub end if printlog " Close saved document " - Call hCloseDocument + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase diff --git a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc index f96238cb11a8..463ef593930c 100755 --- a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc +++ b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc @@ -304,9 +304,9 @@ testcase tGroup_6 Call wTypeKeys "<Right>",2 PrintLog "- Set the focus to rectangle , check if it is moved (Should NOT)" - Call gMouseClick(35,35) + Call gMouseClick(41,40) Call fPositionAndSize("TabPositionAndSizeWriter") - if Horizontalby.Gettext <> sPositionX1 then Warnlog "Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext + if Horizontalby.Gettext <> sPositionX1 then Warnlog "#i106719#Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext if Verticalby.Gettext <> sPositionY1 then Warnlog "Rectangle should NOT be moved: Y Not -> "+sPositionY1+" but -> "+ Verticalby.Gettext TabPositionAndSizeWriter.Cancel @@ -377,7 +377,7 @@ testcase tGroup_7 PrintLog "- Set the focus to rectangle , check if it is moved (Should NOT)." Call gMouseClick(40,40) Call fPositionAndSize("TabPositionAndSizeWriter") - if Horizontalby.Gettext <> sPositionX1 then Warnlog "Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext + if Horizontalby.Gettext <> sPositionX1 then Warnlog "#i106719#Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext if Verticalby.Gettext <> sPositionY1 then Warnlog "Rectangle should NOT be moved: Y Not -> "+sPositionY1+" but -> "+ Verticalby.Gettext TabPositionAndSizeWriter.Cancel diff --git a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc index 1112d4b62551..3f7d55cb8be7 100755 --- a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc +++ b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc @@ -1032,6 +1032,10 @@ testcase tDropDownLB_17 PrintLog "- Open a word document which includes 2 entries." Call hFileOpen(sTestFile) Call sMakeReadOnlyDocumentEditable + + Kontext "EditInputList" + if EditInputList.Exists then EditInputList.Cancel + PrintLog "- Set focus in front of first line." Call wTypeKeys "<MOD1 Home>" PrintLog "- Edit/Fields." @@ -1085,7 +1089,9 @@ testcase tDropDownLB_17 FeldbefehlBearbeitenFunktionen.Cancel - Call hCloseDocument ' <- close word document + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase diff --git a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc index 20b8f62b7853..4e648e87de12 100755 --- a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc +++ b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc @@ -138,17 +138,18 @@ testcase tFormatCharacter3 Dim Vergleich3 as string Dim Vergleich4 as string Dim vLink as integer - '/// Format / Character /// - PrintLog "- Format / Character" - - '/// New document /// + + printlog "New document" Call hNewDocument - printlog " - adjust character" - '/// Select Format / Character /// + printlog "add some text to document => 'formatted text with hyperlink'" + Call wTypeKeys ("formatted text with hyperlink") + printlog "select text" + Call wTypeKeys ("<Shift Home>") + FormatCharacter WaitSlot (5) Kontext - '/// On Tabpage 'Font' adjust settings /// + printlog "On Tabpage 'Font' adjust settings" active.SetPage TabFont kontext "TabFont" try @@ -168,20 +169,20 @@ testcase tFormatCharacter3 endcatch wait 100 Kontext - '/// On Tabpage 'Font Effects' adjust settings /// + printlog "On Tabpage 'Font Effects' adjust settings" active.SetPage TabFontEffects kontext "TabFontEffects" Blinking.Check Kontext Active.Setpage TabFontPosition - '/// On Tabpage 'Font Position ' adjust settings /// + printlog "On Tabpage 'Font Position ' adjust settings" Kontext "TabFontPosition" Spacing.Select 2 SpacingBy.More 3 Vergleich4 = SpacingBy.GetText if Right ( Vergleich4, 2 ) <> "pt" then Warnlog "Wrong Unit at Spacing by" Kontext - '/// On Tabpage 'Hyperlink' adjust settings /// + printlog "On Tabpage 'Hyperlink' adjust settings" active.SetPage TabHyperlinkZeichen kontext "TabHyperlinkZeichen" URLName.SetText "www.mikeportnoy.com" @@ -200,13 +201,9 @@ testcase tFormatCharacter3 Sleep 1 Hintergrundfarbe.Typekeys "<Down><Left>", 4 TabHintergrund.OK - '/// Close dialog and reopen with Format / Character /// + printlog "Close dialog" - Call wTypeKeys "This is formatted text <Home><Right>" - - printlog " - check character" - - '/// Check settings made /// + printlog "Reopen with Format / Character and check settings made" Call wTypeKeys "<Home><Right>" FormatCharacter Kontext @@ -234,38 +231,30 @@ testcase tFormatCharacter3 Kontext active.SetPage TabHyperlinkZeichen kontext "TabHyperlinkZeichen" - if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i41171#Wrong URL : " + URLName.GetText + if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "##i105855##Wrong URL : " + URLName.GetText SetClipboard UrlName.Gettext - if NameText.GetText <> "A hyperlink with testtool" then Warnlog "Wrong Linkname : " + NameText.GetText - if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText - if UnbesuchterLink.GetSelIndex <> vLink then Warnlog "Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex + if NameText.GetText <> "A hyperlink with testtool" then Warnlog "#i105855#Wrong Linkname : " + NameText.GetText + if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText + if UnbesuchterLink.GetSelIndex <> vLink then Warnlog "#i105855#Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex TabHyperlinkZeichen.OK + printlog "Save document as '../user/work/format1.sxw' and close it" if gApplication = "WRITER" then Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\format1.odt", "writer8") else Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\format1.odm", "writer8") 'gMasterDocFilter - end if - '/// Save document as '../user/work/format1.sxw' and close it /// + end if - if getclipboardtext="http://www.mikeportnoy.com/" then - printlog " - activate Link" - end if - Sleep 20 - - printlog " - check saved character format" - Sleep 1 + printlog "Close document" Call hCloseDocument - Sleep 2 + printlog "reopen previous saved document and check saved character format" if gApplication = "WRITER" then Call hFileOpen ( gOfficePath + "user\work\format1.odt" ) else Call hFileOpen ( gOfficePath + "user\work\format1.odm" ) end if - Call wTypeKeys "<Home><Right>" + Call wTypeKeys "<Mod1 Home><Right>" Wait 500 - '/// Reopen previous saved documentand check settings made under Format / Character /// - FormatCharacter WaitSlot (3) Kontext @@ -292,9 +281,9 @@ testcase tFormatCharacter3 Kontext active.SetPage TabHyperlinkZeichen kontext "TabHyperlinkZeichen" - if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i41171#Wrong URL : " + URLName.GetText - if NameText.GetText <> "A hyperlink with testtool" then Warnlog "Wrong Linkname : " + NameText.GetText - if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText + if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i105855#Wrong URL : " + URLName.GetText + if NameText.GetText <> "A hyperlink with testtool" then Warnlog "#i105855#Wrong Linkname : " + NameText.GetText + if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText TabHyperlinkZeichen.OK '/// Close document /// Call hCloseDocument @@ -487,18 +476,21 @@ endcase testcase tFormatCharacter Dim Vergleich1%, Vergleich2$, Vergleich3$, Vergleich4$ - - '/// Format / Character /// + PrintLog "- Format / Character" - - '/// New document /// Call hNewDocument + + printlog "add some text to document => 'formatted text with hyperlink'" + Call wTypeKeys ("formatted text with hyperlink") + printlog "select text" + Call wTypeKeys ("<Shift Home>") + printlog " - adjust character" - '/// Select Format / Character /// + printlog "Format->Character" FormatCharacter Sleep 5 Kontext - '/// On Tabpage 'Font' adjust settings /// + printlog "On Tabpage 'Font' adjust settings" active.SetPage TabFont kontext "TabFont" try @@ -518,24 +510,24 @@ testcase tFormatCharacter endcatch wait 100 Kontext - '/// On Tabpage 'Font Effects' adjust settings /// + printlog "On Tabpage 'Font Effects' adjust settings" active.SetPage TabFontEffects kontext "TabFontEffects" Blinking.Check Kontext Active.Setpage TabFontPosition - '/// On Tabpage 'Font Position ' adjust settings /// + printlog "On Tabpage 'Font Position ' adjust settings" Kontext "TabFontPosition" Spacing.Select 2 SpacingBy.More 3 Vergleich4$ = SpacingBy.GetText if Right ( Vergleich4$, 2 ) <> "pt" then Warnlog "Wrong Unit at Spacing by" Kontext - '/// On Tabpage 'Hyperlink' adjust settings /// + printlog "On Tabpage 'Hyperlink' adjust settings" active.SetPage TabHyperlinkZeichen kontext "TabHyperlinkZeichen" URLName.SetText "www.mikeportnoy.com" - NameText.SetText "Ein Link mit dem Testtool" + NameText.SetText "Link created by testtool" TargetFrame.Select 2 UnbesuchterLink.Select 6 @@ -545,14 +537,12 @@ testcase tFormatCharacter Sleep 1 Hintergrundfarbe.Typekeys "<Down><Left>", 4 TabHintergrund.OK - '/// Close dialog and reopen with Format / Character /// - - Call wTypeKeys "Dies ist ein formatierter Text <Home><Right>" - - printlog " - check character" + printlog "Close dialog" - '/// Check settings made /// - Call wTypeKeys "<Home><Right>" + printlog " Type Home- and Right-Key" + Call wTypeKeys "<Home><Right>" + + printlog "recheck settings made with opening Format->Character" FormatCharacter Kontext active.SetPage TabFont @@ -579,38 +569,30 @@ testcase tFormatCharacter Kontext active.SetPage TabHyperlinkZeichen kontext "TabHyperlinkZeichen" - if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "Wrong URL : " + URLName.GetText + " (#BugID:90982)" + if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i105855#Wrong URL : " + URLName.GetText + " (#BugID:90982)" SetClipboard UrlName.Gettext - if NameText.GetText <> "Ein Link mit dem Testtool" then Warnlog "Wrong Linkname : " + NameText.GetText - if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText - if UnbesuchterLink.GetSelIndex <> 6 then Warnlog "Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex + if NameText.GetText <> "Link created by testtool" then Warnlog "#i105855#Wrong Linkname : " + NameText.GetText + if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText + if UnbesuchterLink.GetSelIndex <> 6 then Warnlog "#i105855#Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex TabHyperlinkZeichen.OK + printlog "Save document as '../user/work/format1.sxw' and close it" if gApplication = "WRITER" then Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\format1.odt", "writer8" ) else Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\format1.odm", "writer8" ) 'gMasterDocFilter - end if - '/// Save document as '../user/work/format1.sxw' and close it /// - - if getclipboardtext="http://www.mikeportnoy.com/" then - printlog " - activate Link" - end if - Sleep 20 - - printlog " - check saved character format" - Sleep 1 + end if Call hCloseDocument - Sleep 2 + printlog "re-open previous saved document" if gApplication = "WRITER" then - Call hFileOpen ( gOfficePath + "user\work\format1.odt" ) + Call hFileOpen ( gOfficePath + "user\work\format1.odt" ) else - Call hFileOpen ( gOfficePath + "user\work\format1.odm" ) + Call hFileOpen ( gOfficePath + "user\work\format1.odm" ) end if - Call wTypeKeys "<Home><Right>" + Call wTypeKeys "<Mod1 Home><Right>" Wait 500 - '/// Reopen previous saved documentand check settings made under Format / Character /// + printlog "Execute Format->Character and re-check settings made" FormatCharacter Sleep 3 @@ -618,13 +600,13 @@ testcase tFormatCharacter active.SetPage TabFont kontext "TabFont" try - if FontWest.GetSelText <> Vergleich2$ then Warnlog "Font should "+ Vergleich2$ +" is "+ FontWest.GetSelText - if StyleWest.GetSelIndex <> Vergleich1% then Warnlog "FontStyle should " +Vergleich3$+" is "+ StyleWest.GetSelText - if SizeWest.GetSelIndex <> 24 then Warnlog "Wrong Font Size : " + SizeWest.GetSelText + if FontWest.GetSelText <> Vergleich2$ then Warnlog "Font should "+ Vergleich2$ +" is "+ FontWest.GetSelText + if StyleWest.GetSelIndex <> Vergleich1% then Warnlog "FontStyle should " +Vergleich3$+" is "+ StyleWest.GetSelText + if SizeWest.GetSelIndex <> 24 then Warnlog "Wrong Font Size : " + SizeWest.GetSelText catch - if Font.GetSelText <> Vergleich2$ then Warnlog "Font should "+ Vergleich2$ +" is "+ Font.GetSelText - if Style.GetSelIndex <> Vergleich1% then Warnlog "FontStyle should " +Vergleich3$+" is "+ Style.GetSelText - if Size.GetSelIndex <> 24 then Warnlog "Wrong Font Size : " + Size.GetSelText + if Font.GetSelText <> Vergleich2$ then Warnlog "Font should "+ Vergleich2$ +" is "+ Font.GetSelText + if Style.GetSelIndex <> Vergleich1% then Warnlog "FontStyle should " +Vergleich3$+" is "+ Style.GetSelText + if Size.GetSelIndex <> 24 then Warnlog "Wrong Font Size : " + Size.GetSelText endcatch Kontext active.SetPage TabFontEffects @@ -638,11 +620,11 @@ testcase tFormatCharacter Kontext active.SetPage TabHyperlinkZeichen kontext "TabHyperlinkZeichen" - if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "Wrong URL : " + URLName.GetText - if NameText.GetText <> "Ein Link mit dem Testtool" then Warnlog "Wrong Linkname : " + NameText.GetText - if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText + if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i105855#Wrong URL : " + URLName.GetText + if NameText.GetText <> "Link created by testtool" then Warnlog "#i105855#Wrong Linkname : " + NameText.GetText + if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText TabHyperlinkZeichen.OK - '/// Close document /// + printlog "Close document" Call hCloseDocument endcase diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc index cdd4bc0b9ef0..5dabe72ff6ca 100755 --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc @@ -1162,58 +1162,60 @@ endcase testcase tParagraphIndent17 - Dim sTestFile1 as String - Dim sTestFile2 as String - - sTestFile1 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldCheck.doc") - sTestFile2 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldNotCheck.doc") - - PrintLog "- Test 'Add spacing between paragarph and talbes' when importing from MS-Word" - '/// <b>Test 'Add spacing between paragarph and talbes' when importing from MS-Word</b> - - Call hNewDocument - - '/// 1.Open the test file - AddSpacingShouldCheck.doc - '/// In Tools/Optionis/Text Document/Compatibility, - '/// + the 'Add spacing between paragarph and talbes' - '/// + should be checked - Call hFileOpen(sTestFile1) - Call sMakeReadOnlyDocumentEditable - - ToolsOptions - Call hToolsOptions("WRITER","COMPATIBILITY") - Kontext "TabCompatibility" - Sleep 2 - Options.TypeKeys "<Down>" - if Options.IsChecked <> TRUE then - warnlog "'Add spacing between paragarph and talbes' should be checked" - end if - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - - Call hCloseDocument - - Call hNewDocument - - '/// 2.Open the test file - AddSpacingShouldNotCheck.doc - '/// In Tools/Optionis/Text Document/Compatibility, - '/// + the 'Add spacing between paragarph and talbes' - '/// + should NOT be checked - Call hFileOpen(sTestFile2) - Call sMakeReadOnlyDocumentEditable - - ToolsOptions - Call hToolsOptions("WRITER","COMPATIBILITY") - Kontext "TabCompatibility" - Sleep 2 - Options.TypeKeys "<Down>" - if Options.IsChecked = TRUE then - warnlog "'Add spacing between paragarph and talbes' should NOT be checked" - end if - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - - Call hCloseDocument + Dim sTestFile1 as String + Dim sTestFile2 as String + + sTestFile1 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldCheck.doc") + sTestFile2 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldNotCheck.doc") + + PrintLog "- Test 'Add spacing between paragarph and talbes' when importing from MS-Word" + '/// <b>Test 'Add spacing between paragarph and talbes' when importing from MS-Word</b> + + Call hNewDocument + + '/// 1.Open the test file - AddSpacingShouldCheck.doc + '/// In Tools/Optionis/Text Document/Compatibility, + '/// + the 'Add spacing between paragarph and talbes' + '/// + should be checked + Call hFileOpen(sTestFile1) + Call sMakeReadOnlyDocumentEditable + + ToolsOptions + Call hToolsOptions("WRITER","COMPATIBILITY") + Kontext "TabCompatibility" + Sleep 2 + Options.TypeKeys "<Down>" + if Options.IsChecked <> TRUE then + warnlog "'Add spacing between paragarph and talbes' should be checked" + end if + Kontext "ExtrasOptionenDlg" + ExtrasOptionenDlg.OK + + Call hCloseDocument + + Call hNewDocument + + '/// 2.Open the test file - AddSpacingShouldNotCheck.doc + '/// In Tools/Optionis/Text Document/Compatibility, + '/// + the 'Add spacing between paragarph and talbes' + '/// + should NOT be checked + Call hFileOpen(sTestFile2) + Call sMakeReadOnlyDocumentEditable + + ToolsOptions + Call hToolsOptions("WRITER","COMPATIBILITY") + Kontext "TabCompatibility" + Sleep 2 + Options.TypeKeys "<Down>" + if Options.IsChecked = TRUE then + warnlog "'Add spacing between paragarph and talbes' should NOT be checked" + end if + Kontext "ExtrasOptionenDlg" + ExtrasOptionenDlg.OK + + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase diff --git a/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc b/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc index c663faf68001..8b7296d1d5a4 100755 --- a/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc +++ b/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc @@ -40,354 +40,347 @@ ' #1 tHyphenation_1 ' #1 tHyphenation_2 ' #1 tHyphenation_3 +' #1 tHyphenation_4 '* '\*********************************************************************** testcase tHyphenation_1 - Dim testFile as String - Dim testWord as String - Dim firstPartOfTestWord as String - Dim secondPartOfTestWord as String - - testFile = "tHyphenation.odt" - testWord = "following" - firstPartOfTestWord = "fol" - secondPartOfTestWord = "follow" - - PrintLog "- Test Hyphenation using ctrl and -" - - printlog "Test Hyphenation using ctrl and -" - - printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable - - Call wTypeKeys "<End><Shift Mod1 Left>" - - EditCopy - - printlog "add '-' between 'fol' and 'lowing' , then press 3 times 'space bar' (pc). (7 times on linux)" - printlog "+ check if fol in the end of the line" - if GetClipboardText = testWord then - Call wTypeKeys "<Right>" , 3 - Call wTypeKeys "<Mod1 SUBTRACT>" - Call wTypeKeys "<Home>" - if gPlatGroup <> "unx" then - Call wTypeKeys "<SPACE>" ,3 - else - Call wTypeKeys "<SPACE>" ,7 - end if - - Call wTypeKeys "<End><Left><Shift Mod1 Left>" - EditCopy - - if GetClipboardText <> firstPartOfTestWord then - Warnlog "The hyphenation does NOT work well in first part!" - end if - - printlog "add '-' between 'follow' and 'ing' , then press 6 times 'space bar'" - printlog "+ check if follow in the end of the line ." - Call wTypeKeys "<Mod1 z>",2 - Call wTypeKeys "<End>" - Call wTypeKeys "<Left>",3 - Call wTypeKeys "<Mod1 SUBTRACT>" - Call wTypeKeys "<Home>" - if gPlatGroup <> "unx" then - Call wTypeKeys "<SPACE>" ,3 - else - Call wTypeKeys "<SPACE>" ,6 - end if - Call wTypeKeys "<End><Left><Shift Mod1 Left>" - EditCopy - - if GetClipboardText = secondPartOfTestWord then - Call wTypeKeys "<Home>" - - printlog "press 5 times 'space bar'" - printlog "check if fol in the end of the line ." - if gPlatGroup <> "unx" then - Call wTypeKeys "<SPACE>" ,3 - else - Call wTypeKeys "<SPACE>" ,5 - end if - Call wTypeKeys "<End><Shift Mod1 Left>" - EditCopy - - if GetClipboardText <> firstPartOfTestWord then - Warnlog "The hyphenation does NOT work well in first part, but it works fine in second part!" - end if - else - Warnlog "The hyphenation does NOT work well in second part!" - end if - - else - Warnlog "The test word is wrong !!" - end if - - Call hCloseDocument - -endcase + Dim testFile as String + Dim testWord as String + Dim PartOfTestWord as String + + testFile = "tHyphenation.odt" + testWord = "following" + PartOfTestWord = "fol" + + printlog "Test Hyphenation using ctrl and -" + + printlog "open a test file" + Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + Call sMakeReadOnlyDocumentEditable + + ' we must assure the word 'following' is the first word in second line + ' otherwise the test will not work correctly + if fPrepareHyphenationDocument(testWord) = false then + Warnlog "Unable to prepare document for hyphenation. Check testcase" + Call hCloseDocument + end if + + printlog "add '-' between 'fol' and 'lowing'" + printlog "+ check if fol in the end of the line" + + Call wTypeKeys "<Home>" + Call wTypeKeys "<Right>" , 3 + Call wTypeKeys "<Mod1 SUBTRACT>" + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<End>" + Call wTypeKeys "<Delete>" + + Call wTypeKeys "<End><Left>" + Call wTypeKeys "<Mod1 Shift Left>" + EditCopy + + if GetClipboardText <> PartOfTestWord then + Warnlog "The hyphenation does NOT work ! Found '" & GetClipboardText & "' and not '" & PartOfTestWord & "'" + end if + + Call hCloseDocument + +endcase '------------------------------------------------------------------------- testcase tHyphenation_2 -warnlog "#i102304# - outcommenting tHyphenation_2 due to bug." -goto endsub - - Dim testFile as String - Dim testWord as String - Dim firstPartOfTestWord as String - Dim secondPartOfTestWord as String - Dim testWordInHyphenationDlg as String - - testFile = "tHyphenation.odt" - testWord = "following" - testWordInHyphenationDlg = "fol=low-ing" - firstPartOfTestWord = "fol" - secondPartOfTestWord = "follow" - - PrintLog "- Test Hyphenation using Tools/Hyphenation ,test like fol-lowing" - - printlog "Test Hyphenation using Tools/Hyphenation ,test like fol-lowing" - - printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable - - Call wTypeKeys "<End><Shift Mod1 Left>" - - EditCopy - - if GetClipboardText <> testWord then - Warnlog "The test word is wrong !!" - goto endsub - end if - - printlog "Press 3 times 'space bar'" - Call wTypeKeys "<Home>" - if gPlatGroup <> "unx" then - Call wTypeKeys "<SPACE>" ,3 - else - Call wTypeKeys "<SPACE>" ,6 - end if - - printlog "Tools/Hyphenation" - ToolsLanguageHyphenate - Kontext "Silbentrennung" - - if Not Silbentrennung.Exists then - Kontext "Active" - if Active.Exists then - if Active.GetRT = 304 then - Active.Yes - - Kontext "Active" - if Active.Exists then - if Active.GetRT = 304 then Active.Ok - end if - end if - end if - Warnlog "Unable to bring up Dialog 'Hyphenation'!" - goto endsub - end if - - printlog "check if get 'fol=low-ing'" - if Wort.Gettext <> testWordInHyphenationDlg then - Warnlog "#i40561# The test can NOT be seperated two times , or something wrong!" - Silbentrennung.Cancel - goto NOTest - end if - - if NOT Vor.IsEnabled then - Warnlog "the Vor button is Not enabled, or something wrong!" - Silbentrennung.Cancel - goto NOTest - end if - - printlog "add '-' between 'fol' and 'lowing' using left arrow key" - Vor.Click - Silbentrennung.OK - - printlog "Close all dialogue, and recover the file to default" - Kontext "Active" - if NOT Active.Exists then - Kontext "Silbentrennung" - Silbentrennung.Cancel - Warnlog "The first message box is NOT pop up" - goto NOTest - end if - - Active.Yes - - Kontext "Active" - if NOT Active.Exists then - Warnlog "The second message box is NOT pop up" - goto endsub - end if - - Active.OK - - printlog "Press 3 times 'space bar' in front of the line" - Call wTypeKeys "<BACKSPACE>",3 - Call wTypeKeys "<SPACE>",3 - - Call wTypeKeys "<End><Left><Shift Mod1 Left>" - EditCopy - - printlog "Check if get 'fol'" - if GetClipboardText <> firstPartOfTestWord then - Warnlog "The hyphenation does NOT work well in first part!" - end if - -NOTest: - Call hCloseDocument - -endcase + Dim testFile as String + Dim testWord as String + Dim PartOfTestWord as String + + testFile = "tHyphenation.odt" + testWord = "following" + PartOfTestWord = "follow" + + printlog "Test Hyphenation using ctrl and -" + + printlog "open a test file" + Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + Call sMakeReadOnlyDocumentEditable + + ' we must assure the word 'following' is the first word in second line + ' otherwise the test will not work correctly + if fPrepareHyphenationDocument(testWord) = false then + Warnlog "Unable to prepare document for hyphenation. Check testcase" + Call hCloseDocument + end if + + printlog "add '-' between 'follow' and 'ing'" + printlog "+ check if 'follow' in the end of the line" + + Call wTypeKeys "<Home>" + Call wTypeKeys "<Right>" , 6 + Call wTypeKeys "<Mod1 SUBTRACT>" + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<End>" + if gPlatgroup = "unx" then + Call wTypeKeys "<Delete>", 6 + else + Call wTypeKeys "<Delete>", 7 + end if + + Call wTypeKeys "<End><Left>" + Call wTypeKeys "<Mod1 Shift Left>" + EditCopy + + if GetClipboardText <> PartOfTestWord then + Warnlog "The hyphenation does NOT work ! Found '" & GetClipboardText & "' and not '" & PartOfTestWord & "'" + end if + + Call hCloseDocument + +endcase '------------------------------------------------------------------------- testcase tHyphenation_3 -warnlog "#i102304# - outcommenting tHyphenation_3 due to bug." -goto endsub - - Dim testFile as String - Dim testWord as String - Dim firstPartOfTestWord - Dim secondPartOfTestWord as String - Dim testWordInHyphenationDlg1 as String - Dim testWordInHyphenationDlg2 as String - - testFile = "tHyphenation.odt" - testWord = "following" - firstPartOfTestWord = "fol" - secondPartOfTestWord = "follow" - testWordInHyphenationDlg1 = "fol=low-ing" - testWordInHyphenationDlg2 = "fol-low=ing" - - printLog "- Test Hyphenation using Tools/Hyphenation ,test like follow-ing" - printlog "Test Hyphenation using Tools/Hyphenation ,test like follow-ing" - - printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable - - Call wTypeKeys "<End><Shift Mod1 Left>" - - EditCopy - - if GetClipboardText <> testWord then - Warnlog "The test word is wrong !!" - goto endsub - end if - - printlog "Press 3 times 'space bar'" - Call wTypeKeys "<Home>" - if gPlatGroup <> "unx" then - Call wTypeKeys "<SPACE>" ,3 - else - Call wTypeKeys "<SPACE>" ,6 - end if - - printlog "Tools/Hyphenation" - ToolsLanguageHyphenate - Kontext "Silbentrennung" - - if Not Silbentrennung.Exists then - Kontext "Active" - if Active.Exists then - if Active.GetRT = 304 then - Active.Yes - - Kontext "Active" - if Active.Exists then - if Active.GetRT = 304 then Active.Ok - end if - end if - end if - Warnlog "Unable to bring up Dialog 'Hyphenation'!" - goto endsub - end if - - printlog "check if get 'fol=low-ing'" - if Wort.Gettext <> testWordInHyphenationDlg1 then - Warnlog "#i40561# The test can NOT be seperated two times , or something wrong!" - Silbentrennung.Cancel - goto NOTest - end if - - printlog "click left arrow key" - if NOT Vor.IsEnabled then - Warnlog "the Vor button is Not enabled, or something wrong!" - Silbentrennung.Cancel - goto NOTest - end if - Vor.Click - - printlog "check if get ''fol-low=ing'" - if Wort.Gettext <> testWordInHyphenationDlg2 then - Warnlog "The test word should be changed after clicking Vor!" - goto endsub - end if - - printlog "add '-' between 'follow' and 'ing' pressing right arrow key" - if NOT Zurueck.IsEnabled then - Warnlog "the Zuruech button is Not enabled, or something wrong!" - goto endsub - end if - Zurueck.Click - - printlog "check if get 'fol-low=ing'" - if Wort.Gettext <> testWordInHyphenationDlg1 then - Warnlog "The test word should be changed after clicking Zurueck!" - goto endsub - end if - - Sleep 1 - - printlog "close all dialogue" - Silbentrennung.OK - - Kontext "Active" - if NOT Active.Exists then - Warnlog "The first message box is NOT pop up" - goto endsub - end if - - Active.Yes - - Kontext "Active" - if NOT Active.Exists then - Warnlog "The second message box is NOT pop up" - goto endsub - end if - - Active.OK - - printlog "recover to the default file and press 3 sparc bar in front of the line" - Call wTypeKeys "<BACKSPACE>",3 - Call wTypeKeys "<SPACE>",3 - - Call wTypeKeys "<End><Left><Shift Mod1 Left>" - EditCopy - - printlog "check if get 'follow' in the end of the line" - if GetClipboardText = secondPartOfTestWord then - Call wTypeKeys "<Home>" - Call wTypeKeys "<SPACE>" , 5 - - Call wTypeKeys "<End><Shift Mod1 Left>" - EditCopy + Dim testFile as String + Dim testWord as String + Dim firstPartOfTestWord as String + Dim secondPartOfTestWord as String + Dim testWordInHyphenationDlg as String + + testFile = "tHyphenation.odt" + testWord = "following" + testWordInHyphenationDlg = "fol=low-ing" + firstPartOfTestWord = "fol" + secondPartOfTestWord = "follow" + + printlog "Test Hyphenation using Tools/Hyphenation ,test like fol-lowing" + + printlog "open a test file" + Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + Call sMakeReadOnlyDocumentEditable + + ' we must assure the word 'following' is the first word in second line + ' otherwise the test will not work correctly + if fPrepareHyphenationDocument(testWord) = false then + Warnlog "Unable to prepare document for hyphenation. Check testcase" + Call hCloseDocument + end if + + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<End>" + if gPlatgroup = "unx" then + Call wTypeKeys "<Delete>", 6 + else + Call wTypeKeys "<Delete>", 7 + end if + + printlog "Tools/Hyphenation" + ToolsLanguageHyphenate + Kontext "Silbentrennung" + + if Not Silbentrennung.Exists then + Warnlog "Unable to bring up Dialog 'Hyphenation'!" + Call hCloseDocument + goto endsub + end if + + printlog "check if get 'fol=low-ing'" + if Wort.Gettext <> testWordInHyphenationDlg then + Warnlog "Expected " & testWordInHyphenationDlg & " but found " & Wort.Gettext + Silbentrennung.Cancel + Call hCloseDocument + goto endsub + end if + + if NOT Vor.IsEnabled then + Warnlog "the 'Vor' button is Not enabled, or something wrong!" + Silbentrennung.Cancel + Call hCloseDocument + goto endsub + end if + + printlog "add '-' between 'fol' and 'lowing' using left arrow key" + Vor.Click + Silbentrennung.OK + + ' Messagebox 'Start hypheantion from the beginning ? + Kontext "Active" + if Active.Exists then + if Active.GetRT = 304 then + try + Active.Yes + catch + Active.ok + endcatch + else + Warnlog "No messagebox asking for hyphenate at beginning of document" + end if + end if + + ' End of hyphenation message + if Active.Exists then + if Active.GetRT = 304 then + try + Active.Ok + catch + Active.yes + endcatch + else + Warning "No 'end of hyphenation' messagebox" + end if + end if + + printlog "Press 3 times 'space bar' in front of the line" + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<End>" + Call wTypeKeys "<Left>" + Call wTypeKeys "<Shift Mod1 Left>" + EditCopy + + printlog "Check if get 'fol'" + if GetClipboardText <> firstPartOfTestWord then + Warnlog "The hyphenation does NOT work ! Found '" & GetClipboardText & "' and not '" & PartOfTestWord & "'" + end if + + Call hCloseDocument + +endcase - if GetClipboardText <> firstPartOfTestWord then - Warnlog "The hyphenation does NOT work well in first part, but it works fine in second part!" - end if - else - Warnlog "The hyphenation does NOT work well in second part!" - end if -NOTest: - Call hCloseDocument +'------------------------------------------------------------------------- +testcase tHyphenation_4 + + Dim testFile as String + Dim testWord as String + Dim firstPartOfTestWord as string + Dim secondPartOfTestWord as String + Dim testWordInHyphenationDlg1 as String + Dim testWordInHyphenationDlg2 as String + + testFile = "tHyphenation.odt" + testWord = "following" + firstPartOfTestWord = "fol" + secondPartOfTestWord = "follow" + testWordInHyphenationDlg1 = "fol=low-ing" + testWordInHyphenationDlg2 = "fol-low=ing" + + printLog "- Test Hyphenation using Tools/Hyphenation ,test like follow-ing" + printlog "Test Hyphenation using Tools/Hyphenation ,test like follow-ing" + + printlog "open a test file" + Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + Call sMakeReadOnlyDocumentEditable + + ' we must assure the word 'following' is the first word in second line + ' otherwise the test will not work correctly + if fPrepareHyphenationDocument(testWord) = false then + Warnlog "Unable to prepare document for hyphenation. Check testcase" + Call hCloseDocument + end if + + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<End>" + if gPlatgroup = "unx" then + Call wTypeKeys "<Delete>", 6 + else + Call wTypeKeys "<Delete>", 7 + end if + + printlog "Tools/Hyphenation" + ToolsLanguageHyphenate + Kontext "Silbentrennung" + + if Not Silbentrennung.Exists then + Call hCloseDocument + goto endsub + end if + + printlog "check if get 'fol=low-ing'" + if Wort.Gettext <> testWordInHyphenationDlg1 then + Warnlog "Expected " & testWordInHyphenationDlg1 & " but found " & Wort.Gettext + Silbentrennung.Cancel + Call hCloseDocument + goto endsub + end if + + printlog "click left arrow key" + if NOT Vor.IsEnabled then + Warnlog "the Vor button is Not enabled, or something wrong!" + Silbentrennung.Cancel + Call hCloseDocument + goto endsub + end if + Vor.Click + + printlog "check if get ''fol-low=ing'" + if Wort.Gettext <> testWordInHyphenationDlg2 then + Warnlog "Expected " & testWordInHyphenationDlg2 & " but found " & Wort.Gettext + Call hCloseDocument + goto endsub + end if + + printlog "add '-' between 'follow' and 'ing' pressing right arrow key" + if NOT Zurueck.IsEnabled then + Warnlog "the 'Back' button is Not enabled, or something wrong!" + Call hCloseDocument + goto endsub + end if + Zurueck.Click + + printlog "check if get 'fol-low=ing'" + if Wort.Gettext <> testWordInHyphenationDlg1 then + Warnlog "The test word should be changed after clicking Zurueck!" + Call hCloseDocument + goto endsub + end if + + Sleep 1 + + printlog "close all dialogs" + Silbentrennung.OK + + ' Messagebox 'Start hypheantion from the beginning ? + Kontext "Active" + if Active.Exists then + if Active.GetRT = 304 then + try + Active.Yes + catch + Active.ok + endcatch + else + Warnlog "No messagebox asking for hyphenate at beginning of document" + end if + end if + + ' End of hyphenation message + if Active.Exists then + if Active.GetRT = 304 then + try + Active.Ok + catch + Active.yes + endcatch + else + Warning "No 'end of hyphenation' messagebox" + end if + end if + + printlog "Press 3 times 'space bar' in front of the line" + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<End>" + Call wTypeKeys "<Left>" + Call wTypeKeys "<Shift Mod1 Left>" + EditCopy + + printlog "Check if get 'follow'" + if GetClipboardText <> secondPartOfTestWord then + Warnlog "The hyphenation does NOT work ! Found '" & GetClipboardText & "' and not '" & secondPartOfTestWord & "'" + end if + + Call hCloseDocument + endcase diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc index 3c0595bdff3f..d6eefcacad1e 100755 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc @@ -631,116 +631,116 @@ endcase testcase tInsertGraphic_18 - Dim sGraphicName1 as String - Dim sGraphicName2 as String - Dim sGraphicName3 as String - Dim sWidth as String - Dim sHeight as String - - sGraphicName1 = "TEST1" - sGraphicName2 = "TEST2" - sGraphicName3 = "TEST3" - - sWidth = "7"+ gSeperator + "00" + gMeasurementUnit - sHeight = "6"+ gSeperator + "00" + gMeasurementUnit + Dim sGraphicName1 as String + Dim sGraphicName2 as String + Dim sGraphicName3 as String + Dim sWidth as String + Dim sHeight as String - PrintLog "- Test Set different attributes via Contextmenu Arrange (send backward)" - '/// Test Set different attributes via Contextmenu Arrange (send backward) + sGraphicName1 = "TEST1" + sGraphicName2 = "TEST2" + sGraphicName3 = "TEST3" - Call hNewDocument + sWidth = "7"+ gSeperator + "00" + gMeasurementUnit + sHeight = "6"+ gSeperator + "00" + gMeasurementUnit - Call wTypeKeys "<Return>" + PrintLog "- Test Set different attributes via Contextmenu Arrange (send backward)" + '/// Test Set different attributes via Contextmenu Arrange (send backward) - '/// Insert three Graphics at the same place , and named in series + Call hNewDocument - 'the 1st graphic - fInsertGraphics("Bughunter.jpg") + Call wTypeKeys "<Return>" - fFormatGraphic("TabZusaetze") - Sleep 1 - ObjektName.SetText sGraphicName1 - TabZusaetze.OK + '/// Insert three Graphics at the same place , and named in series - fFormatGraphic("TabType") - KeepRatio.UnCheck - Sleep 1 - Width.SetText sWidth - wait 500 - Height.SetText sHeight - wait 500 - TabType.OK + 'the 1st graphic + fInsertGraphics("Bughunter.jpg") - Call wTypeKeys "<ESCape>" + fFormatGraphic("TabZusaetze") + Sleep 1 + ObjektName.SetText sGraphicName1 + Kontext + Active.Setpage TabType + Kontext "TabType" + KeepRatio.UnCheck + Sleep 1 + Width.SetText sWidth + wait 500 + Height.SetText sHeight + wait 500 + TabType.OK - 'the 2nd graphic - fInsertGraphics("flowers.gif") + Call wTypeKeys "<ESCape>" - fFormatGraphic("TabZusaetze") - Sleep 1 - ObjektName.SetText sGraphicName2 - TabZusaetze.OK + 'the 2nd graphic + fInsertGraphics("flowers.gif") - fFormatGraphic("TabType") - KeepRatio.UnCheck - Sleep 1 - Width.SetText sWidth - wait 500 - Height.SetText sHeight - wait 500 - TabType.OK + fFormatGraphic("TabZusaetze") + Sleep 1 + ObjektName.SetText sGraphicName2 + TabZusaetze.OK - Call wTypeKeys "<ESCape>" + fFormatGraphic("TabType") + KeepRatio.UnCheck + Sleep 1 + Width.SetText sWidth + wait 500 + Height.SetText sHeight + wait 500 + TabType.OK - 'the 3rd graphic - fInsertGraphics("game.bmp") + Call wTypeKeys "<ESCape>" - fFormatGraphic("TabZusaetze") - Sleep 1 - ObjektName.SetText sGraphicName3 - TabZusaetze.OK + 'the 3rd graphic + fInsertGraphics("game.bmp") - fFormatGraphic("TabType") - KeepRatio.UnCheck - Sleep 1 - Width.SetText sWidth - wait 500 - Height.SetText sHeight - wait 500 - TabType.OK + fFormatGraphic("TabZusaetze") + Sleep 1 + ObjektName.SetText sGraphicName3 + TabZusaetze.OK - '/// ContextMenu Arrange / Send backward - Call wOpenContextMenu + fFormatGraphic("TabType") + KeepRatio.UnCheck + Sleep 1 + Width.SetText sWidth + wait 500 + Height.SetText sHeight + wait 500 + TabType.OK + + '/// ContextMenu Arrange / Send backward + Call wOpenContextMenu hMenuSelectNr(1) Sleep 2 hMenuSelectNr(3) Sleep 1 - Call wTypeKeys "<ESCape>" - Sleep 1 + Call wTypeKeys "<ESCape>" + Sleep 1 - '/// Check if the attributes Arrange (send to back) works well - Call wNavigatorAuswahl(4,1) - Sleep 1 - fFormatGraphic("TabZusaetze") - Sleep 1 - if ObjektName.GetText <> sGraphicName1 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText - TabZusaetze.Cancel + '/// Check if the attributes Arrange (send to back) works well + Call wNavigatorAuswahl(4,1) + Sleep 1 + fFormatGraphic("TabZusaetze") + Sleep 1 + if ObjektName.GetText <> sGraphicName1 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText + TabZusaetze.Cancel - Call wNavigatorAuswahl(4,2) - Sleep 1 - fFormatGraphic("TabZusaetze") - Sleep 1 - if ObjektName.GetText <> sGraphicName2 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText - TabZusaetze.Cancel + Call wNavigatorAuswahl(4,2) + Sleep 1 + fFormatGraphic("TabZusaetze") + Sleep 1 + if ObjektName.GetText <> sGraphicName2 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText + TabZusaetze.Cancel - Call wNavigatorAuswahl(4,3) - Sleep 1 - fFormatGraphic("TabZusaetze") - Sleep 1 - if ObjektName.GetText <> sGraphicName3 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText - TabZusaetze.Cancel + Call wNavigatorAuswahl(4,3) + Sleep 1 + fFormatGraphic("TabZusaetze") + Sleep 1 + if ObjektName.GetText <> sGraphicName3 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText + TabZusaetze.Cancel - Call hCloseDocument + Call hCloseDocument endcase @@ -748,120 +748,122 @@ endcase testcase tInsertGraphic_19 - Dim sGraphicName1 as String - Dim sGraphicName2 as String - Dim sGraphicName3 as String - Dim sWidth as String - Dim sHeight as String + Dim sGraphicName1 as String + Dim sGraphicName2 as String + Dim sGraphicName3 as String + Dim sWidth as String + Dim sHeight as String - sGraphicName1 = "TEST1" - sGraphicName2 = "TEST2" - sGraphicName3 = "TEST3" + sGraphicName1 = "TEST1" + sGraphicName2 = "TEST2" + sGraphicName3 = "TEST3" - sWidth = "7"+ gSeperator + "00" + gMeasurementUnit - sHeight = "6"+ gSeperator + "00" + gMeasurementUnit + sWidth = "7"+ gSeperator + "00" + gMeasurementUnit + sHeight = "6"+ gSeperator + "00" + gMeasurementUnit - PrintLog "- Test Set different attributes via Contextmenu Arrange (bring to front)" - '/// Test Set different attributes via Contextmenu Arrange (bring to front) + PrintLog "- Test Set different attributes via Contextmenu Arrange (bring to front)" + '/// Test Set different attributes via Contextmenu Arrange (bring to front) - Call hNewDocument + Call hNewDocument - Call wTypeKeys "<Return>" + Call wTypeKeys "<Return>" - '/// Insert three Graphics at the same place , and named in series + '/// Insert three Graphics at the same place , and named in series - 'the 1st graphic - fInsertGraphics("Bughunter.jpg") + 'the 1st graphic + fInsertGraphics("Bughunter.jpg") - fFormatGraphic("TabZusaetze") - Sleep 1 - ObjektName.SetText sGraphicName1 - TabZusaetze.OK + fFormatGraphic("TabZusaetze") + Sleep 1 + ObjektName.SetText sGraphicName1 - fFormatGraphic("TabType") - KeepRatio.UnCheck - Sleep 1 - Width.SetText sWidth - wait 500 - Height.SetText sHeight - wait 500 - TabType.OK + Kontext + Active.Setpage TabType + Kontext "TabType" - Call wTypeKeys "<ESCape>" + KeepRatio.UnCheck + Sleep 1 + Width.SetText sWidth + wait 500 + Height.SetText sHeight + wait 500 + TabType.OK - 'the 2nd graphic - fInsertGraphics("flowers.gif") + Call wTypeKeys "<ESCape>" - fFormatGraphic("TabZusaetze") - Sleep 1 - ObjektName.SetText sGraphicName2 - TabZusaetze.OK + 'the 2nd graphic + fInsertGraphics("flowers.gif") - fFormatGraphic("TabType") - KeepRatio.UnCheck - Sleep 1 - Width.SetText sWidth - wait 500 - Height.SetText sHeight - wait 500 - TabType.OK + fFormatGraphic("TabZusaetze") + Sleep 1 + ObjektName.SetText sGraphicName2 + TabZusaetze.OK - Call wTypeKeys "<ESCape>" + fFormatGraphic("TabType") + KeepRatio.UnCheck + Sleep 1 + Width.SetText sWidth + wait 500 + Height.SetText sHeight + wait 500 + TabType.OK - 'the 3rd graphic - fInsertGraphics("game.bmp") + Call wTypeKeys "<ESCape>" - fFormatGraphic("TabZusaetze") - Sleep 1 - ObjektName.SetText sGraphicName3 - TabZusaetze.OK + 'the 3rd graphic + fInsertGraphics("game.bmp") - fFormatGraphic("TabType") - KeepRatio.UnCheck - Sleep 1 - Width.SetText sWidth - wait 500 - Height.SetText sHeight - wait 500 - TabType.OK + fFormatGraphic("TabZusaetze") + Sleep 1 + ObjektName.SetText sGraphicName3 + TabZusaetze.OK - '/// Format / Arrange / Send to back - FormatArrangeSendToBack - Sleep 2 + fFormatGraphic("TabType") + KeepRatio.UnCheck + Sleep 1 + Width.SetText sWidth + wait 500 + Height.SetText sHeight + wait 500 + TabType.OK + + '/// Format / Arrange / Send to back + FormatArrangeSendToBack + Sleep 2 - '/// ContextMenu Arrange / bring to front - Call wOpenContextMenu + '/// ContextMenu Arrange / bring to front + Call wOpenContextMenu hMenuSelectNr(1) Sleep 2 hMenuSelectNr(1) Sleep 1 - Call wTypeKeys "<ESCape>" - Sleep 1 + Call wTypeKeys "<ESCape>" + Sleep 1 - '/// Check if the attributes Arrange (send to back) works well - Call wNavigatorAuswahl(4,1) - Sleep 1 - fFormatGraphic("TabZusaetze") - Sleep 1 - if ObjektName.GetText <> sGraphicName1 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText - TabZusaetze.Cancel + '/// Check if the attributes Arrange (send to back) works well + Call wNavigatorAuswahl(4,1) + Sleep 1 + fFormatGraphic("TabZusaetze") + Sleep 1 + if ObjektName.GetText <> sGraphicName1 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText + TabZusaetze.Cancel - Call wNavigatorAuswahl(4,2) - Sleep 1 - fFormatGraphic("TabZusaetze") - Sleep 1 - if ObjektName.GetText <> sGraphicName2 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText - TabZusaetze.Cancel + Call wNavigatorAuswahl(4,2) + Sleep 1 + fFormatGraphic("TabZusaetze") + Sleep 1 + if ObjektName.GetText <> sGraphicName2 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText + TabZusaetze.Cancel - Call wNavigatorAuswahl(4,3) - Sleep 1 - fFormatGraphic("TabZusaetze") - Sleep 1 - if ObjektName.GetText <> sGraphicName3 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText - TabZusaetze.Cancel + Call wNavigatorAuswahl(4,3) + Sleep 1 + fFormatGraphic("TabZusaetze") + Sleep 1 + if ObjektName.GetText <> sGraphicName3 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText + TabZusaetze.Cancel - Call hCloseDocument + Call hCloseDocument endcase diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc index ad2c3122da63..fd927b339685 100644 --- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc +++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc @@ -51,7 +51,6 @@ testcase tExportAllReadableFormatsIntoODF end if Dim AvailableFilters( 35 ) as String - Dim TemplateFilterFile as String Dim ImportFileList ( 300 ) as String Dim ExportFileList ( 300 ) as String Dim WorkDirectory as String @@ -61,7 +60,6 @@ testcase tExportAllReadableFormatsIntoODF Dim sExportFile as string Dim i as Integer - TemplateFilterFile = ConvertPath ( gTesttoolPath + "writer\optional\input\filterlist.txt") WorkDirectory = ( ConvertPath ( gOfficePath + "user\work\" + gPlatgroup + "\export\")) ImportDir = ConvertPath ( gTesttoolPath + "writer\optional\input\import\") @@ -84,98 +82,103 @@ testcase tExportAllReadableFormatsIntoODF printlog "- Start loading files in list" For i = 1 to listCount(ImportFileList()) printlog "- " & i & ". load: " & ImportFileList(i) - Call hFileOpen ( ImportFileList(i) ) - printlog "- done" - - Kontext "TextImport" - if TextImport.Exists then - TextImport.Ok - printlog "- Text import dialog passed" - end if - - Kontext "Filterauswahl" - if Filterauswahl.Exists then - Filterauswahl.Cancel - printlog "- Filterdialog passed" - end if - - Kontext "AsciiFilterOptionen" - if AsciiFilterOptionen.Exists then - AsciiFilterOptionen.Ok - printlog "- ASCII-Filter dialog passed" - end if - - Kontext "SecurityWarning" - if SecurityWarning.Exists(3) then - SecurityWarning.Ok - printlog "- Security warning passed" - end if - - Kontext "DocumentWriter" - if DocumentWriter.Exists(3) then - Do until DocumentWriter.StatusIsProgress = false - wait 500 - Loop + sExportFile = ImportFileList(i) + if GetExtention ( sExportFile ) = "psw" then + QAErrorlog "#i102221#Pocket Word filter puts General I/O Error" else - Kontext "DocumentCalc" - if DocumentCalc.Exists(3) then - Do until DocumentCalc.StatusIsProgress = false + Call hFileOpen ( ImportFileList(i) ) + printlog "- done" + + Kontext "TextImport" + if TextImport.Exists then + TextImport.Ok + printlog "- Text import dialog passed" + end if + + Kontext "Filterauswahl" + if Filterauswahl.Exists then + Filterauswahl.Cancel + printlog "- Filterdialog passed" + end if + + Kontext "AsciiFilterOptionen" + if AsciiFilterOptionen.Exists then + AsciiFilterOptionen.Ok + printlog "- ASCII-Filter dialog passed" + end if + + Kontext "SecurityWarning" + if SecurityWarning.Exists(3) then + SecurityWarning.Ok + printlog "- Security warning passed" + end if + + Kontext "DocumentWriter" + if DocumentWriter.Exists(3) then + Do until DocumentWriter.StatusIsProgress = false wait 500 Loop else - Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" + Kontext "DocumentCalc" + if DocumentCalc.Exists(3) then + Do until DocumentCalc.StatusIsProgress = false + wait 500 + Loop + else + Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" + end if end if - end if - - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(ImportFileList(i),"sw40") = false then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(ImportFileList(i),"sw40") = false then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel + end if + Sleep 1 + + Kontext "AlienWarning" + if AlienWarning.Exists then + AlienWarning.Ok + printlog "- Alien warning passed" end if - SecurityWarning.Cancel - end if - Sleep 1 - - Kontext "AlienWarning" - if AlienWarning.Exists then - AlienWarning.Ok - printlog "- Alien warning passed" - end if - - ' HTML-File can't be exported as odf this way - if GetExtention(ImportFileList(i)) <> "html" then - - sExportFile = WorkDirectory & "ExportedFile" & i & ".odf" - Printlog "- Save as : " & ConvertPath ( sExportFile ) - if hFileSaveAsWithFilterKill (sExportFile, "writer8") = true then - printlog "- done" - printlog "- close file" - Call hCloseDocument - Printlog "- Open previous saved file" - Call hFileOpenWithFilter (sExportFile, "writer8") - printlog "- done" - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(ImportFileList(i),"sw40") = false then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + ' HTML-File can't be exported as odf this way + if GetExtention(ImportFileList(i)) <> "html" then + + sExportFile = WorkDirectory & "ExportedFile" & i & ".odf" + Printlog "- Save as : " & ConvertPath ( sExportFile ) + if hFileSaveAsWithFilterKill (sExportFile, "writer8") = true then + printlog "- done" + printlog "- close file" + Call hCloseDocument + + Printlog "- Open previous saved file" + Call hFileOpenWithFilter (sExportFile, "writer8") + printlog "- done" + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(ImportFileList(i),"sw40") = false then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel end if - SecurityWarning.Cancel + Sleep 1 + else + Warnlog "Unable to save file: " & sExportFile end if - Sleep 1 else - Warnlog "Unable to save file: " & sExportFile + printlog "- HTML-file is not exported this way" end if - else - printlog "- HTML-file is not exported this way" - end if - - printlog "- Close all open files." - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop + + printlog "- Close all open files." + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop + endif next i 'File endcase @@ -190,7 +193,6 @@ testcase tExportAllReadableFormatsIntoThemselves end if Dim AvailableFilters( 35 ) as String - Dim TemplateFilterFile as String Dim SavedCorrectly as Boolean Dim ImportFileList ( 300 ) as String Dim ExportFileList ( 300 ) as String @@ -205,7 +207,6 @@ testcase tExportAllReadableFormatsIntoThemselves Dim iCounter as integer Dim DocumentCount as integer - TemplateFilterFile = ConvertPath ( gTesttoolPath + "writer\optional\input\filterlist.txt") sWorkDirectory = ( ConvertPath ( gOfficePath + "user\work\" + gPlatgroup + "\export\")) sImportDir = ConvertPath ( gTesttoolPath + "writer\optional\input\import\") @@ -220,155 +221,150 @@ testcase tExportAllReadableFormatsIntoThemselves end if app.Mkdir sWorkDirectory - QAErrorlog "#i102221#Pocketword-filter seems broken." - - For iCurrentFileIndex = 1 to 16 + For iCurrentFileIndex = 7 to 7 select case iCurrentFileIndex - case 1 : sCurrentFile = "xml2.odt" - sCurrentFilter = "writer8" - case 2 : sCurrentFile = "wpsfile.wps" - sCurrentFilter = "Text (encoded)" - case 3 : sCurrentFile = "dostext.txt" - sCurrentFilter = "Text (encoded)" - case 4 : sCurrentFile = "sw30.sdw" - sCurrentFilter = "StarWriter 3.0" - case 5 : sCurrentFile = "sw50.vor" - sCurrentFilter = "StarWriter 5.0 Vorlage/Template" - case 6 : sCurrentFile = "sw31.sdw" - sCurrentFilter = "StarWriter 3.0" - case 7 : sCurrentFile = "sw31.vor" - sCurrentFilter = "StarWriter 3.0 Vorlage/Template" - case 8 : sCurrentFile = "sw40.sdw" - sCurrentFilter = "StarWriter 4.0" - case 9 : sCurrentFile = "sw40_sp2.vor" - sCurrentFilter = "StarWriter 4.0 Vorlage/Template" - case 10 : sCurrentFile = "sw50.sdw" - sCurrentFilter = "StarWriter 5.0" - case 11 : sCurrentFile = "html.html" - sCurrentFilter = "HTML (StarWriter)" - case 12 : sCurrentFile = "rtf.rtf" - sCurrentFilter = "Rich Text Format" - case 13 : sCurrentFile = "sw60.sxw" - sCurrentFilter = "StarOffice XML (Writer)" - case 14 : sCurrentFile = "winw97.doc" - sCurrentFilter = "MS Word 97" - case 15 : sCurrentFile = "winword6.doc" - sCurrentFilter = "MS Word 95" - case 16 : sCurrentFile = "wintext.txt" - sCurrentFilter = "Text (encoded)" -' case 17 : sCurrentFile = "pocketword.psw" -' sCurrentFilter = "PocketWord File" - - -'TODO: 18-23 not applyable. Can be opened, but saving in the format is not supported. - -' case 18 : sCurrentFile = "unixtext.txt" -' sCurrentFilter = "Text" -' case 19 : sCurrentFile = "sw2.sdw" -' sCurrentFilter = "StarWriter 2.0" -' case 20 : sCurrentFile = "amipro3.sam" -' sCurrentFilter = "Ami Pro 1.x-3.1 (W4W)" -' case 21 : sCurrentFile = "mactext.txt" -' sCurrentFilter = "Mac Write 4.x 5.0 (W4W)" -' case 22 : sCurrentFile = "sw1.sdw" -' sCurrentFilter = "StarWriter 1.0" -' case 23 : sCurrentFile = "swdoc.txt" -' sCurrentFilter = "Text (encoded) (StarWriter/GlobalDocument)" -' case 24 : sCurrentFile = "hangul.hwp" -' sCurrentFilter = "writer_MIZI_Hwp_97" + case 1 : sCurrentFile = "xml2.odt" + sCurrentFilter = "writer8" + case 2 : sCurrentFile = "wpsfile.wps" + sCurrentFilter = "Text (encoded)" + case 3 : sCurrentFile = "dostext.txt" + sCurrentFilter = "Text (encoded)" + case 4 : sCurrentFile = "sw30.sdw" + sCurrentFilter = "StarWriter 3.0" + case 5 : sCurrentFile = "sw50.vor" + sCurrentFilter = "StarWriter 5.0 Vorlage/Template" + case 6 : sCurrentFile = "sw31.sdw" + sCurrentFilter = "StarWriter 3.0" + case 7 : sCurrentFile = "sw31.vor" + sCurrentFilter = "StarWriter 3.0 Vorlage/Template" + case 8 : sCurrentFile = "sw40.sdw" + sCurrentFilter = "StarWriter 4.0" + case 9 : sCurrentFile = "sw40_sp2.vor" + sCurrentFilter = "StarWriter 4.0 Vorlage/Template" + case 10 : sCurrentFile = "sw50.sdw" + sCurrentFilter = "StarWriter 5.0" + case 11 : sCurrentFile = "html.html" + sCurrentFilter = "HTML (StarWriter)" + case 12 : sCurrentFile = "rtf.rtf" + sCurrentFilter = "Rich Text Format" + case 13 : sCurrentFile = "sw60.sxw" + sCurrentFilter = "StarOffice XML (Writer)" + case 14 : sCurrentFile = "winw97.doc" + sCurrentFilter = "MS Word 97" + case 15 : sCurrentFile = "winword6.doc" + sCurrentFilter = "MS Word 95" + case 16 : sCurrentFile = "wintext.txt" + sCurrentFilter = "Text (encoded)" +' case 17 : sCurrentFile = "pocketword.psw" +' sCurrentFilter = "PocketWord File" +' TODO: 18-23 not applyable. Can be opened, but saving in the format is not supported. +' case 18 : sCurrentFile = "unixtext.txt" +' sCurrentFilter = "Text" +' case 19 : sCurrentFile = "sw2.sdw" +' sCurrentFilter = "StarWriter 2.0" +' case 20 : sCurrentFile = "amipro3.sam" +' sCurrentFilter = "Ami Pro 1.x-3.1 (W4W)" +' case 21 : sCurrentFile = "mactext.txt" +' sCurrentFilter = "Mac Write 4.x 5.0 (W4W)" +' case 22 : sCurrentFile = "sw1.sdw" +' sCurrentFilter = "StarWriter 1.0" +' case 23 : sCurrentFile = "swdoc.txt" +' sCurrentFilter = "Text (encoded) (StarWriter/GlobalDocument)" +' case 24 : sCurrentFile = "hangul.hwp" +' sCurrentFilter = "writer_MIZI_Hwp_97" end select - printlog " - Export of File nr " + iCurrentFileIndex + " started." - sLoadFile = sImportDir & sCurrentFile - sSaveFile = sWorkDirectory & "filenr_" & iCurrentFileIndex - - try - - ' Load In-file - Call hFileOpenWithFilter(sLoadFile, sCurrentFilter, false) - - kontext "active" - if active.exists(2) then - active.ok - warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." - end if - - Kontext "TextImport" - if TextImport.Exists then - TextImport.Ok - end if - - Kontext "Filterauswahl" - if Filterauswahl.Exists then - Filterauswahl.Cancel - end if - - Kontext "AsciiFilterOptionen" - if AsciiFilterOptionen.Exists then AsciiFilterOptionen.Ok - Kontext "SecurityWarning" - if SecurityWarning.Exists(3) then SecurityWarning.Ok - Kontext "DocumentWriter" - if DocumentWriter.Exists(3) then - Do until DocumentWriter.StatusIsProgress = false - wait 500 - Loop - else - Kontext "DocumentCalc" - if DocumentCalc.Exists(3) then - Do until DocumentCalc.StatusIsProgress = false - wait 500 - Loop - else - Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" - end if - end if - - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(currentfile,"sw40") = false then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" - end if - SecurityWarning.Cancel - end if - Sleep 1 - - Kontext "AlienWarning" - if AlienWarning.Exists then AlienWarning.Ok - - ' Save Out-file - Call hFileSaveAsWithFilterKill(sSaveFile, sCurrentFilter) - - kontext "active" - if active.exists(2) then - active.ok - warnlog "Error saving file " + sLoadFile + " as " + sSaveFile + "." - goto Cleanup - end if - - ' Load Out-file again - Call hFileOpenWithFilter(sSaveFile, sCurrentFilter, false) - - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(currentfile,"sw40") > 0 then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" - end if - SecurityWarning.Cancel - end if - Sleep 1 - - catch - Warnlog "Error with file: " + sLoadFile - endcatch + sSaveFile = sWorkDirectory & "filenr_" & iCurrentFileIndex & "." & GetExtention ( sCurrentFile ) + printlog "- Export of File nr " + iCurrentFileIndex + " started" + printlog " - Save file: " & sLoadFile + printlog " - to file: " & sSaveFile + + + ' Load In-file + Call hFileOpenWithFilter(sLoadFile, sCurrentFilter, false) + + kontext "active" + if active.exists(2) then + active.ok + warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." + end if + + Kontext "TextImport" + if TextImport.Exists then + TextImport.Ok + end if + + Kontext "Filterauswahl" + if Filterauswahl.Exists then + Filterauswahl.Cancel + end if + + Kontext "AsciiFilterOptionen" + if AsciiFilterOptionen.Exists then AsciiFilterOptionen.Ok + Kontext "SecurityWarning" + if SecurityWarning.Exists(3) then SecurityWarning.Ok + Kontext "DocumentWriter" + if DocumentWriter.Exists(3) then + Do until DocumentWriter.StatusIsProgress = false + wait 500 + Loop + else + Kontext "DocumentCalc" + if DocumentCalc.Exists(3) then + Do until DocumentCalc.StatusIsProgress = false + wait 500 + Loop + else + Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" + end if + end if + + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(currentfile,"sw40") = false then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel + end if + Sleep 1 + + Kontext "AlienWarning" + if AlienWarning.Exists then AlienWarning.Ok + + ' Save Out-file + Call hFileSaveAsWithFilterKill(sSaveFile, sCurrentFilter) + + kontext "active" + if active.exists(2) then + active.ok + warnlog "Error saving file " + sLoadFile + " as " + sSaveFile + "." + goto Cleanup + end if + + ' Load Out-file again + Call hFileOpenWithFilter(sSaveFile, sCurrentFilter, false) + + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(currentfile,"sw40") > 0 then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel + end if + Sleep 1 Cleanup: kontext "active" if active.exists(2) then active.ok - warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." + Select Case iCurrentFileIndex + case 7: QAErrorlog "#i106758#Saving StarWriter 3 template corrupts file" + case else + warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." + end select end if printlog " Close all open files." @@ -420,132 +416,79 @@ testcase tExportTop5FormatsIntoTop5 '// Start of the LOAD-Loop For iCurrentLoadFileIndex = 1 to 4 Select case iCurrentLoadFileIndex - case 1 : sCurrentLoadFile = "xml2.odt" - sCurrentLoadFilter = "writer8" - case 2 : sCurrentLoadFile = "sw60.sxw" - sCurrentLoadFilter = "StarOffice XML (Writer)" - case 3 : sCurrentLoadFile = "winw97.doc" - sCurrentLoadFilter = "MS Word 97" - case 4 : sCurrentLoadFile = "rtf.rtf" - sCurrentLoadFilter = "Rich Text Format" - case 5 : sCurrentLoadFile = "html.html" - sCurrentLoadFilter = "HTML (StarWriter)" + case 1 : sCurrentLoadFile = sImportDir & "xml2.odt" + sCurrentLoadFilter = "writer8" + case 2 : sCurrentLoadFile = sImportDir & "sw60.sxw" + sCurrentLoadFilter = "StarOffice XML (Writer)" + case 3 : sCurrentLoadFile = sImportDir & "winw97.doc" + sCurrentLoadFilter = "MS Word 97" + case 4 : sCurrentLoadFile = sImportDir & "rtf.rtf" + sCurrentLoadFilter = "Rich Text Format" + case 5 : sCurrentLoadFile = sImportDir & "html.html" + sCurrentLoadFilter = "HTML (StarWriter)" End select - printlog " - Export of File nr " + iCurrentLoadFileIndex + " started." - - call fLoadTheFile((sImportDir & sCurrentLoadFile), sCurrentLoadFilter) - + printlog "- Export of File nr " + iCurrentLoadFileIndex + " started." + printlog " - Save file: " & sCurrentLoadFile + '/// Here comes the SAVE-Loop For iCurrentSaveFileIndex = 1 to 5 - Select case iCurrentSaveFileIndex - case 1 : sCurrentSaveFile = "SavedFile_l" + iCurrentLoadFileIndex + "_s1.odt" - sCurrentSaveFilter = "writer8" - case 2 : sCurrentSaveFile = "SavedFile_l" + iCurrentLoadFileIndex + "_s2.sxw" - sCurrentSaveFilter = "StarOffice XML (Writer)" - case 3 : sCurrentSaveFile = "SavedFile_l" + iCurrentLoadFileIndex + "_s3.doc" - sCurrentSaveFilter = "MS Word 97" - case 4 : sCurrentSaveFile = "SavedFile_l" + iCurrentLoadFileIndex + "_s4.rtf" - sCurrentSaveFilter = "Rich Text Format" - case 5 : sCurrentSaveFile = "SavedFile_l" + iCurrentLoadFileIndex + "_s5.html" - sCurrentSaveFilter = "HTML (StarWriter)" - End select - - Call hFileSaveAsWithFilterKill((sWorkDirectory & sCurrentSaveFile), sCurrentSaveFilter) - - if hFileExists (sWorkDirectory & sCurrentSaveFile) then - - 'Check if the saved file can be loaded - call fLoadTheFile((sWorkDirectory & sCurrentSaveFile), sCurrentSaveFilter) - - 'Close the opened file - Do Until GetDocumentCount = 1 - Call hCloseDocument - Loop - end if + if hFileOpenWithFilter((sCurrentLoadFile), sCurrentLoadFilter) = true then + Select case iCurrentSaveFileIndex + case 1 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s1.odt" + sCurrentSaveFilter = "writer8" + case 2 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s2.sxw" + sCurrentSaveFilter = "StarOffice XML (Writer)" + case 3 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s3.doc" + sCurrentSaveFilter = "MS Word 97" + case 4 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s4.rtf" + sCurrentSaveFilter = "Rich Text Format" + case 5 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s5.html" + sCurrentSaveFilter = "HTML (StarWriter)" + End select + + printlog " - " & iCurrentSaveFileIndex & ". to file: " & sCurrentSaveFile + if hFileSaveAsWithFilterKill(sCurrentSaveFile, sCurrentSaveFilter) = true then + printlog " - close all open documents" + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop + printlog " - check if file exists" + if hFileExists (sCurrentSaveFile) then + printlog " - success" + printlog " - reload previously saved file" + if hFileOpenWithFilter(sCurrentSaveFile, sCurrentSaveFilter) = true then + printlog " - success" + else + Warnlog "error loading file: " & sCurrentSaveFile + end if + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop + else + Warnlog "Saved file doesn't exist" + 'Close the opened file + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop + end if + else + Warnlog "Error saving file: " & sCurrentLoadFile + 'Close the opened file + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop + end if + else + Warnlog "Error loading file: " & sCurrentLoadFile + 'Close the opened file + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop + end if Next iCurrentSaveFileIndex - '/// Here ends the Save-Loop - - Cleanup: - kontext "active" - if active.exists(2) then - active.ok - warnlog "Error. Last file processed: " + sCurrentLoadFile + " as " + sCurrentSaveFile + "." - end if - - printlog " Close all open files." - - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop - - printlog " - File nr " + iCurrentLoadFileIndex + " completed." + printlog "- Export of File nr " + iCurrentLoadFileIndex + " completed." Next iCurrentLoadFileIndex '// End of the LOAD-Loop. endcase - -'--------------------------------------------------------------------------------------------------------------------- - -function fLoadTheFile(sLoadFile as string, sCurrentFilter as string) - - try - ' Load In-file - Call hFileOpenWithFilter(sLoadFile, sCurrentFilter, false) - - kontext "active" - if active.exists(2) then - active.ok - warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." - end if - - Kontext "TextImport" - if TextImport.Exists then - TextImport.Ok - end if - - Kontext "Filterauswahl" - if Filterauswahl.Exists then - Filterauswahl.Cancel - end if - - Kontext "AsciiFilterOptionen" - if AsciiFilterOptionen.Exists then AsciiFilterOptionen.Ok - Kontext "SecurityWarning" - if SecurityWarning.Exists(3) then SecurityWarning.Ok - Kontext "DocumentWriter" - if DocumentWriter.Exists(3) then - Do until DocumentWriter.StatusIsProgress = false - wait 500 - Loop - else - Kontext "DocumentCalc" - if DocumentCalc.Exists(3) then - Do until DocumentCalc.StatusIsProgress = false - wait 500 - Loop - else - Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" - end if - end if - - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(currentfile,"sw40") > 0 then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" - end if - SecurityWarning.Cancel - end if - Sleep 1 - - Kontext "AlienWarning" - if AlienWarning.Exists then AlienWarning.Ok - - catch - Warnlog "Error with file: " + sLoadFile - endcatch -end function 'fLoadTheFile - -'------------------------------------------------------------------------------------------------------------------------------------------------ - diff --git a/testautomation/writer/optional/includes/navigator/w_navigator.inc b/testautomation/writer/optional/includes/navigator/w_navigator.inc index 21dc8ec9a369..31f146fb733a 100755 --- a/testautomation/writer/optional/includes/navigator/w_navigator.inc +++ b/testautomation/writer/optional/includes/navigator/w_navigator.inc @@ -217,7 +217,7 @@ endcase ' ********************************************************************** testcase tViewNavigator3 - WarnLog "#i94614# - tViewNavigator3 outcommented" + QAErrorlog "#i94614# - tViewNavigator3 outcommented" goto endsub Dim NavigationTearOff as boolean 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 9a7c142d0b1d..d7f96d0635f3 100755 --- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc +++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc @@ -451,6 +451,7 @@ testcase i103265 Call hNewDocument printlog "- Open test document" Call hFileOpen ( gTesttoolPath + "writer\optional\input\regression\issuezilla\i103265.odt" ) + Call sMakeReadOnlyDocumentEditable printlog "- Update TOC" ToolsUpdateAllIndexes @@ -483,7 +484,7 @@ testcase i103265 printlog "- Save as HTML" gApplication = "HTML" - Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\ODFHyperlinksInTOCs.html", "HTML" ) + Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\ODFHyperlinksInTOCs.html", "HTML (StarWriter)" ) Call hCloseDocument printlog "- Reload" diff --git a/testautomation/writer/optional/includes/table/w_204a_.inc b/testautomation/writer/optional/includes/table/w_204a_.inc index 4b18bb064fe2..9ab42295d521 100755 --- a/testautomation/writer/optional/includes/table/w_204a_.inc +++ b/testautomation/writer/optional/includes/table/w_204a_.inc @@ -355,19 +355,13 @@ testcase sTableMergeCell Call hNewDocument - ' set marks to find - Call wTypeKeys "NULL<return>" - Call wTypeKeys "Start<return>" - Call wTypeKeys "End<return>" - Call wTypeKeys "NULL<return><up><up>" - temp (1) = "Table1" - '/// Insert a table with 10 columns and 7 rows + printlog "Insert a table with 10 columns and 7 rows" Call TBOhTabelleEinfuegen (temp (1) ,0,1,0,1,"10",tHeight:="7") ' insert table + printlog "Point cursor out of the table" Call wTypeKeys "<MOD1 END>", 2 - Call wTypeKeys "<up><up>" - '/// Insert a table with 10 columns and 10 rows + printlog "Insert a table with 10 columns and 10 rows" temp (1) = "Table2" Call TBOhTabelleEinfuegen (temp (1) ,0,0,1,1,"10",tHeight:="10") ' insert table @@ -383,49 +377,21 @@ testcase sTableMergeCell Call wTypeKeys "<down><shift down>" ' 2 vertical (1,2) & (1,3) TableMergeCells : inc ac : dec fc Call wTypeKeys "<down><up><shift down><shift up>" ' merge again - 'Warnlog "Merge cells will crash when only one cell is selected (#i33394)" TableMergeCells - ' go to top of table, move to end & count + printlog "Go to top of table" Call wTypeKeys "<mod1 home>" - for i=1 to fc - Call wTypeKeys "<right>" - next i - Call wTypeKeys "<down>" - Call wTypeKeys "<shift end>" ' right after/outside the table -> - try - EditCopy - catch - Warnlog "Test didn't find the end of the table, stops here!" - Call hCloseDocument - goto endsub - endcatch - if (GetClipboardText <> "End") then - Warnlog "Test didn't find the end of the table, stops here! Found:" & GetClipboardtext - Call hCloseDocument - goto endsub - end if - ' undo & check where we are + printlog "Undo all cell mergers (3 times)" for i=1 to ac - EditUndo + try + EditUndo + wait 500 + catch + Warnlog "Edit / Undo disabled on Undo step: " & i + endcatch next i - - sleep (3) - temp (2) = hGetTableName() - if (temp(2) <> temp(1)) then warnlog " --- wrong table? schould be : "+temp (1)+ ", is : "+temp(2) - EditUndo ' go one step further - EditUndo ' go one step further - Call wTypeKeys "<up><shift end>" - EditCopy - temp(2) = GetClipboardText - Call wTypeKeys "<down><shift home>" - EditCopy - temp(3) = GetClipboardText - if ((temp(2) <> "Start") AND (temp(3) <> "End")) then - warnlog "there is smth. wrong with the undo stuff !!! is:"+temp(3) +" and:"+temp(2)+" should:End Start" - end if - '/// Close document + printlog "Close document" Call hCloseDocument endcase diff --git a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc index f0e3d8966ea2..0edd49e1f4a2 100755 --- a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc +++ b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc @@ -45,7 +45,7 @@ sub w_undo_history_3 Call tUndoCaption ' Insert Caption Call tUndoAutoText ' Insert Autotext Call tUndoBookmark ' Bookmark (Insert/Rename/Delete) - Call tUndoNote ' Note (Insert/Delete) + Call tUndoComment ' Comment (Insert/Delete) Call tUndoScript ' Script (Insert/Delete) Call tUndoIndexes ' Index/Bibliography entrys (Insert/Delete) Call tUndoFrames ' Frames (Insert/Rename/Delete) @@ -293,26 +293,23 @@ goto endsub endcase -testcase tUndoNote +testcase tUndoComment - '/// <B>Note (Insert/Delete)</B> - printlog "- Insert Note" - '/// new document + printlog "New document" Call hNewDocument - '/// Insert / Note + printlog "Insert / Comment" InsertNoteWriter - '/// string in Undo-list has to be: "Insert note") - Call CheckUndoStringInUndoList ( 10, "InsertNote" ) - printlog "- Delete Note" - '/// Bring up the Navigator, find the entry "Notes", expand it, and select the expanded section. + printlog "String in Undo-list has to be: 'Insert Comment'" + Call CheckUndoStringInUndoList ( 10, "InsertComment" ) + printlog "- Delete Comment" + printlog "Bring up the Navigator, find the entry 'Comments', expand it, and select the expanded section." Call wNavigatorAuswahl( 11, 1 ) - '/// Enter 'Delete' 'Backspace' kontext "Navigator" Navigator.TypeKeys "<DELETE>" '/// Close the Navigator ViewNavigator - '/// string in Undo-list has to be: "Delete: 'This is a note'") - Call CheckUndoStringInUndoList ( 10, "DeleteNote" ) + '/// string in Undo-list has to be: "Delete comment") + Call CheckUndoStringInUndoList ( 10, "DeleteComment" ) '/// Close document Call hCloseDocument |