summaryrefslogtreecommitdiff
path: root/testautomation/graphics/optional/includes/global
diff options
context:
space:
mode:
Diffstat (limited to 'testautomation/graphics/optional/includes/global')
-rw-r--r--testautomation/graphics/optional/includes/global/g_arrangealign.inc8
-rw-r--r--testautomation/graphics/optional/includes/global/g_character.inc16
-rw-r--r--testautomation/graphics/optional/includes/global/g_clipboard.inc9
-rw-r--r--testautomation/graphics/optional/includes/global/g_line.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_tables.inc11
-rw-r--r--testautomation/graphics/optional/includes/global/g_tools.inc9
6 files changed, 36 insertions, 19 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