diff options
| author | Wolfram Garten [wg] <Wolfram.Garten@oracle.com> | 2010-11-08 14:00:34 +0100 |
|---|---|---|
| committer | Wolfram Garten [wg] <Wolfram.Garten@oracle.com> | 2010-11-08 14:00:34 +0100 |
| commit | 48c78c1397fad0e735f6bfeb6ac333b901dfe97f (patch) | |
| tree | dce7b8c028d3b1656539e2cac0453ea3d9e18a76 /testautomation/graphics/optional/includes | |
| parent | 2f44b7a74dcdafd9a879994ab6a3a81063bf1b7e (diff) | |
i115273,[Automation]: shift old documentation to new style using printlogs
Diffstat (limited to 'testautomation/graphics/optional/includes')
27 files changed, 2198 insertions, 1999 deletions
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc index d96e54bd44fb..6aa979a5c3ea 100644 --- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc +++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc @@ -343,7 +343,7 @@ testcase tPDF hExportAsPDFmulti (1, TRUE, OutputGrafikTBO + 10, TRUE, FALSE, 1, 3) ' button in toolbar -> last settings have to be used - printlog "File->Export as PDF document ///'" + printlog "File->Export as PDF document" printlog " range = all" printlog " compression = Press optimized" kontext "Standardbar" diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc index 731c9e0ed21f..42e3bc745ab4 100644 --- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc +++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc @@ -38,13 +38,6 @@ '* '\******************************************************************* -' Tools->Autocorrect... -' Replace; Exceptions; Options; Custom Quotes -' these are Language -' dependant in the -' listbox above!! -' box only enabled, if the both tabpages are selected ... - testcase tToolsAutocorrectReplace dim i as integer @@ -76,7 +69,9 @@ testcase tToolsAutocorrectReplace TabErsetzung.OK hCloseDocument -endcase +endcase 'tToolsAutocorrectReplace + +'------------------------------------------------------------------------------- testcase tToolsAutocorrectExceptions dim i as integer @@ -119,9 +114,10 @@ testcase tToolsAutocorrectExceptions TabAusnahmen.OK hCloseDocument -endcase +endcase 'tToolsAutocorrectExceptions '------------------------------------------------------------------------------- + testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) ' bSinple = true: use simple quotes ;; else Double Quotes @@ -151,8 +147,6 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) warnlog "The language-file was not found or accessible! The test ends." goto endsub endif - - 'HDE has same problems in w_106a.inc ;-) !!! migrate ?!?! ///' Call hNewDocument hFileOpen sFileName @@ -381,7 +375,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) sleep 1 hCloseDocument -endcase +endcase 'tToolsAutocorrectCustomQuotes '------------------------------------------------------------------------------- testcase tToolsAutocorrectOption @@ -455,6 +449,6 @@ testcase tToolsAutocorrectOption hCloseDocument sleep 1 -endcase +endcase 'tToolsAutocorrectOption -'------------------------------------------------------------------------------- +'-------------------------------------------------------------------------------
\ No newline at end of file diff --git a/testautomation/graphics/optional/includes/global/g_character.inc b/testautomation/graphics/optional/includes/global/g_character.inc index a9d578665c5a..5e746af3c48c 100644 --- a/testautomation/graphics/optional/includes/global/g_character.inc +++ b/testautomation/graphics/optional/includes/global/g_character.inc @@ -42,44 +42,46 @@ testcase tFormatCharacter dim sTemp as string dim iTemp as integer - '/// open application ///' + printlog "open application " Call hNewDocument sleep 1 - '/// create a textframe with content ///' + printlog "create a textframe with content " hTextrahmenErstellen ("This is a check, a check, a check.",10,10,60,30) - '/// type with keys [strg]+[home] [shift]+[end] to select the inserted text ///' + printlog "type with keys [strg]+[home] [shift]+[end] to select the inserted text " hTypeKeys "<MOD1 HOME><shift end>" sleep 1 - '/// Format->Character ///' + printlog "Format->Character " FormatCharacter - sleep 1 - '/// switch to tabpage 'Font' ///' - Kontext - Messagebox.SetPage TabFont - Kontext "TabFont" - sleep 1 - - '/// switch to tabpage 'Font Effects' ///' - Kontext - Messagebox.SetPage TabFontEffects - kontext "TabFontEffects" - sleep 1 - - '/// switch to tabpage 'Position' ///' - Kontext - Messagebox.SetPage TabFontPosition - Kontext "TabFontPosition" - sleep 1 - - '/// close dialog 'Character' with 'OK' ///' - TabFontPosition.OK - '/// close application ///' + sleep 1 + printlog "switch to tabpage 'Font' " + Kontext + Messagebox.SetPage TabFont + Kontext "TabFont" + sleep 1 + + printlog "switch to tabpage 'Font Effects' " + Kontext + Messagebox.SetPage TabFontEffects + kontext "TabFontEffects" + sleep 1 + + printlog "switch to tabpage 'Position' " + Kontext + Messagebox.SetPage TabFontPosition + Kontext "TabFontPosition" + sleep 1 + + printlog "close dialog 'Character' with 'OK' " + TabFontPosition.OK + printlog "close application " Call hCloseDocument endcase 'tFormatCharacter + '--------------------------------------------------------- + testcase tDialogCharacter Dim i as integer @@ -101,11 +103,13 @@ testcase tDialogCharacter ToolsOptions hToolsOptions ( "LanguageSettings", "Languages" ) - if Aktivieren.IsChecked then '/// Check in what state Asian support is ///' + printlog "Check in what state Asian support is " + if Aktivieren.IsChecked then Asiansupportsetting = TRUE else + printlog "Activate if not already activated " Asiansupportsetting = FALSE - Aktivieren.Check '/// Activate if not already activated ///' + Aktivieren.Check end if Kontext "ExtrasOptionenDlg" @@ -118,8 +122,8 @@ testcase tDialogCharacter FormatCharacter sleep 1 - Kontext '"Active" ' insert this, perhaps another - Active.SetPage TabFont ' tabpage is active at open + Kontext '"Active" + Active.SetPage TabFont Kontext "TabFont" CountOfThem = FontWest.GetItemCount for y = 1 to CountOfThem @@ -275,12 +279,14 @@ testcase tDialogCharacter next y Kontext - Active.SetPage TabFontPosition '/// Changes the active tab to "Position" + printlog "Changes the active tab to "Position" + Active.SetPage TabFontPosition Kontext "TabFontPosition" printlog "TabFontPosition" SuperScript.Check Super.Check - RelativeFontSize.ToMin '/// Testing the "Relative Font Size"-Listbox + printlog "Testing the "Relative Font Size"-Listbox + RelativeFontSize.ToMin ThisIsMyTextFromControl = RelativeFontSize.GetText ' printlog "The Relative Font Size minimum is: " & ThisIsMyTextFromControl for y = 1 to 99 @@ -290,7 +296,8 @@ testcase tDialogCharacter next y Automatic.Check - ScaleWith.ToMin '/// Testing the "Scale With"-Listbox + printlog "Testing the "Scale With"-Listbox + ScaleWith.ToMin ThisIsMyTextFromControl = ScaleWith.GetText printlog "ScaleWith minimum is:" & ThisIsMyTextFromControl ' ScaleWith.TypeKeys "<TAB>" @@ -303,8 +310,10 @@ testcase tDialogCharacter Normal.Check Subscript.Check - RelativeFontSize.ToMin '/// Testing the "Reliative Font Size"-Listbox again but this time - ThisIsMyTextFromControl = RelativeFontSize.GetText '/// with "Subscript" and "Normal" Checked + printlog "Testing the Reliative Font Size-Listbox again but this time" + RelativeFontSize.ToMin + printlog "with Subscript and Normal Checked + ThisIsMyTextFromControl = RelativeFontSize.GetText printlog "The Relative Font Size minimum is: " & ThisIsMyTextFromControl for y = 1 to 99 RelativeFontSize.TypeKeys "<UP>" @@ -314,7 +323,8 @@ testcase tDialogCharacter Automatic.Check - ScaleWith.ToMin '/// Testing the "ScaleWith"-Listbox + printlog "Testing the "ScaleWith"-Listbox + ScaleWith.ToMin ThisIsMyTextFromControl = ScaleWith.GetText printlog "The ScaleWith Size is: " & ThisIsMyTextFromControl for y = 1 to 100 @@ -323,13 +333,15 @@ testcase tDialogCharacter ' printlog "The ScaleWith Size is: " & ThisIsMyTextFromControl next y - ThisIsMyTextFromControl = Spacing.GetSelText '/// Testing the "Spacing"-ListBox + printlog "Testing the "Spacing"-ListBox + ThisIsMyTextFromControl = Spacing.GetSelText printlog "The Spacing is first: " & ThisIsMyTextFromControl for y = 2 to 3 Spacing.Select y ThisIsMyTextFromControl = Spacing.GetSelText printlog "The Spacing is: " & ThisIsMyTextFromControl - ThisIsMyTextFromControl = SpacingBy.GetText '/// Testing the "Spacing By"-Scrollbox + printlog "Testing the "Spacing By"-Scrollbox + ThisIsMyTextFromControl = SpacingBy.GetText ' printlog "The SpacingBy Size minimum is: " & ThisIsMyTextFromControl SpacingBy.ToMin for z = 1 to 4 @@ -347,7 +359,8 @@ testcase tDialogCharacter kontext ToolsOptions hToolsOptions ( "LanguageSettings", "Languages" ) - Aktivieren.UnCheck '/// Deactivate if not already deactivated ///' + printlog "Deactivate if not already deactivated " + Aktivieren.UnCheck Printlog "Reseted the Asiansupport-value to it's original state" Kontext "ExtrasOptionenDlg" @@ -385,41 +398,41 @@ testcase tSetFormatCharacter end if sFile = convertPath(gTesttoolpath + "graphics\required\input\spellb_" + iSprache + "."+ExtensionString) - '/// create document, if it doesn't exist, else skip this case :-) ///' + printlog "create document, if it doesn't exist, else skip this case :-) " if (dir(sFile)="") then - '/// open application ///' + printlog "open application " Call hNewDocument - '/// activate all languages in options ///' - '///+ Tools->Options ///' + printlog "activate all languages in options " + '///+ Tools->Options " ToolsOptions - '///+ select tabpage 'Languages' from set 'Language Settings' ///' + '///+ select tabpage 'Languages' from set 'Language Settings' " hToolsOptions("LANGUAGESETTINGS","Languages") kontext "TabSprachen" - '///+ save state and check checkbox 'Asian languages support' ///' - '/// if the language is Asian, skip this part ///' + '///+ save state and check checkbox 'Asian languages support' " + printlog "if the language is Asian, skip this part " printlog "iSprache = " + iSprache if bAsianLan = FALSE then bAsian = Aktivieren.isEnabled Aktivieren.check endif - '///+ save state and check checkbox 'Complex text layout (CTL) support' ///' + '///+ save state and check checkbox 'Complex text layout (CTL) support' " bComplex = ComplexScriptEnabled.isEnabled ComplexScriptEnabled.check - '///+ close dialog 'Options' with OK ///' + '///+ close dialog 'Options' with OK " Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - '/// get count of languages ///' - '///+ Format->Character ///' + printlog "get count of languages " + '///+ Format->Character " FormatCharacter sleep 1 Kontext - '///+ switch to tabpage 'Font' ///' + '///+ switch to tabpage 'Font' " Messagebox.SetPage TabFont kontext "TabFont" sleep 1 - '///+ get count of languages for Western/Asian/CTL fonts ///' + '///+ get count of languages for Western/Asian/CTL fonts " iWest = LanguageWest.getItemCount iAsian = LanguageEast.getItemCount iComplex = LanguageCTL.getItemCount @@ -456,39 +469,39 @@ testcase tSetFormatCharacter Printlog "CTL font languages count : " + iComplex endif endif - '///+ close dialog 'Character' with OK ///' + printlog "close dialog 'Character' with OK " TabFont.Ok WL_SD_TextEinfuegenDraw gMouseMove ( 1, 1, 100, 100 ) - '///+ print the language counts into the first line of the document ///' + printlog "print the language counts into the first line of the document " hTypeKeys(" "+iWest+" "+iAsian+" "+iComplex+"<return>") - '/// set all languages to '[None]' ///' - '///+ Format->Character ///' + printlog "set all languages to '[None]' " + printlog "Format->Character " FormatCharacter kontext "TabFont" - '///+ select '[None]' (should be the first entry in every listbox) ///' + printlog "select '[None]' (should be the first entry in every listbox) " LanguageWest.select 1 LanguageEast.select 1 LanguageCTL.select 1 - '///+ close dialog 'Character' with OK ///' + printlog "close dialog 'Character' with OK " TabFont.Ok - '/// print one line with language formated text for every language ///' + printlog "print one line with language formated text for every language " for i = 1 to iWest - '///+ Format->Character ///' + printlog "Format->Character " FormatCharacter kontext "TabFont" - '///+ select the next language ///' + printlog "select the next language " LanguageWest.select i sTemp = LanguageWest.getItemText (i) ListAppend(sLanguage(), sTemp) - '///+ close dialog 'Character' with OK ///' + printlog "close dialog 'Character' with OK " TabFont.Ok - '///+ type [return][number of language in list][Tab][Language name][Tab] ///' + printlog "type [return][number of language in list][Tab][Language name][Tab] " hTypeKeys(""+i+"<tab>"+sTemp+"<tab><return>") next i @@ -528,7 +541,7 @@ testcase tSetFormatCharacter hTypeKeys(""+i+"<tab>"+sTemp+"<tab><return>") next i - '/// save the created document & the languages list if they don't exists ///' + printlog "save the created document & the languages list if they don't exists " hFileSaveAs (sFile) qaErrorLog "Created file. Please check it and then commit it! " + sTemp sTemp = convertPath(gTesttoolpath + "graphics\required\input\spellb_" + iSprache + ".txt") @@ -536,29 +549,29 @@ testcase tSetFormatCharacter ListWrite(sLanguage(), sTemp,"utf8") endif - '/// restore the options ///' - '///+ Tools->Options ///' + printlog "restore the options " + printlog "Tools->Options " ToolsOptions - '///+ select tabpage 'Languages' from set 'Language Settings' ///' + printlog "select tabpage 'Languages' from set 'Language Settings' " hToolsOptions("LANGUAGESETTINGS","Languages") kontext "TabSprachen" - '///+ restore state of checkbox 'Asian languages support' ///' - '/// if the language is Asian, skip this part ///' + printlog "restore state of checkbox 'Asian languages support' " + printlog "if the language is Asian, skip this part " if bAsianLan = FALSE then if (bAsian <> TRUE) then Aktivieren.UNcheck endif endif - '///+ restore state of checkbox 'Complex text layout (CTL) support' ///' + printlog "restore state of checkbox 'Complex text layout (CTL) support' " if (bComplex <> TRUE) then ComplexScriptEnabled.UNcheck endif - '///+ close dialog 'Options' with OK ///' + printlog "close dialog 'Options' with OK " Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - '/// close application ///' + printlog "close application " Call hCloseDocument endif @@ -586,29 +599,29 @@ testcase tGetFormatCharacter ExtensionString = "odg" end if - '/// open the english document with all languages ///' + printlog "open the english document with all languages " hDateiOeffnen (convertPath(gTesttoolpath + "graphics\required\input\spellb_" + iSprache + "."+ExtensionString) ListRead(sLanguageR(), convertPath(gTesttoolpath + "graphics\required\input\spellb_1.txt"),"utf8") - '/// activate all languages in options ///' - '///+ Tools->Options ///' + printlog "activate all languages in options " + printlog " Tools->Options " ToolsOptions - '///+ select tabpage 'Languages' from set 'Language Settings' ///' + printlog "select tabpage 'Languages' from set 'Language Settings' " hToolsOptions("LANGUAGESETTINGS","Languages") kontext "TabSprachen" - '///+ save state and check checkbox 'Asian languages support' ///' + printlog "save state and check checkbox 'Asian languages support' " bAsian = Aktivieren.isEnabled Aktivieren.check - '///+ save state and check checkbox 'Complex text layout (CTL) support' ///' + printlog "save state and check checkbox 'Complex text layout (CTL) support' " bComplex = ComplexScriptEnabled.isEnabled ComplexScriptEnabled.check - '///+ close dialog 'Options' with OK ///' + printlog "close dialog 'Options' with OK " Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK sleep (1) - '/// get count of languages ///' + printlog "get count of languages " hTypeKeys("<tab><f2>") - '///+ first how many are in the reference document (printed in the first line)///' + printlog "first how many are in the reference document (printed in the first line)" hTypeKeys("<mod1 home><shift end>") sleep (1) editcopy @@ -619,15 +632,15 @@ testcase tGetFormatCharacter iAsian(1) = mid(sTemp, iTemp+1, iTemp-i) iComplex(1) = right(sTemp, Len(sTemp) - i) sleep (1) - '///+ Format->Character ///' + printlog "Format->Character " FormatCharacter sleep 1 Kontext - '///+ switch to tabpage 'Font' ///' + printlog "switch to tabpage 'Font' " Messagebox.SetPage TabFont kontext "TabFont" sleep 1 - '///+ get count of languages for Western/Asian/CTL fonts ///' + printlog "get count of languages for Western/Asian/CTL fonts " iWest(2) = LanguageWest.getItemCount iAsian(2) = LanguageEast.getItemCount iComplex(2) = LanguageCTL.getItemCount @@ -646,10 +659,10 @@ testcase tGetFormatCharacter else Printlog "CTL font languages count : " + iComplex(2) endif - '///+ close dialog 'Character' with OK ///' + printlog "close dialog 'Character' with OK " TabFont.Ok - '/// write the language for every line in the current language ///' + printlog "write the language for every line in the current language " hTypeKeys("<mod1 home><down><home>") for i = 1 to iWest(2) FormatCharacter @@ -659,7 +672,7 @@ testcase tGetFormatCharacter sTemp = LanguageWest.getSelText ListAppend(sLanguage(), sTemp) TabFont.Ok - '///+ type [end][number of language in list][Tab][Language name][down][home] ///' + printlog "type [end][number of language in list][Tab][Language name][down][home] " hTypeKeys("<end>"+iTemp+"<tab>"+sTemp+"<down><home>") next i @@ -685,7 +698,7 @@ testcase tGetFormatCharacter hTypeKeys("<end>"+iTemp+"<tab>"+sTemp+"<down><home>") next i - '/// save the created document & the languages list ///' + printlog "save the created document & the languages list " sTemp = convertPath(gOfficePath + "user\work\spellb_" + iSprache) hFileSaveAsKill (sTemp) sTemp = convertPath(gOfficePath + "user\work\spellb_" + iSprache + ".txt") @@ -709,6 +722,6 @@ testcase tGetFormatCharacter endif next i - '/// close application ///' + printlog "close application " Call hCloseDocument endcase 'tGetFormatCharacter diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc index 4c1900876565..82351b3562e2 100644 --- a/testautomation/graphics/optional/includes/global/g_clipboard.inc +++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc @@ -68,13 +68,15 @@ testcase tiEditUndo print "what" endif Kontext "TabPositionAndSize" - Ueber_Text_1=PositionX.GetText '/// defining variable for original position of object ///' + printlog "defining variable for original position of object" + Ueber_Text_1=PositionX.GetText TabPositionAndSize.Cancel sleep 2 Kontext "Toolbar" Auswahl.Click sleep 1 - ContextArrangeBringBackward '/// Bring Object backward ///' + printlog "Bring Object backward" + ContextArrangeBringBackward sleep 1 gMouseClick 60,60 sleep 1 @@ -85,7 +87,8 @@ testcase tiEditUndo Kontext "Toolbar" Auswahl.Click sleep 1 - ContextPositionAndSize '/// Open Position and Size dialog, checking position ///' + printlog "Open Position and Size dialog, checking position" + ContextPositionAndSize Kontext Messagebox.SetPage TabPositionAndSize Kontext "TabPositionAndSize" @@ -94,8 +97,9 @@ testcase tiEditUndo sleep 2 gMouseClick 60,60 sleep 1 - - EditUndo '/// Edit Undo for BringBackward ///' + + printlog "Edit Undo for BringBackward" + EditUndo Sleep 2 gMouseClick 60,60 sleep 1 @@ -105,7 +109,8 @@ testcase tiEditUndo sleep 1 Kontext "Toolbar" Auswahl.Click - ContextPositionAndSize '/// Again checking position using Position and Size dialog ///' + printlog "Again checking position using Position and Size dialog" + ContextPositionAndSize kontext Messagebox.SetPage TabPositionAndSize kontext "TabPositionAndSize" @@ -115,10 +120,11 @@ testcase tiEditUndo warnlog "Last order could not be redone" end if TabPositionAndSize.Cancel - - Call hCloseDocument '/// Close document ///' -endcase + printlog "Close document" + Call hCloseDocument + +endcase 'tiEditUndo '------------------------------------------------------------------------------- testcase tiEditRedo @@ -133,8 +139,9 @@ testcase tiEditRedo end if Datei$ = gTesttoolPath + "graphics\required\input\leer."+ExtensionString - - hFileOpen ConvertPath (Datei$) '/// Open test document (leer.od?) ///' + + printlog "Open test document (leer.od?)" + hFileOpen ConvertPath (Datei$) sleep 3 ' check if the document is writable if fIsDocumentWritable = false then @@ -159,7 +166,8 @@ testcase tiEditRedo sleep 1 hTypeKeys "<TAB>" sleep 1 - ContextArrangeBringBackward '/// move object behind other object ///' + printlog "move object behind other object" + ContextArrangeBringBackward sleep 1 gMouseClick 60,60 sleep 1 @@ -168,25 +176,29 @@ testcase tiEditRedo ContextPositionAndSize sleep 1 Kontext - Messagebox.SetPage TabPositionAndSize '/// checking new position values ///' + printlog "checking new position values" + Messagebox.SetPage TabPositionAndSize Kontext "TabPositionAndSize" if PositionX.GetText = Ueber_Text_1 Then Warnlog " Nothing changed, so nothing can be undone" TabPositionAndSize.Cancel sleep 1 gMouseClick 60,60 - EditUndo '/// Edit Undo///' + printlog "Edit Undo" + EditUndo sleep 1 hTypeKeys "<TAB>" sleep 1 ContextPositionAndSize sleep 1 kontext - Messagebox.SetPage TabPositionAndSize '/// checking again position ///' + printlog "checking again position" + Messagebox.SetPage TabPositionAndSize kontext "TabPositionAndSize" if PositionX.GetText <> Ueber_Text_1 Then Warnlog " Undo didn't worked, so repeat last action wont work either" TabPositionAndSize.Cancel sleep 2 - EditRedo '/// Edit Redo ///' + printlog "Edit Redo" + EditRedo sleep 2 gMouseClick 60,60 sleep 2 @@ -197,16 +209,18 @@ testcase tiEditRedo kontext Messagebox.SetPage TabPositionAndSize kontext "TabPositionAndSize" - if PositionX.GetText <> Ueber_Text_1 then '/// checking position ///' + printlog "checking position" + if PositionX.GetText <> Ueber_Text_1 then printlog "Action Undo repeated" else warnlog "Action Undo not repeated" end if TabPositionAndSize.OK sleep 1 - call hCloseDocument '/// close document ///' + printlog "close document" + call hCloseDocument sleep 1 -endcase +endcase 'tiEditRedo '------------------------------------------------------------------------------- testcase tiEditClipboard @@ -214,61 +228,63 @@ testcase tiEditClipboard Dim Ueber_Text_4 as string dim sTemp as string - '/// open application ///' + printlog "open application" Call hNewDocument Call sSelectEmptyLayout sleep 1 SetClipboard "" - '/// Create rectangle ///' + printlog "Create rectangle" Call hRechteckErstellen ( 65, 65, 80, 80 ) sleep 1 - '///+ RightClick onto rectangle///' + printlog "RightClick onto rectangle" gMouseClick 70,70 sleep 1 - Ueber_Text_4 = fGetPositionX() '/// Get values for position variables ///' + printlog "Get values for position variables" + Ueber_Text_4 = fGetPositionX() Sleep 1 - '/// <b> Edit->Copy </b> ///' + printlog "<b> Edit->Copy </b>" EditCopy - '///+ Type Key [Deletee] ///' + '///+ Type Key [Deletee]" hTypeKeys "<DELETE>" - '///+ <i> Edit->Paste </i> ///' + '///+ <i> Edit->Paste </i>" EditPaste sleep 1 - '///+ Edit->Select All ///' + '///+ Edit->Select All" EditSelectAll sTemp = fGetPositionX() - if LiberalMeasurement(sTemp, Ueber_Text_4) then '/// TabPositionAndSize: comparing position with original position ///' + printlog "TabPositionAndSize: comparing position with original position" + if LiberalMeasurement(sTemp, Ueber_Text_4) then printlog "OK EditCopy and EditPaste" else warnlog "- Edit paste did not work; is: '" + sTemp + "' ; should: '" + Ueber_Text_4 + "'" end if sleep 1 - '/// Type Keys [escape], + EditSelectAll (to deselect object and to select again) ///' + printlog "Type Keys [escape], + EditSelectAll (to deselect object and to select again)" hTypeKeys "<escape>" EditSelectAll sleep 2 - '/// <b> Edit->Cut </b>///' + printlog "<b> Edit->Cut" EditCut sleep 1 hTypeKeys "<TAB>" try - '///+ - Format->Position And Size -> HAS TO FAIL / IS NOT AVAILABLE !!! '///' + printlog "Format->Position And Size -> HAS TO FAIL / IS NOT AVAILABLE !!! " ContextPositionAndSize kontext - '///+ - select TabPage 'Position And Size' ///' + printlog "select TabPage 'Position And Size'" Messagebox.SetPage TabPositionAndSize Kontext "TabPositionAndSize" if TabPositionAndSize.NOTexists then warnlog "TabPositionAndSize isn't up ?!!" endif - '///+ - Ok dialog 'Position And Size' ///' + printlog "Ok dialog 'Position And Size'" TabPositionAndSize.Ok warnlog "TabPositionAndSize IS up :-( Doesn't have to be, because object should be deleted !!!" catch Printlog " - There is no object in the document anymore :-)" endcatch sleep 1 - '///+ <i> Edit->Paste </i> ///' + printlog "Edit->Paste" EditPaste sleep 2 sTemp = fGetPositionX() @@ -278,9 +294,9 @@ testcase tiEditClipboard warnlog "- Edit paste did not work; is: '" + sTemp + "' ; should: '" + Ueber_Text_4 + "'" end if sleep 3 - '/// close application ///' + printlog "close application" Call hCloseDocument -endcase +endcase 'tiEditClipboard '------------------------------------------------------------------------------- testcase tiEditPasteSpecial_HTML @@ -288,7 +304,8 @@ testcase tiEditPasteSpecial_HTML dim Zaehler as integer Kontext "Standardbar" sleep 1 - Call hFileOpen ConvertPath (gTesttoolPath + "graphics\required\input\frame1.htm") '/// Load html document ///' + printlog "Load html document" + Call hFileOpen ConvertPath (gTesttoolPath + "graphics\required\input\frame1.htm") sleep 5 autoexecute=false Kontext "DocumentWriter" @@ -297,49 +314,61 @@ testcase tiEditPasteSpecial_HTML autoexecute=true EditSelectAll sleep 3 - EditCopy '/// Copy selection ///' + printlog "Copy selection" + EditCopy Sleep 2 - FileClose '/// Close document ///' + printlog "Close document" + FileClose sleep 3 - Call hNewDocument '/// Create new Impress document ///' + printlog "Create new Impress document" + Call hNewDocument sleep 1 - EditPasteSpecial '/// Edit paste special ///' + printlog "Edit paste special" + EditPasteSpecial sleep 1 Kontext "InhaltEinfuegen" For Zaehler = 1 to Auswahl.GetItemCount Auswahl.select Zaehler printlog Zaehler, ". Selection = ", Auswahl.GetSelText next Zaehler - - if Auswahl.GetItemCount <> 4 then '/// Controlling number of possible formats ///' + + printlog "Controlling number of possible formats" + if Auswahl.GetItemCount <> 4 then warnlog "formats for inserting Html <> 4" else printlog "OK 4 formats for HTML-Document" end if sleep 3 - InhaltEinfuegen.OK '/// Paste clipboard content ///' + printlog "Paste clipboard content" + InhaltEinfuegen.OK sleep 3 try - EditCopy '/// Copy object back into clipboard ///' + printlog "Copy object back into clipboard" + EditCopy catch Warnlog "- Nothing inserted into document" endcatch sleep 3 - Call hCloseDocument '/// Close document ///' + printlog "Close document" + Call hCloseDocument sleep 3 -endcase +endcase 'tiEditPasteSpecial_HTML '------------------------------------------------------------------------------- testcase tdEditPasteSpecial_Text printlog "Insert Text" - call hNewDocument '/// new document ///' - SetClipboard "I am a cool test-text in the Clipboard" '/// put text into clipboard ///' - EditPasteSpecial '/// edit paste special ///' + printlog "new document " + call hNewDocument + printlog "put text into clipboard" + SetClipboard "I am a cool test-text in the Clipboard" + printlog "edit paste special" + EditPasteSpecial sleep 1 Kontext "InhaltEinfuegen" - Auswahl.Select 1 '/// select list entree 1 ///' + printlog "select list entree 1" + Auswahl.Select 1 printlog "Selection = ", Auswahl.GetSelText sleep 1 if Auswahl.GetItemCount <> 1 then @@ -347,53 +376,64 @@ testcase tdEditPasteSpecial_Text else printlog "Format Text OK" end if - InhaltEinfuegen.OK '/// close dialog ///' + printlog "close dialog" + InhaltEinfuegen.OK sleep 1 - - Call hCloseDocument '/// close document ///' -endcase + + printlog "close document" + Call hCloseDocument +endcase 'tdEditPasteSpecial_Text '------------------------------------------------------------------------------- testcase tdEditPasteSpecial_Graphic dim Zaehler as integer - - call hNewDocument '/// ^new document ///' + + printlog "new document " + call hNewDocument printlog "Insert graphic file" - InsertGraphicsFromFile '/// insert graphic (sample.bmp)///' + InsertGraphicsFromFile Kontext "GrafikEinfuegenDlg" - Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp") - Oeffnen.Click + Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp") + Oeffnen.Click sleep 1 - EditSelectAll '/// select graphic ///' - EditCut '/// cut graphic ///' - EditPasteSpecial '/// edit paste special ///' + printlog "select graphic" + EditSelectAll + printlog "cut graphic" + EditCut + printlog "edit paste special" + EditPasteSpecial sleep 1 Kontext "InhaltEinfuegen" - For Zaehler = 1 to Auswahl.GetItemCount '/// get item count for Auswahl ///' + printlog "get item count for Auswahl" + For Zaehler = 1 to Auswahl.GetItemCount Auswahl.select Zaehler printlog Zaehler, ". Selection = ", Auswahl.GetSelText next Zaehler - - if Auswahl.GetItemCount <> 4 then '/// check if item count = 4 ///' + + printlog "check if item count = 4" + if Auswahl.GetItemCount <> 4 then warnlog "Format for insert graphic files should be 4, but is: " + Auswahl.GetItemCount else printlog "There are " + Auswahl.GetItemCount + " formats for graphic files" end if - InhaltEinfuegen.OK '/// insert graphic from clipboard ///' + printlog "insert graphic from clipboard" + InhaltEinfuegen.OK gMouseClick 90,90 sleep 1 - Call hCloseDocument '/// close document ///' -endcase + printlog "close document " + Call hCloseDocument +endcase 'tdEditPasteSpecial_Graphic '------------------------------------------------------------------------------- testcase tdEditPasteSpecial_Circle - dim Zaehler as integer - call hNewDocument '/// new document ///' + dim Zaehler as integer + printlog "new document " + call hNewDocument sleep 5 - printlog "Insert circle" '/// create circle ///' + printlog "Insert circle" Kontext "Toolbar" Ellipsen.Click sleep 3 @@ -401,28 +441,36 @@ testcase tdEditPasteSpecial_Circle sleep 1 hTypeKeys "<escape>" sleep 2 - EditSelectAll '/// select circle ///' + printlog "select circle" + EditSelectAll sleep 5 - EditCut '/// cut circle ///' + printlog "cut circle" + EditCut sleep 1 - EditPasteSpecial '/// edit paste special ///' + printlog "edit paste special" + EditPasteSpecial sleep 1 Kontext "InhaltEinfuegen" - if EinfuegenAls.IsVisible Then EinfuegenAls.Check '/// check "EinfuegenAls" ///' - For Zaehler = 1 to Auswahl.GetItemCount '/// get item count for Auswahl ///' + printlog "check Insert as.." + if EinfuegenAls.IsVisible Then EinfuegenAls.Check + printlog "get item count for Auswahl" + For Zaehler = 1 to Auswahl.GetItemCount Auswahl.select Zaehler printlog Zaehler, ". Selection = ", Auswahl.GetSelText next Zaehler - if Auswahl.GetItemCount <> 4 then '/// check if item count = 4 ///' + printlog "check if item count = 4" + if Auswahl.GetItemCount <> 4 then warnlog "Number of possible formats <> 4" else printlog "There are 4 formats for circle" end if sleep 1 - InhaltEinfuegen.OK '/// paste circle ///' + printlog "paste circle" + InhaltEinfuegen.OK sleep 1 - Call hCloseDocument '/// close document ///' -endcase + printlog "close document " + Call hCloseDocument +endcase 'tdEditPasteSpecial_Circle '------------------------------------------------------------------------------- testcase tiEditPasteSpecial @@ -430,8 +478,8 @@ testcase tiEditPasteSpecial dim i as integer dim x as integer ' warnlog "TODOTBO: from draw, impress, math..." - '/// go into writer, type a text, select all, Edit->Cut, close writer ///' - '/// go into application to test, insert every format you can get from Edit->Paste->Special :-) ///' + printlog "go into writer, type a text, select all, Edit->Cut, close writer" + printlog "go into application to test, insert every format you can get from Edit->Paste->Special :-)" gApplication = "WRITER" call hNewDocument kontext "DocumentWriter" @@ -442,28 +490,29 @@ testcase tiEditPasteSpecial call hNewDocument sleep 1 - Printlog " get count of possibilities: " - EditPasteSpecial - sleep 1 - Kontext "InhaltEinfuegen" - x = Auswahl.GetItemCount - for i = 1 to x - printlog " - " + i + " - " + Auswahl.GetItemText (i) - next i - InhaltEinfuegen.Cancel + Printlog " get count of possibilities: " + EditPasteSpecial + sleep 1 + Kontext "InhaltEinfuegen" + x = Auswahl.GetItemCount + for i = 1 to x + printlog " - " + i + " - " + Auswahl.GetItemText (i) + next i + InhaltEinfuegen.Cancel - Printlog " insert every possibility" - for i = 1 to x - Printlog " - processing number: "+i - EditPasteSpecial - sleep 1 - Kontext "InhaltEinfuegen" - Auswahl.Select i - sleep 1 - InhaltEinfuegen.OK - sleep 1 - next i - Call hCloseDocument '/// close document ///' -endcase + Printlog " insert every possibility" + for i = 1 to x + Printlog " - processing number: "+i + EditPasteSpecial + sleep 1 + Kontext "InhaltEinfuegen" + Auswahl.Select i + sleep 1 + InhaltEinfuegen.OK + sleep 1 + next i + printlog "close document" + Call hCloseDocument +endcase 'tiEditPasteSpecial '------------------------------------------------------------------------------- diff --git a/testautomation/graphics/optional/includes/global/g_clipexport3.inc b/testautomation/graphics/optional/includes/global/g_clipexport3.inc index 63eb77cd6134..d43cbacb02ec 100644 --- a/testautomation/graphics/optional/includes/global/g_clipexport3.inc +++ b/testautomation/graphics/optional/includes/global/g_clipexport3.inc @@ -48,7 +48,7 @@ Sub Get_Position_Size_Attributes - Printlog " Get_Position_Size_Attributes Starts" + Printlog "Get_Position_Size_Attributes Starts" FormatPositionAndSize @@ -63,7 +63,7 @@ Sub Get_Position_Size_Attributes End Select sleep 1 - ' /// Size-values ///' + printlog "Size-values" PositionWidth = Width.GetText PositionHeight = Height.GetText @@ -86,7 +86,7 @@ Sub Get_Position_Size_Attributes sleep 3 Printlog " Get_Position_Size_Attributes Ends" -end sub +end sub 'Get_Position_Size_Attributes '------------------------------------------------------------------------------- sub Get_Colour_Attributes @@ -100,7 +100,7 @@ sub Get_Colour_Attributes Kontext "TabArea" - ' /// Area ///' + printlog "Area" FillOptions.Select 2 if FillOptions.GetSelIndex <> 2 then Errorlog "Couldnt click on 'Color' in FormatArea" AreaColourListValue = ColourList.GetSelText @@ -273,7 +273,7 @@ sub Get_Colour_Attributes TabArea.Cancel printlog " Get_Colour_Attributes ends" -end sub +end sub 'Get_Colour_Attributes '------------------------------------------------------------------------------- sub Check_Position_Size_Attributes @@ -355,7 +355,7 @@ sub Check_Position_Size_Attributes sleep 3 printlog " Check_Position_Size_Attributes Ends" -end sub +end sub 'Check_Position_Size_Attributes '---------------------------------------------------------------------------------------------------- sub Check_Text_Formatting @@ -412,8 +412,10 @@ sub Check_Text_Formatting SetKontextApplication printlog " Check_Text_Formatting Ends" -end suB - '---------------------------------------------------------------------------------------------------- +end sub 'Check_Text_Formatting + +'------------------------------------------------------------------------------- + sub Check_Colors_Borders_Attributes printlog " Check_Colors_Borders_Attributes Starts" @@ -425,7 +427,7 @@ sub Check_Colors_Borders_Attributes Active.setpage TabArea Kontext "TabArea" - ' /// Area ///' + printlog "Area" FillOptions.Select 2 if FillOptions.GetSelIndex <> 2 then Errorlog "Couldnt click on 'Color' in FormatArea" @@ -608,7 +610,7 @@ sub Check_Colors_Borders_Attributes Printlog "End of one application" -end sub +end sub 'Check_Colors_Borders_Attributes '---------------------------------- Set the Kontext to the current Application ----------------------------------' sub SetKontextApplication @@ -633,7 +635,7 @@ sub SetKontextApplication end select sleep 1 -end sub +end sub 'SetKontextApplication '------------------------- Part with "create new windows" --------------------- sub New_Draw @@ -644,7 +646,7 @@ sub New_Draw Call hNewDocument SetKontextApplication -end sub +end sub 'New_Draw '------------------------------------------------------------------------------- sub New_Impress @@ -656,7 +658,7 @@ sub New_Impress Call hNewDocument SetKontextApplication -end sub +end sub 'New_Impress '------------------------------------------------------------------------------- sub New_Calc @@ -668,7 +670,7 @@ sub New_Calc Call hNewDocument SetKontextApplication -end sub +end sub 'New_Calc '------------------------------------------------------------------------------- sub New_Writer @@ -680,7 +682,7 @@ sub New_Writer Call hNewDocument SetKontextApplication -end sub +end sub 'New_Writer '------------------------------------------------------------------------------- testcase Choose_Toapplication @@ -709,6 +711,6 @@ testcase Choose_Toapplication Call hNewDocument SetKontextApplication -endcase +endcase 'Choose_Toapplication '-------------------------------------------------------------------------------------------------------- diff --git a/testautomation/graphics/optional/includes/global/g_crossfading.inc b/testautomation/graphics/optional/includes/global/g_crossfading.inc index 0d7142b9ae46..9f8405c5f5d4 100644 --- a/testautomation/graphics/optional/includes/global/g_crossfading.inc +++ b/testautomation/graphics/optional/includes/global/g_crossfading.inc @@ -43,39 +43,47 @@ testcase tCrossfading dim CounterForX as integer dim anothercounter as integer + printlog "New Impress document" Call hNewDocument - Call sSelectEmptyLayout '/// New Impress document ///' + Call sSelectEmptyLayout gMouseClick 50,50 - sleep 1 - Call hRechteckErstellen ( 5, 5, 20, 30 ) '/// Create rectangle ///' + sleep 1 + printlog "Create rectangle" + Call hRechteckErstellen ( 5, 5, 20, 30 ) gMouseClick 90,90 - Call hRechteckErstellen ( 30, 30, 70, 70 ) '/// create rectangle ///' - sleep 1 - EditSelectAll '/// Select all ///' - sleep 1 - EditCrossFading '/// Choose Edit / CrossFading ///' + printlog "create rectangle" + Call hRechteckErstellen ( 30, 30, 70, 70 ) + sleep 1 + printlog "Select all" + EditSelectAll + sleep 1 + printlog "Choose Edit / CrossFading" + EditCrossFading kontext "Ueberblenden" - X = Schritte.GetText ' /// Get counter-value and save it in X ///' + printlog "Get counter-value and save it in X" + X = Schritte.GetText printlog "Steps before we start the test: " + X printlog "Schritte.GetText= " + Schritte.GetText Schritte.ToMin if Schritte.GetText <> "1" then qaerrorlog "Could not change the step-number to 1." - - for I = 2 to 10 ' /// How many steps do you want? ///' + printlog "How many steps do you want?" + for I = 2 to 10 Schritte.More 1 if Schritte.GetText <> I then qaerrorlog "Could not change the step-number to" + I Ueberblenden.OK sleep 1 try - FormatUngroupDraw '/// open context menu and ungroup objects ///' + printlog "open context menu and ungroup objects" + FormatUngroupDraw catch qaerrorlog "Could not ungroup objects" endcatch sleep 1 - hTypeKeys "<TAB>" '/// Should make the first object active ///' + printlog "Should make the first object active" + hTypeKeys "<TAB>" - '/// Get position and dimensions of elements ///' + printlog "Get position and dimensions of elements" try ContextPositionAndSize catch @@ -88,62 +96,76 @@ testcase tCrossfading if TabPositionAndSize.exists (5) then CounterForX=0 CheckX=0 - FirstX=PositionX.GetText '/// Tet Dimensions of first object ///' + printlog "Tet Dimensions of first object" + FirstX=PositionX.GetText TabPositionAndSize.OK else qaerrorlog "Couldn't switch tab page :-( " endif + printlog "How many objects we have on the screen" + anothercounter = I+2 -anothercounter = I+2 '/// How many objects we have on the screen ///' - - for Y = 1 to anothercounter '/// How many times we should step to (hopefully) get back to the first one ///' + printlog "How many times we should step to (hopefully) get back to the first one" + for Y = 1 to anothercounter if Y > anothercounter then warnlog "Too many steps, something is wrong." try - hTypeKeys "<TAB>" '/// Step to the next object ///' + printlog "Step to the next object" + hTypeKeys "<TAB>" catch errolog "Could not step to the next object" endcatch ' Printlog "- Get position and dimensions of elements" - ContextPositionAndSize '/// Open Position and Size for this object ///' + printlog "Open Position and Size for this object" + ContextPositionAndSize sleep 1 Kontext Active.SetPage TabPositionAndSize Kontext "TabPositionAndSize" - CheckX=PositionX.GetText '/// Get Position X for this object ///' + printlog "Get Position X for this object" + CheckX=PositionX.GetText sleep 1 TabPositionAndSize.OK Kontext "DocumentDraw" - CounterForX=CounterForX+1 '/// Up one on the object-counter ///' - if CheckX=FirstX then '/// Check if Position is the same as the first one ///' + printlog "Up one on the object-counter" + CounterForX=CounterForX+1 + printlog "Check if Position is the same as the first one" + if CheckX=FirstX then if anothercounter = CounterForX then printlog "The first box is at: " + CheckX + " And we're now at " + FirstX + " = Correct steps between the objects, everything's fine." - printlog "We should have " + Y + " objects to go through." '/// Just here for debugging. - FHA -' printlog "anothercounter= " + anothercounter '/// Just here for debugging. - FHA + printlog "We should have " + Y + " objects to go through." printlog "Number of objects: " + anothercounter printlog "" endif - next Y '/// End or go on with the checking-loop ///' - - EditSelectAll '/// Select all ///' - EditDelete '/// Delete all ///' + printlog "End or go on with the checking-loop" + next Y + printlog "Select all" + EditSelectAll + printlog "Delete all" + EditDelete sleep 1 - Call hRechteckErstellen ( 5, 5, 20, 30 ) '/// Create rectangle ///' + printlog "Create rectangle" +Call hRechteckErstellen ( 5, 5, 20, 30 ) gMouseClick 90,90 - Call hRechteckErstellen ( 30, 30, 70, 70 ) '/// Create rectangle ///' + printlog "Create rectangle" + Call hRechteckErstellen ( 30, 30, 70, 70 ) sleep 1 - EditSelectAll '/// Select all ///' + printlog "Select all" + EditSelectAll sleep 1 - EditCrossFading '/// Choose Edit / CrossFading ///' - sleep 2 - kontext "Ueberblenden" + printlog "Choose Edit / CrossFading" + EditCrossFading + sleep 2 + kontext "Ueberblenden" next I - '/// And now we're gonna check if we can separate the object into it's parts ///' - '/// And check if the numbers of steps / objects is correct ///' + printlog "And now we're gonna check if we can separate the object into it's parts" + printlog "And check if the numbers of steps / objects is correct" - Schritte.ToMin '/// Select minimum value for number of steps ///' + printlog "Select minimum value for number of steps" + Schritte.ToMin for Z = 1 to X -1 - Schritte.More '/// Raise the value for number of steps with one ///' + printlog "Raise the value for number of steps with one" + Schritte.More next Z printlog "Value has been restored to: " + Schritte.GetText printlog "X is now: " + X @@ -151,101 +173,149 @@ anothercounter = I+2 '/// How many objects we have on the screen ///' Ueberblenden.OK sleep 1 Kontext "DocumentDraw" - EditSelectAll '/// Select all ///' - EditDelete '/// Delete all ///' + printlog "Select all" + EditSelectAll + printlog "Delete all" + EditDelete sleep 1 - Call hRechteckErstellen ( 5, 5, 20, 30 ) '/// Create rectangle ///' + printlog "Create rectangle" + Call hRechteckErstellen ( 5, 5, 20, 30 ) gMouseClick 90,90 - Call hRechteckErstellen ( 30, 30, 70, 70 ) '/// Create second rectangle ///' - EditSelectAll '/// Select all ///' + printlog "Create second rectangle" + Call hRechteckErstellen ( 30, 30, 70, 70 ) + printlog "Select all" + EditSelectAll sleep 1 - EditCrossFading '/// Choose Edit / CrossFading ///' + printlog "Choose Edit / CrossFading" + EditCrossFading Kontext "Ueberblenden" if Attributierung.IsChecked = TRUE then qaerrorlog "Attributierung / was NOT unchecked." - GleicheOrientierung.UnCheck '/// Uncheck "same orienation" ///' -???? - Ueberblenden.OK '/// Close CrossFading-window with "OK" ///' + printlog "Uncheck same orienation" + GleicheOrientierung.UnCheck + printlog "Close CrossFading-window with OK" + Ueberblenden.OK sleep 1 Kontext "DocumentDraw" - EditSelectAll '/// Select all ///' - EditDelete '/// Delete all ///' + printlog "Select all" + EditSelectAll + printlog "Delete all" + EditDelete sleep 1 - Call hRechteckErstellen ( 5, 5, 20, 30 ) '/// Create rectangle ///' + printlog "Create rectangle" + Call hRechteckErstellen ( 5, 5, 20, 30 ) gMouseClick 90,90 - Call hRechteckErstellen ( 30, 30, 70, 70 ) '/// create rectangle ///' - EditSelectAll '/// Select all ///' + printlog "create rectangle" + Call hRechteckErstellen ( 30, 30, 70, 70 ) + printlog "Select all" + EditSelectAll sleep 1 - EditCrossFading '/// Choose Edit / CrossFading ///' + printlog "Choose Edit / CrossFading" + EditCrossFading Kontext "Ueberblenden" if GleicheOrientierung.IsChecked = TRUE then qaerrorlog "GleicheOrientierung / was NOT unchecked." - Attributierung.Check '/// Check "Attributing" ///' - ??? - Ueberblenden.OK '/// Close CrossFading-window with "OK" ///' + printlog "Check Attributing" + Attributierung.Check + printlog "Close CrossFading-window with OK" + Ueberblenden.OK sleep 1 Kontext "DocumentDraw" - EditSelectAll '/// Select all ///' + printlog "Select all" + EditSelectAll sleep 1 - EditDelete '/// Delete all ///' + printlog "Delete all" + EditDelete sleep 1 - Call hRechteckErstellen ( 5, 5, 20, 30 ) '/// Create rectangle ///' + printlog "Create rectangle" + Call hRechteckErstellen ( 5, 5, 20, 30 ) gMouseClick 90,90 - Call hRechteckErstellen ( 30, 30, 70, 70 ) '/// Create second rectangle ///' - EditSelectAll '/// Select all ///' + printlog "Create second rectangle" + Call hRechteckErstellen ( 30, 30, 70, 70 ) + printlog "Select all" + EditSelectAll sleep 1 - EditCrossFading '/// Choose Edit / CrossFading ///' + printlog "Choose Edit / CrossFading" + EditCrossFading Kontext "Ueberblenden" if Attributierung.IsChecked = FALSE then qaerrorlog "Attributierung / was NOT checked again." - GleicheOrientierung.UnCheck '/// Check "same orientation" ///' -???? + printlog "Check same orientation" + GleicheOrientierung.UnCheck Ueberblenden.OK sleep 1 Kontext "DocumentDraw" - EditSelectAll '/// Select all ///' - EditDelete '/// Delete all ///' + printlog "Select all" + printlog "Delete all" + EditSelectAll + EditDelete sleep 1 - Call hRechteckErstellen ( 5, 5, 20, 30 ) '/// Create rectangle ///' + printlog "Create rectangle" + Call hRechteckErstellen ( 5, 5, 20, 30 ) gMouseClick 90,90 - Call hRechteckErstellen ( 30, 30, 70, 70 ) '/// create rectangle ///' - EditSelectAll '/// Select all ///' + printlog "create rectangle" + Call hRechteckErstellen ( 30, 30, 70, 70 ) + printlog "Select all" + EditSelectAll sleep 1 - EditCrossFading '/// Choose Edit / CrossFading ///' + printlog "Choose Edit / CrossFading" + EditCrossFading Kontext "Ueberblenden" - if GleicheOrientierung.IsChecked = TRUE then qaerrorlog "GleicheOrientierung / was NOT checked again." - GleicheOrientierung.Check '/// Check "same orientation" ///' -???? - Ueberblenden.OK '/// Close CrossFading-window with "OK" ///' + if GleicheOrientierung.IsChecked = TRUE then qaerrorlog "GleicheOrientierung / was NOT checked again." + printlog "Check "same orientation"" -???? + GleicheOrientierung.Check + printlog "Close CrossFading-window with OK" + Ueberblenden.OK sleep 1 Kontext "DocumentDraw" - EditSelectAll '/// Select all ///' - EditDelete '/// Delete all ///' - Call hRechteckErstellen ( 5, 5, 20, 30 ) '/// Create rectangle ///' + printlog "Select all" + EditSelectAll + printlog "Delete all" + EditDelete + printlog "Create rectangle" + Call hRechteckErstellen ( 5, 5, 20, 30 ) gMouseClick 90,90 - Call hRechteckErstellen ( 30, 30, 70, 70 ) '/// create rectangle ///' - EditSelectAll '/// Select all ///' + printlog "create rectangle" + Call hRechteckErstellen ( 30, 30, 70, 70 ) + printlog "Select all" + EditSelectAll sleep 1 - EditCrossFading '/// Choose Edit / CrossFading ///' + printlog "Choose Edit / CrossFading" + EditCrossFading Kontext "Ueberblenden" if GleicheOrientierung.IsChecked = FALSE then qaerrorlog "GleicheOrientierung / was NOT checked again." - GleicheOrientierung.Check '/// Check "same orientation" ///' -???? - Ueberblenden.OK '/// Close CrossFading-window with "OK" ///' + printlog "Check same orientation" + GleicheOrientierung.Check + printlog "Close CrossFading-window with OK" + Ueberblenden.OK sleep 1 - - Kontext "DocumentDraw" '/// EditCrossFading should not be enabled if more than two objects is selected. ///' - EditSelectAll '/// Select all ///' - EditDelete '/// Delete all ///' + + printlog "EditCrossFading should not be enabled if more than two objects is selected." + Kontext "DocumentDraw" + printlog "Select all" + EditSelectAll + printlog "Delete all" + EditDelete sleep 1 - Call hRechteckErstellen ( 5, 5, 20, 30 ) '/// Create rectangle ///' + printlog "Create rectangle" + Call hRechteckErstellen ( 5, 5, 20, 30 ) gMouseClick 90,90 - Call hRechteckErstellen ( 30, 30, 70, 70 ) '/// Create second rectangle ///' + printlog "Create second rectangle" + Call hRechteckErstellen ( 30, 30, 70, 70 ) gMouseClick 90,90 - Call hRechteckErstellen ( 20, 20, 50, 50 ) '/// Create third rectangle ///' + printlog "Create third rectangle" + Call hRechteckErstellen ( 20, 20, 50, 50 ) sleep 1 - EditSelectAll '/// Select all ///' + printlog "Select all" + EditSelectAll sleep 1 try - EditCrossFading '/// Choose Edit / CrossFading ///' + printlog "Choose Edit / CrossFading" + EditCrossFading sleep 2 If active = "Ueberblenden" then qaerrorlog "CrossFading should NOT be selectable since more than two objects is selected." kontext "Ueberblenden" - Ueberblenden.CANCEL '/// Close CrossFading-window with "CANCEL" ///' + printlog "Close CrossFading-window with CANCEL" + Ueberblenden.CANCEL endif sleep 2 Kontext "DocumentDraw" @@ -254,14 +324,17 @@ anothercounter = I+2 '/// How many objects we have on the screen ///' endcatch try - EditSelectAll '/// Select all ///' - EditDelete '/// Delete all ///' + EditSelectAll + EditSelectAll + printlog "Delete all" + EditDelete catch warnlog "Could not select and delete all objects." endcatch printlog "End of test" - Call hCloseDocument '/// Close document ///' + printlog "Close document" + Call hCloseDocument -endcase 'tCrossfading +endcase 'tCrossfading
\ No newline at end of file diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc index ac60d1790275..7883b46e5fdd 100644 --- a/testautomation/graphics/optional/includes/global/g_demoguide.inc +++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc @@ -41,12 +41,10 @@ testcase t_Introduction gApplication = "IMPRESS" - '///Open new presentation printlog "Open new presentation" Call hNewDocument Call sSelectEmptyLayout - '///Open the Gallery printlog "Open the Gallery" ToolsGallery Sleep (1) @@ -55,7 +53,6 @@ testcase t_Introduction ToolsGallery end if - '///Choose computer theme and insert the third image printlog "Choose an item from the gallery" Gallerys.Select(2) View.TypeKeys "<HOME><RIGHT><RIGHT>" @@ -65,7 +62,7 @@ testcase t_Introduction sleep 2 MenuSelect(MenuGetItemID(1)) 'Copy sleep 2 - '///+ - Check that we really got a copy of the object ///' + printlog "Check that we really got a copy of the object " kontext "DocumentImpress" DocumentImpress.OpenContextMenu(true) sleep 2 @@ -95,14 +92,14 @@ testcase t_Introduction endcatch sleep 5 - '///Resize object printlog "Resize object" Kontext "DocumentImpress" gMouseClick (10, 10) sleep 1 EditSelectAll sleep 1 - ContextPositionAndSize '/// Format-position and size + printlog "Format-position and size" + ContextPositionAndSize Kontext Active.SetPage TabPositionAndSize Kontext "TabPositionAndSize" @@ -112,7 +109,6 @@ testcase t_Introduction Width.SetText CStr((CInt(Width.GetText)) * 2) TabPositionAndSize.OK - '///Break object printlog "Break object" Kontext "DocumentImpress" gMouseClick (10, 10) @@ -121,7 +117,6 @@ testcase t_Introduction sleep 1 hOpenContextMenu '(when the object is marked) hMenuSelectNr(13) - '/// Select part of object and make it black printlog "Select part of object and make it black" DocumentImpress.TypeKeys "<SHIFT TAB>" FormatArea @@ -132,14 +127,12 @@ testcase t_Introduction ColourList.Select 1 TabArea.OK - '///Group the objects printlog "Group the object" kontext "DocumentImpress" DocumentImpress.TypeKeys "<MOD1 A>" hOpenContextMenu '(when the object is marked) hMenuSelectNr(12) - '///Add Layout "Title Only" Printlog "Add Layout" kontext "Tasks" if (NOT Tasks.exists) then @@ -147,19 +140,18 @@ testcase t_Introduction ViewTaskPane endif - ' enable all items in the task pane. - ' may be one item is not enabled due to a previous testrun + printlog "enable all items in the task pane" + printlog "may be one item is not enabled due to a previous testrun" dim i as integer for i = 1 to 5 printlog i View.OpenMenu if ( MenuIsItemChecked(MenuGetItemID(i)) ) then - ' do nothing the item is allready displayed + printlog "ok" else MenuSelect(MenuGetItemId(4)) endif hMenuSelectNr(0) - 'sleep(1) next View.OpenMenu @@ -171,10 +163,8 @@ testcase t_Introduction View.OpenMenu MenuSelect(MenuGetItemId(5)) - LayoutsPreview.TypeKeys "<HOME> <DOWN> <DOWN> <RETURN>" sleep (5) - '///Add a background Printlog "Add background" Kontext "Tasks" @@ -194,7 +184,6 @@ testcase t_Introduction Tasks.TypeKeys "<MOD1 HOME>",true AvailableForUsePreview.TypeKeys "<HOME> <RIGHT> <RETURN>" sleep (5) - '///Add a transition effect Printlog "Add a transition effect" Kontext "Tasks" sleep(5) @@ -207,34 +196,35 @@ testcase t_Introduction View.OpenMenu MenuSelect(MenuGetItemID(4)) - TransitionSound.GetItemCount 'needed for select + TransitionSound.GetItemCount Sleep 1 TransitionSound.Select 4 - '///Close the document + printlog "Close the document Printlog "Close the document" Call hCloseDocument endcase 't_Introduction + '-------------------------------------------------------------------- + testcase t_Interoperability Dim sTemplatename as string gApplication = "IMPRESS" - '///Open PowerPoint presentation printlog "Open PowerPoint presentation" hFileOpen (Convertpath (gTesttoolPath + "graphics/required/input/dotNetOverview.ppt")) Call sMakeReadOnlyDocumentEditable - 'Save the name of the origin background (taken from last slide) - Kontext "DocumentImpress" - DocumentImpress.TypeKeys "<END>" - sleep (4) - sTemplatename = DocumentImpress.StatusGetText (6) - printlog " Background = " & sTemplatename 'Debugcode + printlog "Save the name of the origin background (taken from last slide)" + Kontext "DocumentImpress" + DocumentImpress.TypeKeys "<END>" + sleep (4) + sTemplatename = DocumentImpress.StatusGetText (6) + printlog " Background = " & sTemplatename printlog "Choose a masterpage from right pane" @@ -253,7 +243,7 @@ testcase t_Interoperability Kontext "AvailableForUsePreview" AvailableForUsePreview.TypeKeys "<HOME> <RIGHT> <RETURN>" sleep (10) - printlog " Verify that the background has changed" + printlog "Verify that the background has changed" Kontext "DocumentImpress" printlog " Background is " & DocumentImpress.StatusGetText (6) 'Debugcode if DocumentImpress.StatusGetText (6) = sTemplatename then @@ -261,7 +251,6 @@ testcase t_Interoperability else printlog " Background has been changed" endif - '///Switch back to original background printlog "Switch back to original background" Kontext "Tasks" Kontext "AvailableForUsePreview" @@ -273,7 +262,6 @@ testcase t_Interoperability else warnlog "The background is " & DocumentImpress.StatusGetText (6) & " but should be: " & sTemplatename endif - '///Resort slides printlog "Resort slides" Kontext "DocumentImpress" Kontext "Slides" @@ -303,12 +291,11 @@ testcase t_Interoperability if NameField.GetText <> ".NET Enterprise Federation" then Warnlog "Wrong slide found! Expected no 3, but found " + NameField.GetText + "." else - Printlog " The slide was correctly moved" + Printlog "The slide was correctly moved" endif NameDlgPage.OK sleep 1 - '///Switch views printlog "Switch views" ViewWorkspaceOutlineView sleep (2) @@ -319,8 +306,8 @@ testcase t_Interoperability DocumentImpressOutlineView.TypeKeys "<Mod1 C>" sleep (5) if getclipboard() <> ".NET Enterprise" then - warnlog " Wrong selection in outlineview. Should be '.NET Enterprise', but is '" & getclipboard() +"'." - else printlog " Switching to Outlineview was successfull" + warnlog "Wrong selection in outlineview. Should be '.NET Enterprise', but is '" & getclipboard() +"'." + else printlog "Switching to Outlineview was successfull" endif catch warnlog "Switching to Outlineview was not successfull" @@ -335,7 +322,7 @@ testcase t_Interoperability MenuSelect(MenuGetItemID(3)) 'Open Contextmenu Line Kontext "TabLinie" TabLinie.Cancel - printlog " Switching to Notesview was successfull" + printlog "Switching to Notesview was successfull" catch warnlog "Switching to Notesview was not successfull" endcatch @@ -344,7 +331,7 @@ testcase t_Interoperability try Kontext "DocumentImpressHandoutView" DocumentImpressHandoutView.TypeKeys "<TAB>" - printlog " Switching to Handoutview was successfull" + printlog "Switching to Handoutview was successfull" catch warnlog "Switching to Handoutview was not successfull" endcatch @@ -354,7 +341,7 @@ testcase t_Interoperability try Kontext "Slides" SlidesControl.TypeKeys "<TAB>" - printlog " Switching to Slideview was successfull" + printlog "Switching to Slideview was successfull" catch warnlog "Switching to Slideview was not successfull" endcatch @@ -364,12 +351,11 @@ testcase t_Interoperability try Kontext "DocumentImpress" DocumentImpress.TypeKeys "<TAB>" - printlog " Switching back to Drawingview was successfull" + printlog "Switching back to Drawingview was successfull" catch warnlog "Switching to Drawingview was not successfull" endcatch - '///Travel through the presentation by left pane printlog "Travel through the presentation by left pane to slide 7" Kontext "DocumentImpress" DocumentImpress.TypeKeys "<HOME><PAGEDOWN><PAGEDOWN><PAGEDOWN><PAGEDOWN><PAGEDOWN><PAGEDOWN><PAGEDOWN>" @@ -420,18 +406,16 @@ testcase t_DrawingEngine gApplication = "DRAW" - '///Open a drawing printlog "Open a drawing" hFileOpen (Convertpath (gTesttoolPath + "graphics/required/input/Blueprint.odg")) Call fMakeDocumentWritable - '///Select grouped object and enter group printlog "Select group" Kontext "DocumentDraw" DocumentDraw.TypeKeys "<TAB><TAB>" sleep (5) - printlog " Save position of group" + printlog "Save position of group" ContextPositionAndSize 'Format-position and size Kontext Active.SetPage TabPositionAndSize @@ -444,7 +428,6 @@ testcase t_DrawingEngine FormatEditGroupDraw sleep 1 - '///Select and move single object printlog "Select and move single object" printlog " Select object" Kontext "DocumentDraw" @@ -456,48 +439,46 @@ testcase t_DrawingEngine kontext "NameDlgObject" if NameField.GetText <> "Chair" then Warnlog "Wrong object selected!" - else Printlog " The correct object is selected" + else Printlog "The correct object is selected" endif NameDlgObject.OK sleep 1 - printlog " Save position of group" - ContextPositionAndSize 'Format-position and size + printlog "Save position of group" + ContextPositionAndSize Kontext Active.SetPage TabPositionAndSize Kontext "TabPositionAndSize" sObjectPosition = PositionY.GetText - printlog " - ObjectPosition is " & sObjectPosition + printlog "ObjectPosition is " & sObjectPosition TabPositionAndSize.OK - printlog " Move object" + printlog "Move object" Kontext "DocumentDraw" DocumentDraw.TypeKeys "<UP><UP><UP>" sleep (5) - printlog " Verify that the object was moved" - ContextPositionAndSize '/// Format-position and size + printlog "Verify that the object was moved" + ContextPositionAndSize Kontext Active.SetPage TabPositionAndSize Kontext "TabPositionAndSize" if PositionY.GetText <> sObjectPosition then - printlog " Single object was moved" + printlog "Single object was moved" else warnlog "The object has not been moved" endif TabPositionAndSize.OK - printlog " Exit group" + printlog "Exit group" FormatExitGroupDraw Printlog "Verify that the group is still on position" - printlog " Verify position" ContextPositionAndSize 'Format-position and size Kontext Active.SetPage TabPositionAndSize Kontext "TabPositionAndSize" if PositionY.GetText = sGroupPosition then - printlog " Group is still on position" + printlog "Group is still on position" else warnlog "Group has moved from " & sGroupPosition & " to " & PositionY.GetText endif TabPositionAndSize.OK - '///Close document printlog "Close document" Call hCloseDocument -endcase 't_DrawingEngine +endcase 't_DrawingEngine
\ No newline at end of file diff --git a/testautomation/graphics/optional/includes/global/g_edit.inc b/testautomation/graphics/optional/includes/global/g_edit.inc index fdff948d0bfb..9840fe58df96 100644 --- a/testautomation/graphics/optional/includes/global/g_edit.inc +++ b/testautomation/graphics/optional/includes/global/g_edit.inc @@ -43,32 +43,42 @@ ' Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp") testcase tEditDuplicate - dim Ueber_Text_1 - dim Zaehler - Call hNewDocument '/// New Impress document ///' - Call hRechteckErstellen ( 5, 5, 20, 30 ) '/// Create rectangle ///' - EditSelectAll '/// Select rectangle ///' - EditDuplicate '/// Edit-duplicate ///' - Kontext "Duplizieren" - Ueber_Text_1 = AnzahlAnKopien.GetText - AnzahlAnKopien.SetText "50" '/// Set number of copies to 50 ///' - Duplizieren.Cancel '/// Cancel Edit Duplicate ///' - sleep 1 - For Zaehler = 1 to 8 - EditDuplicate '/// Edit Duplicate ///' - sleep 1 - Kontext "Duplizieren" - AnzahlAnKopien.SetText "30" '/// Number of copies = 30 ///' + dim Ueber_Text_1 + dim Zaehler - Select Case Zaehler '/// Setting values for axis and angles ///' - Case 1: XAchse.SetText "0,0" + printlog " New Impress document" + Call hNewDocument + printlog " Create rectangle" + Call hRechteckErstellen ( 5, 5, 20, 30 ) + printlog " Select rectangle" + EditSelectAll + printlog " Edit-duplicate" + EditDuplicate + Kontext "Duplizieren" + Ueber_Text_1 = AnzahlAnKopien.GetText + printlog " Set number of copies to 50" + AnzahlAnKopien.SetText "50" + printlog " Cancel Edit Duplicate" + Duplizieren.Cancel + sleep 1 + For Zaehler = 1 to 8 + printlog " Edit Duplicate" + EditDuplicate + sleep 1 + Kontext "Duplizieren" + printlog " Number of copies = 30" + AnzahlAnKopien.SetText "30" + + Select Case Zaehler + printlog " Setting values for axis and angles" + Case 1: XAchse.SetText "0,0" YAchse.SetText "0,45" Hoehe.SetText "-0,1" Breite.SetText "-0,1" Drehwinkel.SetText "3" Anfang.Select Int((Anfang.GetItemCount * Rnd)+1) - Case 2,6: XAchse.SetText "0,6" + Case 2,6: XAchse.SetText "0,6" YAchse.SetText "0,0" Hoehe.SetText "0,15" Breite.SetText "0,01" @@ -78,26 +88,28 @@ testcase tEditDuplicate Hoehe.SetText "-0,1" Breite.SetText "0,06" Drehwinkel.SetText "11" - Case 4,8: XAchse.SetText "-0,6" + Case 4,8: XAchse.SetText "-0,6" YAchse.SetText "0,0" Hoehe.SetText "0,05" Breite.SetText "-0,08" Drehwinkel.SetText "347" - Case 5: XAchse.SetText "0,1" + Case 5: XAchse.SetText "0,1" YAchse.SetText "0,48" Hoehe.SetText "-0,05" Breite.SetText "-0,05" Drehwinkel.SetText "355" - End Select - Ende.Select Int((Ende.GetItemCount * Rnd)+1) - Duplizieren.OK '/// Execute Duplicate ///' - sleep 1 - Next Zaehler - sleep 2 - Call hCloseDocument '/// Close document ///' + End Select + Ende.Select Int((Ende.GetItemCount * Rnd)+1) + printlog " Execute Duplicate" + Duplizieren.OK + sleep 1 + Next Zaehler + sleep 2 + printlog " Close document" + Call hCloseDocument endcase 'tEditDuplicate -'--------------------------------------------------------- +'------------------------------------------------------------------------------- testcase tEditFields Call hNewDocument @@ -148,68 +160,85 @@ endcase 'tEditFields '-------------------------------------------------------- testcase tEditDeleteSlide - dim Ueber_Text_1 as string - dim Ueber_Text_2 as string - dim Ueber_Text_3 as string - Call hNewDocument '/// New impress document ///' - sleep 3 - Call hRechteckErstellen ( 30, 30, 70, 70 ) '/// create rectangle ///' - sleep 1 - ContextPositionAndSize '/// open Position and Size dialog ///' - kontext - Messagebox.SetPage TabPositionAndSize - kontext "TabPositionAndSize" - Ueber_Text_1 = PositionX.GetText '/// get position values for rectangle ///' - TabPositionAndSize.OK - InsertSlide '/// insert slide ///' - sleep 2 - hTypekeys "<Pagedown>" - sleep 2 - Call hRechteckErstellen ( 40, 40, 60, 60 ) '/// create rectangle ///' - sleep 1 - EditDeleteSlide '/// Delete slide ///' - sleep 1 - Ueber_Text_2 = "OK Page was closed" - Ueber_Text_3 = "Page was not closed" - call Position_Vergleichen (Ueber_Text_1,Ueber_Text_2,Ueber_Text_3) '/// compare position of rectange ///' - sleep 1 - Call hCloseDocument '/// close document ///' + dim Ueber_Text_1 as string + dim Ueber_Text_2 as string + dim Ueber_Text_3 as string + + printlog " New impress document" + Call hNewDocument + sleep 3 + printlog " create rectangle" + Call hRechteckErstellen ( 30, 30, 70, 70 ) + sleep 1 + printlog " open Position and Size dialog" + ContextPositionAndSize + kontext + Messagebox.SetPage TabPositionAndSize + kontext "TabPositionAndSize" + printlog " get position values for rectangle" + Ueber_Text_1 = PositionX.GetText + TabPositionAndSize.OK + printlog " insert slide" + InsertSlide + sleep 2 + hTypekeys "<Pagedown>" + sleep 2 + printlog " create rectangle" + Call hRechteckErstellen ( 40, 40, 60, 60 ) + sleep 1 + printlog " Delete slide" + EditDeleteSlide + sleep 1 + Ueber_Text_2 = "OK Page was closed" + Ueber_Text_3 = "Page was not closed" + printlog " compare position of rectange" + call Position_Vergleichen (Ueber_Text_1,Ueber_Text_2,Ueber_Text_3) + sleep 1 + printlog " close document" + Call hCloseDocument endcase 'tEditDeleteSlide '-------------------------------------------------------- testcase tEditLinks - Call hNewDocument '/// New document ///' - InsertGraphicsFromFile '/// insert graphic (sample.bmp) ///' - Kontext "GrafikEinfuegenDlg" - Link.Check '/// check link ///' - Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp") - Oeffnen.Click - sleep 3 - EditLinksDraw '/// edit links ///' - Kontext "VerknuepfungenBearbeiten" - Aktualisieren.Click '/// refresh ///' - sleep 1 - 'Aendern 'kann man noch den Dialog aufrufen... - Loesen.Click - sleep 1 - Kontext - Messagebox.Yes - VerknuepfungenBearbeiten.Close '/// close dialog ///' - sleep 1 - try - EditLinksDraw '/// check if last changes remain in the dialog ///' + printlog " New document" + Call hNewDocument + printlog " insert graphic (sample.bmp)" + InsertGraphicsFromFile + Kontext "GrafikEinfuegenDlg" + printlog " check link" + Link.Check + Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp") + Oeffnen.Click + sleep 3 + printlog " edit links" + EditLinksDraw Kontext "VerknuepfungenBearbeiten" + printlog " refresh" + Aktualisieren.Click + sleep 1 Loesen.Click sleep 1 Kontext Messagebox.Yes + printlog " close dialog" VerknuepfungenBearbeiten.Close - warnlog "Break link does not work" + sleep 1 + try + printlog " check if last changes remain in the dialog" + EditLinksDraw + Kontext "VerknuepfungenBearbeiten" + Loesen.Click + sleep 1 + Kontext + Messagebox.Yes + VerknuepfungenBearbeiten.Close + warnlog "Break link does not work" catch - printlog "OK Link broken" + printlog "OK Link broken" endcatch - Call hCloseDocument '/// close document ///' + printlog " close document" + Call hCloseDocument endcase 'tEditLinks '--------------------------------------------------------- @@ -218,77 +247,86 @@ testcase tdEditDeleteLayer dim Ueber_Text_1 as string dim Ueber_Text_2 as string dim Ueber_Text_3 as string - Call hNewDocument '/// new document ///' - sleep 2 - Call hRechteckErstellen ( 30, 30, 70, 70 ) '/// create rectangle ///' - sleep 1 -'/// View->Layer ///' - ViewLayer - ContextPositionAndSize '/// get position values for rectangle ///' - kontext - active.SetPage TabPositionAndSize - kontext "TabPositionAndSize" - Ueber_Text_1 = PositionX.GetText - TabPositionAndSize.OK - InsertLayer '/// insert layer ///' - Kontext "EbeneEinfuegenDlg" - EbeneEinfuegenDlg.OK - Call hRechteckErstellen ( 10, 40, 90, 60 ) '/// create rectangle on created layer ///' - sleep 1 - EditDeleteLayer '/// delete layer ///' - sleep 1 - Kontext - Active.Yes - sleep 1 - Ueber_Text_2 = "OK Layer was deleted" '/// compare position of selected rectangle with position of created rectangle in deteted layer ///' - Ueber_Text_3 = "Layer was not deleted" - Call Position_Vergleichen (Ueber_Text_1,Ueber_Text_2,Ueber_Text_3) - sleep 1 - Call hCloseDocument '/// close document ///' + + printlog " new document" + Call hNewDocument + sleep 2 + printlog " create rectangle" + Call hRechteckErstellen ( 30, 30, 70, 70 ) + sleep 1 + printlog " View->Layer" + ViewLayer + printlog " get position values for rectangle" + ContextPositionAndSize + kontext + active.SetPage TabPositionAndSize + kontext "TabPositionAndSize" + Ueber_Text_1 = PositionX.GetText + TabPositionAndSize.OK + printlog " insert layer" + InsertLayer + Kontext "EbeneEinfuegenDlg" + EbeneEinfuegenDlg.OK + printlog " create rectangle on created layer" + Call hRechteckErstellen ( 10, 40, 90, 60 ) + sleep 1 + printlog " delete layer" + EditDeleteLayer + sleep 1 + Kontext + Active.Yes + sleep 1 + Ueber_Text_2 = "OK Layer was deleted" + Ueber_Text_3 = "Layer was not deleted" + printlog " compare position of selected rectangle with position of created rectangle in deteted layer" + Call Position_Vergleichen (Ueber_Text_1,Ueber_Text_2,Ueber_Text_3) + sleep 1 + printlog " close document" + Call hCloseDocument endcase 'tdEditDeleteLayer '-------------------------------------------------------- testcase tEditObjectEdit - Dim Schrieb as string + Dim Schrieb as string - Schrieb = gOLEWriter - if Schrieb = "" then - warnlog " the OLE is not defined :-((( gOLEWriter: " + iSprache - else - - Call hNewDocument - call sSelectEmptyLayout - sleep 1 '/// new document ///' - InsertObjectOLEObject '/// insert writer ole object ///' - Kontext "OLEObjektEinfuegen" - sleep 3 - if ObjektTyp.GetItemCount = 0 Then - Warnlog "- No available Ole-entry in the list, maybe an error in the Install.ini?" - sleep 1 - OleObjektEinfuegen.Cancel - sleep 1 - else + Schrieb = gOLEWriter + if Schrieb = "" then + warnlog " the OLE is not defined :-((( gOLEWriter: " + iSprache + else - ObjektTyp.Select Schrieb - sleep 1 - OLEObjektEinfuegen.OK - sleep 3 ' Changed from Sleep 1 to Sleep 3 - gMouseMove 10,10,90,90 - sleep 1 - EditSelectAll + Call hNewDocument + call sSelectEmptyLayout + sleep 1 printlog " new document" + InsertObjectOLEObject printlog " insert writer ole object" + Kontext "OLEObjektEinfuegen" + sleep 3 + if ObjektTyp.GetItemCount = 0 Then + Warnlog "- No available Ole-entry in the list, maybe an error in the Install.ini?" + sleep 1 + OleObjektEinfuegen.Cancel + sleep 1 + else + ObjektTyp.Select Schrieb + sleep 1 + OLEObjektEinfuegen.OK + sleep 3 + gMouseMove 10,10,90,90 + sleep 1 + EditSelectAll - try - EditObjectEdit 'keine ID '/// try edit-objects ///' - sleep 2 - catch - Warnlog "- The EditObjectEdit did not work" - endcatch + try + EditObjectEdit + sleep 2 + catch + Warnlog "- The EditObjectEdit did not work" + endcatch - gMouseClick 90,90 + gMouseClick 90,90 end if - sleep 1 - Call hCloseDocument '/// close document ///' - endif -endcase 'tEditObjectEdit + sleep 1 + printlog " close document" + Call hCloseDocument + endif +endcase 'tEditObjectEdit
\ No newline at end of file diff --git a/testautomation/graphics/optional/includes/global/g_find_replace.inc b/testautomation/graphics/optional/includes/global/g_find_replace.inc index 4f6a045578e0..a8af431fcaae 100644 --- a/testautomation/graphics/optional/includes/global/g_find_replace.inc +++ b/testautomation/graphics/optional/includes/global/g_find_replace.inc @@ -36,19 +36,19 @@ '* '\********************************************************************************** testcase tiEditSearchAndReplace - '/// This test tests the 'Search and Replace' -dialogue. ///' - Dim sFile 'as string - Dim sExpression(2) as string ' Expression to look for: ... Replace with - dim sExt as string + printlog "This test tests the 'Search and Replace' -dialogue." + Dim sFile 'as string + Dim sExpression(2) as string ' Expression to look for: ... Replace with + dim sExt as string - Select Case Ucase(gApplication) - case "DRAW" : sExt = ".odg" - case "IMPRESS" : sExt = ".odp" - end select + Select Case Ucase(gApplication) + case "DRAW" : sExt = ".odg" + case "IMPRESS" : sExt = ".odp" + end select - 'First we need some errornes words to replace. (sExpression) - 'sExpression(1) has to be 3 times in the document - select case iSprache + printlog "First we need some errornes words to replace. (sExpression) + printlog "sExpression(1) has to be 3 times in the document" + select case iSprache case 01 : sExpression(1) = "Alle" : sExpression(2) = "Allz" case 03 : sExpression(1) = "empreza" : sExpression(2) = "Emperor" ' Portuguese case 07 : qaerrorlog "No files for Russian yet, will use english instead." @@ -91,9 +91,9 @@ testcase tiEditSearchAndReplace else Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_"+iSprache+sExt) endif - ' check if the document is writable + printlog "check if the document is writable" if fIsDocumentWritable = false then - ' make the document writable and check if it's succesfull + printlog "make the document writable and check if it's succesfull" if fMakeDocumentWritable = false then warnlog "The document can't be make writeable. Test stopped." goto endsub @@ -108,24 +108,28 @@ testcase tiEditSearchAndReplace Messagebox.OK end if sleep 2 - hTypeKeys "<MOD1 HOME>" '/// Select the text ///' + printlog "Select the text" + hTypeKeys "<MOD1 HOME>" - '/// Edit-Find & Replace I///' + printlog "Edit-Find & Replace" EditSearchAndReplace sleep 1 Kontext "FindAndReplace" - '/// Clap the 'more options'-part open ///' + printlog "Clap the 'more options'-part open" More.Click - '/// verify, that search is done without 'similarity search' !!! ///' + printlog "verify, that search is done without 'similarity search' !!!" if SimilaritySearch.IsChecked = TRUE then SimilaritySearch.UnCheck warnlog "'Similar search' checkbox was enabled! It shouldn't be the default!" end if - SearchFor.SetText sExpression(1) '/// set Search text ///' - ReplaceWith.SetText sExpression(2) '/// set Replace text///' + printlog "set Search text" + SearchFor.SetText sExpression(1) + printlog "set Replace text" + ReplaceWith.SetText sExpression(2) - '/// Word has to be there ONLY three times ///' - SearchNow.Click '/// 1st search for text ///' + printlog "Word has to be there ONLY three times" + printlog "1st search for text" + SearchNow.Click Kontext "Messagebox" if Messagebox.Exists(2) then Printlog Messagebox.GetText @@ -134,7 +138,8 @@ testcase tiEditSearchAndReplace sleep 1 Kontext "FindAndReplace" - SearchNow.Click '/// 2nd search for text ///' + printlog "2nd search for text" + SearchNow.Click Kontext "Messagebox" if Messagebox.Exists(2) then Printlog Messagebox.GetText @@ -143,7 +148,8 @@ testcase tiEditSearchAndReplace sleep 1 Kontext "FindAndReplace" - SearchNow.Click '/// 3th search for text///' + printlog "3th search for text" + SearchNow.Click Kontext "Messagebox" if Messagebox.Exists(2) then Printlog Messagebox.GetText @@ -151,15 +157,16 @@ testcase tiEditSearchAndReplace end if sleep 1 Kontext "FindAndReplace" - - SearchNow.Click '/// 4th search for text; but it is no more available!///' + printlog "4th search for text; but it is no more available!" + SearchNow.Click sleep 2 kontext "Messagebox" if Messagebox.Exists Then Printlog "- The word was found 3 times: '" + messagebox.gettext + "'" Messagebox.OK else - SearchNow.Click '/// 5th search for word 1///' + printlog "5th search for word 1" + SearchNow.Click kontext if Messagebox.Exists (5) Then Printlog "?: "+Messagebox.gettext @@ -169,7 +176,7 @@ testcase tiEditSearchAndReplace Warnlog "- No MsgBox appeared: 'changed'" end if - '/// Replace all ///' + printlog "Replace all" Kontext "FindAndReplace" sleep 1 ReplaceAll.Click @@ -183,7 +190,8 @@ testcase tiEditSearchAndReplace end if Kontext "FindAndReplace" sleep 2 - SearchNow.Click '/// Search for word 1 to check if all words are replaced ///' + printlog "Search for word 1 to check if all words are replaced" + SearchNow.Click Kontext "Messagebox" if Not Messagebox.Exists then Warnlog " Not all words are replaced (Replace All)" @@ -195,17 +203,20 @@ testcase tiEditSearchAndReplace FindAndReplace.Close sleep 3 - '/// Edit-Find & Replace II ///' + printlog "Edit-Find & Replace II" gMouseClick 50,50 sleep 1 hTypeKeys "<MOD1 HOME>" EditSearchAndReplace sleep 1 Kontext "FindAndReplace" - SearchFor.SetText sExpression(2) '/// Search for word 2 ///' - ReplaceWith.SetText sExpression(1) '/// Replace with word 1 ///' + printlog "Search for word 2" + SearchFor.SetText sExpression(2) + printlog "Replace with word 1" + ReplaceWith.SetText sExpression(1) - ReplaceBtn.Click '/// Replace 1 ///' + printlog "Replace 1" + ReplaceBtn.Click Kontext "Messagebox" if Messagebox.Exists(4) Then Kontext "Messagebox" @@ -217,7 +228,8 @@ testcase tiEditSearchAndReplace Kontext "FindAndReplace" sleep 1 - SearchNow.Click '/// 2nd search for word 2 ///' + printlog "2nd search for word 2" + SearchNow.Click Kontext "Messagebox" if Messagebox.Exists(2) Then Warnlog " All words got replaced, but only the 1st should have been" @@ -228,7 +240,7 @@ testcase tiEditSearchAndReplace Printlog " Word replaced" end if - '/// Replace all ///' + printlog "Replace all" Kontext "FindAndReplace" ReplaceAll.Click kontext "Messagebox" @@ -238,7 +250,7 @@ testcase tiEditSearchAndReplace Printlog "- No messagebox after replace all" end if - '/// Search for word 2 to check if all are replaced ///' + printlog "Search for word 2 to check if all are replaced" Kontext "FindAndReplace" SearchNow.Click kontext "Messagebox" @@ -253,21 +265,23 @@ testcase tiEditSearchAndReplace More.Click FindAndReplace.Close sleep 2 - '/// Close document ///' + printlog "Close document" Call hCloseDocument endcase 'tiEditSearchAndReplace + '-------------------------------------------------------- + testcase tiEditSearchAndReplaceBUGS -'/// inspired by bugs: 101974, 101975, 101976 ///' +printlog "inspired by bugs: 101974, 101975, 101976" dim i as integer dim bTemp as boolean - '/// open application ///' + printlog "open application" Call hNewDocument sleep 3 - '/// Edit->Search and Replace ///' + printlog "Edit->Search and Replace" EditSearchAndReplace Kontext "FindAndReplace" if FindAndReplace.Exists (5) then @@ -276,7 +290,7 @@ testcase tiEditSearchAndReplaceBUGS Warnlog "Dialog for Search&Replace could NOT be opened :-(" endif - '/// for al 5 views in 'View->Workspace->...' do: ///' + printlog "for al 5 views in 'View->Workspace->...' do: " for i = 1 to 6 Printlog "- " + i + " View->Workspace->... ------------------------------------------------------" try @@ -315,7 +329,7 @@ testcase tiEditSearchAndReplaceBUGS endcatch sleep 5 Kontext "FindAndReplace" - '///+ if not already open, open. edit->search and replace ///' + printlog "if not already open, open. edit->search and replace" if (FindAndReplace.exists <> TRUE) then try EditSearchAndReplace @@ -330,13 +344,13 @@ testcase tiEditSearchAndReplaceBUGS endif else Kontext "FindAndReplace" - '///+ set text to look for to "a" ///' + printlog "set text to look for to a" SearchFor.SetText "a" - Printlog "'///+ click button 'find' ///'" + Printlog " click button 'find'" SearchNow.Click sleep 5 kontext - '///+ if active exists 'wrap/not found...' say OK ///' + printlog "if active exists 'wrap/not found...' say OK" if active.exists(5) then Printlog "Active: '" + active.GetText + "'" try @@ -357,7 +371,7 @@ testcase tiEditSearchAndReplaceBUGS next i Kontext "FindAndReplace" FindAndReplace.cancel - '/// close application ///' + printlog "close application" Call hCloseDocument endcase 'tiEditSearchAndReplaceBUGS diff --git a/testautomation/graphics/optional/includes/global/g_group.inc b/testautomation/graphics/optional/includes/global/g_group.inc index a11b809355ce..7784303e207a 100644 --- a/testautomation/graphics/optional/includes/global/g_group.inc +++ b/testautomation/graphics/optional/includes/global/g_group.inc @@ -34,74 +34,87 @@ '\******************************************************************** testcase tiGruppierung - Dim PosX 'Variable fuer PositionX + Dim PosX 'Variable for PositionX + printlog "new document" Call hNewDocument - Call sSelectEmptyLayout '/// new document ///' - sleep 3 - Kontext "DocumentImpress" - sleep 2 - hRechteckErstellen (20,20,40,40) '/// create rectangle ///' - sleep 1 - hRechteckErstellen (60,60,70,10) '/// create 2nd rectangle ///' - sleep 1 - hRechteckErstellen (50,90,70,40) '/// create 3rd rectangle ///' - sleep 1 + printlog "Select empty layout" + Call sSelectEmptyLayout + sleep 3 + Kontext "DocumentImpress" + sleep 2 + printlog "create rectangle " + hRechteckErstellen (20,20,40,40) + sleep 1 + printlog "create 2nd rectangle" + hRechteckErstellen (60,60,70,10) + sleep 1 + printlog "create 3rd rectangle" + hRechteckErstellen (50,90,70,40) + sleep 1 Printlog "- Created 3 rectangles for group testing" - gMouseClick (50,50) '/// Put the mouse-marker in the middle of the screen ///' - EditSelectAll '/// select all rectangles ///' - if (gApplication = "DRAW") then - hOpenContextMenu + printlog "Put the mouse-marker in the middle of the screen" + gMouseClick (50,50) + printlog "select all rectangles" + EditSelectAll + if (gApplication = "DRAW") then + hOpenContextMenu sleep(2) - hMenuSelectNr(12) ' Select "Group" + printlog "Select Group" + hMenuSelectNr(12) sleep(2) - else - FormatGroupDraw '/// open context menue and group rectangles ///' - endif - sleep 1 + else + printlog "open context menue and group rectangles" + FormatGroupDraw + endif + sleep 1 Printlog "- Get position and dimensions of elements" - ContextPositionAndSize '/// get dimensions of group ///' - sleep 1 - Kontext - Active.SetPage TabPositionAndSize - Kontext "TabPositionAndSize" - sleep 1 - PosX=PositionX.GetText - TabPositionAndSize.OK - sleep 1 - Kontext "DocumentImpress" - gMouseClick 35,35 - sleep 1 - hTypeKeys "<F3>" '/// entering group using key "F3" ///' - sleep 3 - try - EditCut '/// cut rectangle out of document ///' - sleep 1 - Warnlog "- Entering the group, no object within the group should have been selected" - catch - Printlog "- entered group, nothing selected" - endcatch - gMouseClick (35,35) - gMouseMove (30,30,60,60) - sleep 1 - Printlog "- Exit group" -' DocumentImpress.OpenContextMenu '/// leave group, compare dimensions ///' -' sleep 1 -' hMenuSelectNr (13) - hTypeKeys "<mod1 F3>" '/// exit group using key "strg F3" ///' - ' would be better to call the slot TBO! - ContextPositionAndSize - sleep 1 - Kontext - Active.SetPage TabPositionAndSize - Kontext "TabPositionAndSize" - sleep 1 - if PosX = PositionX.GetText then - Warnlog "- No change in position for X axis, even we changed position of 1 object within the group" - TabPositionAndSize.OK - else - Printlog "- Moving within the group works" - TabPositionAndSize.OK - end if - Call hCloseDocument '/// close document ///' -endcase + ContextPositionAndSize + sleep 1 + Kontext + Active.SetPage TabPositionAndSize + Kontext "TabPositionAndSize" + sleep 1 + PosX=PositionX.GetText + TabPositionAndSize.OK + sleep 1 + Kontext "DocumentImpress" + gMouseClick 35,35 + sleep 1 + printlog "entering group using key F3" + hTypeKeys "<F3>" + sleep 3 + try + printlog "cut rectangle out of document" + EditCut + sleep 1 + Warnlog "- Entering the group, no object within the group should have been selected" + catch + Printlog "- entered group, nothing selected" + endcatch + gMouseClick (35,35) + gMouseMove (30,30,60,60) + sleep 1 + printlog "leave group, compare dimensions" + ' DocumentImpress.OpenContextMenu + ' sleep 1 + ' hMenuSelectNr (13) + printlog "exit group using key strg F3" + hTypeKeys "<mod1 F3>" + ' would be better to call the slot TBO! + ContextPositionAndSize + sleep 1 + Kontext + Active.SetPage TabPositionAndSize + Kontext "TabPositionAndSize" + sleep 1 + if PosX = PositionX.GetText then + Warnlog "- No change in position for X axis, even we changed position of 1 object within the group" + TabPositionAndSize.OK + else + Printlog "- Moving within the group works" + TabPositionAndSize.OK + end if + printlog "close document " + Call hCloseDocument +endcase
\ No newline at end of file diff --git a/testautomation/graphics/optional/includes/global/g_imagemap.inc b/testautomation/graphics/optional/includes/global/g_imagemap.inc index de53fdb6f647..5f37ec445515 100644 --- a/testautomation/graphics/optional/includes/global/g_imagemap.inc +++ b/testautomation/graphics/optional/includes/global/g_imagemap.inc @@ -35,12 +35,15 @@ '\************************************************************************************* testcase tEditImageMap - Call hNewDocument '/// new document ///' - EditImageMap '/// edit image map ///' + printlog "new document" + Call hNewDocument + printlog "edit image map" + EditImageMap Kontext "ImageMapEditor" sleep 1 - if ImageMapEditor.Exists (2) then '/// test dialog controls ///' + if ImageMapEditor.Exists (2) then printlog "ImageMap editor exists" + printlog "test dialog controls" DialogTest ( ImageMapEditor ) try ImageMapEditor.Close @@ -60,52 +63,59 @@ testcase tEditImageMap Printlog "ImageMap closed using the edit-menu entry" endcatch end if - Call hCloseDocument '/// close document ///' + printlog "close document" + Call hCloseDocument endcase 'tEditImageMap -'------------------------------------------------------------------------------------------------------------------------------------ + +'------------------------------------------------------------------------------- + testcase tEditImageMapProperties qaerrorlog "test not yet ready." goto endsub - Call hNewDocument '/// new document ///' - InsertGraphicsFromFile '/// Insert a graphic and select it ///' + printlog "new document" + Call hNewDocument + printlog "Insert a graphic and select it" + InsertGraphicsFromFile sleep (1) Kontext "GrafikEinfuegenDlg" - sleep (2) - Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\SaveAsPicture\SaveAsPicture.pcx") - sleep (2) - Oeffnen.Click - sleep (2) - EditImageMap '/// Open the image map dialog ///' - Kontext "ImageMapEditor" - sleep (1) - if ImageMapEditor.Exists (2) then '/// test dialog controls ///' - printlog "ImageMap editor exists" - else - warnlog "Something is wrong, the Imagemap didn't show up." - end if - - Ellipse.Click '/// Insert an 'image map' object ///' - Dokument.MouseDown 50,50 - Dokument.MouseMove 50,50,10,10 - Dokument.MouseUp 10,10 - - Eigenschaften.Click '/// Click on the properties icon to open up the properties for the Object ///' - kontext "ImageMapHyperlink" - sleep (1) - if ImageMapHyperlink.Exists (2) then - printlog "ImageMapHyperlink (properties) editor exists" - else - warnlog "Something is wrong, the ImageMapHyperlink (properties) didn't show up." - end if + sleep (2) + Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\SaveAsPicture\SaveAsPicture.pcx") + sleep (2) + Oeffnen.Click + sleep (2) + printlog "Open the image map dialog" + EditImageMap + Kontext "ImageMapEditor" + sleep (1) + if ImageMapEditor.Exists (2) then + printlog "ImageMap editor exists" + else + warnlog "Something is wrong, the Imagemap didn't show up." + end if + printlog "Insert an 'image map' object" + Ellipse.Click + Dokument.MouseDown 50,50 + Dokument.MouseMove 50,50,10,10 + Dokument.MouseUp 10,10 - URL.SetText "http://www.cnn.com" '/// Write some text in each field ///' - Frame.SetText "http://www.framed.com" - Objectname.SetText "This is a strange name: Huckillerry Bohaahw" - Alternativetext.SetText "Alternative, the only way to fly..." - Description.SetText "Just a Foney-text... or whatever it's called." - ImageMapHyperlink.Ok '/// Close the Properties-Dialogue with "Ok" ///' + printlog "Click on the properties icon to open up the properties for the Object" + Eigenschaften.Click + kontext "ImageMapHyperlink" + sleep (1) + if ImageMapHyperlink.Exists (2) then + printlog "ImageMapHyperlink (properties) editor exists" + else + warnlog "Something is wrong, the ImageMapHyperlink (properties) didn't show up." + end if + printlog "Write some text in each field" + URL.SetText "http://www.cnn.com" + Frame.SetText "http://www.framed.com" + Objectname.SetText "This is a strange name: Huckillerry Bohaahw" + Alternativetext.SetText "Alternative, the only way to fly..." + Description.SetText "Just a Foney-text... or whatever it's called." + ImageMapHyperlink.Ok printlog "Close the Properties-Dialogue with Ok" kontext "ImageMapEditor" Zuweisen.Click sleep (1) @@ -117,7 +127,8 @@ testcase tEditImageMapProperties kontext "DocumentImpress" end if - EditImageMap '/// Check if what we wrote in the Properites-Dialogue still is visible." + EditImageMap + printlog "Check if what we wrote in the Properites-Dialogue still is visible." Kontext "ImageMapEditor" sleep (1) if ImageMapEditor.Exists (2) then @@ -128,32 +139,33 @@ testcase tEditImageMapProperties Dokument.TypeKeys "<TAB>" sleep (1) + printlog "Click on the properties icon to open up the properties for the Object" + Eigenschaften.Click + kontext "ImageMapHyperlink" + sleep (1) + if ImageMapHyperlink.Exists (2) then + printlog "ImageMapHyperlink (properties) editor exists" + else + warnlog "Something is wrong, the ImageMapHyperlink (properties) didn't show up." + end if - Eigenschaften.Click '/// Click on the properties icon to open up the properties for the Object ///' - kontext "ImageMapHyperlink" - sleep (1) - if ImageMapHyperlink.Exists (2) then - printlog "ImageMapHyperlink (properties) editor exists" - else - warnlog "Something is wrong, the ImageMapHyperlink (properties) didn't show up." - end if - - '/// Check if the entries we set before has remained the same, with one exception: cnn.com should now have a slash after it. ///' - if URL.GetText <> "http://www.cnn.com/" then warnlog "URL should have been: http://www.cnn.com/ . But was " + URL.GetText + printlog "Check if the entries we set before has remained the same, with one exception: cnn.com should now have a slash after it. " + if URL.GetText <> "http://www.cnn.com/" then warnlog "URL should have been: http://www.cnn.com/ . But was " + URL.GetText ' if Frame.GetSelText <> "http://www.framed.com" then warnlog "Frame should have been: http://www.framed.com. But was " + Frame.GetSelText - if Objectname.GetText <> "This is a strange name: Huckillerry Bohaahw" then warnlog "Objectname. should have been: This is a strange name: Huckillerry Bohaahw. But was " + Objectname.GetText - if Alternativetext.GetText <> "Alternative, the only way to fly..." then warnlog "Alternativetext should have been: . But was " + Alternativetext.GetText - if Description.GetText <> "Just a Foney-text... or whatever it's called." then warnlog "Description. should have been: . But was " + Description.GetText - ImageMapHyperlink.Ok '/// Close the Properties-Dialogue ///' - sleep (1) + if Objectname.GetText <> "This is a strange name: Huckillerry Bohaahw" then warnlog "Objectname. should have been: This is a strange name: Huckillerry Bohaahw. But was " + Objectname.GetText + if Alternativetext.GetText <> "Alternative, the only way to fly..." then warnlog "Alternativetext should have been: . But was " + Alternativetext.GetText + if Description.GetText <> "Just a Foney-text... or whatever it's called." then warnlog "Description. should have been: . But was " + Description.GetText + printlog "Close the Properties-Dialogue" + ImageMapHyperlink.Ok + sleep (1) kontext "ImageMapEditor" Zuweisen.Click sleep (1) ImageMapEditor.Close sleep (1) - - Call hCloseDocument '/// close document ///' + printlog "close document" + Call hCloseDocument endcase 'tEditImageMapProperties '------------------------------------------------------------------------------------------------------------------------------------ diff --git a/testautomation/graphics/optional/includes/global/g_load_save.inc b/testautomation/graphics/optional/includes/global/g_load_save.inc index 8d64e158eb2a..bb8044786d6d 100644 --- a/testautomation/graphics/optional/includes/global/g_load_save.inc +++ b/testautomation/graphics/optional/includes/global/g_load_save.inc @@ -45,76 +45,79 @@ ' #1 tSaveLoadLayoutSpreadsheet '\************************************************************************************* testcase tFileOpenSaveEtc - Dim Dokument$ - Dim Dokument2$ + Dim Dokument$ + Dim Dokument2$ Dokument$ = ConvertPath ( gOfficePath + "user\work\test1") Dokument2$ = ConvertPath ( gOfficePath + "user\work\test1_2") - if (gApplication = "IMPRESS") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" end if - '/// delete previous created documents: 'user\\work\\test1*.od?' ///' + printlog "delete previous created documents: 'user\\work\\test1*.od?'" if Dir (Dokument$ + ".odp") <> "" then kill (Dokument$ + ".odp") if Dir (Dokument2$ + ".odg") <> "" then kill (Dokument2$ + ".odg") - '/// open application ///' + printlog "open application" hNewDocument gMouseclick 90,90 - '/// create a textframe with content ///' + printlog "create a textframe with content" Call hTextrahmenErstellen ( "This is a test",20,20,40,30 ) - '/// save file as 'test1' ///' + printlog "save file as 'test1'" hFileSaveAsKill (Dokument$ + "." + ExtensionString) Sleep 10 - '/// close Document ///' + printlog "close Document" hCloseDocument - printlog "- Document Saved and Closed" + printlog "Document Saved and Closed" - '/// load document 'test1' ///' + printlog "load document 'test1'" hFileOpen (Dokument$ + "." + ExtensionString) - Sleep 10 - '/// close Document ///' - hCloseDocument - printlog "- document Loaded and closed" - Sleep 10 - '/// load document 'test1' ///' - hFileOpen (Dokument$ + "." + ExtensionString) - ' check if the document is writable - if fIsDocumentWritable = false then - ' make the document writable and check if it's succesfull - if fMakeDocumentWritable = false then - warnlog "The document can't be make writeable. Test stopped." - goto endsub - endif - endif - Sleep 10 - gMouseclick 90,90 - '/// create another textbox with content ///' - Call hTextrahmenerstellen ( "Change",60,60,80,80 ) - '/// File->Close needn't work, just say CANCEL to the question about saving changes! ///' - FileClose - Kontext ' message about 'something changed should i [overwrite discard cancel]?' - if Messagebox.exists (5) then + Sleep 10 + printlog "close Document" + hCloseDocument + printlog "- document Loaded and closed" + Sleep 10 + printlog "load document 'test1'" + hFileOpen (Dokument$ + "." + ExtensionString) + printlog "check if the document is writable + if fIsDocumentWritable = false then + printlog "make the document writable and check if it's succesfull + if fMakeDocumentWritable = false then + warnlog "The document can't be make writeable. Test stopped." + goto endsub + endif + endif + Sleep 10 + gMouseclick 90,90 + printlog "create another textbox with content" + Call hTextrahmenerstellen ( "Change",60,60,80,80 ) + printlog "File->Close needn't work, just say CANCEL to the question about saving changes!" + FileClose + Kontext + printlog "message about 'something changed should i [overwrite discard cancel]?'" + if Messagebox.exists (5) then printlog "2:"+messagebox.gettext Messagebox.Cancel - else + else Warnlog "Mesagebox is missing :-(" - endif - printlog "- Document loaded, changed and closed discarding all changes" + endif + printlog "Document loaded, changed and closed discarding all changes" - printlog "- Last version" - try - FileReload '/// File Reload ///' + printlog "Last version" + try + printlog "File Reload" + FileReload + catch + kontext "DocumentImpress" + try + printlog "File Reload" + FileReload catch - kontext "documentimpress" - try - FileReload '/// File Reload ///' - catch - warnlog "Damn reload ?? Why ? BREAKPOINT! File reload doesn't work. Create new object and try again :-(" + warnlog "BREAKPOINT! File reload doesn't work. Create new object and try again :-(" endcatch endcatch Kontext @@ -128,22 +131,24 @@ testcase tFileOpenSaveEtc if GetClipboardText = "Change" then Warnlog "- Last version not loaded. Changes in the document still in." printlog "- Change document, save it under different name" Kontext "DocumentImpress" - Call hTextrahmenErstellen ("Change2",10,10,50,20 ) '/// new textbox ///' + printlog "new textbox" + Call hTextrahmenErstellen ("Change2",10,10,50,20 ) gMouseclick 90,90 sleep 1 - FileSaveAs - Kontext "SpeichernDlg" - Dateiname.SetText Dokument2$ - Speichern.Click - kontext "AlienWarning" - if AlienWarning.exists(5) then - warnlog "#i41983# Alien Warning on export not allowed" - AlienWarning.OK - endif - Kontext "Messagebox" - if Messagebox.Exists(2) then Messagebox.Yes + FileSaveAs + Kontext "SpeichernDlg" + Dateiname.SetText Dokument2$ + Speichern.Click + kontext "AlienWarning" + if AlienWarning.exists(5) then + warnlog "#i41983# Alien Warning on export not allowed" + AlienWarning.OK + endif + Kontext "Messagebox" + if Messagebox.Exists(2) then Messagebox.Yes Sleep 3 - FileClose '/// Close document ///' + printlog "Close document" + FileClose sleep 10 Kontext "Messagebox" if Messagebox.Exists Then @@ -152,42 +157,42 @@ testcase tFileOpenSaveEtc end if sleep 2 printlog "- Loading write protected file" - FileOpen '/// Open write protected file ///' + FileOpen + printlog "Open write protected file" Kontext "OeffnenDlg" Dateiname.SetText (Dokument2$ + "." + ExtensionString) NurLesen.Check Oeffnen.Click - Sleep 10 - ' check if the document is writable - try - Call hTextrahmenErstellen ( "Hello",85,85,95,95 ) '/// attempt to create a textbox ///' - hTypeKeys "<SHIFT LEFT>",5 - hTypeKeys "<MOD1 C>" - sleep 1 - if GetClipboardText = "Hello" then Warnlog "Write protected document could be edited" + Sleep 10 + printlog "check if the document is writable" + try + printlog "attempt to create a textbox" + Call hTextrahmenErstellen ( "Hello",85,85,95,95 ) + hTypeKeys "<SHIFT LEFT>",5 + hTypeKeys "<MOD1 C>" + sleep 1 + if GetClipboardText = "Hello" then Warnlog "Write protected document could be edited" catch - Printlog "- Write protected document could not be edited" + Printlog "- Write protected document could not be edited" endcatch sleep 5 - FileClose '/// Close document ///' + printlog "Close document" + FileClose endcase 'tFileOpenSaveEtc -'-------------------------------------------------------- +'------------------------------------------------------------------------------- testcase tFileProperties qaerrorlog "#i88163#, File/properties/user defined fields get mixed up." goto endsub Call hNewDocument Call hTextrahmenErstellen ("This is a document to test the Menupoint in File/Properties",30,30,60,40) - if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" end if - FileProperties - Kontext active.SetPage TabDokumentinfo Kontext "TabDokumentinfo" @@ -212,9 +217,7 @@ testcase tFileProperties RefreshThisDocument.Check TabInternet.OK - hFileSaveAsKill ConvertPath (gOfficePath + "user\work\eigen." & ExtensionString) - FileClose Kontext "Active" if Active.Exists(2) then Active.Yes @@ -223,45 +226,45 @@ testcase tFileProperties Sleep 2 hFileOpen ConvertPath (gOfficePath + "user\work\eigen." + ExtensionString) - ' check if the document is writable + printlog "check if the document is writable" if fIsDocumentWritable = false then - ' make the document writable and check if it's succesfull + printlog "make the document writable and check if it's succesfull" if fMakeDocumentWritable = false then warnlog "The document can't be make writeable. Test stopped." goto endsub endif endif - FileProperties - Kontext - active.SetPage TabDokumentinfo - Kontext "TabDokumentinfo" - if Titel.GetText <> "Properties" then Warnlog "Description / Titel is wrong" - if Thema.GetText <> "Documentproperties" then Warnlog "Description / Thema is wrong" - if Schluesselworte.GetText <> "None" then Warnlog "Description / Keywords is wrong" - - qaerrorlog "#i95523#" - 'Kontext - 'active.SetPage TabBenutzer - 'Kontext "TabBenutzer" - 'if Info2.GetText <> "Thorsten Peters" then Warnlog "User Defined / Info2 is wrong" - - 'Infofelder.Click - 'sleep 2 - 'Kontext "InfonamenBearbeiten" - 'if Namen2.GetText <> "Name" then Warnlog "Edit Field Names / Info2 is wrong" - 'InfonamenBearbeiten.OK - - Kontext - active.SetPage TabInternet - Kontext "TabInternet" - if RefreshThisDocument.IsChecked = FALSE then Warnlog "Internet / 'Refresh this document' is not checked" - - TabInternet.Close - - Call hCloseDocument -endcase - -'******************************************************************************************** + FileProperties + Kontext + active.SetPage TabDokumentinfo + Kontext "TabDokumentinfo" + if Titel.GetText <> "Properties" then Warnlog "Description / Titel is wrong" + if Thema.GetText <> "Documentproperties" then Warnlog "Description / Thema is wrong" + if Schluesselworte.GetText <> "None" then Warnlog "Description / Keywords is wrong" + + qaerrorlog "#i95523#" + 'Kontext + 'active.SetPage TabBenutzer + 'Kontext "TabBenutzer" + 'if Info2.GetText <> "Thorsten Peters" then Warnlog "User Defined / Info2 is wrong" + + 'Infofelder.Click + 'sleep 2 + 'Kontext "InfonamenBearbeiten" + 'if Namen2.GetText <> "Name" then Warnlog "Edit Field Names / Info2 is wrong" + 'InfonamenBearbeiten.OK + + Kontext + active.SetPage TabInternet + Kontext "TabInternet" + if RefreshThisDocument.IsChecked = FALSE then Warnlog "Internet / 'Refresh this document' is not checked" + + TabInternet.Close + + Call hCloseDocument +endcase 'tFileProperties + +'------------------------------------------------------------------------------- testcase tFilePassword52 Dim Datei$ @@ -271,7 +274,6 @@ testcase tFilePassword52 dim sExt() as string sExt = array("d","a") - ' passwo52.sd d-preas a-draw for i = 0 to 1 Datei$ = ConvertPath ( gTesttoolPath + "graphics\required\input\passwo52.sd"+sExt(i) ) hFileOpen(Datei$) @@ -290,9 +292,9 @@ testcase tFilePassword52 endif hCloseDocument next i -endcase +endcase 'tFilePassword52 -'******************************************************************************************** +'------------------------------------------------------------------------------- testcase tFileOpenImport dim q as integer @@ -324,28 +326,29 @@ testcase tFileOpenImport if (gApplication="DRAW") then Call hCloseDocument endif -endcase +endcase 'tFileOpenImport -'******************************************************************************************** +'------------------------------------------------------------------------------- testcase tTestDXF255CharBug -'/// tries to load a DXF-document which has a string-leght of 255 characters. ///' -dim q as integer - call hNewDocument - InsertGraphicsFromFile '/// insert graphic ///' - sleep 1 - kontext "Active" - sleep 1 + printlog "tries to load a DXF-document which has a string-leght of 255 characters." + dim q as integer + call hNewDocument + printlog "insert graphic " + InsertGraphicsFromFile + sleep 1 + kontext "Active" + sleep 1 if Active.Exists Then - Active.OK + Active.OK end if sleep 1 - Kontext "GrafikEinfuegenDlg" - sleep 2 - '/// Dateiname.SetText (ConvertPath (gTesttoolpath + "graphics\required\input\255chars.dxf")) ///' - Dateiname.SetText (ConvertPath (gTesttoolpath + "graphics\required\input\255chars.dxf")) - Oeffnen.Click - Sleep 2 + Kontext "GrafikEinfuegenDlg" + sleep 2 + printlog " Dateiname.SetText (ConvertPath (gTesttoolpath + "graphics\required\input\255chars.dxf"))" + Dateiname.SetText (ConvertPath (gTesttoolpath + "graphics\required\input\255chars.dxf")) + Oeffnen.Click + Sleep 2 if gApplication = "DRAW" then Kontext "Documentdraw" @@ -375,7 +378,7 @@ dim q as integer Call hCloseDocument endcase 'tTestDXF255CharBug -'******************************************************************************************** +'------------------------------------------------------------------------------- testcase tDeletedTemplate dim i as integer @@ -395,35 +398,35 @@ testcase tDeletedTemplate - '/// delete previous created documents: 'user\\work\\test*.odp' ///' + printlog "delete previous created documents: 'user\\work\\test*.odp'" if Dir (Dokument1$) <> "" then kill Dokument1$ if Dir (Dokument2$) <> "" then kill Dokument2$ - '/// open application ///' + printlog "open application" hNewDocument gMouseclick 90,90 - '/// create a textframe with content ///' + printlog "create a textframe with content" Call hTextrahmenErstellen ( "This is the first file",20,20,40,30 ) - '/// save file as 'test1.odp' ///' + printlog "save file as 'test1.odp'" hFileSaveAsKill (Dokument1$) Sleep 10 - '/// close Document ///' + printlog "close Document" hCloseDocument printlog "- Document 'test1.odp' Saved and Closed" - '/// open application again ///' + printlog "open application again" hNewDocument gMouseclick 90,90 - '/// create another textframe with content ///' + printlog "create another textframe with content" Call hTextrahmenErstellen ( "This is the second file",20,20,40,30 ) - '/// save file as 'test2.odp' ///' + printlog "save file as 'test2.odp'" hFileSaveAsKill (Dokument2$) Sleep 10 - '/// close Document ///' + printlog "close Document" hCloseDocument printlog "- Document 'test2.odp' Saved and Closed" - '/// Delete the first file ///' + printlog "Delete the first file" try kill Dokument1$ Printlog " Correctly deleted the file: " + Dokument1$ @@ -431,28 +434,29 @@ testcase tDeletedTemplate warnlog "Could not delete the file: " + Dokument1$ endcatch - '/// File => New => Presentation ///' - FileAutopilotPresentation '/// new document-autopilot ///' - Kontext "AutopilotPraesentation1" - sleep 5 - Existingpresentation.Check - sleep 5 - kontext "active" - if active.exists then - SavedActiveMessage = Active.GetText - QaErrorLog "Message: " + SavedActiveMessage - active.ok - Kontext "AutopilotPraesentation1" - if Existinglist.GetSelText = "test1.odp" then - warnlog " The deleted File was found. Messagebox said: " + SavedActiveMessage - endif - SavedActiveMessage = "" - endif - Kontext "AutopilotPraesentation1" - Existinglist.TypeKeys "<HOME>" - sleep 5 - found = false - for i = 1 to Existinglist.GetItemCount + printlog "File => New => Presentation" + printlog "new document-autopilot" + FileAutopilotPresentation + Kontext "AutopilotPraesentation1" + sleep 5 + Existingpresentation.Check + sleep 5 + kontext "active" + if active.exists then + SavedActiveMessage = Active.GetText + QaErrorLog "Message: " + SavedActiveMessage + active.ok + Kontext "AutopilotPraesentation1" + if Existinglist.GetSelText = "test1.odp" then + warnlog " The deleted File was found. Messagebox said: " + SavedActiveMessage + endif + SavedActiveMessage = "" + endif + Kontext "AutopilotPraesentation1" + Existinglist.TypeKeys "<HOME>" + sleep 5 + found = false + for i = 1 to Existinglist.GetItemCount kontext "active" if active.exists then SavedActiveMessage = Active.GetText @@ -473,7 +477,7 @@ testcase tDeletedTemplate if found = true then warnlog " An error-message showed up. Eventually a result of '138498'" AutopilotPraesentation1.Cancel Sleep 2 - '/// Delete the second file ///' + printlog "Delete the second file" try kill Dokument2$ Printlog " Correctly deleted the file: " + Dokument2$ @@ -482,7 +486,7 @@ testcase tDeletedTemplate endcatch endcase 'tDeletedTemplate -'**************************************************************************************************** +'------------------------------------------------------------------------------- testcase tSaveLoadLayoutEmpty Dim NewFileDir as String @@ -492,7 +496,6 @@ testcase tSaveLoadLayoutEmpty printlog " Will try to create the directory: " + NewFileDir app.mkdir NewFileDir - gApplication = "IMPRESS" Call hNewDocument @@ -510,13 +513,12 @@ testcase tSaveLoadLayoutEmpty sleep (5) call fSaveLoadAllFormats (NewFileDir) 'Runs the Function below. - - printlog " Will try to delete the directory: " + NewFileDir + printlog "Will try to delete the directory: " + NewFileDir app.rmDir NewFileDir endcase 'tSaveLoadLayoutEmpty -'**************************************************************************************************** +'------------------------------------------------------------------------------- testcase tSaveLoadLayoutOLE qaerrorlog "not yet ready" @@ -525,7 +527,7 @@ testcase tSaveLoadLayoutOLE NewFileDir = ConvertPath (gOfficePath + "user\work\LayoutTest\") - printlog " Will try to create the directory: " + NewFileDir + printlog "Will try to create the directory: " + NewFileDir app.mkdir NewFileDir @@ -563,12 +565,12 @@ testcase tSaveLoadLayoutOLE call fSaveLoadAllFormats (NewFileDir) 'Runs the Function below. - printlog " Will try to delete the directory: " + NewFileDir + printlog "Will try to delete the directory: " + NewFileDir app.rmDir ConvertPath (gOfficePath + "user\work\LayoutTest\")' NewFileDir endcase 'tSaveLoadLayoutOLE -'**************************************************************************************************** +'------------------------------------------------------------------------------- testcase tSaveLoadLayoutText qaerrorlog "not yet ready" @@ -580,7 +582,6 @@ testcase tSaveLoadLayoutText printlog " Will try to create the directory: " + NewFileDir app.mkdir NewFileDir - gApplication = "IMPRESS" Call hNewDocument @@ -601,17 +602,16 @@ testcase tSaveLoadLayoutText hTypeKeys ("<TAB><TAB><TAB>") hTypeKeys ("<Return>") hTypeKeys ("<ESCAPE>") - ' LayoutsPreview.TypeKeys "<RETURN>" sleep (5) call fSaveLoadAllFormats (NewFileDir) 'Runs the Function below. - printlog " Will try to delete the directory: " + NewFileDir + printlog "Will try to delete the directory: " + NewFileDir app.rmDir ConvertPath (gOfficePath + "user\work\LayoutTest\")' NewFileDir endcase 'tSaveLoadLayoutText -'**************************************************************************************************** +'------------------------------------------------------------------------------- testcase tSaveLoadLayoutOutline qaerrorlog "not yet ready" @@ -623,7 +623,6 @@ testcase tSaveLoadLayoutOutline printlog " Will try to create the directory: " + NewFileDir app.mkdir NewFileDir - gApplication = "IMPRESS" Call hNewDocument @@ -653,7 +652,7 @@ testcase tSaveLoadLayoutOutline endcase 'tSaveLoadLayoutOutline -'**************************************************************************************************** +'------------------------------------------------------------------------------- testcase tSaveLoadLayoutPicture qaerrorlog "not yet ready" @@ -665,7 +664,6 @@ testcase tSaveLoadLayoutPicture printlog " Will try to create the directory: " + NewFileDir app.mkdir NewFileDir - gApplication = "IMPRESS" Call hNewDocument @@ -695,7 +693,7 @@ testcase tSaveLoadLayoutPicture endcase 'tSaveLoadLayoutPicture -'**************************************************************************************************** +'------------------------------------------------------------------------------- testcase tSaveLoadLayoutChart qaerrorlog "not yet ready" @@ -707,7 +705,6 @@ testcase tSaveLoadLayoutChart printlog " Will try to create the directory: " + NewFileDir app.mkdir NewFileDir - gApplication = "IMPRESS" Call hNewDocument @@ -737,7 +734,7 @@ testcase tSaveLoadLayoutChart endcase 'tSaveLoadLayoutChart -'**************************************************************************************************** +'------------------------------------------------------------------------------- testcase tSaveLoadLayoutSpreadsheet qaerrorlog "not yet ready" @@ -749,7 +746,6 @@ testcase tSaveLoadLayoutSpreadsheet printlog " Will try to create the directory: " + NewFileDir app.mkdir NewFileDir - gApplication = "IMPRESS" Call hNewDocument @@ -774,10 +770,10 @@ testcase tSaveLoadLayoutSpreadsheet call fSaveLoadAllFormats (NewFileDir) 'Runs the Function below. - printlog " Will try to delete the directory: " + NewFileDir + printlog "Will try to delete the directory: " + NewFileDir app.rmDir ConvertPath (gOfficePath + "user\work\LayoutTest\")' NewFileDir endcase 'tSaveLoadLayoutSpreadsheet -'**************************************************************************************************** +'------------------------------------------------------------------------------- diff --git a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc index 5961a2132467..db77e7ef3068 100644 --- a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc +++ b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc @@ -47,37 +47,39 @@ testcase g_mediaplayer goto endsub endif Datei$ = ConvertPath (convertPath (gTesttoolPath + "graphics\required\input\29secsound.wav")) - '/// Open New Document ///' + printlog "Open New Document" Call hNewDocument sleep 2 - '/// Check if the Media Player already exists - if so - close it ///' + printlog "Check if the Media Player already exists - if so - close it" kontext "mPlayer" - if mPlayer.exists then ' Close the MediaPlayer - warnlog "The MediaPlayer was visible since some earlier test. Plese notify FHA." + printlog "Close the MediaPlayer if it is open already" + if mPlayer.exists then + warnlog "The MediaPlayer was visible since some earlier test." ToolsMediaPlayer printlog "Closed the Media Player" endif - '/// Tools - MediaPlayer ///' + printlog "Tools - MediaPlayer" ToolsMediaPlayer sleep 2 - '/// Open file ///' 'a bigger / longer one + printlog "Open file" kontext "mPlayer" if mPlayer.exists then printlog "The MediaPlayer was open." else - warnlog "Tools - MediaPlayer didnt work. The MediaPlayer wasnt visible. Aborting test." - Call hCloseDocument '/// Close document ///' - goto endsub + warnlog "Tools - MediaPlayer didnt work. The MediaPlayer wasnt visible. Aborting test." + printlog "Close document" + Call hCloseDocument + goto endsub endif Mopen.Click kontext "OeffnenDlg" Pfad.SetText Datei$ Oeffnen.Click - '/// This test wont work correctly under Solaris and Linux, ///' - '/// unless some optional Media-libraries are installed. ///' - '/// Therefore we warn the tester about it if we cannot open the file. ///' + printlog "This test wont work correctly under Solaris and Linux," + printlog "unless some optional Media-libraries are installed." + printlog "Therefore we warn the tester about it if we cannot open the file." iWaitIndex = 0 do while OeffnenDlg.Exists AND iWaitIndex < 10 @@ -90,7 +92,8 @@ testcase g_mediaplayer Active.OK kontext "Mplayer" ToolsMediaPlayer - Call hCloseDocument '/// close document ///' + printlog "close document" + Call hCloseDocument goto endsub else kontext "Mplayer" @@ -99,7 +102,7 @@ testcase g_mediaplayer timevalue1 = mTimeedit.GetText - '/// Stop ///' + printlog "Stop" sleep 2 mStop.Click printlog "Just pressed stop." @@ -109,17 +112,18 @@ testcase g_mediaplayer timevalue3 = mTimeedit.GetText printlog "The time was: " + mTimeedit.GetText if timevalue1 = timevalue2 AND timevalue2 = timevalue3 then - if gtSYSName <> "WinXP" then '("Solaris x86" OR "Linux" OR "Solaris") then - warnlog "The sound doesnt seem to be played at all. And since the test is run on a platform which needs extra libraries, the test ends now." - kontext "Mplayer" - if Mplayer.Exists(3) then - ToolsMediaPlayer - endif - Call hCloseDocument '/// close document ///' - goto endsub - else - warnlog "The sound doesnt seem to be played at all, but I will continue the test. The platform was: " + gtSYSName - endif + if gtSYSName <> "WinXP" then '("Solaris x86" OR "Linux" OR "Solaris") then + warnlog "The sound doesnt seem to be played at all. And since the test is run on a platform which needs extra libraries, the test ends now." + kontext "Mplayer" + if Mplayer.Exists(3) then + ToolsMediaPlayer + endif + printlog "close document" + Call hCloseDocument + goto endsub + else + warnlog "The sound doesnt seem to be played at all, but I will continue the test. The platform was: " + gtSYSName + endif else if timevalue1 <> timevalue2 AND timevalue2 = timevalue3 then Printlog "the stop-button seemed to work. Good." @@ -127,7 +131,7 @@ testcase g_mediaplayer warnlog "Very strange. The first value was: " + timevalue1 + ". Second: " + timevalue2 + ". Third: " + timevalue3 endif endif - '/// Play ///' + printlog "Play" ' Save value timevalue1 = mTimeedit.GetText ' Press 'Play' @@ -141,7 +145,7 @@ testcase g_mediaplayer Printlog "the play-button seemed to work. Good." endif - '/// Pause ///' + printlog "Pause" mPlay.Click sleep 10 mPause.Click @@ -156,19 +160,23 @@ testcase g_mediaplayer Printlog "the pause-button seemed to work. Good." endif - '/// Time ///' - mStop.Click 'to get to the beginning. - sleep 1 'And make sure it's really the beginning. + printlog "Time" + printlog " Click Stop to get to the beginning." + mStop.Click + sleep 1 + printlog "And make sure it's really the beginning." timevalue1 = mTimeedit.GetText if timevalue1 <> "00:00:00 / 00:00:29" then warnlog "Expected the time to go back to 00:00:00, but was " + timevalue1 + " instead." - mStop.Click 'to make another try to get to the beginning again. + printlog "to make another try to get to the beginning again." + mStop.Click ' else printlog "Sound stopped, time-value set to 00:00:00." endif printlog "We press 'Play'" - mPlay.Click 'to get it running + printlog "Click play to get it running" + mPlay.Click sleep 5 timefound = 0 @@ -192,41 +200,34 @@ testcase g_mediaplayer warnlog "Either the time didnt change, or the test-computer is too fast." endif - '-Repeat - 'Plays the file repeatedly. - '/// Loop ///' + printlog "Loop" mLoop.Click - '/// Volume ///' - 'mVolume. 'Click - '-Volume slider - 'Adjusts the volume. + printlog "Volume" - '/// Mute ///' + printlog "Mute" mMute.Click sleep 1 mMute.Click - '-Mute - 'Turns sound off and on. - '/// Time-slider ///' + printlog "Time-slider" ' mTimeslider. 'Click '-Position slider 'Moves to a different position in the file. - '/// Scroll-whatever ///' + printlog "Scroll-whatever" 'mZoomlistbox. '-Zoom 'Adjusts the size of the movie playback. - '/// Apply ///' + printlog "Apply" mInsert.Click sleep 10 - '/// Close the MediaPlayer via Tools - MediaPlayer ///' + printlog "Close the MediaPlayer via Tools - MediaPlayer" ToolsMediaPlayer - '/// Check if there is an object available. ///' + printlog "Check if there is an object available." if (gApplication = "IMPRESS") then kontext "DocumentImpress" else @@ -242,15 +243,15 @@ testcase g_mediaplayer Kontext "TabPositionAndSize" if Width.Exists then Printlog "Position and Size came up, object inserted correctly." - '/// Close dialog TabPositionAndSize with 'OK' ///' + printlog "Close dialog TabPositionAndSize with 'OK'" TabPositionAndSize.OK else Warnlog "Position And Size didn't come up, was there no sound-object inserted?" endif sleep 2 - '/// close document ///' - Call hCloseDocument '/// close document ///' + printlog "close document" + Call hCloseDocument printlog "close document" else qaerrorLog "#74350# - Different strings in g_mediaplayer under Italian." endif -endcase +endcase
\ No newline at end of file diff --git a/testautomation/graphics/optional/includes/global/g_shaddow.inc b/testautomation/graphics/optional/includes/global/g_shaddow.inc index 1dfd01f305aa..caa9b7eabca8 100644 --- a/testautomation/graphics/optional/includes/global/g_shaddow.inc +++ b/testautomation/graphics/optional/includes/global/g_shaddow.inc @@ -54,19 +54,19 @@ testcase tiShaddow dim linewidth as string dim cornerstyletype as string - '/// Set the file-extension we'll be using when opening the saved file ///' + printlog "Set the file-extension we'll be using when opening the saved file " if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" end if - '/// Open application ///' + printlog "Open application " Call hNewDocument Call sSelectEmptyLayout sleep 1 - '/// Import picture ///' + printlog "Import picture " InsertGraphicsFromFile sleep 3 kontext "Active" @@ -81,10 +81,10 @@ testcase tiShaddow Oeffnen.Click printlog "Inserted file" sleep 2 - '/// Select all ///' + printlog "Select all" EditSelectAll sleep 3 - '/// Check values and save them ///' + printlog "Check values and save them" FormatPositionAndSize kontext active.SetPage TabPositionAndSize @@ -92,11 +92,11 @@ testcase tiShaddow ImageWidth = Width.GetText ImageHeight = Height.GetText printlog "Got values from position and size" - '/// Check the "Protect Size"-button. And close dialogue. ///' + printlog "Check the "Protect Size"-button. And close dialogue. " ProtectSize.Check TabPositionAndSize.Ok - '/// Add Shaddow via Toolbar-Button ///' + printlog "Add Shaddow via Toolbar-Button " Kontext "GraphicObjectbar" if GraphicObjectbar.Exists = FALSE then ViewToolbarsPicture @@ -106,21 +106,21 @@ testcase tiShaddow end if sleep 1 - '/// click button 'Shadow' ///' - Schatten.Click -' '/// Check and save Shaddow-values via context-menu ///' - EditSelectAll - hOpenContextMenu - sleep(2) - if hMenuFindSelect(10142, true, 4) = false then + printlog "click button 'Shadow'" + Schatten.Click + printlog " Check and save Shaddow-values via context-menu " + EditSelectAll + hOpenContextMenu + sleep(2) + if hMenuFindSelect(10142, true, 4) = false then Warnlog "Context-Menu-entry `Area` was not found. Therefore the test ends." Call hCloseDocument Goto Endsub - endif - '/// Select Contextmenu entry "Area" ///' - sleep(2) + endif + printlog " Select Contextmenu entry Area " + sleep(2) kontext "TabArea" - '/// Switch to Shaddow-tabpage, do some changes, save them, close dialogue + printlog "Switch to Shaddow-tabpage, do some changes, save them, close dialogue Kontext active.SetPage TabSchatten kontext "TabSchatten" @@ -131,20 +131,20 @@ testcase tiShaddow Warnlog "'Use Shadow' doesn't exist or isn't visible." endif - '/// Change Distance and Transparency-values ///' - Entfernung.More ',2 - Transparenz.More ',2 - shadowdistancevalue = Entfernung.GetText - shadowcolorvalue = Farbe.GetSelText - shadowtransparencyvalue = Transparenz.GetText - printlog "Got values from TabArea" - TabSchatten.Ok + printlog "Change Distance and Transparency-values " + Entfernung.More ',2 + Transparenz.More ',2 + shadowdistancevalue = Entfernung.GetText + shadowcolorvalue = Farbe.GetSelText + shadowtransparencyvalue = Transparenz.GetText + printlog "Got values from TabArea" + TabSchatten.Ok - '/// Check if it's the same when going over FormatArea ///' + printlog "Check if it's the same when going over FormatArea " FormatArea sleep 1 kontext "TabArea" - '/// Switch to Shaddow-tabpage, do some changes, save them, close dialogue ///' + printlog "Switch to Shaddow-tabpage, do some changes, save them, close dialogue " Kontext active.SetPage TabSchatten kontext "TabSchatten" @@ -165,23 +165,23 @@ testcase tiShaddow endif TabSchatten.Ok - '/// Add Cornerstyle via FormatLine ///' - FormatLine - Kontext - Messagebox.SetPage TabLinie - kontext "TabLinie" - Stil.Select 2 ' Select Continuously. - linetype = Stil.GetItemText - Farbe.Select 2 ' Select Blue - linecolour = Farbe.GetItemText - Breite.More 3 ' Set Width to 3 - linewidth = Breite.Gettext - CornerStyle.Select 4 ' Select number four: Beveled - cornerstyletype = CornerStyle.GetSelText - printlog "Cornerstyle is: " + CornerStyle.GetSelText '+ cornerstyletype + printlog "Add Cornerstyle via FormatLine " + FormatLine + Kontext + Messagebox.SetPage TabLinie + kontext "TabLinie" + Stil.Select 2 ' Select Continuously. + linetype = Stil.GetItemText + Farbe.Select 2 ' Select Blue + linecolour = Farbe.GetItemText + Breite.More 3 ' Set Width to 3 + linewidth = Breite.Gettext + CornerStyle.Select 4 ' Select number four: Beveled + cornerstyletype = CornerStyle.GetSelText + printlog "Cornerstyle is: " + CornerStyle.GetSelText '+ cornerstyletype TabLinie.ok - '/// Check values via PositionAndSize via the Contextmenu ///' + printlog "Check values via PositionAndSize via the Contextmenu " hOpenContextmenu sleep(2) if hMenuFindSelect(10087, true, 1) = false then @@ -189,35 +189,35 @@ testcase tiShaddow Call hCloseDocument Goto Endsub endif - 'Select "Position and Size" - sleep(2) - Kontext - Active.SetPage TabPositionAndSize - Kontext "TabPositionAndSize" - if ImageWidth <> Width.GetText then warnlog "Position X differs. Should be: " + ImageWidth + " But is: " + Width.GetText - if ImageHeight <> Height.GetText then warnlog "Position Y differs. Should be: " + ImageHeight + " But is: " + Height.GetText + printlog "Select Position and Size" + sleep(2) + Kontext + Active.SetPage TabPositionAndSize + Kontext "TabPositionAndSize" + if ImageWidth <> Width.GetText then warnlog "Position X differs. Should be: " + ImageWidth + " But is: " + Width.GetText + if ImageHeight <> Height.GetText then warnlog "Position Y differs. Should be: " + ImageHeight + " But is: " + Height.GetText TabPositionAndSize.OK - '/// Check Cornerstyle via FormatLine ///' - FormatLine - Kontext - Messagebox.SetPage TabLinie - kontext "TabLinie" - if linetype <> Stil.GetItemText then warnlog "Linetype should be: " + linetype + " But is: " + Stil.GetItemText - if linecolour <> Farbe.GetItemText then warnlog "Linecolour should be: " + linetype + " But is: " + Farbe.GetItemText - if linewidth <> Breite.GetText then warnlog "Linewidth should be: " + linewidth + " But is: " + Breite.GetText - if cornerstyletype <> CornerStyle.GetSelText then warnlog "CornerStyle should be: " + cornerstyletype + " But is: " + CornerStyle.GetSelText 'ItemText - TabLinie.ok - - '/// Check if the Shaddow-button is activated ///' - Kontext "GraphicObjectbar" - if Schatten.GetState(2) <> 1 then - warnlog "Shaddow-button shouldnt have been checked" - endif + printlog "Check Cornerstyle via FormatLine " + FormatLine + Kontext + Messagebox.SetPage TabLinie + kontext "TabLinie" + if linetype <> Stil.GetItemText then warnlog "Linetype should be: " + linetype + " But is: " + Stil.GetItemText + if linecolour <> Farbe.GetItemText then warnlog "Linecolour should be: " + linetype + " But is: " + Farbe.GetItemText + if linewidth <> Breite.GetText then warnlog "Linewidth should be: " + linewidth + " But is: " + Breite.GetText + if cornerstyletype <> CornerStyle.GetSelText then warnlog "CornerStyle should be: " + cornerstyletype + " But is: " + CornerStyle.GetSelText 'ItemText + TabLinie.ok + + printlog "Check if the Shaddow-button is activated " + Kontext "GraphicObjectbar" + if Schatten.GetState(2) <> 1 then + warnlog "Shaddow-button shouldnt have been checked" + endif - '/// Save the file. Then close the office and reload the file ///' + printlog "Save the file. Then close the office and reload the file " sFileName = ( ConvertPath(gOfficePath + "user\work\shaddow-test")) - '/// File-Save As with filter as: "user\temp\shaddow-test" ///' + printlog "File-Save As with filter as: "user\temp\shaddow-test" " try FileSaveAs Kontext "SpeichernDlg" @@ -233,12 +233,12 @@ testcase tiShaddow warnlog "Error when saving file." endcatch - '/// Close the office-session ///' + printlog "Close the office-session " FileClose Kontext "Messagebox" if Messagebox.Exists(2) then Messagebox.Yes Sleep 3 - '/// Open the saved file ///' + printlog "Open the saved file " try hFileOpen sFileName + "." + ExtensionString Sleep 3 @@ -247,11 +247,11 @@ testcase tiShaddow warnlog "Error when opening file." endcatch - '/// Select all ///' + printlog "Select all " EditSelectAll sleep 2 - '/// Check if the Shaddow-button still is activated ///' + printlog "Check if the Shaddow-button still is activated " kontext "GraphicObjectbar" if schatten.Getstate(2) <> 1 then warnlog "The Shadow-button should be activated" @@ -259,7 +259,7 @@ testcase tiShaddow Printlog "Shaddowbutton activated, good." endif - '/// Check the attributes for the picture ///' + printlog "Check the attributes for the picture " hOpenContextmenu sleep(2) if hMenuFindSelect(10087, true, 1) = false then @@ -267,7 +267,7 @@ testcase tiShaddow Call hCloseDocument Goto Endsub endif - 'Select "Position and Size" + printlog "Position and Size" sleep(2) Kontext Active.SetPage TabPositionAndSize @@ -279,7 +279,7 @@ testcase tiShaddow FormatArea sleep 1 kontext "TabArea" - '/// Switch to Shaddow-tabpage, do some changes, save them, close dialogue ///' + printlog "Switch to Shaddow-tabpage, do some changes, save them, close dialogue " Kontext active.SetPage TabSchatten kontext "TabSchatten" @@ -293,7 +293,7 @@ testcase tiShaddow if shadowcolorvalue <> Farbe.GetSelText then warnlog "Color value changed. Should be: " + shadowcolorvalue + ". But is: " + Farbe.gettext if shadowtransparencyvalue <> Transparenz.GetText then warnlog "Transparency value changed. Should be: " + shadowtransparencyvalue + ". But is: " + Transparenz.gettext - '/// Check Transparency ///' + printlog "Check Transparency" Kontext Active.SetPage TabTransparenz kontext "TabTransparenz" @@ -306,7 +306,7 @@ testcase tiShaddow kontext "TabSchatten" TabSchatten.Ok - '/// Check Cornerstyle via FormatLine ///' + printlog "Check Cornerstyle via FormatLine " FormatLine Kontext Messagebox.SetPage TabLinie @@ -317,7 +317,7 @@ testcase tiShaddow if cornerstyletype <> CornerStyle.GetSelText then warnlog "CornerStyle should be: " + cornerstyletype + " But is: " + CornerStyle.GetSelText 'ItemText TabLinie.ok - '/// If Impress: Save as Powerpoint-file. If Draw: Save as usual Draw-file. ///' + printlog "If Impress: Save as Powerpoint-file. If Draw: Save as usual Draw-file. " if (gApplication = "IMPRESS") then ExtensionString = "ppt" else @@ -344,19 +344,19 @@ testcase tiShaddow printlog "Saved as: " + sFileName Sleep 3 - '/// Close the office and reload the file ///' + printlog "Close the office and reload the file" FileClose Kontext "Messagebox" if Messagebox.Exists(2) then Messagebox.Yes Sleep 3 - '/// Open the saved file ///' + printlog " Open the saved file " hFileOpen (sFileName + "." + ExtensionString) printlog "File opened: " + sFileName + "." + ExtensionString Sleep 3 - '/// Select all ///' + printlog "Select all" EditSelectAll - '/// Check the attributes for the picture ///' + printlog "Check the attributes for the picture" hOpenContextmenu sleep(2) if hMenuFindSelect(10087, true, 1) = false then @@ -364,7 +364,7 @@ testcase tiShaddow Call hCloseDocument Goto Endsub endif - 'Select "Position and Size" + printlog "Select Position and Size" sleep(2) Kontext Active.SetPage TabPositionAndSize @@ -373,7 +373,7 @@ testcase tiShaddow if ImageHeight <> Height.GetText then warnlog "Position X differs. Should be: " + ImageHeight + " But is: " + Height.GetText TabPositionAndSize.OK - '/// Check if transparency has disappeared and if the cornerstyle has changed ///' + printlog "Check if transparency has disappeared and if the cornerstyle has changed" FormatArea Kontext Messagebox.SetPage TabTransparenz @@ -402,7 +402,7 @@ testcase tiShaddow TabTransparenz.Cancel - '/// Check Cornerstyle via FormatLine ///' + printlog "Check Cornerstyle via FormatLine " FormatLine Kontext Messagebox.SetPage TabLinie @@ -413,7 +413,7 @@ testcase tiShaddow if cornerstyletype <> CornerStyle.GetSelText then warnlog "CornerStyle should be: " + cornerstyletype + " But is: " + CornerStyle.GetSelText 'ItemText TabLinie.ok - '/// Remove the Shaddow, Transparency and Cornerstyle ///' + printlog "Remove the Shaddow, Transparency and Cornerstyle" FormatArea Kontext Messagebox.SetPage TabTransparenz @@ -421,14 +421,14 @@ testcase tiShaddow KeineTransparenz.Check sleep 1 kontext "TabArea" - '/// Switch to Shaddow-tabpage, do some changes, save them, close dialogue ///' + printlog "Switch to Shaddow-tabpage, do some changes, save them, close dialogue" Kontext active.SetPage TabSchatten kontext "TabSchatten" Anzeigen.UnCheck TabSchatten.Ok - '/// If Impress: Save as Powerpoint-file. If Draw: Save as usual Draw-file. ///' + printlog "If Impress: Save as Powerpoint-file. If Draw: Save as usual Draw-file." if (gApplication = "IMPRESS") then ExtensionString = "ppt" else @@ -454,19 +454,19 @@ testcase tiShaddow printlog "Saved as: " + sFileName Sleep 3 - '/// Close the office-session ///' + printlog "Close the office-session" FileClose Kontext "Messagebox" if Messagebox.Exists(2) then Messagebox.Yes Sleep 3 - '/// Open the saved file ///' + printlog "Open the saved file" hFileOpen (sFileName + "." + ExtensionString) printlog "File opened: " + sFileName + "." + ExtensionString Sleep 3 - '/// Select all ///' + printlog "Select all" EditSelectAll - '/// Check the attributes for the picture ///' + printlog "Check the attributes for the picture" hOpenContextmenu sleep(2) if hMenuFindSelect(10087, true, 1) = false then @@ -474,7 +474,7 @@ testcase tiShaddow Call hCloseDocument Goto Endsub endif - 'Select "Position and Size" + printlog "Select Position and Size" sleep(2) Kontext Active.SetPage TabPositionAndSize @@ -483,7 +483,7 @@ testcase tiShaddow if ImageHeight <> Height.GetText then warnlog "Position X differs. Should be: " + ImageHeight + " But is: " + Height.GetText TabPositionAndSize.OK - '/// Check if transparency has disappeared ///' + printlog "Check if transparency has disappeared " FormatArea Kontext Messagebox.SetPage TabTransparenz @@ -495,7 +495,7 @@ testcase tiShaddow end if TabTransparenz.Cancel - '/// Check if the cornerstyle has changed via FormatLine ///' + printlog "Check if the cornerstyle has changed via FormatLine " FormatLine Kontext Messagebox.SetPage TabLinie @@ -506,7 +506,7 @@ testcase tiShaddow if cornerstyletype <> CornerStyle.GetSelText then warnlog "CornerStyle should be: " + cornerstyletype + " But is: " + CornerStyle.GetSelText 'ItemText TabLinie.ok - '/// Close application ///' + printlog "Close application" Call hCloseDocument Printlog "Finished Shaddow-test for " + gApplication diff --git a/testautomation/graphics/optional/includes/global/g_stylist.inc b/testautomation/graphics/optional/includes/global/g_stylist.inc index fab547eb5d3b..3b828680f13c 100644 --- a/testautomation/graphics/optional/includes/global/g_stylist.inc +++ b/testautomation/graphics/optional/includes/global/g_stylist.inc @@ -38,17 +38,18 @@ testcase tFormatStylistFlyer Dim ySize% printlog " - Format/Stylist : using all possible things to manipulate the flyer" - '/// open application ///' + printlog "open application" Call hNewDocument Kontext "Gestalter" - '/// Check if stylist is there. Expected: not there ///' + printlog "Check if stylist is there. Expected: not there" if Gestalter.NotExists = false Then - qaErrorLog " - Expected Stylist to be closed; But is Open. Check tests." + qaErrorLog "Expected Stylist to be closed; But is Open. Check tests." else if lcase(gPlatform) = "osx" then hTypekeys "<mod1 t>" else - hTypekeys "<F11>" '/// open stylist by pressing key [F11] ///' + printlog "open stylist by pressing key [F11]" + hTypekeys "<F11>" end if sleep 1 end if @@ -57,51 +58,51 @@ testcase tFormatStylistFlyer Warnlog " No stylist popped up using F11; opening now via slotID" FormatStylist end if - '///+ save stylist position and size ///' + printlog "save stylist position and size" xPos% = Gestalter.GetPosX yPos% = Gestalter.GetPosY xSize% = Gestalter.GetSizeX ySize% = Gestalter.GetSizeY - '///+ if Stylist is docked; undock ///' + printlog " if Stylist is docked; undock" if Gestalter.IsDocked then Gestalter.UnDock - printlog " - '///move stylist ///" - '///+ move stylist to 10,10 ///' + printlog " move stylist" + printlog "move stylist to 10,10" Gestalter.Move 10, 10 Sleep 1 - '///+ move stylist to 300,400 ///' + printlog "move stylist to 300,400" Gestalter.Move 300, 400 Sleep 1 - '///+ move stylist to 590,790 ///' + printlog "move stylist to 590,790" Gestalter.Move 590, 790 Sleep 1 - '///+ move stylist back to saved start position ///' + printlog " move stylist back to saved start position" Gestalter.Move xPos%, yPos% Sleep 1 - printlog " - '///size stylist ///" - '///+ change size to 200,200 ///' + printlog "size stylist" + printlog "change size to 200,200" Gestalter.Size 200, 200 Sleep 1 - '///+ change size to 300,400 ///' + printlog "change size to 300,400" Gestalter.Size 300, 400 Sleep 1 - '///+ change size to 150,250 ///' + printlog "change size to 150,250" Gestalter.Size 150, 250 Sleep 1 - '///+ change size back to saved size ///' + printlog "change size back to saved size" Gestalter.Size xSize%, ySize% Sleep 1 - printlog " - Close stylist reopen stylist, check if appearence is same as before" - '/// save stylist position and size ///' + printlog "Close stylist reopen stylist, check if appearence is same as before" + printlog "save stylist position and size" xPos% = Gestalter.GetPosX yPos% = Gestalter.GetPosY xSize% = Gestalter.GetSizeX ySize% = Gestalter.GetSizeY - '/// close stylist Format->Stylist ///' + printlog "close stylist Format->Stylist" FormatStylist Sleep 1 - '/// open stylist Format->Stylist ///' + printlog "open stylist Format->Stylist" FormatStylist sleep (1) if xPos% <> Gestalter.GetPosX then Warnlog "The x-Pos. has changed : Should be -> '"+ xPos% + "' Is -> '"+ Gestalter.GetPosX +"'." @@ -110,29 +111,29 @@ testcase tFormatStylistFlyer if ySize% <> Gestalter.GetSizeY then Warnlog "The y-Size has changed : Should be -> '"+ ySize% + "' Is -> '"+ Gestalter.GetSizeY +"'." printlog " - dock stylist" - '/// dock stylist ///' + printlog "dock stylist" Gestalter.Dock Sleep 1 if (NOT Gestalter.IsDocked) then warnlog " stylist not docked but should" endif - '/// UNdock stylist ///' + printlog "UNdock stylist" if (Gestalter.IsDocked) Then Gestalter.UnDock endif Sleep 1 printlog " - maximize/minimize stylist" - '/// minimize stylist ///' + printlog "minimize stylist" Gestalter.Minimize Sleep 1 - '/// maximize stylist ///' + printlog "maximize stylist" Gestalter.Maximize Sleep 1 if (NOT Gestalter.IsMax) then warnlog " The stylist did not return to maximized state" endif - '/// close stylist ///' + printlog "close stylist" Gestalter.Close Call hCloseDocument diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index 04fc0b92d4b2..aab38d09a233 100644 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -189,7 +189,7 @@ testcase tiToolsThesaurus Call hCloseDocument -endcase +endcase 'tiToolsThesaurus '------------------------------------------------------------------------------- testcase tiToolsThesaurusWithoutText @@ -212,7 +212,7 @@ testcase tiToolsThesaurusWithoutText Call hCloseDocument -endcase +endcase 'tiToolsThesaurusWithoutText '------------------------------------------------------------------------------- testcase tiToolsThesaurusContextMenu @@ -308,15 +308,17 @@ testcase tiToolsThesaurusContextMenu call hCloseDocument -endcase +endcase 'tiToolsThesaurusContextMenu '------------------------------------------------------------------------------- testcase tiToolsHyphenation1 printlog " - Hyphenation without any text" - Call hNewDocument '/// New impress document ///' + printlog "New impress document " + Call hNewDocument sleep 3 - ToolsLanguageHyphenationDraw '/// Try with empty document ///' + ToolsLanguageHyphenationDraw Kontext "Hyphenation" + printlog "Try with empty document" if Hyphenation.Exists(1) = True Then Warnlog " - Dialog ist da" Hyphenation.Cancel @@ -326,10 +328,12 @@ testcase tiToolsHyphenation1 ' Kontext "DocumentImpress" printlog " - Hyphenation with text, but without any possibility to break words" select case iSprache - case 01 : hTextrahmenErstellen ("This ist a text with no split words",10,10,40,40) '/// Create text without a pssibility to split words///' + printlog "Create text without a pssibility to split words" + case 01 : hTextrahmenErstellen ("This ist a text with no split words",10,10,40,40) case 03 : hTextrahmenErstellen ("Compare a tradu" + Chr(231) + Chr(227) + "o com o original",10,10,40,40) case 07 : qaerrorlog "- No Hypenation for Russian available" - Call hCloseDocument '/// Close document ///' + printlog "Close document" + Call hCloseDocument goto endsub case 31 : hTextrahmenErstellen ("Het is mijn bedoeling om voor en hulpmiddel.",10,10,40,40) case 33 : hTextrahmenErstellen ("Merci beaucoup pout votre candidature du 13/11/97.",10,10,40,40) @@ -340,7 +344,7 @@ testcase tiToolsHyphenation1 case 46 : hTextrahmenErstellen ("Detta är en text utan delade ord",10,10,40,40) case 48 : hTextrahmenErstellen (" Jeoli jednak zechcesz",10,10,40,40) case 49 : hTextrahmenErstellen ("Dies ist ein Text ohne eine Moeglichkeit Woerter zu trennen",10,10,40,40) - case 50 : hTextrahmenErstellen ("Zato ves ?as iš?emo nove ?lane: sodelujte",10,10,40,40) + case 50 : hTextrahmenErstellen ("Zato ves �?as iš�?emo nove �?lane: sodelujte",10,10,40,40) case 55 : hTextrahmenErstellen ("a Sun tentou adquirir a Apple",10,10,40,40) case else : if bAsianLan then printlog "For the language " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-)" @@ -351,7 +355,7 @@ testcase tiToolsHyphenation1 endif end select hTypeKeys "<Home>" - ToolsLanguageHyphenationDraw '/// Try ///' + ToolsLanguageHyphenationDraw Kontext "Hyphenation" if Hyphenation.Exists =True Then Warnlog "Dialog exists" @@ -360,8 +364,8 @@ testcase tiToolsHyphenation1 Kontext "Active" if Active.Exists then Active.OK end if - - Call hCloseDocument '/// Close document ///' + printlog "Close document " + Call hCloseDocument endcase 'tiToolsHyphenation1 @@ -385,7 +389,7 @@ testcase tiToolsHyphenation2 Call hFileOpen (sFile) endif - select case iSprache '/// Open prepared document ///' + select case iSprache case 01 :DasWort = "ation" : DasWort2 = "tion" : DasWort3 = "ion" : DasWort4 = "on" '+Chr(34) case 07 : qaerrorlog "- No Hypenation for Russian available" goto endsub @@ -402,6 +406,7 @@ testcase tiToolsHyphenation2 case else : if bAsianLan then printlog "For the language " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-)" printlog " :-) will use English instead" + printlog "Open prepared document" Call hFileOpen (gTesttoolpath + "graphics\required\input\silben_"+"1"+sExt) DasWort = "ation" : DasWort2 = "tion" : DasWort3 = "ion" : DasWort4 = "on" '+Chr(34) else @@ -412,24 +417,29 @@ testcase tiToolsHyphenation2 Call sMakeReadOnlyDocumentEditable - printlog " - Test hyphenation" - EditSelectAll '/// Press CTRL + A to select all ///' - '/// press return to go into the edit mode ///' + printlog "Test hyphenation" +printlog "Press CTRL + A to select all" + EditSelectAll + printlog "press return to go into the edit mode" hTypeKeys "<Return>" sleep 1 ' WA for draw, or smth else: get text part before hyphenation: if iSprache = "1" OR bAsianLan = TRUE then - hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT RIGHT>" '/// Select part of text and compare it with original text at this place ///' + printlog "Select part of text and compare it with original text at this place" + hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT RIGHT>" else hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT>" endif EditCopy sDraw = GetClipboardText() - EditSelectAll '/// Select whole text ///' - ToolsLanguageHyphenationDraw '/// Run Hyphenation ///' + printlog "Select whole text" + EditSelectAll + printlog "Run Hyphenation" + ToolsLanguageHyphenationDraw gMouseClick 50,50 - hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT>" '/// Select part of text and compare it with original text at this place ///' + printlog "Select part of text and compare it with original text at this place" + hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT>" sleep 3 EditCopy printlog GetClipboardText @@ -447,7 +457,8 @@ printlog GetClipboardText Printlog "Expected: '"+DasWort+"'; or something different than: '"+sDraw+"'; But what we got was: '"+GetClipboardText+"'" end if sleep 1 - Call hCloseDocument '/// Close document ///' + printlog "Close document" + Call hCloseDocument endcase 'tiToolsHyphenation2 @@ -464,9 +475,9 @@ testcase tToolsMacro ToolsMacro Kontext "Makro" - '/// to get the count of all macros, the list needs to get elapsed-all ///' + printlog "to get the count of all macros, the list needs to get elapsed-all" for j = 1 to 2 - Zaehler=MakroAus.GetItemCount + Zaehler=MakroAus.GetItemCoun4t MakroAus.typeKeys "<end>" for i = 1 to Zaehler MakroAus.typeKeys "<+><up>" diff --git a/testautomation/graphics/optional/includes/global/g_zoom.inc b/testautomation/graphics/optional/includes/global/g_zoom.inc index c82b6743966a..90741015aafd 100644 --- a/testautomation/graphics/optional/includes/global/g_zoom.inc +++ b/testautomation/graphics/optional/includes/global/g_zoom.inc @@ -49,20 +49,22 @@ testcase tViewZoom Datei$ = ConvertPath (gOfficePath + "user\work\test." & ExtensionString) Printlog "- View-Zoom testing" - if dir(Datei$) <> "" then app.Kill(Datei$) ' to avoid the anoying overwrite warnlog :-) - Call hNewDocument '/// new document ///' + printlog "to avoid the anoying overwrite warnlog :-)" + if dir(Datei$) <> "" then app.Kill(Datei$) + printlog "new document" +Call hNewDocument ViewZoom Kontext "Massstab" - Vergroesserung100.Check '/// set zoom to 50% ///' + Vergroesserung100.Check Massstab.OK - '/// create a number of rectangles with different color properties ///' + printlog "create a number of rectangles with different color properties" Kontext "SD_Farbleiste" sleep 1 if SD_Farbleiste.Exists then Printlog "- Color toolbar will be disabled now" ViewToolbarsColorBar end if - '/// All rectangles are created with same dimensions but using different zoom settings ///' + printlog "All rectangles are created with same dimensions but using different zoom settings" For Zaehler = 1 to 9 Position1 = 5 * Zaehler - 3 Position2 = 105 - 5 * Zaehler @@ -77,9 +79,11 @@ testcase tViewZoom gMouseClick 50,0 Next Zaehler sleep 2 - hFileSaveAs (Datei$) '/// save document ///' + printlog "save document" + hFileSaveAs (Datei$) sleep 3 - for Zaehler = 1 to 6 '/// changing zoom settings and checking functionality with controlling the color of the selected rectangle ///' + printlog "changing zoom settings and checking functionality with controlling the color of the selected rectangle" + for Zaehler = 1 to 6 ViewZoom Kontext "Massstab" VergroesserungStufenlos.check @@ -103,18 +107,14 @@ testcase tViewZoom Case 6: VergroesserungStufenlos.check Stufenlos.Settext "200" - 'Case 2: Vergroesserung50.check - 'Case 3: Vergroesserung75.check - 'Case 4: Vergroesserung100.check - 'Case 5: Vergroesserung150.check - 'Case 6: Vergroesserung200.check End Select Massstab.OK sleep 1 Kontext "DocumentImpress" - gMouseClick 15,15 'hier soll die Maus ein Rechteck treffen; - 'die Farbe des Rechtecks sagt uns dann, ob - FormatArea 'richtig vergroessert oder verkleinert wurde. + printlog "Mouseclick should hit a rectangle. Color tells us then if it was zoomed correctly." + gMouseClick 15,15 + + FormatArea sleep 1 Kontext Active.SetPage TabFarben @@ -128,6 +128,6 @@ testcase tViewZoom 'Optimal.push 'Seitenbreite.push sleep 2 - - Call hCloseDocument '/// close document ///' + printlog "close document" + Call hCloseDocument endcase diff --git a/testautomation/graphics/optional/includes/impress/i_animation.inc b/testautomation/graphics/optional/includes/impress/i_animation.inc index 8ee7777e5994..ac1c07ed817e 100644 --- a/testautomation/graphics/optional/includes/impress/i_animation.inc +++ b/testautomation/graphics/optional/includes/impress/i_animation.inc @@ -37,151 +37,178 @@ ' Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\grafix3.ras") testcase tExtrasAnimation + + Dim i + Dim Zaehler + Dim ZaehlerAnpassung + + Printlog "- Tools/Animation" - Dim i - Call hNewDocument - Call sSelectEmptyLayout '/// New impress document ///' - sleep 2 - InsertGraphicsFromFile '/// insert graphic file (sample.bmp) ///' - sleep 1 - Kontext "GrafikEinfuegenDlg" - sleep 2 + printlog "New impress document " + Call hNewDocument + Call sSelectEmptyLayout + sleep 2 + printlog "insert graphic file (sample.bmp) " + InsertGraphicsFromFile + sleep 1 + Kontext "GrafikEinfuegenDlg" + sleep 2 Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp") sleep 2 Oeffnen.Click sleep 2 - Kontext "DocumentImpress" - DocumentImpress.MouseDoubleClick 90,90 '/// Deselect graphic ///' - sleep 1 - InsertGraphicsFromFile - sleep 2 - Kontext "GrafikEinfuegenDlg" - Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\grafix3.ras") - sleep 2 - Oeffnen.Click - sleep 2 - Opl_SD_EffekteZulassen - Kontext "Animation" - - for i=1 to 10 - BildAufnehmen.Click '/// add selected picture 10 times into the animation ///' - next i - sleep 1 - if AnzahlBilder.GetText <> "10" Then '/// compare frame number in animation dialog ///' - WarnLog " - Adding graphics did not work" - else - PrintLog " Pictures added" - end if - - if AlleAufnehmen.IsEnabled Then WarnLog " - Add all should not be enabled, there is only 1 graphic selected" '/// test if Add all is eneabled (shouldn't be because of only 1 object selected) ///' - Kontext "DocumentImpress" - EditSelectAll '/// Select both pictures ///' - - Kontext "Animation" - - for i=1 to 5 - AlleAufnehmen.Click '/// Add all (5 times) ///' - next i - sleep 1 - if AnzahlBilder.GetText <> "20" Then '/// check if number of frames is now 20 ///' - WarnLog " - Adding pics did not work" - else - PrintLog " All pics added" - end if - - ErstesBild.Click '/// Click First Picture ///' - - if AnzahlBilder.GetText <> "1" Then '/// Control if we are at frame 1 ///' - WarnLog " - Jump back to start did not work" - else - PrintLog " Jumped back to first picture" - end if - - LetztesBild.Click '/// Go to last picture ///' - - if AnzahlBilder.GetText <> "20" Then '/// Control frame number ///' - WarnLog " - Jump to end did not work" - else - PrintLog " Jump to end did work" - end if - - Abspielen.Click '/// Play animation ///' - sleep 3 - Kontext "DocumentImpress" - EditSelectAll '/// Select all in document ///' - DocumentImpress.TypeKeys "<DELETE>" '/// Delete content ///' - - Kontext "Animation" - Erstellen.Click '/// /Create animation //' - sleep 10 - - Kontext "DocumentImpress" - try - EditCopy '/// Try to copy ccreated animation into clipboard ///' - PrintLog " animation created" - catch - WarnLog " - Animation not created" - endcatch - - Kontext "Animation" - - if AnimationsgruppeGruppenobjekt.IsChecked=True Then - try - AnzeigedauerProBild.SetText "1" '/// Try setting duration per frame ///' - WarnLog " - Edit field should be disabled" - catch - PrintLog " Edit field not enabled because groupobject status is = " + AnimationsgruppeGruppenobjekt.IsChecked - endcatch - end if - - - AnimationsgruppeBitmapobjekt.Check '/// check animation group object ///' - - AnzeigedauerProBild.SetText "3" '/// Set duration per frame to 3///' - SetClipboard AnzeigedauerProBild.GetText - AnzeigedauerProBild.More '/// Raise value for duration ///' - if AnzeigedauerProBild.GetText <> GetClipboardText Then - PrintLog " Time per pic could be edited" - else - WarnLog " - Time per pic could be edited" - end if - - Dim Zaehler - Zaehler = AnzahlDurchlaeufe.GetItemCount - for i=1 to Zaehler '/// Change number of plays ///' - AnzahlDurchlaeufe.Select i - next i - PrintLog " Number of loops checked" - - - Dim ZaehlerAnpassung - ZaehlerAnpassung=Anpassung.GetItemCount '/// change ZaehlerAnpassung ///' - for i=1 to ZaehlerAnpassung - Anpassung.Select i - next i - PrintLog " Loop count changed" - - BildLoeschen.Click '/// Delete 1 frame ///' - if AnzahlBilder = "20" Then - WarnLog " - Delete pictures from animation did not work" - else - PrintLog " Picture No20 deleted" - end if - - AlleLoeschen.Click '/// Delete all frames ///' - Kontext "Active" - Active.Yes - sleep 3 - - Kontext "Animation" - if Abspielen.IsEnabled=true Then - WarnLog " - Not all pics could be deleted" - else - PrintLog " all pics deleted" - end if - sleep 2 - Animation.Close - sleep 2 - Call hCloseDocument '/// close document///' + Kontext "DocumentImpress" + printlog "Deselect graphic " + DocumentImpress.MouseDoubleClick 90,90 + sleep 1 + InsertGraphicsFromFile + sleep 2 + Kontext "GrafikEinfuegenDlg" + Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\grafix3.ras") + sleep 2 + Oeffnen.Click + sleep 2 + Opl_SD_EffekteZulassen + Kontext "Animation" + + printlog "add selected picture 10 times into the animation " + for i=1 to 10 + BildAufnehmen.Click + next i + sleep 1 + printlog "compare frame number in animation dialog " + if AnzahlBilder.GetText <> "10" Then + WarnLog " - Adding graphics did not work" + else + printlog "Pictures added" + end if + + printlog "test if Add all is eneabled (shouldn't be because of only 1 object selected) " + if AlleAufnehmen.IsEnabled Then WarnLog " - Add all should not be enabled, there is only 1 graphic selected" + Kontext "DocumentImpress" + printlog "Select both pictures " + EditSelectAll + Kontext "Animation" + printlog "Add all (5 times) " + for i=1 to 5 + AlleAufnehmen.Click + next i + sleep 1 + printlog "check if number of frames is now 20 " + if AnzahlBilder.GetText <> "20" Then + WarnLog " - Adding pics did not work" + else + printlog "All pics added" + end if + + printlog "Click First Picture " + ErstesBild.Click + + printlog "Control if we are at frame 1 " + if AnzahlBilder.GetText <> "1" Then + WarnLog " - Jump back to start did not work" + else + printlog "Jumped back to first picture" + end if + + printlog "Go to last picture " + LetztesBild.Click + + printlog "Control frame number " + if AnzahlBilder.GetText <> "20" Then + WarnLog " - Jump to end did not work" + else + printlog "Jump to end did work" + end if + + printlog "Play animation " + Abspielen.Click + sleep 3 + Kontext "DocumentImpress" + printlog "Select all in document " + EditSelectAll + printlog "Delete content " + DocumentImpress.TypeKeys "<DELETE>" + + Kontext "Animation" + printlog "Create animation" + Erstellen.Click + sleep 10 + + Kontext "DocumentImpress" + try + printlog "Try to copy ccreated animation into clipboard " + EditCopy + printlog "animation created" + catch + WarnLog " - Animation not created" + endcatch + + Kontext "Animation" + + if AnimationsgruppeGruppenobjekt.IsChecked=True Then + try + printlog "Try setting duration per frame " + AnzeigedauerProBild.SetText "1" + WarnLog " - Edit field should be disabled" + catch + printlog "Edit field not enabled because groupobject status is = " + AnimationsgruppeGruppenobjekt.IsChecked + endcatch + end if + + + printlog "check animation group object " + AnimationsgruppeBitmapobjekt.Check + + printlog "Set duration per frame to 3" + AnzeigedauerProBild.SetText "3" + SetClipboard AnzeigedauerProBild.GetText + printlog "Raise value for duration " + AnzeigedauerProBild.More + if AnzeigedauerProBild.GetText <> GetClipboardText Then + printlog "Time per pic could be edited" + else + WarnLog " - Time per pic could be edited" + end if + + Zaehler = AnzahlDurchlaeufe.GetItemCount + printlog "Change number of plays " + for i=1 to Zaehler + AnzahlDurchlaeufe.Select i + next i + printlog "Number of loops checked" + + printlog "change ZaehlerAnpassung " + ZaehlerAnpassung=Anpassung.GetItemCount + for i=1 to ZaehlerAnpassung + Anpassung.Select i + next i + printlog "Loop count changed" + + printlog "Delete 1 frame " + BildLoeschen.Click + if AnzahlBilder = "20" Then + WarnLog " - Delete pictures from animation did not work" + else + printlog "Picture No20 deleted" + end if + + printlog "Delete all frames " + AlleLoeschen.Click + Kontext "Active" + Active.Yes + sleep 3 + + Kontext "Animation" + if Abspielen.IsEnabled=true Then + WarnLog " - Not all pics could be deleted" + else + printlog "all pics deleted" + end if + sleep 2 + Animation.Close + sleep 2 + printlog "close document" + Call hCloseDocument endcase diff --git a/testautomation/graphics/optional/includes/impress/i_pengine.inc b/testautomation/graphics/optional/includes/impress/i_pengine.inc index 4f19f254b055..aed79a6ce827 100644 --- a/testautomation/graphics/optional/includes/impress/i_pengine.inc +++ b/testautomation/graphics/optional/includes/impress/i_pengine.inc @@ -36,26 +36,24 @@ '\******************************************************************* testcase tiPenginefast -' dim i,t,q as integer -' dim e as string - dim sFileName as string + ' dim i,t,q as integer + ' dim e as string + dim sFileName as string -'/// the Presentation-Engine consists of showing the presentation, with all it's effects. ///' - -'/// Create a new presentation. ///' + printlog "the Presentation-Engine consists of showing the presentation, with all it's effects." + printlog "Create a new presentation." Call hNewDocument sleep 1 + printlog "Open the test-file." + Call hDateiOeffnen (gTesttoolpath + "graphics\required\input\allshapes.odp") - '/// Open the test-file. ///' - Call hDateiOeffnen (gTesttoolpath + "graphics\required\input\allshapes.odp") 'effects.odp") - - '/// Start the slideshow. ///' + printlog "Start the slideshow." CALL hTypeKeys "<F5>" sleep (5) kontext "DocumentPresentation" DocumentPresentation.TypeKeys "<SPACE>" - '/// Wait for the presentation to reach a certain moment. ///' + printlog "Wait for the presentation to reach a certain moment." sleep (10) DocumentPresentation.TypeKeys "<SPACE>" sleep (7) @@ -63,7 +61,7 @@ testcase tiPenginefast sleep (7) DocumentPresentation.TypeKeys "<SPACE>" sleep (7) - '/// Press "Space" again, to continue with slide two. ///' + printlog "Press "Space" again, to continue with slide two." DocumentPresentation.TypeKeys "<SPACE>" sleep (7) DocumentPresentation.TypeKeys "<SPACE>" @@ -72,19 +70,18 @@ testcase tiPenginefast sleep (7) DocumentPresentation.TypeKeys "<SPACE>" sleep (7) - '/// And press "Space" again, to exit the presentation-mode. ///' + printlog "And press "Space" again, to exit the presentation-mode." DocumentPresentation.TypeKeys "<SPACE>" - FileClose Call hNewDocument sleep 1 - '/// Open the test-file. ///' + printlog "Open the test-file." Call hDateiOeffnen (gTesttoolpath + "graphics\required\input\effects.odp") - '/// Start the slideshow. ///' + printlog "Start the slideshow." CALL hTypeKeys "<F5>" sleep (200) - '/// Press "Space" again, to continue with slide two. ///' + printlog "Press Space again, to continue with slide two." kontext "DocumentPresentation" DocumentPresentation.TypeKeys "<SPACE>" sleep (40) @@ -126,93 +123,94 @@ testcase tiPenginefast kontext "DocumentImpress" end if -'/// Insert a new slide. ///' -' InsertSlide -' sleep 2 -' hTypekeys "<Pagedown>" -' sleep 2 - -'/// Menu: Slideshow: Check every menu-item. ///' - -'Exists: -' #1 tSlideShowSlideShow -' #1 tSlideShowRehearseTimings -' #1 tSlideShowSlideShowSettings -' #1 tSlideShowCustomSlideShow -' #1 tSlideShowSlideTransition -' #1 tSlideShowShowHideSlide - -' Slideshow menu 1 - Slide show -' Slideshow menu 2 - Slide show settings -' Slideshow menu 3 - Rehearse timings -' Slideshow menu 4 - Interaction -' Slideshow menu 6 - Slide Transition -' Slideshow menu 7 - Show / Hide slide -' Slideshow menu 8 - Custom Slide show - - -'Printlog " Here starts the test " - -'Presentation - Start / Stop. Different ways to do it. -'Presentation - Effects. -'LeftWindow - -'/// Slideshow Settings: Range: test all three alternatives. ///' -'/// Test if the Slideshow-types (Default, Window, Auto) works. ///' -'/// Check if the checkboxes works. ///' -'/// Close dialogue. ///' -'/// Add an object. ///' -'/// Custom Animation: Add an Animation to the object. ///' -'/// Run the slideshow. ///' - -'/// Change to the next effect and continue through every animation in ///' -'/// Entrance, Emphasis, Exit and Motion Paths. ///' -'/// While testing - test the speed-choices for every kind of animation. ///' -'/// Check if the "Change" and "Remove"-buttons. ///' -'/// Check the Start, "Direction" and "Speed" variables. ///' -'/// Add two effects to one object and change the order. ///' -'/// Try the Play and "Slide Show"-button. ///' -'/// Try the Automatic preview-button. ///' - -'/// Slidetransition. ///' -'/// Go through every kind of effect, speed, and sound. ///' -'/// Check loop until next sound. ///' -'/// Check the Advance slide with mouseclick-function. ///' -'/// Check the "Apply to all slides", "Play", and "Slide Show"-buttons. ///' -'/// Check Automatic preview. ///' - -'/// Some effects doesnt have a right / left orientation. Test these. ///' -'/// Possibility: check random effects and see if something hangs. ///' - -'/// Load/Save-test: Does the settings last? ///' - -'/// Are two different objects dependant or independent from each other? ///' - -'/// Close Application ///' + printlog "Insert a new slide." + ' InsertSlide + ' sleep 2 + ' hTypekeys "<Pagedown>" + ' sleep 2 + + printlog "Menu: Slideshow: Check every menu-item." + + 'Exists: + ' #1 tSlideShowSlideShow + ' #1 tSlideShowRehearseTimings + ' #1 tSlideShowSlideShowSettings + ' #1 tSlideShowCustomSlideShow + ' #1 tSlideShowSlideTransition + ' #1 tSlideShowShowHideSlide + + ' Slideshow menu 1 - Slide show + ' Slideshow menu 2 - Slide show settings + ' Slideshow menu 3 - Rehearse timings + ' Slideshow menu 4 - Interaction + ' Slideshow menu 6 - Slide Transition + ' Slideshow menu 7 - Show / Hide slide + ' Slideshow menu 8 - Custom Slide show + + + 'Printlog " Here starts the test " + + 'Presentation - Start / Stop. Different ways to do it. + 'Presentation - Effects. + 'LeftWindow + + printlog "Slideshow Settings: Range: test all three alternatives." + printlog "Test if the Slideshow-types (Default, Window, Auto) works." + printlog "Check if the checkboxes works." + printlog "Close dialogue." + printlog "Add an object." + printlog "Custom Animation: Add an Animation to the object." + printlog "Run the slideshow." + + printlog "Change to the next effect and continue through every animation in" + printlog "Entrance, Emphasis, Exit and Motion Paths." + printlog "While testing - test the speed-choices for every kind of animation." + printlog "Check if the "Change" and "Remove"-buttons." + printlog "Check the Start, "Direction" and "Speed" variables." + printlog "Add two effects to one object and change the order." + printlog "Try the Play and "Slide Show"-button." + printlog "Try the Automatic preview-button." + + printlog "Slidetransition." + printlog "Go through every kind of effect, speed, and sound." + printlog "Check loop until next sound." + printlog "Check the Advance slide with mouseclick-function." + printlog "Check the "Apply to all slides", "Play", and "Slide Show"-buttons." + printlog "Check Automatic preview." + + printlog "Some effects doesnt have a right / left orientation. Test these." + printlog "Possibility: check random effects and see if something hangs." + + printlog "Load/Save-test: Does the settings last?" + + printlog "Are two different objects dependant or independent from each other?" + + printlog "Close Application" Call hCloseDocument Printlog "Finished Optional-test for Presentation-Engine" -endcase +endcase 'tiPenginefast +'------------------------------------------------------------------------------- testcase tSlideShowInteraction - Dim Datei$ - Dim i as integer - Dim Zaehler as integer - dim b115364 as boolean + Dim Datei$ + Dim i as integer + Dim Zaehler as integer + dim b115364 as boolean - Datei$ =ConvertPath (gOfficePath + "user\work\interac.sxi") + Datei$ =ConvertPath (gOfficePath + "user\work\interac.sxi") -' '/// save file as presentation with name '"user\\work\\diashow.sxi")' ///' +' printlog "save file as presentation with name '"user\\work\\diashow.sxi")'" ' hFileSaveAsWithFilterKill ( sFile , gImpressFilter, FALSE ) ' Printlog "saved presetation: '" + sFile + "'" - '/// open application ///' + printlog "open application" Call hNewDocument sleep 5 - setStartCurrentPage(FALSE) '/// Set "start with current page to OFF ///' + setStartCurrentPage(FALSE) printlog "Set "start with current page to OFF" - '/// call 'Insert->Slide' three times and name the slides 2, 3, 4 and create a rectangle on it ///' - '///+ we now have 4 slides ?! :-) ///' + printlog "call 'Insert->Slide' three times and name the slides 2, 3, 4 and create a rectangle on it " + '///+ we now have 4 slides ?! :-)" for i = 2 to 4 InsertSlide sleep 2 @@ -222,7 +220,7 @@ testcase tSlideShowInteraction sleep 2 next i - '/// check state of navigator ! expected: closed -> open navigator ///' + printlog "check state of navigator ! expected: closed -> open navigator" Kontext "Navigator" if Navigator.exists then warnlog "Navigator: already open :-(" @@ -232,194 +230,194 @@ testcase tSlideShowInteraction endif sleep 3 - '/// Slide Show->Interaction ///' - SlideShowInteraction - Kontext "TabInteraktion" - sleep 1 - if AktionBeiMausklick.GetItemCount = 13 Then - Printlog "- List is complete" - else - Warnlog "- Number of possible actions is wrong. It should be: 13, but it is: " + AktionBeiMausklick.GetItemCount - end if - sleep 1 - - AktionBeiMausklick.Select 1 'Keine Aktion bei Mausclick - Printlog (AktionBeiMausklick.GetSelText + " chosen") - If Durchsuchen.IsVisible then Warnlog "- Control should be invisible because AktionBeiMausklick = " + AktionBeiMausKlick.GetSelText - sleep 1 - - Kontext "TabInteraktion" - AktionBeiMausklick.Select 2 'Sprung zur vorhergehenden Seite - Printlog (AktionBeiMausklick.GetSelText + " chosen") - if Durchsuchen.IsVisible Then Warnlog "- Control should be invisible, beacause Action = " + AktionBeiMausKlick.GetSelText - TabInteraktion.OK - sleep 2 - Kontext "DocumentImpress" - gMouseClick 90,90 - sleep 1 - gMouseClick 50,50 + printlog "Slide Show->Interaction" + SlideShowInteraction + Kontext "TabInteraktion" + sleep 1 + if AktionBeiMausklick.GetItemCount = 13 Then + Printlog "- List is complete" + else + Warnlog "- Number of possible actions is wrong. It should be: 13, but it is: " + AktionBeiMausklick.GetItemCount + end if + sleep 1 + + AktionBeiMausklick.Select 1 'Keine Aktion bei Mausclick + Printlog (AktionBeiMausklick.GetSelText + " chosen") + If Durchsuchen.IsVisible then Warnlog "- Control should be invisible because AktionBeiMausklick = " + AktionBeiMausKlick.GetSelText + sleep 1 + + Kontext "TabInteraktion" + AktionBeiMausklick.Select 2 'Sprung zur vorhergehenden Seite + Printlog (AktionBeiMausklick.GetSelText + " chosen") + if Durchsuchen.IsVisible Then Warnlog "- Control should be invisible, beacause Action = " + AktionBeiMausKlick.GetSelText + TabInteraktion.OK + sleep 2 + Kontext "DocumentImpress" + gMouseClick 90,90 + sleep 1 + gMouseClick 50,50 sleep 2 - Kontext "NavigatorDraw" - sleep 2 - if Not Liste.GetSelIndex = 3 Then - Warnlog "- jumped to wrong slide" - else - Printlog "- jumped to correct slide" - end if - sleep 1 + Kontext "NavigatorDraw" + sleep 2 + if Not Liste.GetSelIndex = 3 Then + Warnlog "- jumped to wrong slide" + else + Printlog "- jumped to correct slide" + end if + sleep 1 - Kontext "DocumentImpress" - EditSelectAll - sleep 1 + Kontext "DocumentImpress" + EditSelectAll + sleep 1 - SlideShowInteraction - sleep 2 - Kontext "TabInteraktion" - AktionBeiMausklick.select 3 'Sprung zur naechsten Seite - Printlog (AktionBeiMausKlick.GetSelText + " chosen") - TabInteraktion.OK - sleep 1 + SlideShowInteraction + sleep 2 + Kontext "TabInteraktion" + AktionBeiMausklick.select 3 'Sprung zur naechsten Seite + Printlog (AktionBeiMausKlick.GetSelText + " chosen") + TabInteraktion.OK + sleep 1 Kontext "DocumentImpress" gMouseClick 90,90 sleep 2 gMouseClick 50,50 Kontext "NavigatorDraw" - if Liste.GetSelIndex <> 4 Then - Warnlog "- Jumped to wrong slide" - else - Printlog " Jumped to correct slide" - end if - sleep 1 - kontext "DocumentImpress" - EditSelectAll - sleep 1 - - SlideShowInteraction - sleep 1 - Kontext "TabInteraktion" - AktionBeiMausklick.select 4 'Sprung zur ersten Seite - Printlog AktionBeiMausKlick.GetSelText - sleep 1 - TabInteraktion.OK - sleep 1 - Kontext "DocumentImpress" - gMouseClick 90,90 - gMouseClick 50,50 - Kontext "NavigatorDraw" - if Liste.GetSelIndex <> 1 Then Warnlog "- jumped to wrong slide" - Letzte.Click 'Liste.Select 4 - Kontext "DocumentImpress" - EditSelectAll - sleep 2 + if Liste.GetSelIndex <> 4 Then + Warnlog "- Jumped to wrong slide" + else + Printlog " Jumped to correct slide" + end if + sleep 1 + kontext "DocumentImpress" + EditSelectAll + sleep 1 + + SlideShowInteraction + sleep 1 + Kontext "TabInteraktion" + AktionBeiMausklick.select 4 'Sprung zur ersten Seite + Printlog AktionBeiMausKlick.GetSelText + sleep 1 + TabInteraktion.OK + sleep 1 + Kontext "DocumentImpress" + gMouseClick 90,90 + gMouseClick 50,50 + Kontext "NavigatorDraw" + if Liste.GetSelIndex <> 1 Then Warnlog "- jumped to wrong slide" + Letzte.Click 'Liste.Select 4 + Kontext "DocumentImpress" + EditSelectAll + sleep 2 try SlideShowInteraction catch warnlog "SlideshowInteraction diasabled :-(" endcatch - Kontext "TabInteraktion" - AktionBeiMausklick.select 5 'Sprung zur letzten Seite - printlog AktionBeiMausKlick.GetSelText - TabInteraktion.OK - sleep 1 - Kontext "NavigatorDraw" - if Not Liste.GetSelIndex = 1 Then Warnlog "- jumped to wrong slide" + Kontext "TabInteraktion" + AktionBeiMausklick.select 5 'Sprung zur letzten Seite + printlog AktionBeiMausKlick.GetSelText + TabInteraktion.OK + sleep 1 + Kontext "NavigatorDraw" + if Not Liste.GetSelIndex = 1 Then Warnlog "- jumped to wrong slide" - kontext "DocumentImpress" - Call hRechteckErstellen 20,20,50,50 - sleep 1 - EditSelectAll - sleep 1 + kontext "DocumentImpress" + Call hRechteckErstellen 20,20,50,50 + sleep 1 + EditSelectAll + sleep 1 try FormatGroupGroup catch warnlog "GROUP?" endcatch - sleep 1 - - SlideShowInteraction - Kontext "TabInteraktion" - AktionBeiMausklick.select 6 'Sprung zu Seite oder Objekt - printlog AktionBeiMausKlick.GetSelText - sleep 2 - if Not ListeSprungZuSeiteObjekt.IsVisible Then Warnlog " list seems to be invisible" - Seite.SetText S2 - Suchen.Click - if ListeSprungZuSeiteObjekt.GetSelIndex <> 3 Then Warnlog " Search does not work" - printlog ListeSprungZuSeiteObjekt.GetSelIndex - TabInteraktion.OK - sleep 1 + sleep 1 - Kontext "DocumentImpress" - gMouseClick 90,90 - gMouseClick 25,25, - sleep 2 - Kontext "NavigatorDraw" - if Liste.GetSelIndex <> 2 Then Warnlog "- Jumped to wrong destination" - printlog Liste.GetSelIndex - Liste.Select 4 - Kontext "DocumentImpress" - EditSelectAll - sleep 1 + SlideShowInteraction + Kontext "TabInteraktion" + AktionBeiMausklick.select 6 'Sprung zu Seite oder Objekt + printlog AktionBeiMausKlick.GetSelText + sleep 2 + if Not ListeSprungZuSeiteObjekt.IsVisible Then Warnlog " list seems to be invisible" + Seite.SetText S2 + Suchen.Click + if ListeSprungZuSeiteObjekt.GetSelIndex <> 3 Then Warnlog " Search does not work" + printlog ListeSprungZuSeiteObjekt.GetSelIndex + TabInteraktion.OK + sleep 1 - Kontext "DocumentImpress" - EditSelectAll + Kontext "DocumentImpress" + gMouseClick 90,90 + gMouseClick 25,25, + sleep 2 + Kontext "NavigatorDraw" + if Liste.GetSelIndex <> 2 Then Warnlog "- Jumped to wrong destination" + printlog Liste.GetSelIndex + Liste.Select 4 + Kontext "DocumentImpress" + EditSelectAll + sleep 1 + + Kontext "DocumentImpress" + EditSelectAll + sleep 1 + SlideShowInteraction + Kontext "TabInteraktion" + sleep 1 + AktionBeiMausKlick.Select 7 'Sprung zu Dokument + Printlog AktionBeiMausKlick.GetSelText + " chosen" + try + Durchsuchen.Click sleep 1 - SlideShowInteraction - Kontext "TabInteraktion" - sleep 1 - AktionBeiMausKlick.Select 7 'Sprung zu Dokument - Printlog AktionBeiMausKlick.GetSelText + " chosen" - try - Durchsuchen.Click - sleep 1 - Kontext "OeffnenDlg" - sleep 1 - Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\recht_49.sxi") - Oeffnen.Click - sleep 10 - ' check if the document is writable - if fIsDocumentWritable = false then - ' make the document writable and check if it's succesfull - if fMakeDocumentWritable = false then - warnlog "The document can't be make writeable. Test stopped." - goto endsub - endif - endif - catch - Warnlog "- Search button could not be accessed" - endcatch - sleep 1 - Kontext "TabInteraktion" - sleep 1 - TabInteraktion.OK - sleep 3 - Kontext "DocumentImpress" - DocumentImpress.MouseDown 90,90 - DocumentImpress.MouseUp 90,90 - sleep 2 - Kontext "DocumentImpress" - DocumentImpress.Mousedown 30,30 - kontext - b115364 = false - if messagebox.exists then - printlog "baeh: '" + messagebox.gettext + "'" - try - messagebox.ok ' was default in so7 - catch - warnlog "behaviour changed #115364# mother document gets closed :-(" - if fileExists(ConvertPath (gOfficePath + "user\work\bug115364.sxi")) then - kill ConvertPath (gOfficePath + "user\work\bug115364.sxi") - endif - messagebox.yes ' don't save changes, before going on! - b115364 = true - kontext "SpeichernDlg" - Dateiname.setText ConvertPath (gOfficePath + "user\work\bug115364.sxi") - Speichern.click - sleep 10 - endcatch + Kontext "OeffnenDlg" + sleep 1 + Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\recht_49.sxi") + Oeffnen.Click + sleep 10 + ' check if the document is writable + if fIsDocumentWritable = false then + ' make the document writable and check if it's succesfull + if fMakeDocumentWritable = false then + warnlog "The document can't be make writeable. Test stopped." + goto endsub + endif + endif + catch + Warnlog "- Search button could not be accessed" + endcatch + sleep 1 + Kontext "TabInteraktion" + sleep 1 + TabInteraktion.OK + sleep 3 + Kontext "DocumentImpress" + DocumentImpress.MouseDown 90,90 + DocumentImpress.MouseUp 90,90 + sleep 2 + Kontext "DocumentImpress" + DocumentImpress.Mousedown 30,30 + kontext + b115364 = false + if messagebox.exists then + printlog "baeh: '" + messagebox.gettext + "'" + try + messagebox.ok ' was default in so7 + catch + warnlog "behaviour changed #115364# mother document gets closed :-(" + if fileExists(ConvertPath (gOfficePath + "user\work\bug115364.sxi")) then + kill ConvertPath (gOfficePath + "user\work\bug115364.sxi") + endif + messagebox.yes ' don't save changes, before going on! + b115364 = true + kontext "SpeichernDlg" + Dateiname.setText ConvertPath (gOfficePath + "user\work\bug115364.sxi") + Speichern.click + sleep 10 + endcatch else printlog "OK :-)" endif @@ -444,207 +442,207 @@ testcase tSlideShowInteraction endif sleep 5 - Kontext "NavigatorDraw" - sleep 1 - Naechste.click + Kontext "NavigatorDraw" + sleep 1 + Naechste.click - Kontext "DocumentImpress" - EditSelectAll - sleep 1 - - SlideShowInteraction - Kontext "TabInteraktion" - sleep 1 - AktionBeiMausKlick.Select 9 - Printlog AktionBeiMausKlick.GetSelText + " chosen" - sleep 1 - Tabinteraktion.OK - sleep 2 + Kontext "DocumentImpress" + EditSelectAll + sleep 1 - SlideShowInteraction - Kontext "TabInteraktion" - sleep 1 - if not AktionBeiMausKlick.GetSelIndex = 9 Then Warnlog "- Not the right action chosen" - sleep 1 - AktionBeiMausKlick.Select 9 'Klang abspielen - Printlog AktionBeiMausKlick.GetSelText + "- chosen" - sleep 1 - Tabinteraktion.OK - sleep 2 - Kontext "NavigatorDraw" - sleep 1 - Liste.Select 2 - Kontext "DocumentImpress" - EditSelectAll - sleep 1 - SlideShowInteraction - Kontext "TabInteraktion" - sleep 1 - Durchsuchen.Click - sleep 1 - Kontext "OeffnenDlg" - sleep 1 - Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\blip.wav") - sleep 1 - Oeffnen.Click - sleep 1 - Kontext "Active" - if Active.Exists Then - Warnlog Active.GetText + " Gallery might be empty" - Active.OK - sleep 1 - Kontext "OeffnenDlg" - OeffnenDlg.Cancel - sleep 1 - end if - Kontext "TabInteraktion" - SetClipboard Klangwahl.GetText - TabInteraktion.OK - sleep 1 - SlideShowInteraction - Kontext "TabInteraktion" - sleep 1 - if Klangwahl.GetText <> GetClipboardText then Warnlog "- Not the right sound chosen" - TabInteraktion.OK - sleep 1 - InsertGraphicsFromFile - sleep 1 - Kontext "GrafikeinfuegenDlg" - sleep 1 - if Verknuepfen.IsChecked then Verknuepfen.UnCheck - Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp") - Oeffnen.Click - sleep 3 - Kontext "NavigatorDraw" - sleep 1 - Liste.Select 4 - sleep 1 - SlideShowInteraction - Kontext "TabInteraktion" - sleep 1 - AktionBeiMausKlick.Select 11 'Objektaktion ausfuehren - Printlog AktionBeiMausKlick.GetSelText + " chosen" - sleep 1 - Zaehler=Effekt.GetItemCount - for i=1 to Zaehler - Effekt.Select i - Printlog Effekt.GetSelText + " chosen" - if i=1 Then - if Langsam.IsEnabled Then Warnlog "- Control should not be enabled, because no effect chosen" - if Mittel.IsEnabled Then Warnlog "- Control should not be enabled, because no effect chosen" - if Schnell.IsEnabled Then Warnlog "- Control should not be enabled, because no effect chosen" - end if - sleep 1 + SlideShowInteraction + Kontext "TabInteraktion" + sleep 1 + AktionBeiMausKlick.Select 9 + Printlog AktionBeiMausKlick.GetSelText + " chosen" + sleep 1 + Tabinteraktion.OK + sleep 2 - TabInteraktion.OK - sleep 1 - SlideShowInteraction - Kontext "TabInteraktion" - sleep 1 - next i - TabInteraktion.OK - sleep 1 - SlideShowInteraction - Kontext "TabInteraktion" - sleep 1 - AktionBeiMausKlick.Select 10 'Objekt ausblenden - Printlog AktionBeiMausKlick.GetSelText + " chosen" - ListeObjektAktion.Select 1 - sleep 1 - TabInteraktion.OK - sleep 1 - gMouseClick 90,90 - sleep 1 - gMouseClick 55,55 - sleep 1 - Kontext "DocumentImage" - - SlideShowInteraction - Kontext "TabInteraktion" - sleep 1 - AktionBeiMausKlick.Select 13 'Makro - Printlog AktionBeiMausKlick.GetSelText + " chosen" - sleep 2 - Durchsuchen.Click - sleep 5 - Kontext "Makro" - sleep 5 - Makro.Cancel - sleep 2 - Kontext "TabInteraktion" - sleep 1 - TabInteraktion.OK - sleep 3 - - SlideShowInteraction - Kontext "TabInteraktion" - sleep 2 - if not AktionBeiMausKlick.GetSelIndex = 12 Then Warnlog "- Wrong action used" - sleep 1 - AktionBeiMausKlick.Select 14 'Praesentation beenden - Printlog AktionBeiMausKlick.GetSelText - Tabinteraktion.OK - sleep 1 - - SlideShowPresentationSettings - Kontext "Bildschirmpraesentation" - if not Fenster.IsChecked Then Fenster.Check - BildschirmPraesentation.OK - sleep 2 - Kontext "DocumentImpress" - DocumentImpress.TypeKeys "<MOD1 F2>" - sleep 5 - Kontext "DocumentPresentation" - sleep 2 - DocumentPresentation.MouseDown 50,50 - DocumentPresentation.MouseUp 50,50 - sleep 5 - try - Kontext "DocumentImpress" - EditSelectAll - Printlog "- Slideshow ended at right point" - catch - Warnlog "- Program is still in slideshow mode" - Kontext "DocumentPresentation" - DocumentPresentation.TypeKeys "<ESCAPE>" - endcatch + SlideShowInteraction + Kontext "TabInteraktion" + sleep 1 + if not AktionBeiMausKlick.GetSelIndex = 9 Then Warnlog "- Not the right action chosen" + sleep 1 + AktionBeiMausKlick.Select 9 'Klang abspielen + Printlog AktionBeiMausKlick.GetSelText + "- chosen" + sleep 1 + Tabinteraktion.OK + sleep 2 + Kontext "NavigatorDraw" + sleep 1 + Liste.Select 2 + Kontext "DocumentImpress" + EditSelectAll + sleep 1 + SlideShowInteraction + Kontext "TabInteraktion" + sleep 1 + Durchsuchen.Click + sleep 1 + Kontext "OeffnenDlg" + sleep 1 + Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\blip.wav") + sleep 1 + Oeffnen.Click + sleep 1 + Kontext "Active" + if Active.Exists Then + Warnlog Active.GetText + " Gallery might be empty" + Active.OK + sleep 1 + Kontext "OeffnenDlg" + OeffnenDlg.Cancel + sleep 1 + end if + Kontext "TabInteraktion" + SetClipboard Klangwahl.GetText + TabInteraktion.OK + sleep 1 + SlideShowInteraction + Kontext "TabInteraktion" + sleep 1 + if Klangwahl.GetText <> GetClipboardText then Warnlog "- Not the right sound chosen" + TabInteraktion.OK + sleep 1 + InsertGraphicsFromFile + sleep 1 + Kontext "GrafikeinfuegenDlg" + sleep 1 + if Verknuepfen.IsChecked then Verknuepfen.UnCheck + Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp") + Oeffnen.Click + sleep 3 + Kontext "NavigatorDraw" + sleep 1 + Liste.Select 4 + sleep 1 + SlideShowInteraction + Kontext "TabInteraktion" + sleep 1 + AktionBeiMausKlick.Select 11 'Objektaktion ausfuehren + Printlog AktionBeiMausKlick.GetSelText + " chosen" + sleep 1 + Zaehler=Effekt.GetItemCount + for i=1 to Zaehler + Effekt.Select i + Printlog Effekt.GetSelText + " chosen" + if i=1 Then + if Langsam.IsEnabled Then Warnlog "- Control should not be enabled, because no effect chosen" + if Mittel.IsEnabled Then Warnlog "- Control should not be enabled, because no effect chosen" + if Schnell.IsEnabled Then Warnlog "- Control should not be enabled, because no effect chosen" + end if + sleep 1 - Kontext "DocumentImpress" - DocumentImpress.TypeKeys "<SHIFT MOD1 F5>" - sleep 3 - setStartCurrentPage(TRUE) '/// Set "start with current page to ON = Default ///' - Call hCloseDocument -endcase + TabInteraktion.OK + sleep 1 + SlideShowInteraction + Kontext "TabInteraktion" + sleep 1 + next i + TabInteraktion.OK + sleep 1 + SlideShowInteraction + Kontext "TabInteraktion" + sleep 1 + AktionBeiMausKlick.Select 10 'Objekt ausblenden + Printlog AktionBeiMausKlick.GetSelText + " chosen" + ListeObjektAktion.Select 1 + sleep 1 + TabInteraktion.OK + sleep 1 + gMouseClick 90,90 + sleep 1 + gMouseClick 55,55 + sleep 1 + Kontext "DocumentImage" -' Slideshow menu 5 - Custom Animation + SlideShowInteraction + Kontext "TabInteraktion" + sleep 1 + AktionBeiMausKlick.Select 13 'Makro + Printlog AktionBeiMausKlick.GetSelText + " chosen" + sleep 2 + Durchsuchen.Click + sleep 5 + Kontext "Makro" + sleep 5 + Makro.Cancel + sleep 2 + Kontext "TabInteraktion" + sleep 1 + TabInteraktion.OK + sleep 3 + + SlideShowInteraction + Kontext "TabInteraktion" + sleep 2 + if not AktionBeiMausKlick.GetSelIndex = 12 Then Warnlog "- Wrong action used" + sleep 1 + AktionBeiMausKlick.Select 14 'Praesentation beenden + Printlog AktionBeiMausKlick.GetSelText + Tabinteraktion.OK + sleep 1 + + SlideShowPresentationSettings + Kontext "Bildschirmpraesentation" + if not Fenster.IsChecked Then Fenster.Check + BildschirmPraesentation.OK + sleep 2 + Kontext "DocumentImpress" + DocumentImpress.TypeKeys "<MOD1 F2>" + sleep 5 + Kontext "DocumentPresentation" + sleep 2 + DocumentPresentation.MouseDown 50,50 + DocumentPresentation.MouseUp 50,50 + sleep 5 + try + Kontext "DocumentImpress" + EditSelectAll + Printlog "- Slideshow ended at right point" + catch + Warnlog "- Program is still in slideshow mode" + Kontext "DocumentPresentation" + DocumentPresentation.TypeKeys "<ESCAPE>" + endcatch + + Kontext "DocumentImpress" + DocumentImpress.TypeKeys "<SHIFT MOD1 F5>" + sleep 3 + setStartCurrentPage(TRUE) printlog "Set "start with current page to ON = Default" + Call hCloseDocument +endcase 'tSlideShowInteraction + +'------------------------------------------------------------------------------- testcase tSlideShowCustomAnimation dim bError as boolean - '/// open application ///' + printlog "open application" Call hNewDocument - '/// create textbox with text ///' + printlog "create textbox with text" Call hTextrahmenErstellen ("Test text to test text effects", 10, 10, 20, 40 ) - '/// Slide Show->Custom Animation... ///' + printlog "Slide Show->Custom Animation..." SlideShowCustomAnimation Kontext "Tasks" - '/// click button 'Add...' ///' + printlog "click button 'Add...'" EffectAdd.click - '/// Dialog 'Custom Animation' comes up ///' + printlog "Dialog 'Custom Animation' comes up" kontext - '/// Switch to TabPage: Entrance ///' + printlog "Switch to TabPage: Entrance" active.setPage(TabEntrance) kontext "TabEntrance" if TabEntrance.exists(5) then DialogTest(TabEntrance) - '/// select in the listbox 'Effects' the second entry ///' + printlog "select in the listbox 'Effects' the second entry" Effects.select(2) Speed.getItemCount AutomaticPreview.unCheck sleep 1 AutomaticPreview.Check kontext - '/// Switch to TabPage: Emphasis ///' + printlog "Switch to TabPage: Emphasis" active.setPage(TabEmphasis) kontext "TabEmphasis" if TabEmphasis.exists(5) then @@ -654,7 +652,7 @@ testcase tSlideShowCustomAnimation warnlog "Impress:Tasks Pane:Custom Animation:TabEmphasis tabPage doesn't work." endif kontext - '/// Switch to TabPage: Exit ///' + printlog "Switch to TabPage: Exit" active.setPage(TabExit) kontext "TabExit" if TabExit.exists(5) then @@ -664,7 +662,7 @@ testcase tSlideShowCustomAnimation warnlog "Impress:Tasks Pane:Custom Animation:TabExit tabPage doesn't work." endif kontext - '/// Switch to TabPage: Motion Paths ///' + printlog "Switch to TabPage: Motion Paths" active.setPage(TabMotionPaths) kontext "TabMotionPaths" if TabMotionPaths.exists(5) then @@ -674,7 +672,7 @@ testcase tSlideShowCustomAnimation bError = true warnlog "Impress:Tasks Pane:Custom Animation:TabMotionPaths tabPage doesn't work." endif - '/// Close dialog 'Custom Animation' with 'OK' ///' + printlog "Close dialog 'Custom Animation' with 'OK'" TabMotionPaths.OK bError = false else @@ -683,11 +681,11 @@ testcase tSlideShowCustomAnimation endif Kontext "Tasks" if (NOT bError) then - '/// click button 'Change...' ///' + printlog "click button 'Change...'" EffectChange.click - '/// Dialog 'Custom Animation' comes up ///' + printlog "Dialog 'Custom Animation' comes up" kontext - '/// Switch to TabPage: Entrance ///' + printlog "Switch to TabPage: Entrance" active.setPage(TabEntrance) kontext "TabEntrance" if (NOT TabEntrance.exists(5)) then @@ -699,14 +697,14 @@ testcase tSlideShowCustomAnimation if EffectProperty.isEnabled then EffectProperty.getItemCount endif - '/// CLick on button '...' (Options) ///' + printlog "CLick on button '...' (Options)" EffectOptions.click kontext "TabEffect" if TabEffect.exists(5) then dialogTest(TabEffect) Sound.getItemCount AfterAnimation.getItemCount - '/// switch to TabPage 'Timing' ///' + printlog "switch to TabPage 'Timing'" Kontext active.setPage TabTiming kontext "TabTiming" @@ -723,7 +721,7 @@ testcase tSlideShowCustomAnimation else warnlog "Impress:Tasks Pane:Custom Animation:Effect Options: Timing TabPage didn't work." endif - '/// switch to TabPage 'Timing' ///' + printlog "switch to TabPage 'Timing'" Kontext active.setPage TabTextAnimation kontext "TabTextAnimation" @@ -753,10 +751,9 @@ testcase tSlideShowCustomAnimation endif kontext "Tasks" EffectAutomaticPreview.isChecked - '/// click button 'Remove' ///' + printlog "click button 'Remove'" EffectRemove.click endif - '/// close application ///' + printlog "close application" Call hCloseDocument -endcase - +endcase
\ No newline at end of file diff --git a/testautomation/graphics/optional/includes/impress/i_slidecopy.inc b/testautomation/graphics/optional/includes/impress/i_slidecopy.inc index 92283b35a369..19b4443c4f69 100644 --- a/testautomation/graphics/optional/includes/impress/i_slidecopy.inc +++ b/testautomation/graphics/optional/includes/impress/i_slidecopy.inc @@ -169,7 +169,7 @@ testcase tiSlideCopyNewPresentation kontext "DocumentImpress" hMouseClick DocumentImpress, 90, 90 '---------------------------------------------------------------------------3 - '/// Copy the slide to the clipboard ///' + printlog "Copy the slide to the clipboard" kontext "Slides" SlidesControl.TypeKeys "<PAGEUP>" sleep (1) @@ -182,16 +182,16 @@ testcase tiSlideCopyNewPresentation Call hCloseDocument Goto Endsub endif - '/// Close the presentation-window ///' + printlog "Close the presentation-window" Call hCloseDocument - '/// Open a new presentation ///' + printlog "Open a new presentation" Call hNewDocument - '/// Paste the slide from the clipboard ///' + printlog "Paste the slide from the clipboard! kontext "Slides" hUseAsyncSlot( "EditPaste" ) - '/// Delete the first slide ///' + printlog "Delete the first slide" hUseAsyncSlot( "EditDeleteSlide" ) - '/// Check if all three objects exists, and has the right values ///' + printlog "Check if all three objects exists, and has the right values" kontext "DocumentImpress" hTypeKeys "<ESCAPE>" hTypeKeys "<TAB>", 1 'Select the first object. @@ -263,7 +263,7 @@ testcase tiSlideCopyNewPresentation Warnlog "Wrong object or object-name! The name found was: " + value13 endif - '/// Close the bars we opened before. ///' + printlog "Close the bars we opened before." kontext "Connectorsbar" if Connectorsbar.Exists then Connectorsbar.Close kontext "SymbolShapes" @@ -271,7 +271,7 @@ testcase tiSlideCopyNewPresentation kontext "StarShapes" if StarShapes.Exists then StarShapes.Close - '/// Close Presentation. End testcase ///' + printlog "Close Presentation. End testcase" Call hCloseDocument endcase 'tiSlideCopyNewPresentation @@ -531,17 +531,17 @@ testcase tiSlideCopyPasteSpecial Dim value1 as string Dim value2 as string Dim value3 as string - '/// Copies slide, and pastes it with "Paste Special", ///' - '/// just to see if the office can handle it ///' - '/// Make new presentation ///' + printlog "Copies slide, and pastes it with Paste Special" + printlog "just to see if the office can handle it" + printlog "Make new presentation" Call hNewDocument - '/// Insert three objects: Connector, Door-plate, and Smiley ///' + printlog "Insert three objects: Connector, Door-plate, and Smiley" - '1 Insert Connector. + printlog "Insert Connector" kontext "Toolbar" sleep 1 try - Verbinder.TearOff ' insert connector + Verbinder.TearOff catch warnlog "bug for GH from FHA; .tearoff doesnt tell success" endcatch @@ -556,11 +556,11 @@ testcase tiSlideCopyPasteSpecial kontext "DocumentImpress" hMouseClick DocumentImpress, 90, 90 - '2 Insert Door-plate. + printlog "Insert Door-plate" kontext "Toolbar" sleep 1 try - StarShapes.TearOff ' insert connector + StarShapes.TearOff catch warnlog "bug for GH from FHA; .tearoff doesnt tell success" endcatch @@ -575,11 +575,11 @@ testcase tiSlideCopyPasteSpecial kontext "DocumentImpress" hMouseClick DocumentImpress, 90, 90 - '3 Insert Smiley. + printlog "Insert Smiley" kontext "Toolbar" sleep 1 try - SymbolShapes.TearOff ' insert connector + SymbolShapes.TearOff catch warnlog "bug for GH from FHA; .tearoff doesnt tell success" endcatch @@ -591,7 +591,7 @@ testcase tiSlideCopyPasteSpecial gMouseMove (70,70,89,89) gMouseUp (89,89) - '/// Copy the slide to the clipboard ///' + printlog "Copy the slide to the clipboard" kontext "Slides" SlidesControl.TypeKeys "<PAGEUP>" SlidesControl.TypeKeys "<SHIFT F10>" @@ -603,12 +603,12 @@ testcase tiSlideCopyPasteSpecial Goto Endsub endif - '/// Try to paste special. And check that the office still stays alive ///' + printlog "Try to paste special. And check that the office still stays alive" EditPasteSpecial kontext "InhaltEinfuegen" InhaltEinfuegen.OK - '/// Close the bars we opened before. ///' + printlog "Close the bars we opened before" kontext "Connectorsbar" if Connectorsbar.Exists then Connectorsbar.Close kontext "SymbolShapes" @@ -618,12 +618,13 @@ testcase tiSlideCopyPasteSpecial sleep 1 kontext "DocumentImpress" - '/// Close Presentation. End testcase ///' + printlog "Close Presentation. End testcase" Call hCloseDocument endcase 'tiSlideCopyPasteSpecial '----------------------------------------------------------------------- + testcase tiSlideCopyInSlideSorter qaerrorlog "#i58418#: Pasting in slide sorter sets slide to wrong position" goto endsub @@ -631,10 +632,10 @@ testcase tiSlideCopyInSlideSorter Dim value1 as string Dim value2 as string Dim value3 as string - '/// Copies slides within the slidesorter, and makes sure they are pasted on the correct position ///' - '/// Make new presentation ///' + printlog "Copies slides within the slidesorter, and makes sure they are pasted on the correct position" + printlog "Make new presentation" Call hNewDocument - '/// Insert an object: Connector, on the first slide ///' + printlog "Insert an object: Connector, on the first slide" kontext "Toolbar" sleep 1 try @@ -653,12 +654,9 @@ testcase tiSlideCopyInSlideSorter gMouseMove (10,10,30,30) gMouseUp (30,30) Printlog " Inserted a Connector-object." - 'Rename object hTypeKeys "<ESCAPE>" hTypeKeys "<TAB>", 1 DocumentImpress.TypeKeys "<SHIFT F10>" - - 'Rename if hMenuFindSelect(27027, true, 14) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument @@ -668,15 +666,14 @@ testcase tiSlideCopyInSlideSorter NameField.SetText "First" NameDlgObject.OK sleep 1 - Printlog " Renamed a the object to 'First'" + Printlog "Renamed a the object to 'First'" sleep 3 - '/// Rename slide to "1" ///' + printlog "Rename slide to 1" kontext "Slides" SlidesControl.TypeKeys "<PAGEUP>" SlidesControl.TypeKeys "<SHIFT F10>" sleep 3 - 'Rename if hMenuFindSelect(27268, true, 2) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument @@ -687,25 +684,24 @@ testcase tiSlideCopyInSlideSorter NameField.SetText "1" NameDlgPage.OK sleep 1 - Printlog " Renamed the Slide to '1'" + Printlog "Renamed the Slide to '1'" kontext "DocumentImpress" hMouseClick DocumentImpress, 90, 90 sleep 3 - '/// Insert a new slide ///' + printlog "Insert a new slide" kontext "Slides" SlidesControl.TypeKeys "<TAB><PAGEDOWN>" SlidesControl.OpenContextMenu sleep 3 - 'Insert slide if hMenuFindSelect(27014, true, 1) = false then Warnlog "Context-Menu-entry `Insert slide` was not found. Therefore the test ends." Call hCloseDocument Goto Endsub endif - Printlog " Inserted a new slide." - '/// Insert an object: Door-plate, on the second slide ///' + Printlog "Inserted a new slide." + printlog "Insert an object: Door-plate, on the second slide" kontext "Toolbar" sleep 1 try @@ -721,13 +717,10 @@ testcase tiSlideCopyInSlideSorter gMouseDown (40,40) gMouseMove (40,40,60,60) gMouseUp (60,60) - Printlog " Inserted a Door-Plate-object." - + Printlog "Inserted a Door-Plate-object." hTypeKeys "<ESCAPE>" hTypeKeys "<TAB>", 2 hTypeKeys "<SHIFT F10>" - - ' Rename if hMenuFindSelect(27027, true, 15) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument @@ -738,16 +731,15 @@ testcase tiSlideCopyInSlideSorter NameField.SetText "Second" NameDlgObject.OK sleep 1 - Printlog " Renamed a the object to 'Second'" + Printlog "Renamed a the object to 'Second'" kontext "DocumentImpress" hMouseClick DocumentImpress, 90, 90 sleep 2 - '/// Rename slide to "2" ///' + printlog "Rename slide to 2" kontext "Slides" SlidesControl.OpenContextMenu sleep 3 - ' Rename if hMenuFindSelect(27268, true, 3) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument @@ -759,20 +751,18 @@ testcase tiSlideCopyInSlideSorter sleep 1 Printlog " Renamed the slide '2'" - '/// Insert a new slide ///' + printlog "Insert a new slide" kontext "Slides" Slidescontrol.TypeKeys "<PAGEDOWN>", 2 Slidescontrol.TypeKeys "<SHIFT F10>" sleep 3 - 'Insert slide if hMenuFindSelect(27014, true, 1) = false then Warnlog "Context-Menu-entry `Insert slide` was not found. Therefore the test ends." Call hCloseDocument Goto Endsub endif - Printlog " Inserted a new slide." - - '/// Insert an object: Smiley, on the second slide ///' + Printlog "Inserted a new slide." + printlog "Insert an object: Smiley, on the second slide" kontext "Toolbar" sleep 1 try @@ -788,13 +778,9 @@ testcase tiSlideCopyInSlideSorter gMouseMove (70,70,89,89) gMouseUp (89,89) Printlog " Inserted a Smiley-object." - - 'Rename object hTypeKeys "<ESCAPE>" hTypeKeys "<TAB>", 2 hTypeKeys "<SHIFT F10>" - - 'Choose rename. if hMenuFindSelect(27027, true, 15) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument @@ -804,13 +790,11 @@ testcase tiSlideCopyInSlideSorter NameField.SetText "Third" NameDlgObject.OK Printlog " Renamed a the object to 'Third'" - - '/// Rename slide to "3" ///' + printlog "Rename slide to 3" kontext "Slides" Slidescontrol.TypeKeys "<PAGEDOWN>", 2 SlidesControl.OpenContextMenu sleep 3 - ' Rename if hMenuFindSelect(27268, true, 3) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument @@ -823,7 +807,7 @@ testcase tiSlideCopyInSlideSorter sleep 1 Printlog " Renamed the slide '3'" - '/// Close the bars we opened before. ///' + printlog "Close the bars we opened before." kontext "Connectorsbar" if Connectorsbar.Exists then Connectorsbar.Close kontext "SymbolShapes" @@ -831,47 +815,46 @@ testcase tiSlideCopyInSlideSorter kontext "StarShapes" if StarShapes.Exists then StarShapes.Close - '/// Change to Slidesorter ///' + printlog "Change to Slidesorter" kontext "DocumentImpress" ViewSlideSorter - '/// Now we have changed view to the slidesorter ///' + printlog "Now we have changed view to the slidesorter" kontext "Slides" - Printlog " Changed view to 'SlideSorter'" - '/// Make sure the last slide is selcted ///' + Printlog "Changed view to 'SlideSorter'" + printlog "Make sure the last slide is selcted" SlidesControl.TypeKeys "<TAB>" SlidesControl.TypeKeys "<PAGEDOWN>", 3 - '/// Cut the last slide ///' + printlog "Cut the last slide" SlidesControl.TypeKeys "<MOD1 X>" - '/// Make sure the first slide is selected ///' + printlog "Make sure the first slide is selected" SlidesControl.TypeKeys "<TAB>" SlidesControl.TypeKeys "<PAGEUP>", 2 sleep 1 - '/// Paste the Slide ///' + printlog "Paste the Slide" kontext "Slides" SlidesControl.TypeKeys "<MOD1 V>" - '/// choose "Before" as specification for where + printlog "choose Before as specification for where" Kontext "InsertPaste" if InsertPaste.Exists(3) then Before.Check InsertPaste.OK Printlog " Pasted slide 'Before'" else - warnlog " Problem when copying/pasting slide." + warnlog "Problem when copying/pasting slide." endif - '/// Check where the slide ended up ///' + printlog "Check where the slide ended up" kontext "Slides" SlidesControl.TypeKeys "<TAB>" SlidesControl.TypeKeys "<PAGEUP>", 3 'to get to the first slide SlidesControl.TypeKeys "<SHIFT F10>" sleep 3 - ' Rename if hMenuFindSelect(27268, true, 3) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument @@ -888,12 +871,14 @@ testcase tiSlideCopyInSlideSorter sleep 1 kontext "Slides" - '/// Choose the slide in the middle (named "1") ///' + printlog "Choose the slide in the middle (named 1)" SlidesControl.TypeKeys "<TAB>" - SlidesControl.TypeKeys "<PAGEDOWN>", 3 'to get to the last slide - SlidesControl.TypeKeys "<PAGEUP>" 'to go back one step + printlog "to get to the last slide" + SlidesControl.TypeKeys "<PAGEDOWN>", 3 + printlog "to go back one step" + SlidesControl.TypeKeys "<PAGEUP>" SlidesControl.OpenContextMenu (true) - ' Check the name of that slide (via Rename) + printlog "Check the name of that slide (via Rename)" if hMenuFindSelect(27268, true, 3) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument @@ -910,7 +895,7 @@ testcase tiSlideCopyInSlideSorter sleep 1 kontext "Slides" - '/// Cut the slide ///' + printlog "Cut the slide" SlidesControl.TypeKeys "<SHIFT F10>" sleep 3 if hMenuFindSelect(5710, true, 10) = false then @@ -919,18 +904,18 @@ testcase tiSlideCopyInSlideSorter Goto Endsub endif - '/// Make sure we have selected the last slide ///' + printlog "Make sure we have selected the last slide" SlidesControl.TypeKeys "<TAB>" SlidesControl.TypeKeys "<PAGEDOWN>", 2 - '/// Place the mousepointer to the left of the first slide ///' + printlog "Place the mousepointer to the left of the first slide" sleep 1 kontext "Slides" SlidesControl.MouseMove 2, 3 SlidesControl.OpenContextMenu true sleep 3 - '/// Paste the Slide ///' + printlog "Paste the Slide" if hMenuFindSelect(5712, true, 12) = false then Warnlog "Context-Menu-entry `Paste` were not found. Therefore the test ends." Call hCloseDocument @@ -938,7 +923,7 @@ testcase tiSlideCopyInSlideSorter endif sleep 1 - '/// Choose "After" as specification for where ///' + printlog "Choose "After" as specification for where" Kontext "InsertPaste" if InsertPaste.Exists(3) then After.Check @@ -948,13 +933,15 @@ testcase tiSlideCopyInSlideSorter warnlog " Problem when copying/pasting slide." endif - '/// Check where the slide ended up. Should have showed up at the last position ///' + printlog "Check where the slide ended up. Should have showed up at the last position" kontext "Slides" SlidesControl.TypeKeys "<TAB>" - SlidesControl.TypeKeys "<PAGEDOWN>", 3 'to get to the last slide - SlidesControl.TypeKeys "<SHIFT F10>" '= open context menu + printlog "to get to the last slide" + SlidesControl.TypeKeys "<PAGEDOWN>", 3 + printlog "open context menu" + SlidesControl.TypeKeys "<SHIFT F10>" sleep 3 - ' Rename + printlog "Rename" if hMenuFindSelect(27268, true, 3) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument @@ -970,10 +957,8 @@ testcase tiSlideCopyInSlideSorter NameDlgPage.OK sleep 1 - '/// Close Presentation. End testcase ///' + printlog "Close Presentation. End testcase" Call hCloseDocument endcase 'tiSlideCopyInSlideSorter '------------------------------------------------------------------------ - -'TODO FHA - Check the objects after pasting them. diff --git a/testautomation/graphics/optional/includes/impress/i_stylist.inc b/testautomation/graphics/optional/includes/impress/i_stylist.inc index 7efe28089365..1ef1773a5c55 100644 --- a/testautomation/graphics/optional/includes/impress/i_stylist.inc +++ b/testautomation/graphics/optional/includes/impress/i_stylist.inc @@ -29,15 +29,10 @@ '* '* short description : '* -'******************************************************************* -'* -' #1 tFormatStylistBackground -' #1 fGetSetPageBackground -'* '\******************************************************************* testcase tFormatStylistBackground -'/// special test for BUG # 96364 "Background style looses functionality over PPT Ex/import" ///' + printlog " special test for BUG # 96364 Background style looses functionality over PPT Ex/import" dim sFilter (50) as string dim sFileList (30) as string dim i as integer @@ -59,7 +54,7 @@ testcase tFormatStylistBackground goto endsub endif - '/// if not exists : gOfficePath + '\\user\\impress\\optional\\', create it ///' + printlog " if not exists : gOfficePath + '\\user\\impress\\optional\\', create it" if app.dir (ConvertPath ( gOfficePath + "user/work/impress") ) = "" then app.mkdir ConvertPath ( gOfficePath + "user/work/impress") endif @@ -67,23 +62,23 @@ testcase tFormatStylistBackground app.mkdir ConvertPath ( gOfficePath + "user/work/impress/optional") endif - '/// open application ///' + printlog " open application" Call hNewDocument iColor = 10 - '/// change background color via stylist ///' + printlog " change background color via stylist" if (iColor <> fGetSetPageBackground (iColor,0)) then warnlog "Stylist background was not changed as expected :-( "+iColor endif - '/// check if it is the same in Format -> Page ///' + printlog " check if it is the same in Format -> Page" if fGetSetPageBackground (0,1) <> iColor then warnlog " First stage error! Difference between stylist and menu entry :-( "+iColor endif - '/// save this in 3 formats: ///' - '///+ - StarImpress 5.0 ///' - '///+ - StarOffice 6.0 Presentation ///' - '///+ - Microsoft PowerPoint 97/2000/XP ///' + printlog " save this in 3 formats:" + printlog "+ - StarImpress 5.0" + printlog "+ - StarOffice 6.0 Presentation" + printlog "+ - Microsoft PowerPoint 97/2000/XP" FileSaveAs sleep 2 Kontext "SpeichernDlg" @@ -110,14 +105,14 @@ testcase tFormatStylistBackground printlog " saved with filter ("+i+"/3): "+ sFilter(i) next i - '/// close impress ///' + printlog "close impress" FileClose sleep 1 - kontext ' active about information loss ? + kontext if active.exists (5) then active.yes sleep 10 - '/// open just saved files ///' + printlog " open just saved files" sFileName = ConvertPath ( gOfficePath + "user/work/impress/optional/" ) GetFileList ( sFileName, "isty_*", sFileList() ) @@ -127,23 +122,23 @@ testcase tFormatStylistBackground hFileOpen ( sFileList(i) ) Sleep 5 If hIsNamedDocLoaded (sFileList(i)) Then - printlog " used filter: " + hGetUsedFilter() + printlog "used filter: " + hGetUsedFilter() else warnlog "document didn't get loaded" endif sleep 5 - '/// check if stylist, menue and prediction are as expected ///' + printlog " check if stylist, menue and prediction are as expected" iColor = 10 if ((fGetSetPageBackground (0,0) <> iColor) OR (fGetSetPageBackground (0,1) <> iColor)) then warnlog "Background was not as expected on loading :-( "+iColor endif iColor = 20 - '/// change background in stylist ///' + printlog " change background in stylist" if (fGetSetPageBackground (iColor,0) <> iColor) then warnlog "Stylist background was not changed as expected :-( "+iColor endif sleep 1 - '/// check if background is same in format menu ///' + printlog " check if background is same in format menu" if (fGetSetPageBackground (0,1) <> iColor) then warnlog "Format menu background is wrong :-( "+iColor endif @@ -151,7 +146,7 @@ testcase tFormatStylistBackground hCloseDocument sleep 2 next i -endcase +endcase 'tFormatStylistBackground '------------------------------------------------------------------------------ diff --git a/testautomation/graphics/optional/includes/impress/i_view.inc b/testautomation/graphics/optional/includes/impress/i_view.inc index 54ba5132d16e..fab032656579 100644 --- a/testautomation/graphics/optional/includes/impress/i_view.inc +++ b/testautomation/graphics/optional/includes/impress/i_view.inc @@ -41,24 +41,28 @@ testcase tAnsichtHintergrundNotizen Printlog "- View background notes" - Call hNewDocument '/// new document ///' + printlog "new document" + Call hNewDocument try - ViewNotes '/// view background notes ///' + printlog "view background notes" + ViewNotes sleep 3 catch Warnlog "View-Notes could not be accessed" endcatch ViewWorkspaceDrawingView sleep 1 - Call hCloseDocument '/// close document ///' + printlog "close document" + Call hCloseDocument sleep 1 -endcase +endcase 'tAnsichtHintergrundNotizen '------------------------------------------------------------------------------- testcase tViewWorkspaceHandoutView Printlog "- View background handout" - Call hNewDocument '/// new document ///' + printlog "new document" + Call hNewDocument sleep 2 Kontext "DocumentImpress" if NOT documentImpress.Exists then @@ -67,7 +71,7 @@ testcase tViewWorkspaceHandoutView end if sleep 2 Printlog " ViewWorkspaceHandoutView" - ViewWorkspaceHandoutView '/// view background handout ///' + ViewWorkspaceHandoutView sleep 2 Kontext "Tasks" sleep 2 @@ -77,9 +81,11 @@ testcase tViewWorkspaceHandoutView Printlog " ViewWorkspaceHandoutView works" end if Printlog "ViewWorkspaceHandoutView closed" - ViewWorkspaceDrawingView '/// back to view background drawing ///' - Call hCloseDocument '/// close document ///' -endcase + printlog "back to view background drawing" + ViewWorkspaceDrawingView + printlog "close document" + Call hCloseDocument +endcase 'tViewWorkspaceHandoutView '------------------------------------------------------------------------------- @@ -89,67 +95,67 @@ testcase tViewWorkspaceOutlineView dim sFile as string dim i as integer - '/// load a document with heading styles in writer and use the function 'writer:'File->Send->Outline to presentation' to get it into the presentation ///' + printlog "load a document with heading styles in writer and use the function 'writer:'File->Send->Outline to presentation' to get it into the presentation" ' all 'heading 1' are new slides - '/// document used : "graphics\\required\\input\\outlinefromwriter.sxw" -> you get into writer ///' + printlog "document used : graphics\\required\\input\\outlinefromwriter.sxw -> you get into writer" sFile = ConvertPath (gTesttoolPath + "graphics\required\input\outlinefromwriter.sxw") hDateiOeffnen (sFile) sleep 10 - '///+ with 'File->Send->Outline to presentation' you get into impress ///' + printlog "with 'File->Send->Outline to presentation' you get into impress" FileSendOutlineToPresentation sleep 10 - Printlog "'/// View->Workspace->Outline View ///'" + Printlog "printlog View->Workspace->Outline View" ViewWorkspaceOutlineView sleep 1 - '/// go to the line with the 'I' (via 'search & replace' function) ///' + printlog "go to the line with the 'I' (via 'search & replace' function)" hTypeKeys "<STRG HOME>" EditSelectAll hFindeImDokument ("I") - '///<b> expected level/style: 'Outline 8' </b>///' - '/// get last character from selected style in stylist (expect a number of the outline(heading level) ///' + printlog "expected level/style: 'Outline 8'" + printlog "get last character from selected style in stylist (expect a number of the outline(heading level)" fGetPresentationStyle ("8") - '/// type keys [home] [tab] to go one level down ///' + printlog "type keys [home] [tab] to go one level down" Kontext "DocumentImpressOutlineView" DocumentImpressOutlineView.TypeKeys "<Home><Tab>" - '///<b> expected level/style: 'Outline 9' </b>///' + printlog "expected level/style: 'Outline 9'" fGetPresentationStyle ("9") Kontext "DocumentImpressOutlineView" - '/// Edit - "Select All" to go select the whole text ///' + printlog "Edit - "Select All" to go select the whole text" EditSelectAll - '/// type keys [shift]+[tab] eight times, to get all lines to the highest, except the one with the 'I' ///' + printlog "type keys [shift]+[tab] eight times, to get all lines to the highest, except the one with the 'I'" DocumentImpressOutlineView.TypeKeys ("<Shift Tab>", 8) hPrepareSearchBUG hTypeKeys "<STRG HOME>" EditSelectAll hFindeImDokument ("I") - '///<b> expected level/style: 'Outline 1' </b>///' + printlog "expected level/style: 'Outline 1 fGetPresentationStyle ("1") - '/// type keys [shift]+[tab] to get the last line to the highest level, too ///' + printlog "type keys [shift]+[tab] to get the last line to the highest level, too" Kontext "DocumentImpressOutlineView" DocumentImpressOutlineView.TypeKeys ("<Shift Tab>", 1) - '///<b> expected level/style: 'Title' </b>///' + printlog "expected level/style: 'Title'" fGetPresentationStyle (0) Kontext "DocumentImpressOutlineView" DocumentImpressOutlineView.TypeKeys ("<escape>", 1) - Printlog "'///<b> call 'Edit->Undo' nine times </b>///'" + Printlog "call 'Edit->Undo' nine times" for i = 1 to 9 editundo next i hPrepareSearchBUG hFindeImDokument ("I") - '///<b> expected level/style: 'Outline 9' </b>///' + printlog "expected level/style: 'Outline 9'" fGetPresentationStyle (9) - Printlog "'///<b> call 'Edit->Redo' nine times </b>///'" + Printlog "call 'Edit->Redo' nine times " for i = 1 to 9 editredo next i @@ -164,10 +170,10 @@ hPrepareSearchBUG hTypeKeys "<STRG HOME>" EditSelectAll hFindeImDokument ("I") - '///<b> expected level/style: 'Title' </b>///' + printlog "expected level/style: 'Title'" fGetPresentationStyle (0) - Printlog "'///<b> call 'Edit->Undo' nine times </b>///'" + Printlog "call 'Edit->Undo' nine times" for i = 1 to 9 editundo next i @@ -176,13 +182,13 @@ hPrepareSearchBUG hTypeKeys "<STRG HOME>" EditSelectAll hFindeImDokument ("I") - '///<b> expected level/style: 'Outline 9' </b>///' + printlog "expected level/style: 'Outline 9" fGetPresentationStyle (9) - '/// type keys [strg]+[A] ///' + printlog "type keys [strg]+[A]" Kontext "DocumentImpressOutlineView" EditSelectAll - '/// type keys [strg]+[X] ///' + printlog "type keys [strg]+[X]" DocumentImpressOutlineView.TypeKeys "<mod1 X>" kontext @@ -193,17 +199,17 @@ hPrepareSearchBUG Warnlog "messagebox missing ! (about deleting pages with graphic objects:)" endif - '/// 'Edit->Undo' ///' + printlog "'Edit->Undo'" editundo - '/// 'Edit->Redo' ///' + printlog "'Edit->Redo'" editredo - '/// 'Edit->Undo' ///' + printlog "'Edit->Undo'" editundo - '/// type keys [strg]+[A] ///' + printlog "type keys [strg]+[A]" Kontext "DocumentImpressOutlineView" EditSelectAll - '/// type keys [strg]+[X] ///' + printlog "type keys [strg]+[X]" DocumentImpressOutlineView.TypeKeys "<mod1 X>" kontext @@ -214,23 +220,23 @@ hPrepareSearchBUG Warnlog "messagebox missing ! (about deleting pages with graphic objects:)" endif - '/// type keys [strg]+[V] ///' + printlog "type keys [strg]+[V]" Kontext "DocumentImpressOutlineView" DocumentImpressOutlineView.TypeKeys "<mod1 V>" - '/// 'Edit->Undo' ///' + printlog "'Edit->Undo'" editundo - '/// 'Edit->Redo' ///' + printlog "'Edit->Redo'" editredo - '/// type keys [strg]+[End] ///' + printlog "type keys [strg]+[End]" Kontext "DocumentImpressOutlineView" DocumentImpressOutlineView.TypeKeys "<mod1 End>" - '/// type keys [strg]+[V] ///' + printlog "type keys [strg]+[V]" DocumentImpressOutlineView.TypeKeys "<mod1 V>" - '/// type keys [strg]+[A] ///' + printlog "type keys [strg]+[A]" EditSelectAll - '/// type keys [delete] ///' + printlog "type keys [delete]" DocumentImpressOutlineView.TypeKeys "<delete>" kontext @@ -242,7 +248,7 @@ hPrepareSearchBUG Warnlog "messagebox missing ! (about deleting pages with graphic objects:)" endif - '/// type keys [strg]+[A] ///' + printlog "type keys [strg]+[A]" Kontext "DocumentImpressOutlineView" EditSelectAll try @@ -252,7 +258,7 @@ hPrepareSearchBUG Warnlog "error 4711 TBO :-(" endcatch - '/// type keys [delete] ///' + printlog "type keys [delete]" Kontext "DocumentImpressOutlineView" DocumentImpressOutlineView.TypeKeys "<delete>" @@ -275,44 +281,50 @@ hPrepareSearchBUG endcatch ViewWorkspaceDrawingView - Call hCloseDocument '/// close document ///' - Call hCloseDocument '/// close document ///' -endcase + printlog "close document" + Call hCloseDocument +endcase 'tViewWorkspaceOutlineView '------------------------------------------------------------------------------- testcase tViewWorkspaceDrawingView Printlog "- View/Background-drawing" - Call hNewDocument '/// new document ///' + printlog "new document" + Call hNewDocument sleep 2 - ViewDrawing '/// view background drawing ///' + printlog "view background drawing" + ViewDrawing try - hRechteckErstellen ( 20,20,40,40 ) '/// create rectangle ///' + printlog "create rectangle" + hRechteckErstellen ( 20,20,40,40 ) sleep 1 Printlog " - rectangle created" catch Warnlog " Rectangle could not be created" endcatch - Call hCloseDocument '/// close document ///' -endcase + rintlog "close document" + Call hCloseDocument p +endcase 'tViewWorkspaceDrawingView '------------------------------------------------------------------------------- testcase tAnsichtEbene - printLog "- View/Layer" '/// view layer ///' - - - FileAutopilotPresentation '/// new document-autopilot ///' + printLog "- View/Layer" + + printlog "new document-autopilot" + FileAutopilotPresentation Kontext "AutopilotPraesentation1" sleep 5 AutopilotPraesentation1.Ok sleep 2 sleep 2 - ViewSlide '/// back to view slide ///' + printlog "back to view slide" + ViewSlide Sleep 2 - - Call hCloseDocument '/// close document ///' -endcase + printlog "close document" + Call hCloseDocument + +endcase 'tAnsichtEbene '------------------------------------------------------------------------------- diff --git a/testautomation/graphics/optional/includes/impress/im_002_.inc b/testautomation/graphics/optional/includes/impress/im_002_.inc index d1fa457ae8b2..609ddabf6376 100644 --- a/testautomation/graphics/optional/includes/impress/im_002_.inc +++ b/testautomation/graphics/optional/includes/impress/im_002_.inc @@ -32,21 +32,21 @@ '\***************************************************************** testcase tiEditDeleteSlide -'/// open application ///' - Call hNewDocument -'/// Insert->Slide; press 'OK' ///' - InsertSlide - sleep 2 - hTypekeys "<Pagedown>" - sleep 2 -'/// Edit->Delete Slide ///' - try + printlog "open application" + Call hNewDocument + printlog "Insert->Slide; press 'OK'" + InsertSlide + sleep 2 + hTypekeys "<Pagedown>" + sleep 2 + printlog "Edit->Delete Slide" + try EditDeleteSlide - catch + catch warnlog "Error when deleting slide" - endcatch - Call hCloseDocument -'/// close application ///' + endcatch + Call hCloseDocument + printlog "close application" endcase diff --git a/testautomation/graphics/optional/includes/impress/im_003_.inc b/testautomation/graphics/optional/includes/impress/im_003_.inc index 1db0627e4a4e..ca07ad8cbb6f 100644 --- a/testautomation/graphics/optional/includes/impress/im_003_.inc +++ b/testautomation/graphics/optional/includes/impress/im_003_.inc @@ -39,7 +39,7 @@ testcase tiViewPanes goto endsub 'TODO WG, tiViewPanes outcommented due to reconstruction of test dim bState as boolean - '/// open application ///' + printlog "open application" Call hCloseDocument Call hNewDocument sleep 1 @@ -54,7 +54,7 @@ testcase tiViewPanes ViewTaskSlide endif kontext "Tasks" - '/// Deactivate all but "masterpages" ///' + printlog "Deactivate all but masterpages" View.OpenMenu hMenuSelectNr (2) View.OpenMenu @@ -77,14 +77,14 @@ testcase tiViewPanes endif kontext "Tasks" sleep 1 - '/// View->Task Pane ///' + printlog "View->Task Pane" ViewTaskPane sleep 1 if (Tasks.exists) then warnlog "View->Task Panel failed" ViewTaskPane endif - '/// View->Task Pane ///' + printlog "View->Task Pane" ViewTaskPane sleep 1 if (NOT Tasks.exists) then @@ -101,7 +101,7 @@ testcase tiViewPanes warnlog "View->Slide Panel failed." ViewTaskSlide endif - '/// View->Slide Pane ///' + printlog "View->Slide Pane" ViewTaskSlide sleep 1 if (NOT Slides.exists) then @@ -112,7 +112,7 @@ testcase tiViewPanes warnlog "View->Slide Pane couldn't get executed" endcatch - '/// Reactivate all pages in the Task-panel ///' + printlog "Reactivate all pages in the Task-panel" kontext "Tasks" View.OpenMenu hMenuSelectNr (2) @@ -120,121 +120,117 @@ testcase tiViewPanes hMenuSelectNr (3) View.OpenMenu hMenuSelectNr (4) -endcase +endcase 'tiViewPanes + +'------------------------------------------------------------------------------- testcase tiViewMasterView -'/// open application ///' - Call hNewDocument -'/// View->Master View->Drawing View ///' - sleep 1 - ViewWorkspaceDrawingView -' Kontext "DocumentImpress" -' gMouseClick 70,70 - sleep 5 -'/// View->Master View->Outline View ///' - ViewWorkspaceOutlineView -' Kontext "DocumentImpressOutlineView" -' DocumentImpressOutlineView.MouseDown 70,70 -' DocumentImpressOutlineView.MouseUp 70,70 - sleep 1 -'/// View->Master View->Slides View ///' - ViewWorkspaceSlidesView -' Kontext "DocumentImpressSlideView" -' DocumentImpressSlideView.MouseDown 70,70 -' DocumentImpressSlideView.MouseUp 70,70 - sleep 1 -'/// View->Master View->Notes View ///' - ViewWorkspaceNotesView - sleep 1 -'/// View->Master View->Handout View ///' - ViewWorkspaceHandoutView - sleep 1 -'/// View->Master View->Drawing View ///' - ViewWorkspaceDrawingView -'/// close application ///' - sleep 1 - Call hCloseDocument -endcase + printlog "open application" + Call hNewDocument + printlog "View->Master View->Drawing View" + sleep 1 + ViewWorkspaceDrawingView + sleep 5 + printlog "View->Master View->Outline View" + ViewWorkspaceOutlineView + sleep 1 + printlog "View->Master View->Slides View" + ViewWorkspaceSlidesView + sleep 1 + printlog "View->Master View->Notes View" + ViewWorkspaceNotesView + sleep 1 + printlog "View->Master View->Handout View" + ViewWorkspaceHandoutView + sleep 1 + printlog "View->Master View->Drawing View" + ViewWorkspaceDrawingView + printlog "close application" + sleep 1 + Call hCloseDocument +endcase 'tiViewMasterView + +'------------------------------------------------------------------------------- testcase tiViewSlideMaster -'/// open application with : File->Autopilot->Presentation; OK; OK ///' -' Call hNewDocument - FileAutopilotPresentation ' to get a title :-) - sleep 2 - Kontext "AutopilotPraesentation1" - AutopilotPraesentation1.Ok - sleep 1 - Kontext "Seitenlayout" ' aka: Modify Slide - if Seitenlayout.exists(5) then - warnlog "Slidelayout has to vanish; moved to sidebar" - Seitenlayout.OK - endif - kontext "DocumentImpress" - sleep 1 -'/// View->Slide ///' - ViewSlide - Sleep 1 -'/// View->Master->Drawing ///' - ViewDrawing - Sleep 1 -'/// View->Slide ///' - ViewSlide - Sleep 1 -'/// View->Master->Title ///' - try - ViewTitle - Errorlog "View - Master - Title Slide Master should NOT be accessable" - catch - printlog "View - Master - Title Slide Master not accessable - good" - endcatch - Sleep 1 -'/// View->Slide ///' - ViewSlide - Sleep 1 -'/// View->Master->Handout ///' - ViewHandout - Sleep 1 -' ViewSlide - Sleep 1 -'/// View->Master->Notes ///' - ViewNotes - kontext "DocumentImpress" - Sleep 1 -'/// View->Slide ///' - ViewSlide - Sleep 1 -'/// close application ///' - Call hCloseDocument -endcase + printlog "open application with : File->Autopilot->Presentation; OK; OK" + FileAutopilotPresentation + sleep 2 + Kontext "AutopilotPraesentation1" + AutopilotPraesentation1.Ok + sleep 1 + Kontext "Seitenlayout" ' aka: Modify Slide + if Seitenlayout.exists(5) then + warnlog "Slidelayout has to vanish; moved to sidebar" + Seitenlayout.OK + endif + kontext "DocumentImpress" + sleep 1 + printlog "View->Slide" + ViewSlide + Sleep 1 + printlog "View->Master->Drawing" + ViewDrawing + Sleep 1 + printlog "View->Slide" + ViewSlide + Sleep 1 + printlog "View->Master->Title" + try + ViewTitle + Errorlog "View - Master - Title Slide Master should NOT be accessable" + catch + printlog "View - Master - Title Slide Master not accessable - good" + endcatch + Sleep 1 + printlog "View->Slide" + ViewSlide + Sleep 1 + printlog "View->Master->Handout" + ViewHandout + Sleep 1 + Sleep 1 + printlog "View->Master->Notes" + ViewNotes + kontext "DocumentImpress" + Sleep 1 + printlog "View->Slide" + ViewSlide + Sleep 1 + printlog "close application" + Call hCloseDocument +endcase 'tiViewSlideMaster + +'------------------------------------------------------------------------------- testcase tiViewToolbar_1 - Dim Zaehler as integer - Dim i as integer + Dim Zaehler as integer + Dim i as integer -'/// open application ///' - Call hNewDocument - sleep 2 -'/// Insert->Graphic... : "global\input\graf_inp\desp.bmp" ///' - InsertGraphicsFromFile - sleep 2 - Kontext "GrafikEinfuegenDlg" - sleep 1 - Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp") - sleep 1 - Oeffnen.Click - sleep 3 - Kontext "Messagebox" + printlog "open application" + Call hNewDocument + sleep 2 + printlog "Insert->Graphic... : global\input\graf_inp\desp.bmp" + InsertGraphicsFromFile + sleep 2 + Kontext "GrafikEinfuegenDlg" + sleep 1 + Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp") + sleep 1 + Oeffnen.Click + sleep 3 + Kontext "Messagebox" if Messagebox.Exists then - Warnlog Messagebox.GetText - Messagebox.OK + Warnlog Messagebox.GetText + Messagebox.OK end if - Kontext "DocumentImpress" -'/// select graphic ///' - EditSelectAll - sleep 2 - Kontext "GraphicObjectbar" + Kontext "DocumentImpress" + printlog "select graphic" + EditSelectAll + sleep 2 + Kontext "GraphicObjectbar" sleep 1 -'/// The Graphics Toolbar has to be visible now; If not -> ERROR ///' + printlog "The Graphics Toolbar has to be visible now; If not -> ERROR" if GraphicObjectbar.Exists Then Printlog "- graphic object toolbar exists" Zaehler=Grafikmodus.GetItemCount @@ -247,8 +243,6 @@ testcase tiViewToolbar_1 else Warnlog "- No graphic function toolbar visible" end if -'/// close application ///' - Call hCloseDocument -endcase - - + printlog "close application" + Call hCloseDocument +endcase 'tiViewToolbar_1
\ No newline at end of file diff --git a/testautomation/graphics/optional/includes/impress/im_004_.inc b/testautomation/graphics/optional/includes/impress/im_004_.inc index 17d00addc847..21387dca3516 100644 --- a/testautomation/graphics/optional/includes/impress/im_004_.inc +++ b/testautomation/graphics/optional/includes/impress/im_004_.inc @@ -33,26 +33,25 @@ testcase tiInsertSlideExpandSummary -'/// open application ///' - Call hNewDocument - ' presupposition -'/// View->Master View->Outline View ///' - ViewWorkspaceOutlineView - Sleep 1 - Kontext "DocumentImpressOutlineView" -'/// Type 2 rows ///' - DocumentImpressOutlineView.TypeKeys "Herbert<Return>Rudi" -'/// View->Master View->Drawing View ///' - ViewWorkspaceDrawingView - Sleep 1 - ' test menue entries -'/// Insert->Summery Slide ///' - InsertSummerySlide - Sleep 1 -'/// Insert->Expand Slide ///' - InsertExpandSlide - Sleep 2 -'/// close application ///' - Call hCloseDocument -endcase + printlog "open application" + Call hNewDocument + ' presupposition + printlog "View->Master View->Outline View" + ViewWorkspaceOutlineView + Sleep 1 + Kontext "DocumentImpressOutlineView" + printlog "Type 2 rows" + DocumentImpressOutlineView.TypeKeys "Herbert<Return>Rudi" + printlog "View->Master View->Drawing View" + ViewWorkspaceDrawingView + Sleep 1 + printlog "Insert->Summery Slide" + InsertSummerySlide + Sleep 1 + printlog "Insert->Expand Slide" + InsertExpandSlide + Sleep 2 + printlog "close application" + Call hCloseDocument +endcase 'tiInsertSlideExpandSummary diff --git a/testautomation/graphics/optional/includes/impress/im_005_.inc b/testautomation/graphics/optional/includes/impress/im_005_.inc index 1aa218f3ecba..d2a115deb3ca 100644 --- a/testautomation/graphics/optional/includes/impress/im_005_.inc +++ b/testautomation/graphics/optional/includes/impress/im_005_.inc @@ -33,18 +33,18 @@ testcase tiFormatModifyLayout -'/// open application ///' +printlog " open application" Call hNewDocument -'/// Impress: Format->Modify Layout ///' -'/// Draw : kontext menu: Slide-> Modify Slide (always disabled :-( ?///' +printlog " Impress: Format->Modify Layout" +printlog " Draw : kontext menu: Slide-> Modify Slide " FormatPage ' 27046 SID_MODIFYPAGE Kontext "SeitenLayout" DialogTest ( SeitenLayout ) sleep 1 -'/// cancel dialog 'Page Setup' ///' +printlog " cancel dialog 'Page Setup'" SeitenLayout.Cancel -'/// close application ///' +printlog " close application" Call hCloseDocument -endcase +endcase 'tiFormatModifyLayout diff --git a/testautomation/graphics/optional/includes/impress/options.inc b/testautomation/graphics/optional/includes/impress/options.inc index cfce04e68805..d67eaea8d195 100644 --- a/testautomation/graphics/optional/includes/impress/options.inc +++ b/testautomation/graphics/optional/includes/impress/options.inc @@ -41,8 +41,7 @@ function tiPEngineOptionsTest dim lala, optsound, os, oa, odc, ota, ets, etspeed, etrep, etshap, etgt as integer Kontext "Tasks" -' if (NOT bError) then - '/// CLick on button '...' (Options) ///' + printlog "CLick on button '...' (Options)" EffectOptions.Click kontext "TabEffect" if TabEffect.Exists(5) then @@ -56,13 +55,6 @@ function tiPEngineOptionsTest kontext "TabEffect" else kontext "TabEffect" -' if play.isEnabled then -' try -' play.click -' catch -' warnlog Sound.GetSelText + " wasn't played correctly." -' endcatch -' endif endif next os if AfterAnimation.isEnabled AND AfterAnimation.isVisible then @@ -89,7 +81,7 @@ function tiPEngineOptionsTest for ota = 1 to TextAnimation.GetItemCount TextAnimation.Select ota next ota - '/// switch to TabPage 'Timing' ///' + printlog "switch to TabPage 'Timing'" Kontext Active.SetPage TabTiming kontext "TabTiming" @@ -130,7 +122,7 @@ function tiPEngineOptionsTest else warnlog "Impress:Tasks Pane:Custom Animation:Effect Options: Timing TabPage didn't work." endif - '/// switch to TabPage 'Timing' ///' + printlog "switch to TabPage 'Timing'" Kontext active.setPage TabTextAnimation kontext "TabTextAnimation" @@ -163,9 +155,9 @@ function tiPEngineOptionsTest warnlog "Impress:Tasks Pane:Custom Animation:... button didn't work." endif Kontext "Tasks" -end function - +end function 'tiPEngineOptionsTest +'------------------------------------------------------------------------------- function optionstest2 dim filedialogue as boolean @@ -188,7 +180,7 @@ function optionstest2 else Warnlog "DelayBetweenCharacters should have been enabled" endif - '/// switch to TabPage 'Timing' ///' + printlog "switch to TabPage 'Timing'" Kontext Active.SetPage TabTiming kontext "TabTiming" @@ -234,7 +226,7 @@ function optionstest2 else warnlog "Impress:Tasks Pane:Custom Animation:Effect Options: Timing TabPage didn't work." endif - '/// switch to TabPage 'Timing' ///' + printlog "switch to TabPage 'Timing'" Kontext active.setPage TabTextAnimation kontext "TabTextAnimation" @@ -267,4 +259,4 @@ function optionstest2 warnlog "Impress:Tasks Pane:Custom Animation:... button didn't work." endif Kontext "Tasks" -end function +end function 'optionstest2
\ No newline at end of file |