diff options
Diffstat (limited to 'testautomation/graphics/optional/includes/impress')
6 files changed, 775 insertions, 767 deletions
diff --git a/testautomation/graphics/optional/includes/impress/i_animation.inc b/testautomation/graphics/optional/includes/impress/i_animation.inc index 8ee7777e5..ac1c07ed8 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 4f19f254b..aed79a6ce 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 92283b35a..61249353c 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 7efe28089..1ef1773a5 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 e82ec2ec3..214676c3b 100644 --- a/testautomation/graphics/optional/includes/impress/i_view.inc +++ b/testautomation/graphics/optional/includes/impress/i_view.inc @@ -41,31 +41,35 @@ 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" DocumentImpress.UseMenu hMenuSelectNr (5) hMenuSelectNr (13) Printlog " ViewWorkspaceHandoutView" - ViewWorkspaceHandoutView '/// view background handout ///' + ViewWorkspaceHandoutView sleep 2 Kontext "Tasks" sleep 2 @@ -75,9 +79,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 '------------------------------------------------------------------------------- @@ -87,67 +93,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 @@ -162,10 +168,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 @@ -174,13 +180,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 @@ -191,17 +197,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 @@ -212,23 +218,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 @@ -240,7 +246,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 @@ -250,7 +256,7 @@ hPrepareSearchBUG Warnlog "error 4711 TBO :-(" endcatch - '/// type keys [delete] ///' + printlog "type keys [delete]" Kontext "DocumentImpressOutlineView" DocumentImpressOutlineView.TypeKeys "<delete>" @@ -273,44 +279,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 + printlog "close document" + Call hCloseDocument +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/options.inc b/testautomation/graphics/optional/includes/impress/options.inc index cfce04e68..d67eaea8d 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 |