summaryrefslogtreecommitdiff
path: root/testautomation/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'testautomation/graphics')
-rwxr-xr-xtestautomation/graphics/optional/g_insert.bas2
-rwxr-xr-xtestautomation/graphics/optional/includes/global/export_graphic_2.inc23
-rwxr-xr-xtestautomation/graphics/optional/includes/global/g_insert.inc54
-rwxr-xr-xtestautomation/graphics/optional/includes/global/g_spellcheck.inc12
-rwxr-xr-xtestautomation/graphics/optional/includes/global/g_tables.inc8
-rwxr-xr-xtestautomation/graphics/optional/includes/global/g_tools.inc2
-rwxr-xr-xtestautomation/graphics/optional/includes/impress/i_us_present.inc7
7 files changed, 14 insertions, 94 deletions
diff --git a/testautomation/graphics/optional/g_insert.bas b/testautomation/graphics/optional/g_insert.bas
index 92067c394754..62d8422925f6 100755
--- a/testautomation/graphics/optional/g_insert.bas
+++ b/testautomation/graphics/optional/g_insert.bas
@@ -60,7 +60,6 @@ sub main
Call tInsertSpreadsheet
Call tInsertGraphics
Call tInsertObjectPlugIn ' Doesn't exist in the VCL
- Call tInsertObjectApplet
Call tInsertObjectFormula ' Is in the VCL in InsertObjectOLEObject
Call tInsertChart
Call tdInsertFile
@@ -82,7 +81,6 @@ sub main
Call tInsertSpreadsheet
Call tInsertGraphics
Call tInsertObjectPlugIn ' Doesn't exist in the VCL
- Call tInsertObjectApplet
Call tInsertObjectFormula ' Is in the VCL in InsertObjectOLEObject
' Call tInsertChart
Call tdInsertFile
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
index c39e12f73afd..a053bc2dfe64 100755
--- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
@@ -519,7 +519,7 @@ testcase tPDF_Creator
gApplication = "WRITER"
sleep 5 ' wait for document to be loaded
' /Creator
- bTemp = hFindeImDokument ("<</Creator<",true)
+ bTemp = hFindeImDokument ("<</Creator<",true,true)
if (bTemp = TRUE) then
Printlog "OK"
else
@@ -569,22 +569,7 @@ testcase tPDF_Creator
endif
endif
endif
- ' /CreationDate (
- bTemp = hFindeImDokument ("/CreationDate(")
- if (bTemp = TRUE) then
- Printlog "OK"
- else
- warnlog " /CreationDate not found in pdf file :-("
- endif
- hTypeKeys("<left><right><shift end>")
- editcopy
- sTemp = getClipboardText()
- sTemp = left(sTemp, inStr(sTemp, ")")-1)
- printlog sTemp + " -- " + len(sTemp)
- iCreatorOffset = iCreatorOffset + (len(sTemp) - 23)
- if (len(sTemp) <> 23) then
- warnlog "Date is longer than expected; is: '" + sTemp2 + "'"
- endif
+
gApplication = sApp
call hCloseDocument
call hCloseDocument
@@ -785,7 +770,7 @@ qaerrorlog
else
warnlog "File didn't get saved :-("
endif
-
+ hCloseDocument ()
sleep 5
hNewDocument()
sleep 5
@@ -867,7 +852,7 @@ qaerrorlog
call hCloseDocument
-endcase
+endcase 'tBMP
'-------------------------------------------------------------------------------
testcase tEMF
diff --git a/testautomation/graphics/optional/includes/global/g_insert.inc b/testautomation/graphics/optional/includes/global/g_insert.inc
index 87689a73e944..c8a77778fb1e 100755
--- a/testautomation/graphics/optional/includes/global/g_insert.inc
+++ b/testautomation/graphics/optional/includes/global/g_insert.inc
@@ -36,19 +36,6 @@
'* short description :
'*
'**************************************************************************************
-' #1 tInsertFloatingFrame
-' #1 tInsertFields
-' #1 tdInsertObjectOleObjects
-' #1 tdInsertSnapPoint_Line
-' #1 tInsertSpecialCharacter
-' #1 tInsertSpreadsheet
-' #1 tInsertGraphics
-' #1 tInsertObjectPlugIn
-' #1 tInsertObjectApplet
-' #1 tInsertObjectFormula
-' #1 tInsertChart
-' #1 tdInsertFile
-'\*************************************************************************************
testcase tdInsertObjectOleObjects
@@ -743,48 +730,7 @@ testcase tInsertGraphics
endcase 'tInsertGraphics
'-------------------------------------------------------------------------------
-testcase tInsertObjectApplet
- printlog " open application "
- Call hNewDocument
- printlog " Insert->Object->Applet "
- sleep 1
- InsertObjectApplet
- Kontext "AppletEinfuegen"
- printlog " press button 'Search' "
- sleep 2
- Suchen.Click
- Kontext "OeffnenDlg"
- printlog " set filename to 'global\\input\\java\\rocket.class' "
- Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\java\Clock.class")
- printlog " close dialog 'Open' by pressing 'Open' "
- sleep 2
- Oeffnen.Click
- Kontext "AppletEinfuegen"
- printlog " close dialog 'Insert Applet' by pressing OK "
- sleep 2
- AppletEinfuegen.OK
- sleep 3
- printlog " deselect object by typing key [Escape] "
- hTypeKeys ("<Escape>")
- sleep 3
- try
- printlog " Edit->Select All "
- EditSelectAll
- printlog " delete object by typing key [Delete] "
- sleep 3
- hTypeKeys "<DELETE>"
- catch
- Warnlog "Delete did not work, maybe some error while creating the object before"
- endcatch
- sleep 1
- ' gMouseclick 70,70
- printlog " close application "
- Call hCloseDocument
-
-endcase 'tInsertObjectApplet
-
-'-------------------------------------------------------------------------------
testcase tInsertObjectFormula
printlog " open application "
diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
index c2ab184675c7..cb3b2f9fe934 100755
--- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc
+++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
@@ -190,7 +190,7 @@ testcase tiToolsSpellcheckError
ToolsOptions
Kontext "ExtrasOptionenDlg"
hToolsOptions("LANGUAGESETTINGS","Languages")
- Westlich.Select 32
+ Westlich.Select 34
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
printlog "Create 1 textbox with 1 spelling error (test replace always)"
@@ -489,16 +489,6 @@ testcase tiToolsSpellcheckCheck
goto endsub
end if
Kontext "Spellcheck"
- printlog "Save the current Dictionary Language."
- s = DictionaryLanguage.GetSelIndex
- for i= 1 to DictionaryLanguage.GetItemCount
- DictionaryLanguage.Select i
- sleep 1
- printlog "Dictionary language is: # "+i+": "+DictionaryLanguage.GetSelText
- next i
- iWord(1) = 1
- iWord(2) = 2
- DictionaryLanguage.Select s
printlog "Close dialog 'Spellcheck'."
Spellcheck.Close
Kontext "Active"
diff --git a/testautomation/graphics/optional/includes/global/g_tables.inc b/testautomation/graphics/optional/includes/global/g_tables.inc
index 6b647963025c..99b5a84f97ac 100755
--- a/testautomation/graphics/optional/includes/global/g_tables.inc
+++ b/testautomation/graphics/optional/includes/global/g_tables.inc
@@ -59,11 +59,11 @@ testcase tiInsertTableUsingMenu
if (UCase(gApplication)) = "IMPRESS" then
DocumentImpress.UseMenu
hMenuSelectNr(4)
- hMenuSelectNr(13)
+ hMenuSelectNr(14)
else
DocumentDraw.UseMenu
hMenuSelectNr(4)
- hMenuSelectNr(10)
+ hMenuSelectNr(11)
endif
@@ -222,11 +222,11 @@ testcase tiTableObjectBar
if (UCase(gApplication)) = "IMPRESS" then
DocumentImpress.UseMenu
hMenuSelectNr(4)
- hMenuSelectNr(13)
+ hMenuSelectNr(14)
else
DocumentDraw.UseMenu
hMenuSelectNr(4)
- hMenuSelectNr(10)
+ hMenuSelectNr(11)
endif
Kontext "InsertTableImpress"
diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc
index 1e58bda65745..7602dc98a9af 100755
--- a/testautomation/graphics/optional/includes/global/g_tools.inc
+++ b/testautomation/graphics/optional/includes/global/g_tools.inc
@@ -126,7 +126,7 @@ testcase tiToolsThesaurus
ToolsOptions
Kontext "ExtrasOptionenDlg"
hToolsOptions("LANGUAGESETTINGS","Languages")
-Westlich.Select 32
+Westlich.Select 34
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
sleep 1
diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc
index 6b95ef90b958..26afac12e190 100755
--- a/testautomation/graphics/optional/includes/impress/i_us_present.inc
+++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc
@@ -232,10 +232,11 @@ testcase i_us_presentation2
SlidesControl.FadeIn
printlog " Did the 'mistake' to FadeIn/Out the Slidepane"
-
- '/// Make a Mouse Double-Click on the left part of the Layout, to input a picture ///'
+
+ printlog "activating the input picture area"
kontext "DocumentImpress"
- DocumentImpress.MouseDoubleClick 30,50
+ DocumentImpress.TypeKeys "<TAB>",2
+ DocumentImpress.TypeKeys "<RETURN>"
sleep (1)
'/// Graphics-Import-dialogue. Select "i_us_large.jpg" ///'