diff options
Diffstat (limited to 'testautomation/graphics/optional/includes')
10 files changed, 57 insertions, 41 deletions
diff --git a/testautomation/graphics/optional/includes/global/g_arrangealign.inc b/testautomation/graphics/optional/includes/global/g_arrangealign.inc index 1023ab88fd0a..929f139ed1ef 100644 --- a/testautomation/graphics/optional/includes/global/g_arrangealign.inc +++ b/testautomation/graphics/optional/includes/global/g_arrangealign.inc @@ -41,15 +41,15 @@ testcase tiDatei_Fuer_Anordnen_Erstellen call hNewDocument if gApplication = "DRAW" then kontext "DocumentDraw" - DocumentDraw.UseMenu else kontext "DocumentImpress" DocumentImpress.UseMenu + hMenuSelectNr(4) + hMenuSelectNr(13) + call sSelectEmptyLayout end if - hMenuSelectNr(4) - hMenuSelectNr(13) - call sSelectEmptyLayout '/// new document ///' + if Dir(Datei)<>"" then app.Kill(Datei) ' kill old file printlog "create 3 overlapping objects " for Zaehler = 1 to 3 diff --git a/testautomation/graphics/optional/includes/global/g_character.inc b/testautomation/graphics/optional/includes/global/g_character.inc index 8d58263c74d4..a1ee4285036b 100644 --- a/testautomation/graphics/optional/includes/global/g_character.inc +++ b/testautomation/graphics/optional/includes/global/g_character.inc @@ -404,35 +404,35 @@ testcase tSetFormatCharacter Call hNewDocument printlog "activate all languages in options " - '///+ Tools->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' " 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' " + 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 printlog "get count of languages " - '///+ 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 = LanguageWest.getItemCount iAsian = LanguageEast.getItemCount iComplex = LanguageCTL.getItemCount diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc index 70b387581329..d43c49610c26 100644 --- a/testautomation/graphics/optional/includes/global/g_clipboard.inc +++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc @@ -136,7 +136,6 @@ testcase tiEditUndo else warnlog "File is missing." endif - Call hCloseDocument printlog "Close document" Call hCloseDocument @@ -259,14 +258,14 @@ testcase tiEditClipboard printlog "Get values for position variables" Ueber_Text_4 = fGetPositionX() Sleep 1 - printlog "<b> Edit->Copy </b>" + printlog " Edit->Copy" EditCopy - '///+ Type Key [Deletee]" + printlog " Type Key [Delete]" hTypeKeys "<DELETE>" - '///+ <i> Edit->Paste </i>" + printlog "Edit->Paste" EditPaste sleep 1 - '///+ Edit->Select All" + printlog "Edit->Select All" EditSelectAll sTemp = fGetPositionX() printlog "TabPositionAndSize: comparing position with original position" diff --git a/testautomation/graphics/optional/includes/global/g_line.inc b/testautomation/graphics/optional/includes/global/g_line.inc index 2a6d5b315f89..eb672b3b9716 100644 --- a/testautomation/graphics/optional/includes/global/g_line.inc +++ b/testautomation/graphics/optional/includes/global/g_line.inc @@ -325,7 +325,7 @@ ZentriertLinks.Check TabLinienenden.Cancel sleep 2 - '///New part for line + 'New part for line 'EditSelectAll printlog "Select all objects in document" 'sleep 2 'hTypeKeys "<DELETE>" printlog "Delete objects" diff --git a/testautomation/graphics/optional/includes/global/g_tables.inc b/testautomation/graphics/optional/includes/global/g_tables.inc index 10774ab43d76..c3c8f99c551c 100644 --- a/testautomation/graphics/optional/includes/global/g_tables.inc +++ b/testautomation/graphics/optional/includes/global/g_tables.inc @@ -40,6 +40,9 @@ dim iItemIndex AS integer 'Counter for/next testcase tiInsertTableUsingMenu +qaerrorlog "#i116013# No table toolbar when inserting table via insert/table" +goto endsub + printlog "Inserting table into doc using the menu." Call hNewDocument printlog "Switching between Draw/Impress" @@ -60,6 +63,7 @@ testcase tiInsertTableUsingMenu Kontext "InsertTableImpress" if InsertTableImpress.Exists then printlog "InsertTable Dialog is up." + InsertTableImpress.OK else warnlog "InsertTableDialog did not come up!" endif @@ -125,6 +129,9 @@ endcase 'tiInsertTableUsingMenu testcase tiInsertTableUsingButton +qaerrorlog "#i116013# No table toolbar when inserting table via insert/table" +goto endsub + printlog " Inserting table using the button in standard toolbar." Call hNewDocument printlog "Open New Document." @@ -204,6 +211,9 @@ endcase 'tiInsertTableUsingToolbarbutton '------------------------------------------------------------------------------- testcase tiTableObjectBar +qaerrorlog "#i116013# No table toolbar when inserting table via insert/table" +goto endsub + printlog "Testing TableObjectBar." printlog "Inserting table into doc using the menu." Call hNewDocument @@ -244,6 +254,7 @@ testcase tiTableObjectBar printlog "Table bar visible." else warnlog "Table bar is not up!" + ViewToolbarsTable endif printlog "Checking LinienStil." diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index 9faee3508c1b..e8e918b95cbb 100644 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -459,11 +459,16 @@ endcase 'tiToolsHyphenation2 '------------------------------------------------------------------------------- testcase tToolsMacro +qaerrorlog( "#i116017# - [Automation]: TypeKeys executes wrong commands" ) + goto endsub + + Dim i as integer Dim j as integer Dim Zaehler as integer Dim ZaehlerListe as integer + printlog "New document" Call hNewDocument ToolsMacro @@ -474,7 +479,9 @@ testcase tToolsMacro Zaehler=MakroAus.GetItemCount MakroAus.typeKeys "<end>" for i = 1 to Zaehler - MakroAus.typeKeys "<+><up>" + MakroAus.typeKeys "<+>" + sleep 1 + MakroAus.typeKeys "<up>" next i next j Zaehler=MakroAus.GetItemCount diff --git a/testautomation/graphics/optional/includes/impress/i_pengine.inc b/testautomation/graphics/optional/includes/impress/i_pengine.inc index aed79a6ce827..2374ff28f572 100644 --- a/testautomation/graphics/optional/includes/impress/i_pengine.inc +++ b/testautomation/graphics/optional/includes/impress/i_pengine.inc @@ -210,7 +210,6 @@ testcase tSlideShowInteraction setStartCurrentPage(FALSE) printlog "Set "start with current page to OFF" 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 diff --git a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc index 724aaa8b70a4..508394144663 100644 --- a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc +++ b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc @@ -49,23 +49,23 @@ testcase tiInsertExpandSlide ViewWorkspaceOutlineView Sleep 1 Kontext "DocumentImpressOutlineView" - '///+ create a slide with some levels...and some more slides with just one level... " - '///+ it should look like this: " - '///+-------------------------------------------------- " - '///+ Slide 1" - '///+ - A " - '///+ - - B" - '///+ - - - C" - '///+ - - - - D" - '///+ - - - - - - F" - '///+ - B" - '///+ - C" - '///+ - D" - '///+ Slide 2 " - '///+ Slide 3 " - '///+ Slide 4 " - '///+ Slide 5 " - '///+-------------------------------------------------- " + 'create a slide with some levels...and some more slides with just one level... " + 'it should look like this: " + '-------------------------------------------------- " + 'Slide 1" + ' - A " + '- - B" + ' - - - C" + ' - - - - D" + ' - - - - - - F" + ' - B" + ' - C" + ' - D" + ' Slide 2 " + ' Slide 3 " + ' Slide 4 " + ' Slide 5 " + '-------------------------------------------------- " DocumentImpressOutlineView.TypeKeys "Slide 1" for i = 1 to 6 DocumentImpressOutlineView.TypeKeys "<return><tab>" diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow.inc b/testautomation/graphics/optional/includes/impress/i_slideshow.inc index 2c51a83a509a..da96b13cc47d 100644 --- a/testautomation/graphics/optional/includes/impress/i_slideshow.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow.inc @@ -1092,7 +1092,7 @@ testcase tSlideShowSlideTransition select case i case 1: printlog " click button 'Automatic Transition' " if (TransitionAutomaticallyAfter.IsEnabled) then - '///+ - + + Check Time '1' OR " + printlog " Check Time '1' OR " sTemp = TransitionAutomaticallyAfterTime.GetText if (sTemp <> TimerValue) then Warnlog " Time is different :-( is: '" + sTemp + "' should be: '" + TimerValue + "'" '"00:00:01" @@ -1101,11 +1101,11 @@ testcase tSlideShowSlideTransition Warnlog " button 'Automatic Transition' not pressed ?" end if case 2: if (TransitionAutomaticallyAfter.IsChecked <> FALSE) then - '///+ - + check button 'SemiAutomatic Transition' OR " + printlog " check button 'SemiAutomatic Transition' OR " Warnlog " button 'Automatic Transition' is pressed ?" end if case 3: if (TransitionAutomaticallyAfter.IsChecked <> FALSE) then - '///+ - + click button 'Manual Transition' " + printlog "click button 'Manual Transition' " Warnlog " button 'Automatic Transition' is pressed ?" end if end select diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc index 07ac2f0d9def..52858e22e7cf 100644 --- a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc @@ -560,7 +560,7 @@ testcase tExtrasPraesentationseinstellungen printlog " Check state of navigator ! Expected: closed" Kontext "Navigator" if Navigator.exists then - '///+ Close Navigator !" + printlog " Close Navigator !" Navigator.Close Warnlog "Navigator: Should have been closed. Closing now." else |