diff options
Diffstat (limited to 'testautomation/graphics')
9 files changed, 33 insertions, 72 deletions
diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc index 54a3a67c58d0..d733c878aeb4 100644 --- a/testautomation/graphics/optional/includes/global/g_demoguide.inc +++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc @@ -247,7 +247,8 @@ testcase t_Interoperability MenuSelect(MenuGetItemID(3)) View.OpenMenu MenuSelect(MenuGetItemID(2)) - sleep 2 + printlog "needing a longer wait here for first start of the master page previews" + wait(20000) Kontext "AvailableForUsePreview" AvailableForUsePreview.TypeKeys "<HOME> <RIGHT> <RETURN>" sleep (5) diff --git a/testautomation/graphics/optional/includes/global/g_edit.inc b/testautomation/graphics/optional/includes/global/g_edit.inc index 869e6730cf0d..fdff948d0bfb 100644 --- a/testautomation/graphics/optional/includes/global/g_edit.inc +++ b/testautomation/graphics/optional/includes/global/g_edit.inc @@ -258,6 +258,7 @@ testcase tEditObjectEdit else Call hNewDocument + call sSelectEmptyLayout sleep 1 '/// new document ///' InsertObjectOLEObject '/// insert writer ole object ///' Kontext "OLEObjektEinfuegen" diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc index 74f6177287ef..1c82bf3921c3 100644 --- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc +++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc @@ -101,6 +101,7 @@ testcase tiToolsSpellcheckCorrect case 39 : hTextrahmenErstellen ("La ringraziamo per l'interesse mostrato a collaborare con la firma.<Return>",10,10,70,20) case 46 : hTextrahmenErstellen ("Det varierar vad som behandlas och ur vilket perspektiv.<Return>",10,10,50,20) case 49 : hTextrahmenErstellen ("Dies ist ein Text ohne Fehler.<Return>",10,10,50,20) + case 50 : hTextrahmenErstellen ("To je besedilo brez napake.<Return>",10,10,50,20) case 55 : hTextrahmenErstellen ("Esta poderia ser a resposta para suas preces?<Return>",10,10,50,20) case else : if bAsianLan then @@ -160,6 +161,7 @@ testcase tiToolsSpellcheckError case 39 : FehlerText$ = "Ringrarziamo per l'interessa mostrato a collaborare con la firma." : Fehler$ = "Ringrarziamo" : Sprachenname$ = "Italienisch" case 46 : FehlerText$ = "Detd varierar vad som behandlas och ur vilket perspektiv." : Fehler$ = "Detd" : Sprachenname$ = "Schwedisch" case 49 : FehlerText$ = "Diees ist ein Fehler." : Fehler$ = "Diees" : Sprachenname$ = "Deutsch" + case 50 : FehlerText$ = "Toje napaka, ker manjka presledek." : Fehler$ = "Toje" : Sprachenname$ = "Slovenščina" case 55 : FehlerText$ = "Eesta poderia ser a resposta para suas preces?": Fehler$ = "Eesta" : Sprachenname$ = "Portugiesisch" case else : if bAsianLan then @@ -410,6 +412,7 @@ testcase tiToolsSpellcheckCheck case 39 : sWord(1) = "Millano" : sWord(2) = "tarrget" case 46 : sWord(1) = "desa" : sWord(2) = "occh" case 49 : sWord(1) = "Texxt" : sWord(2) = "reichtt" + case 50 : sWord(1) = "Bsedilo" : sWord(2) = "zadosča" case 55 : sWord(1) = "esktava" : sWord(2) = "noitee" case else : if bAsianLan then diff --git a/testautomation/graphics/optional/includes/global/g_tables.inc b/testautomation/graphics/optional/includes/global/g_tables.inc index 94a76349e948..410ed8ca0fc6 100644 --- a/testautomation/graphics/optional/includes/global/g_tables.inc +++ b/testautomation/graphics/optional/includes/global/g_tables.inc @@ -218,8 +218,12 @@ testcase tiTableObjectBar Kontext "InsertTableImpress" printlog "Inserting table." - InsertTableImpress.OK - + if InsertTableImpress.Exists(1) then + InsertTableImpress.OK + else + sleep (1) + InsertTableImpress.OK + endif printlog "Selecting table for geeting the TableObjectBar." printlog "Switching between Draw/Impress" if ( gApplication = "IMPRESS" )then diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index b760ad7b1b0f..fa3f429bbb3b 100644 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -280,16 +280,7 @@ testcase tiToolsThesaurusContextMenu PrintLog "Thesaurus with 1 word: " + sWord - if( Ucase(gApplication) = "DRAW" ) then - sExt = ".odg" - Kontext "DrawDocument" - elseif( Ucase(gApplication) = "IMPRESS" ) then - sExt = ".odp" - Kontext "ImpressDocument" - endif - - Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) - + Call hNewDocument Call hTextrahmenErstellen (sWord,20,20,50,30) sleep 1 diff --git a/testautomation/graphics/optional/includes/impress/i_us2_present.inc b/testautomation/graphics/optional/includes/impress/i_us2_present.inc index 1a844f299c2d..eeeeb5effb6b 100644 --- a/testautomation/graphics/optional/includes/impress/i_us2_present.inc +++ b/testautomation/graphics/optional/includes/impress/i_us2_present.inc @@ -145,6 +145,7 @@ testcase i_us2_pres1 DocumentImpress.UseMenu hMenuSelectNr (4) hMenuSelectNr (1) + call sSelectEmptyLayout sleep (1) kontext "Slides" diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc index 4a711cf0a902..ee0019586d14 100644 --- a/testautomation/graphics/optional/includes/impress/i_us_present.inc +++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc @@ -52,19 +52,13 @@ testcase i_us_presentation1 printlog "New master" MenuSelect(MenuGetItemID(1)) sleep (1) - ViewMasterPage - kontext "Slides" - SlidesControl.OpenContextMenu(true) - sleep (2) - MenuSelect(MenuGetItemID(1)) 'New Master - sleep (1) - printlog " Inserted second Master-Slide" + printlog "Inserted second Master-Slide" printlog "set background to picture(Gallery)" Kontext "Gallery" if Gallery.Exists(2) then - warnlog " The Gallery was already visible. Check earlier ran tests for inconsistency." + warnlog "The Gallery was already visible. Check earlier ran tests for inconsistency." sleep (2) else ToolsGallery @@ -118,9 +112,8 @@ testcase i_us_presentation1 sleep (2) Kontext "ExportierenDlg" if ExportierenDlg.IsVisible(5) then - printlog " Gallery-object correctly copied into Slide." + printlog "Gallery-object correctly copied into Slide." ExportierenDlg.Close - ToolsGallery WaitSlot (2000) end if kontext "GraphicObjectbar" @@ -128,33 +121,7 @@ testcase i_us_presentation1 kontext "DocumentImpress" ViewToolbarsPicture end if - Kontext "Gallery" - View.TypeKeys "<HOME><RIGHT><RIGHT>" - printlog "'OpenContextMenu" - View.TypeKeys "<SHIFT F10>" - sleep (2) - MenuSelect(MenuGetItemID(1)) 'Insert - sleep (2) - MenuSelect(MenuGetItemID(1)) 'Copy - sleep (2) - printlog "Check that we really got a copy of the object " - kontext "DocumentImpress" - DocumentImpress.OpenContextMenu(true) - sleep (2) - MenuSelect 27353 - sleep (2) - Kontext "ExportierenDlg" - if ExportierenDlg.IsVisible(5) then - printlog " Gallery-object correctly copied into Slide." - ExportierenDlg.Close - else - warnlog " Doesn't seem like we copied anything from the Gallery... ?" - end if - kontext "GraphicObjectbar" - if GraphicObjectbar.Exists(5) = FALSE then - kontext "DocumentImpress" - ViewToolbarsPicture - end if + kontext "Gallery" Gallerys.Select (iPictures) printlog " 50% Transparency" @@ -172,17 +139,9 @@ testcase i_us_presentation1 Width.SetText "16" Height.SetText "16" Mosaic.OK - kontext "GraphicFilterBar" - GraphicFilterBar.Close - ToolsGallery - WaitSlot (1000) - kontext "DocumentImpress" - hTypeKeys "<TAB>" - sleep (1) kontext "GraphicFilterBar" Mosaic.Click - kontext "Mosaic" if ( Mosaic.exists( 2 ) ) then Width.SetText "16" @@ -191,25 +150,21 @@ testcase i_us_presentation1 else warnlog( "Dialog <Mosaic> did not open" ) endif - kontext "GraphicFilterBar" GraphicFilterBar.Close - ToolsGallery WaitSlot (1000) - kontext "DocumentImpress" gMouseClick 50,50 sleep (1) - FormatPositionAndSize kontext if ( Active.exists( 2 ) ) then active.setPage(TabPositionAndSize) kontext "TabPositionAndSize" - Width.SetText "800" - Height.SetText "600" + Width.SetText "15" + Height.SetText "11" SizePosition.TypeKeys "<RIGHT><DOWN>" TabPositionAndSize.OK else @@ -239,13 +194,13 @@ testcase i_us_presentation2 PresentationFile1 = ConvertPath( gOfficePath + "user\work\PowerPes1.odp" ) PresentationFile2 = ConvertPath( gOfficePath + "user\work\PowerPes2.odp" ) - if ( FileExists( PresentationFile1 ) ) then 'if file exists... + if ( FileExists( PresentationFile1 ) ) then 'if file exists... hFileOpen (PresentationFile1) else warnlog " This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester." goto endsub end if - + sleep (2) printlog "New Slide" kontext "slides" SlidesControl.TypeKeys( "<PAGEDOWN>", 3 ) @@ -254,7 +209,7 @@ testcase i_us_presentation2 MenuSelect(MenuGetItemID(1)) 'New Slide 'No 2 printlog " Inserted second normal Slide" - + call sSelectEmptyLayout printlog "2. Layouts: Text. Bild: Gallery: Animation - Gif" Kontext "Tasks" printlog "to get to the very first position" @@ -275,11 +230,14 @@ testcase i_us_presentation2 printlog " Did the 'mistake' to FadeIn/Out the Slidepane" - printlog "activating the input picture area" - kontext "DocumentImpress" - DocumentImpress.TypeKeys "<TAB>",2 - DocumentImpress.TypeKeys "<RETURN>" - sleep (1) +InsertGraphicsFromFile +Kontext "GrafikEinfuegenDlg" +if GrafikEinfuegenDlg.exists(5) then +printlog " The Insertgraphics-dialogue showed up correctly." +sleep (5) +else +warnlog " The Insertgraphics-dialogue didn't show up." +endif printlog "Graphics-Import-dialogue. Select i_us_large.jpg" Kontext "GrafikEinfuegenDlg" diff --git a/testautomation/graphics/required/includes/global/id_002.inc b/testautomation/graphics/required/includes/global/id_002.inc index 2aac13baadf1..9cc7dd10da53 100644 --- a/testautomation/graphics/required/includes/global/id_002.inc +++ b/testautomation/graphics/required/includes/global/id_002.inc @@ -204,6 +204,7 @@ testcase tiEditFields printlog " open application " Call hNewDocument WaitSlot (2000) + call sSelectEmptyLayout() printlog " insert something to be able to use this function" printlog "+ Insert->Fields->Date (fixed)" printlog "+ deselect object, select, editmode " diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc index 6c5ca705f8c4..435e58a73928 100644 --- a/testautomation/graphics/tools/id_tools_2.inc +++ b/testautomation/graphics/tools/id_tools_2.inc @@ -572,6 +572,7 @@ sub LoadGraphic ( sFile as String, bOK as Boolean ) as boolean Dim iHMax if app.FileLen(sFile) = "0" then warnlog " the file (" + (sFile) + ") seems to be zero bytes large." call hGrafikEinfuegen ( sFile ) + sleep (1) FormatGraphics Kontext Active.SetPage TabType |