summaryrefslogtreecommitdiffstats
path: root/testautomation/global
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-01 17:35:56 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-01 17:35:56 +0000
commit7fd7c0f1978bd577410409ecf011f38f4bf99e82 (patch)
tree47481b51ae9882e56fa3e188ce3078060bf24b45 /testautomation/global
parentCWS-TOOLING: integrate CWS tbo05 (diff)
downloadcore-7fd7c0f1978bd577410409ecf011f38f4bf99e82.tar.gz
core-7fd7c0f1978bd577410409ecf011f38f4bf99e82.zip
CWS-TOOLING: integrate CWS automation003
2009-04-01 09:25:55 +0200 hde r270300 : #i100664# 2009-03-31 14:45:05 +0200 jsk r270280 : #i96838 2009-03-31 14:37:11 +0200 jsk r270279 : #i96838 2009-03-31 12:47:41 +0200 jsk r270275 : #i100584 2009-03-31 12:44:46 +0200 jsk r270272 : #i96838 2009-03-31 11:42:57 +0200 jsk r270269 : #i100584 2009-03-31 11:37:16 +0200 jsk r270268 : #i96838 2009-03-31 08:43:06 +0200 jsk r270260 : #i99713 - continued 2009-03-31 08:38:12 +0200 hde r270259 : #i100664# 2009-03-31 07:50:01 +0200 jsk r270257 : #i99713 - continued 2009-03-30 15:40:05 +0200 jsk r270237 : #i96838 2009-03-30 15:17:58 +0200 jsk r270236 : #i100584 2009-03-30 15:05:31 +0200 hde r270235 : #i100664# 2009-03-30 14:56:58 +0200 hde r270234 : #i100664# 2009-03-30 11:43:04 +0200 oc r270206 : i100669 2009-03-30 09:54:46 +0200 jsk r270199 : #i99713 - partly done, needs checking 2009-03-30 09:46:25 +0200 hde r270198 : #i100664# 2009-03-30 09:46:05 +0200 hde r270197 : #i100664# 2009-03-30 09:45:09 +0200 hde r270196 : #i100664# 2009-03-30 08:07:38 +0200 jsk r270193 : #i99713 - partly done, needs checking 2009-03-27 11:46:19 +0100 jsk r270143 : #i99713 2009-03-27 07:03:47 +0100 jsk r270128 : #i100602 2009-03-27 06:59:28 +0100 jsk r270122 : #i100602 2009-03-26 13:46:17 +0100 jsk r270077 : #i100584 - graphics tests 2009-03-26 13:07:02 +0100 jsk r270073 : #i100584 - hToolsOptions()/framework tools 2009-03-26 12:09:37 +0100 jsk r270065 : #i100581 - Fix outdated gApplication names in config files
Diffstat (limited to 'testautomation/global')
-rw-r--r--testautomation/global/input/filters/build_to_filter.txt24
-rw-r--r--testautomation/global/input/filters/build_to_suffix.txt12
-rwxr-xr-xtestautomation/global/input/filters/native_suffixes.dat10
-rwxr-xr-xtestautomation/global/required/includes/g_option.inc1058
-rwxr-xr-xtestautomation/global/system/includes/master.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_docfuncs.inc10
-rw-r--r--testautomation/global/tools/includes/optional/t_xml_filter1.inc486
-rwxr-xr-xtestautomation/global/tools/includes/required/t_doc2.inc76
-rwxr-xr-xtestautomation/global/tools/includes/required/t_files.inc24
-rwxr-xr-xtestautomation/global/tools/includes/required/t_option.inc142
-rw-r--r--testautomation/global/tools/includes/required/t_option2.inc165
-rwxr-xr-xtestautomation/global/tools/includes/required/t_tools1.inc70
12 files changed, 1085 insertions, 994 deletions
diff --git a/testautomation/global/input/filters/build_to_filter.txt b/testautomation/global/input/filters/build_to_filter.txt
index f5860778c898..32a95a095060 100644
--- a/testautomation/global/input/filters/build_to_filter.txt
+++ b/testautomation/global/input/filters/build_to_filter.txt
@@ -7,8 +7,8 @@ CALC=StarCalc 5.0
IMPRESS=StarImpress 5.0
DRAW=StarDraw 5.0
MATH=StarMath 5.0
-MASTERDOC=StarWriter 5.0/GlobalDocument
-INSIGHT=
+MASTERDOCUMENT=StarWriter 5.0/GlobalDocument
+DATABASE=
CHART=StarChart 5.0
HTML=HTML
@@ -18,8 +18,8 @@ CALC=StarOffice XML (Calc)
IMPRESS=StarOffice XML (Impress)
DRAW=StarOffice XML (Draw)
MATH=StarOffice XML (Math)
-MASTERDOC=writer_globaldocument_StarOffice_XML_Writer_GlobalDocument
-INSIGHT=
+MASTERDOCUMENT=writer_globaldocument_StarOffice_XML_Writer_GlobalDocument
+DATABASE=
CHART=StarOffice XML (Chart)
HTML=Text (StarWriter/Web)
@@ -29,8 +29,8 @@ CALC=StarOffice XML (Calc)
IMPRESS=StarOffice XML (Impress)
DRAW=StarOffice XML (Draw)
MATH=StarOffice XML (Math)
-MASTERDOC=writer_globaldocument_StarOffice_XML_Writer_GlobalDocument
-INSIGHT=
+MASTERDOCUMENT=writer_globaldocument_StarOffice_XML_Writer_GlobalDocument
+DATABASE=
CHART=StarOffice XML (Chart)
HTML=HTML
@@ -40,8 +40,8 @@ CALC=calc8
IMPRESS=impress8
DRAW=draw8
MATH=math8
-MASTERDOC=writerglobal8
-INSIGHT=
+MASTERDOCUMENT=writerglobal8
+DATABASE=
CHART=chart8
HTML=HTML
@@ -51,8 +51,8 @@ CALC=calc8
IMPRESS=impress8
DRAW=draw8
MATH=math8
-MASTERDOC=writerglobal8
-INSIGHT=
+MASTERDOCUMENT=writerglobal8
+DATABASE=
CHART=chart8
HTML=HTML
@@ -62,7 +62,7 @@ CALC=calc8
IMPRESS=impress8
DRAW=draw8
MATH=math8
-MASTERDOC=writerglobal8
-INSIGHT=
+MASTERDOCUMENT=writerglobal8
+DATABASE=
CHART=chart8
HTML=HTML
diff --git a/testautomation/global/input/filters/build_to_suffix.txt b/testautomation/global/input/filters/build_to_suffix.txt
index 0c9c72f70c33..3bd665bf7311 100644
--- a/testautomation/global/input/filters/build_to_suffix.txt
+++ b/testautomation/global/input/filters/build_to_suffix.txt
@@ -7,7 +7,7 @@ CALC=calc_StarCalc_50
IMPRESS=impress_StarImpress_50
DRAW=draw_StarDraw_50
MATH=math_StarMath_50
-MASTERDOC=writer_globaldocument_StarWriter_50GlobalDocument
+MASTERDOCUMENT=writer_globaldocument_StarWriter_50GlobalDocument
INSIGHT=
CHART=chart_StarChart_50
HTML=HTML
@@ -18,7 +18,7 @@ CALC=calc_StarOffice_XML_Calc
IMPRESS=impress_StarOffice_XML_Impress
DRAW=draw_StarOffice_XML_Draw
MATH=math_StarOffice_XML_Math
-MASTERDOC=writer_globaldocument_StarOffice_XML_Writer_GlobalDocument
+MASTERDOCUMENT=writer_globaldocument_StarOffice_XML_Writer_GlobalDocument
INSIGHT=
CHART=chart_StarOffice_XML_Chart
HTML=writer_web_HTML
@@ -29,7 +29,7 @@ CALC=calc_StarOffice_XML_Calc
IMPRESS=impress_StarOffice_XML_Impress
DRAW=draw_StarOffice_XML_Draw
MATH=math_StarOffice_XML_Math
-MASTERDOC=writer_globaldocument_StarOffice_XML_Writer_GlobalDocument
+MASTERDOCUMENT=writer_globaldocument_StarOffice_XML_Writer_GlobalDocument
INSIGHT=
CHART=chart_StarOffice_XML_Chart
HTML=writer_web_HTML
@@ -40,7 +40,7 @@ CALC=calc8
IMPRESS=impress8
DRAW=draw8
MATH=math8
-MASTERDOC=writerglobal8
+MASTERDOCUMENT=writerglobal8
INSIGHT=
CHART=chart8
HTML=writer_web_HTML
@@ -51,7 +51,7 @@ CALC=calc8
IMPRESS=impress8
DRAW=draw8
MATH=math8
-MASTERDOC=writerglobal8
+MASTERDOCUMENT=writerglobal8
INSIGHT=
CHART=chart8
HTML=writer_web_HTML
@@ -62,7 +62,7 @@ CALC=calc8
IMPRESS=impress8
DRAW=draw8
MATH=math8
-MASTERDOC=writerglobal8
+MASTERDOCUMENT=writerglobal8
INSIGHT=
CHART=chart8
HTML=writer_web_HTML
diff --git a/testautomation/global/input/filters/native_suffixes.dat b/testautomation/global/input/filters/native_suffixes.dat
index bfb3acad138d..6c648955fbdb 100755
--- a/testautomation/global/input/filters/native_suffixes.dat
+++ b/testautomation/global/input/filters/native_suffixes.dat
@@ -7,7 +7,7 @@ IMPRESS=.sdd
DRAW=.sda
MATH=.smf
HTML=.htm
-MASTERDOC=.sgl
+MASTERDOCUMENT=.sgl
[641]
#StarOffice 6.x
@@ -18,7 +18,7 @@ IMPRESS=.sxi
DRAW=.sxd
MATH=.sxm
HTML=.htm
-MASTERDOC=.sxg
+MASTERDOCUMENT=.sxg
[645]
#OpenOffice.org 1.x / StarOffice 7 / StarSuite 7
@@ -29,7 +29,7 @@ IMPRESS=.sxi
DRAW=.sxd
MATH=.sxm
HTML=.htm
-MASTERDOC=.sxg
+MASTERDOCUMENT=.sxg
[680]
#OpenOffice.org 2.0 / StarOffice 8 / StarSuite 8
@@ -40,7 +40,7 @@ IMPRESS=.odp
DRAW=.odg
MATH=.odf
HTML=.htm
-MASTERDOC=.odm
+MASTERDOCUMENT=.odm
[current]
#the current build is 680
@@ -50,4 +50,4 @@ IMPRESS=.odp
DRAW=.odg
MATH=.odf
HTML=.htm
-MASTERDOC=.odm
+MASTERDOCUMENT=.odm
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index a9f5a2b72550..fe3fb9b23236 100755
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -1,7 +1,7 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'*
+'*
'* Copyright 2008 by Sun Microsystems, Inc.
'*
'* OpenOffice.org - a multi-platform office productivity suite
@@ -39,27 +39,26 @@
global sErrMes as String
global iSectionNumber as Integer
-sub ExtrasOptionenTest
- Call tToolsOptionsTest
-end sub
+'*******************************************************************************
sub tToolsOptionsTest
- dim sApplication as string
-
- sApplication = gApplication
+
+ dim sPreviousApplication as string
+
+ sPreviousApplication = gApplication
' Document- and database related options are placed in the g_option2.inc library
use "global\required\includes\g_option2.inc"
' subs and functions has been placed there
use "global/tools/includes/required/t_option2.inc"
- ' To prevent users from running just a subsection from this file, without THIS
+ ' To prevent users from running just a subsection from this file, without THIS
' subroutine, in every subsection the value of 'iSectionNumber' is checked.
- ' The test will exist with warnlog, if iSectionNumber is 0
+ ' The test will exit with warnlog, if iSectionNumber is 0
sErrMes = ""
- select case uCase(gApplication)
- case "WRITER","MASTERDOCUMENT","HTML": iSectionNumber = 8
- case "IMPRESS","DRAW","MATH","CALC" : iSectionNumber = 7
- end select
+ select case uCase(gApplication)
+ case "WRITER","MASTERDOCUMENT","HTML" : iSectionNumber = 8
+ case "IMPRESS","DRAW","MATH","CALC" : iSectionNumber = 7
+ end select
' common testcases are placed in this library
' these tab-sets are always available:
Call tToolsOptionsStarOffice
@@ -74,235 +73,270 @@ sub tToolsOptionsTest
gApplication = "WRITER"
iSectionNumber = 8
Call tToolsOptionsTextdocument
-
+
gApplication = "HTML"
Call tToolsOptionsHTMLDocument
-
+
gApplication = "CALC"
iSectionNumber = 7
Call tToolsOptionsSpreadsheet
-
+
gApplication = "IMPRESS"
iSectionNumber = 7
Call tToolsOptionsPresentation
-
+
gApplication = "DRAW"
iSectionNumber = 7
Call tToolsOptionsDrawing
-
+
gApplication = "MATH"
iSectionNumber = 7
Call tToolsOptionsFormula
- gApplication = sApplication
+ gApplication = sPreviousApplication
end sub
+'*******************************************************************************
+
testcase tToolsOptionsStarOffice
+
dim EchteAnzahl as Integer, i as Integer
dim gefunden as Boolean, bSave as Boolean
dim iMenuShould as integer
'/// We have 12 tab pages in this category. If the <i>central configuration</i> feature is being used 13 (<i>Single SignOn</i>)
'/// <i>Tools</i> / <i>Options</i> / <i>OpenOffice.org</i>
PrintLog "- Tools/Options/StarOffice ( Extras/Optionen/StarOffice )"
- if (0 = iSectionNumber) then
+ if (0 = iSectionNumber) then
warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
goto endsub
endif
- if gApplication <> "BACKGROUND" then Call hNewDocument
+
+ if ( gApplication = "BACKGROUND" ) then
+ ' Do not open any document
+ else
+ Call hNewDocument
+ endif
+
ToolsOptions
ToPosInOptionlist ( 1 )
Kontext "ExtrasOptionenDlg"
EchteAnzahl = Optionsliste.GetItemCount - iSectionNumber
iMenuShould = 14
-
+
if EchteAnzahl <> iMenuShould then
if ((gtplatform = "sol") OR (gtplatform = "x86") OR gOOO) AND EchteAnzahl = 12 then
- printLog "One Tabpage is missing. This is ok for a patched Solaris (sparc and x86) or OOo installation."
+ printLog "One Tabpage is missing. This is ok for a patched Solaris (sparc and x86) or OOo installation."
else
Warnlog "The number of entries is not " + iMenuShould + "! => the current number is " + EchteAnzahl
endif
- end if
+ endif
+
Kontext "Active"
try
if Active.Exists then Active.OK
catch
if Active.Exists then Active.No
endcatch
+
for i=1 to EchteAnzahl
gefunden = FALSE
Kontext "OptionenDlg"
Optionsliste.TypeKeys "<Down>"
select case i
- case 1 : Kontext "TabAllgemeines"
- '///+<ul><li>User data</li>
- printlog " - Userdata / Benutzerdaten"
- if TabAllgemeines.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabAllgemeines )
- end if
- case 2 : Kontext "TabSonstigesAllgemein"
- '///+<li>General</li>
- printlog " - General / Allgemein"
- if TabSonstigesAllgemein.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabSonstigesAllgemein )
- end if
- case 3 : Kontext "TabMemory"
- '///+<li>Memory</li>
- printlog " - Memory / Arbeitsspeicher"
- if TabMemory.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabMemory )
- end if
- case 4 : Kontext "TabAnsichtAllgemein"
- '///+<li>View</li>
- printlog " - View / Ansicht"
- if TabAnsichtAllgemein.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabAnsichtAllgemein )
- end if
- case 5 : Kontext "TabPrintStarOffice"
- '///+<li>Print</li>
- printlog " - Print / Drucken"
- if TabPrintStarOffice.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabPrintStarOffice )
- end if
- case 6 : Kontext "TabPfade"
- '///+<li>Paths
- '///+ <ul><li>Click <i>edit</i> to all list entries and then close the file dialog</li></ul></li>
- printlog " - Paths / Pfade"
- if TabPfade.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabPfade )
- Call DialogeFuerTypenKontrollieren
- end if
- case 7 : Kontext "TabFarben"
- '///+<li>Colors
- '///+<ul><li>Click on <i>Add</i></li>
- '///+<li>Click <i>OK</i> on message box</li>
- '///+<li>Click <i>cancel> on <i>Name</i> dialog</li>
- '///+<li>Click on <i>Edit</i></li>
- '///+<li>Click on <i>Close</i> in <i>Colors</i> dialog</li></ul></li>
- printlog " - Color / Farben"
- sleep(4)
+ case 1 :
+ Kontext "TabAllgemeines"
+ '///+<ul><li>User data</li>
+ printlog " - Userdata / Benutzerdaten"
+ if TabAllgemeines.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabAllgemeines )
+ endif
+ case 2 :
+ Kontext "TabSonstigesAllgemein"
+ '///+<li>General</li>
+ printlog " - General / Allgemein"
+ if TabSonstigesAllgemein.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabSonstigesAllgemein )
+ endif
+ case 3 :
+ Kontext "TabMemory"
+ '///+<li>Memory</li>
+ printlog " - Memory / Arbeitsspeicher"
+ if TabMemory.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabMemory )
+ endif
+ case 4 :
+ Kontext "TabAnsichtAllgemein"
+ '///+<li>View</li>
+ printlog " - View / Ansicht"
+ if TabAnsichtAllgemein.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabAnsichtAllgemein )
+ endif
+ case 5 :
+ Kontext "TabPrintStarOffice"
+ '///+<li>Print</li>
+ printlog " - Print / Drucken"
+ if TabPrintStarOffice.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabPrintStarOffice )
+ endif
+ case 6 :
+ Kontext "TabPfade"
+ '///+<li>Paths
+ '///+ <ul><li>Click <i>edit</i> to all list entries and then close the file dialog</li></ul></li>
+ printlog " - Paths / Pfade"
+ if TabPfade.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabPfade )
+ Call DialogeFuerTypenKontrollieren
+ endif
+ case 7 :
+ Kontext "TabFarben"
+ '///+<li>Colors
+ '///+<ul><li>Click on <i>Add</i></li>
+ '///+<li>Click <i>OK</i> on message box</li>
+ '///+<li>Click <i>cancel> on <i>Name</i> dialog</li>
+ '///+<li>Click on <i>Edit</i></li>
+ '///+<li>Click on <i>Close</i> in <i>Colors</i> dialog</li></ul></li>
+ printlog " - Color / Farben"
+ if ( TabFarben.exists( 4 ) ) then
if TabFarben.IsVisible then
- gefunden = TRUE
- Call DialogTest (TabFarben)
- Farbe.Select(1)
- Hinzufuegen.Click
- Kontext "Active"
- Active.OK
- Kontext "NameDlg"
- Call DialogTest (NameDlg)
- NameDlg.Cancel
- Kontext "TabFarben"
- Bearbeiten.Click
- sleep(3)
- Kontext "FarbeDlg"
- FarbeDlg.Cancel
- end if
- case 8 : Kontext "TabSchriftErsetzung"
- '///+<li>Font replacement</li>
- printlog " - Font Replacement / Schriftersetzung"
- if TabSchriftErsetzung.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabSchriftErsetzung )
- end if
- case 9: Kontext "TabSecurity"
- '///+<li>Security</li>
- printlog " - Security / Sicherheit"
- if TabSecurity.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabSecurity )
- MacroSecurity.click()
-
- kontext "TabSecurityLevel"
- if ( TabSecurityLevel.exists( 2 ) ) then
- call DialogTest( TabSecurityLevel )
- kontext
- active.setpage TabTrustedSources
- kontext "TabTrustedSources"
- call DialogTest( TabTrustedSources )
- TabTrustedSources.cancel
- else
- warnlog( "Macro Security Options dialog is missing" )
- qaerrorlog( "#i45295# or office built without mozilla support" )
- endif
-
- Kontext "TabSecurity"
- if Protect.isEnabled then
- Protect.click()
- Kontext "PasswordDLG"
- call DialogTest( PasswordDLG )
- PasswordDLG.cancel()
- else
- select case uCase(gApplication)
- case "WRITER","MASTERDOCUMENT" :WarnLog "Protect-Button is disabled."
- case "MATH","IMPRESS","DRAW","HTML","CALC" :PrintLog "Protect-Button is disabled."
- end select
- endif
- sleep(1)
- Kontext "TabSecurity"
- Options.click
- Kontext "TabSecurityOptionsAndWarnings"
- Call DialogTest(TabSecurityOptionsAndWarnings)
- TabSecurityOptionsAndWarnings.cancel
- sleep(1)
- end if
- case 10: Kontext "TabAppearance"
- '///+<li>Appearance</li>
- printlog " - Appearance / Aussehen"
- if TabAppearance.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabAppearance )
- end if
- case 11: Kontext "TabAccessibility"
- '///+<li>Accessibility</li>
- printlog " - Accessibility"
- if TabAccessibility.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabAccessibility )
- end if
- case 12: Kontext "TabJava"
- '///+<li>Java</li></ul>
- printlog " - Java"
- if TabJava.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabJava )
- end if
- if useJava.isChecked then
- Add.click
- Kontext "OeffnenDlg"
- Sleep (1)
- OeffnenDlg.Cancel
- Kontext "TabJava"
- Parameters.click
- Kontext "JavaStartParameter"
- Call DialogTest ( JavaStartParameter )
- JavaStartParameter.cancel
- Kontext "TabJava"
- ClassPath.click
- Kontext "JavaClassPath"
- Call DialogTest ( JavaClassPath )
- JavaClassPath.cancel
+ gefunden = TRUE
+ Call DialogTest (TabFarben)
+ Farbe.Select(1)
+ Hinzufuegen.Click
+ Kontext "Active"
+ Active.OK
+ Kontext "NameDlg"
+ Call DialogTest (NameDlg)
+ NameDlg.Cancel
+ Kontext "TabFarben"
+ Bearbeiten.Click
+ WaitSlot( 3000 )
+ Kontext "FarbeDlg"
+ FarbeDlg.Cancel
+ endif
+ endif
+ case 8 :
+ Kontext "TabSchriftErsetzung"
+ '///+<li>Font replacement</li>
+ printlog " - Font Replacement / Schriftersetzung"
+ if TabSchriftErsetzung.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabSchriftErsetzung )
+ endif
+ case 9:
+ Kontext "TabSecurity"
+ '///+<li>Security</li>
+ printlog " - Security / Sicherheit"
+ if TabSecurity.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabSecurity )
+ MacroSecurity.click()
+
+ kontext "TabSecurityLevel"
+ if ( TabSecurityLevel.exists( 2 ) ) then
+ call DialogTest( TabSecurityLevel )
+ kontext
+ active.setpage TabTrustedSources
+ kontext "TabTrustedSources"
+ call DialogTest( TabTrustedSources )
+ TabTrustedSources.cancel
+ else
+ warnlog( "Macro Security Options dialog is missing" )
+ qaerrorlog( "#i45295# or office built without mozilla support" )
+ endif
+
+ Kontext "TabSecurity"
+ if Protect.isEnabled then
+ Protect.click()
+ Kontext "PasswordDLG"
+ call DialogTest( PasswordDLG )
+ PasswordDLG.cancel()
+ else
+ select case uCase(gApplication)
+ case "WRITER","MASTERDOCUMENT"
+ WarnLog "Protect-Button is disabled."
+ case "MATH","IMPRESS","DRAW","HTML","CALC"
+ PrintLog "Protect-Button is disabled."
+ end select
+ endif
+
+ Kontext "TabSecurity"
+ if ( TabSecurity.exists( 1 ) ) then
+ Options.click
+ Kontext "TabSecurityOptionsAndWarnings"
+ Call DialogTest(TabSecurityOptionsAndWarnings)
+ TabSecurityOptionsAndWarnings.cancel
else
- printlog "Use Java is disabled."
- end if
- case 13: kontext "TabOnlineUpdate"
- '///+<li>Online update</li>
- printlog " - Online update"
- if TabOnlineUpdate.isVisible then
- gefunden = TRUE
- Call DialogTest( TabOnlineUpdate )
+ warnlog( "Tabsecurity did not open" )
endif
- 'CheckNow.click
- case 14: Kontext "TabOOoImprovement"
- printlog( " - OpenOffice.org Improvement Program" )
- if ( TabOOoImprovement.isVisible() ) then
- gefunden = TRUE
- Call DialogTest( TabOOoImprovement )
- endif
+
+ endif
+ case 10:
+ Kontext "TabAppearance"
+ '///+<li>Appearance</li>
+ printlog " - Appearance / Aussehen"
+ if TabAppearance.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabAppearance )
+ endif
+ case 11:
+ Kontext "TabAccessibility"
+ '///+<li>Accessibility</li>
+ printlog " - Accessibility"
+ if TabAccessibility.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabAccessibility )
+ endif
+ case 12:
+ Kontext "TabJava"
+ '///+<li>Java</li></ul>
+ printlog " - Java"
+ if TabJava.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabJava )
+ endif
+ if useJava.isChecked then
+ Add.click
+ Kontext "OeffnenDlg"
+ if ( OeffnenDlg.exists( 1 ) ) then
+ OeffnenDlg.Cancel
+ else
+ warnlog( "OeffnenDlg is missing" )
+ endif
+ Kontext "TabJava"
+ Parameters.click
+ Kontext "JavaStartParameter"
+ Call DialogTest ( JavaStartParameter )
+ JavaStartParameter.cancel
+ Kontext "TabJava"
+ ClassPath.click
+ Kontext "JavaClassPath"
+ Call DialogTest ( JavaClassPath )
+ JavaClassPath.cancel
+ else
+ printlog "Use Java is disabled."
+ endif
+ case 13:
+ kontext "TabOnlineUpdate"
+ '///+<li>Online update</li>
+ printlog " - Online update"
+ if TabOnlineUpdate.isVisible then
+ gefunden = TRUE
+ Call DialogTest( TabOnlineUpdate )
+ endif
+ 'CheckNow.click
+ case 14:
+ Kontext "TabOOoImprovement"
+ printlog( " - OpenOffice.org Improvement Program" )
+ if ( TabOOoImprovement.isVisible() ) then
+ gefunden = TRUE
+ Call DialogTest( TabOOoImprovement )
+ endif
end select
if ( NOT gefunden ) then
Warnlog "Error with the " & i & ".page, perhaps this page has been deleted or changed its position"
@@ -311,265 +345,287 @@ testcase tToolsOptionsStarOffice
i=10
else
i=1-1
- end if
- end if
+ endif
+ endif
next i
-'/// Close the options dialog
- Kontext "OptionenDlg"
- OptionenDlg.Cancel
-'/// Close the document
- if gApplication <> "BACKGROUND" then
- Call hCloseDocument
- end if
+ '/// Close the options dialog
+ Kontext "OptionenDlg"
+ if ( OptionenDlg.exists( 1 ) ) then
+ OptionenDlg.Cancel
+ else
+ warnlog( "Options Dialog not ready" )
+ endif
+ '/// Close the document
+ if ( gApplication = "BACKGROUND" ) then
+ ' We should be on the backing window
+ else
+ Call hCloseDocument()
+ endif
+
endcase
'-------------------------------------------------------------------------
testcase tToolsOptionsLoadSave
- dim EchteAnzahl as Integer, i as Integer
- dim gefunden as Boolean
- PrintLog "- Tools/Options/Load Save ( Extras/Optionen/Laden Speichern )"
- if (0 = iSectionNumber) then
+
+ dim EchteAnzahl as Integer, i as Integer
+ dim gefunden as Boolean
+ PrintLog "- Tools/Options/Load Save ( Extras/Optionen/Laden Speichern )"
+ if (0 = iSectionNumber) then
warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
goto endsub
endif
- if gApplication <> "BACKGROUND" then Call hNewDocument
-'/// <i>Tools</i> / <i>Options</i> / <i>Load/Save</i>
- ToolsOptions
- ToPosInOptionlist (2)
- EchteAnzahl = OptionTabPageZaehler (4, FALSE)
- for i=1 to EchteAnzahl
- gefunden = FALSE
- Kontext "OptionenDlg"
- Optionsliste.TypeKeys "<Down>"
- select case i
- case 1 : Kontext "TabSpeichern"
- '///+<ul><li>General</li>
- printlog " - General / Save"
- if TabSpeichern.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabSpeichern )
- end if
- case 2 : Kontext "TabMicrosoftOffice97"
- '///+<li>VBA settings</li>
- printlog " - VBA Settings / VBA Eigenschaften"
- if TabMicrosoftOffice97.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabMicrosoftOffice97 )
- end if
- case 3 : Kontext "TabMicrosoftOffice2"
- '///+<li>Microsoft Office</li>
- printlog " - Microsoft Office"
- if TabMicrosoftOffice2.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabMicrosoftOffice2 )
- end if
- case 4 : Kontext "TabHTML"
- '///+<li>HTML Compatibility</li></ul>
- printlog " - HTML Compatibility / HTML Kompatibilitaet"
- if TabHTML.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabHTML )
- end if
- end select
- if gefunden=FALSE then
- Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
- EchteAnzahl = EchteAnzahl - 1
- if EchteAnzahl < 5 then
- i=11
- else
- i=1-1
- end if
- end if
- next i
-'/// Close the options dialog
- Kontext "OptionenDlg"
- OptionenDlg.Cancel
-'/// Close the document
- if gApplication <> "BACKGROUND" then
- Call hCloseDocument
- end if
+ if gApplication <> "BACKGROUND" then Call hNewDocument
+ '/// <i>Tools</i> / <i>Options</i> / <i>Load/Save</i>
+ ToolsOptions
+ ToPosInOptionlist (2)
+ EchteAnzahl = OptionTabPageZaehler (4, FALSE)
+ for i=1 to EchteAnzahl
+ gefunden = FALSE
+ Kontext "OptionenDlg"
+ Optionsliste.TypeKeys "<Down>"
+ select case i
+ case 1 :
+ Kontext "TabSpeichern"
+ '///+<ul><li>General</li>
+ printlog " - General / Save"
+ if TabSpeichern.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabSpeichern )
+ endif
+ case 2 :
+ Kontext "TabMicrosoftOffice97"
+ '///+<li>VBA settings</li>
+ printlog " - VBA Settings / VBA Eigenschaften"
+ if TabMicrosoftOffice97.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabMicrosoftOffice97 )
+ endif
+ case 3 :
+ Kontext "TabMicrosoftOffice2"
+ '///+<li>Microsoft Office</li>
+ printlog " - Microsoft Office"
+ if TabMicrosoftOffice2.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabMicrosoftOffice2 )
+ endif
+ case 4 :
+ Kontext "TabHTML"
+ '///+<li>HTML Compatibility</li></ul>
+ printlog " - HTML Compatibility / HTML Kompatibilitaet"
+ if TabHTML.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabHTML )
+ endif
+ end select
+ if gefunden=FALSE then
+ Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
+ EchteAnzahl = EchteAnzahl - 1
+ if EchteAnzahl < 5 then
+ i=11
+ else
+ i=1-1
+ endif
+ endif
+ next i
+ '/// Close the options dialog
+ Kontext "OptionenDlg"
+ OptionenDlg.Cancel
+ '/// Close the document
+ if gApplication <> "BACKGROUND" then
+ Call hCloseDocument
+ endif
endcase
'-------------------------------------------------------------------------
testcase tToolsOptionsLanguageSettings
- dim EchteAnzahl as Integer, i as Integer, j as Integer
- dim gefunden as Boolean
- dim bAsianSup as Boolean
- PrintLog "- Tools/Options/Language Settings ( Extras/Optionen/Spracheinstellungen )"
- if (0 = iSectionNumber) then
+ dim EchteAnzahl as Integer, i as Integer, j as Integer
+ dim gefunden as Boolean
+ dim bAsianSup as Boolean
+
+ PrintLog "- Tools/Options/Language Settings ( Extras/Optionen/Spracheinstellungen )"
+ if (0 = iSectionNumber) then
warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
goto endsub
endif
- if gApplication <> "BACKGROUND" then Call hNewDocument
- '/// <i>Tools</i> / <i>Options</i> / <i>Language settings</i>
- ToolsOptions
+ if gApplication <> "BACKGROUND" then Call hNewDocument
+ '/// <i>Tools</i> / <i>Options</i> / <i>Language settings</i>
+ ToolsOptions
ToPosInOptionlist ( 3 )
- EchteAnzahl = Optionsliste.GetItemCount - iSectionNumber
- '/// We only have two tab pages in this section:
- '///+ <ul><li><i>Languages</i> and <i>Writing Aids</i></li>
- '///+<ol><li>In asian languages we have two additional tab pages:
- '///+ <ul><li><i>Japanese Find</i> and <i>Asian Layout</i></li></ul></li>
- '///+<li>In languages with CTL (<i>Complex Text Layout</i>) there is also one more:
- '///+<ul><li><i>Complex Text Layout</i></li></ul></li></ol></li></ul>
- select case (EchteAnzahl)
- case 2: printlog "Asian or Complex Text Layout support is not activated (on languages-page)!"
- case 3: printlog "Complex Text Layout support is activated (on languages-page)!"
- case 4: printlog "Asian support is activated (on languages-page)!"
- case 5: if (gAsianSup AND gCTLSup) then
- printlog "Asian and Complex Text Layout support is activated (on languages-page)!"
- else
- Warnlog "There are more than 4 pages!"
- endif
- case else
- Warnlog "There are more than 5 pages!"
- end select
- Kontext "Active"
- try
- if Active.Exists then Active.OK
- catch
- if Active.Exists then Active.No
- endcatch
- for i=1 to EchteAnzahl
- gefunden = FALSE
- Kontext "OptionenDlg"
- Optionsliste.TypeKeys "<Down>"
- select case i
- case 1 : Kontext "TabSprachen"
- 'Languages
- printlog " - Languages / Sprachen"
- if TabSprachen.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabSprachen )
- end if
- case 2 : Kontext "TabLinguistik"
- printlog " - Writing Aids / Linguistik"
- if TabLinguistik.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabLinguistik )
+ EchteAnzahl = Optionsliste.GetItemCount - iSectionNumber
+ '/// We only have two tab pages in this section:
+ '///+ <ul><li><i>Languages</i> and <i>Writing Aids</i></li>
+ '///+<ol><li>In asian languages we have two additional tab pages:
+ '///+ <ul><li><i>Japanese Find</i> and <i>Asian Layout</i></li></ul></li>
+ '///+<li>In languages with CTL (<i>Complex Text Layout</i>) there is also one more:
+ '///+<ul><li><i>Complex Text Layout</i></li></ul></li></ol></li></ul>
+ select case (EchteAnzahl)
+ case 2:
+ printlog "Asian or Complex Text Layout support is not activated (on languages-page)!"
+ case 3:
+ printlog "Complex Text Layout support is activated (on languages-page)!"
+ case 4:
+ printlog "Asian support is activated (on languages-page)!"
+ case 5:
+ if (gAsianSup AND gCTLSup) then
+ printlog "Asian and Complex Text Layout support is activated (on languages-page)!"
+ else
+ Warnlog "There are more than 4 pages!"
+ endif
+ case else
+ Warnlog "There are more than 5 pages!"
+ end select
+ Kontext "Active"
+ try
+ if Active.Exists then Active.OK
+ catch
+ if Active.Exists then Active.No
+ endcatch
+ for i=1 to EchteAnzahl
+ gefunden = FALSE
+ Kontext "OptionenDlg"
+ Optionsliste.TypeKeys "<Down>"
+ select case i
+ case 1 :
+ Kontext "TabSprachen"
+ 'Languages
+ printlog " - Languages / Sprachen"
+ if TabSprachen.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabSprachen )
+ endif
+ case 2 :
+ Kontext "TabLinguistik"
+ printlog " - Writing Aids / Linguistik"
+ if TabLinguistik.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabLinguistik )
'/// In <i>Writing aids</i>
'///+<ul><li> On <i>modules<i> click <i>edit</i></li>
- SprachmoduleBearbeiten.Click
- Kontext "ModuleBearbeiten"
- Call DialogTest ( ModuleBearbeiten )
- ModuleBearbeiten.Close
- '///+<li> close dialog</li></ul>
- Kontext "TabLinguistik"
+ SprachmoduleBearbeiten.Click
+ Kontext "ModuleBearbeiten"
+ Call DialogTest ( ModuleBearbeiten )
+ ModuleBearbeiten.Close
+ '///+<li> close dialog</li></ul>
+ Kontext "TabLinguistik"
'///+<ul><li>On <i>dictionaries</i> click <i>new</i></li>
'///+<li>close dialog</li></ul>
- Neu.Click
- Kontext "BenutzerwoerterbuchAnlegen"
- Call DialogTest ( BenutzerwoerterbuchAnlegen )
- BenutzerwoerterbuchAnlegen.Cancel
+ Neu.Click
+ Kontext "BenutzerwoerterbuchAnlegen"
+ Call DialogTest ( BenutzerwoerterbuchAnlegen )
+ BenutzerwoerterbuchAnlegen.Cancel
'///+<ul><li>On <i>dictionaries</i> click <i>edit</i></li>
'///+<li>close dialog</li></ul>
- Kontext "TabLinguistik"
- for j=1 to 5
- if Bearbeiten.IsEnabled then
- Bearbeiten.Click
- j=6
- else
- Benutzerwoerterbuch.TypeKeys "<Down>"
- end if
- next j
- Kontext "BenutzerwoerterbuchBearbeiten"
- if BenutzerwoerterbuchBearbeiten.Exists then
- Call DialogTest ( BenutzerwoerterbuchBearbeiten )
- BenutzerwoerterbuchBearbeiten.Close
- else
- warnlog "Edit the 'user-defined dictionary' is not possible => Bug?"
- end if
- '/// <i>Options</i>
+ Kontext "TabLinguistik"
+ for j=1 to 5
+ if Bearbeiten.IsEnabled then
+ Bearbeiten.Click
+ j=6
+ else
+ Benutzerwoerterbuch.TypeKeys "<Down>"
+ endif
+ next j
+ Kontext "BenutzerwoerterbuchBearbeiten"
+ if BenutzerwoerterbuchBearbeiten.Exists then
+ Call DialogTest ( BenutzerwoerterbuchBearbeiten )
+ BenutzerwoerterbuchBearbeiten.Close
+ else
+ warnlog "Edit the 'user-defined dictionary' is not possible => Bug?"
+ endif
+ '/// <i>Options</i>
'///+<ul><li>On 9th, 10th and 11th entry click <i>edit</i></li>
'///+<li>close dialog</li></ul>
- Kontext "TabLinguistik"
- Optionen.TypeKeys "<PageUp>", 3
- Sleep 1
- Optionen.TypeKeys "<Down>", 6
- Sleep 1
- OptionenBearbeiten.Click
- Kontext "SilbentrennungOptionen"
- Call DialogTest ( SilbentrennungOptionen )
- SilbentrennungOptionen.Cancel
- Kontext "TabLinguistik"
- Optionen.TypeKeys "<Down>"
- OptionenBearbeiten.Click
- Kontext "SilbentrennungOptionen"
- Call DialogTest ( SilbentrennungOptionen )
- SilbentrennungOptionen.Cancel
- Kontext "TabLinguistik"
- Optionen.TypeKeys "<Down>"
- OptionenBearbeiten.Click
- Kontext "SilbentrennungOptionen"
- Call DialogTest ( SilbentrennungOptionen )
- SilbentrennungOptionen.Cancel
- end if
- case 3,5 : try
- Kontext "TabJapaneseFind"
- 'Japanese find
- if TabJapaneseFind.IsVisible then
- printlog " - Japanese Find / Japanische Suche"
- gefunden = TRUE
- Call DialogTest ( TabJapaneseFind )
- end if
- catch
- endcatch
- try
- Kontext "TabComplexTextLayout"
- 'Complex Text Layout
- if TabComplexTextLayout.IsVisible then
- printlog " - Complex Text Layout"
- gefunden = TRUE
- Call DialogTest ( TabComplexTextLayout )
- end if
- catch
- endcatch
- case 4 : Kontext "TabAsianLayoutOptions"
- 'Asian layout
- printlog " - Asian Layout / Asiatisches Layout"
- if TabAsianLayoutOptions.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabAsianLayoutOptions )
- end if
- end select
- if gefunden=FALSE then
- Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
- EchteAnzahl = EchteAnzahl - 1
- if EchteAnzahl < 5 then
- i=5
- else
- i=1-1
- end if
- end if
- next i
-'/// Close the options dialog
- Kontext "OptionenDlg"
- OptionenDlg.Cancel
-'/// Close the document
- if gApplication <> "BACKGROUND" then
- Call hCloseDocument
- end if
+ Kontext "TabLinguistik"
+ Optionen.TypeKeys "<PageUp>", 3
+ WaitSlot() ' similar effect as a NOOP
+ Optionen.TypeKeys "<Down>", 6
+ WaitSlot() ' similar effect as a NOOP
+ OptionenBearbeiten.Click
+ Kontext "SilbentrennungOptionen"
+ Call DialogTest ( SilbentrennungOptionen )
+ SilbentrennungOptionen.Cancel
+ Kontext "TabLinguistik"
+ Optionen.TypeKeys "<Down>"
+ OptionenBearbeiten.Click
+ Kontext "SilbentrennungOptionen"
+ Call DialogTest ( SilbentrennungOptionen )
+ SilbentrennungOptionen.Cancel
+ Kontext "TabLinguistik"
+ Optionen.TypeKeys "<Down>"
+ OptionenBearbeiten.Click
+ Kontext "SilbentrennungOptionen"
+ Call DialogTest ( SilbentrennungOptionen )
+ SilbentrennungOptionen.Cancel
+ endif
+ case 3,5 :
+ try
+ Kontext "TabJapaneseFind"
+ 'Japanese find
+ if TabJapaneseFind.IsVisible then
+ printlog " - Japanese Find / Japanische Suche"
+ gefunden = TRUE
+ Call DialogTest ( TabJapaneseFind )
+ endif
+ catch
+ endcatch
+ try
+ Kontext "TabComplexTextLayout"
+ 'Complex Text Layout
+ if TabComplexTextLayout.IsVisible then
+ printlog " - Complex Text Layout"
+ gefunden = TRUE
+ Call DialogTest ( TabComplexTextLayout )
+ endif
+ catch
+ endcatch
+ case 4 :
+ Kontext "TabAsianLayoutOptions"
+ 'Asian layout
+ printlog " - Asian Layout / Asiatisches Layout"
+ if TabAsianLayoutOptions.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabAsianLayoutOptions )
+ endif
+ end select
+ if gefunden=FALSE then
+ Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
+ EchteAnzahl = EchteAnzahl - 1
+ if EchteAnzahl < 5 then
+ i=5
+ else
+ i=1-1
+ endif
+ endif
+ next i
+ '/// Close the options dialog
+ Kontext "OptionenDlg"
+ OptionenDlg.Cancel
+ '/// Close the document
+ if gApplication <> "BACKGROUND" then
+ Call hCloseDocument
+ endif
endcase
'-------------------------------------------------------------------------
testcase tToolsOptionsInternet
- dim EchteAnzahl as Integer, i as Integer
- dim gefunden as Boolean
- PrintLog "- Tools/Options/Internet ( Extras/Optionen/Internet )"
- if (0 = iSectionNumber) then
+ dim EchteAnzahl as Integer, i as Integer
+ dim gefunden as Boolean
+
+ PrintLog "- Tools/Options/Internet ( Extras/Optionen/Internet )"
+ if (0 = iSectionNumber) then
warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
goto endsub
endif
- if gApplication <> "BACKGROUND" then Call hNewDocument
- '/// <i>Tools</i> / <i>Options</i> / <i>Internet</i>
- ToolsOptions
- '/// (The last section in Tools / Options is <i>Internet</i>)
- ToPosInOptionlist ( iSectionNumber)
+ if gApplication <> "BACKGROUND" then Call hNewDocument
+ '/// <i>Tools</i> / <i>Options</i> / <i>Internet</i>
+ ToolsOptions
+ '/// (The last section in Tools / Options is <i>Internet</i>)
+ ToPosInOptionlist ( iSectionNumber)
if gPlatgroup = "w95" OR gPlatform = lcase("osx") then
'/// On MacOS X systems this section includes the tab pages:
@@ -588,87 +644,89 @@ testcase tToolsOptionsInternet
'///+<li>E-Mail</li>
'///+<li>Mozilla Plugin</li></ol>
EchteAnzahl = OptionTabPageZaehler ( 4 , FALSE )
- end if
-
- for i=1 to EchteAnzahl
- gefunden = FALSE
- Kontext "OptionenDlg"
- Optionsliste.TypeKeys "<Down>"
- Kontext "ProxyWarnung"
- if ProxyWarnung.Exists(1) then
- NichtMehrAnzeigen.Check
- ProxyWarnung.OK
- end if
-
- select case i
- case 1 : Kontext "TabProxyServer"
- 'Proxy
- printlog " - Proxy / Proxy"
- if TabProxyServer.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabProxyServer )
- end if
- case 2 : Kontext "Active"
- 'Search
- printlog " - Search / Suche"
- if Active.Exists then
- sErrMes = Active.GetText
- Warnlog "A messagebox exists => BUG : " + sErrMes
- Active.OK
- end if
- Kontext "TabSuche"
- if TabSuche.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabSuche )
- end if
- case 3 :
- if gPlatgroup = "unx" then
- Kontext "TabEmail"
- 'E-mail
- printlog " - E-mail"
- if TabEmail.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabEmail )
- end if
- end if
- if gPlatgroup = "w95" then
- Kontext "TabMozillaPlugin"
- 'Mozilla Plug-in (On Win32)
- printlog " - Mozilla Plug-in"
- if TabMozillaPlugin.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabMozillaPlugin )
- end if
- end if
- case 4 :
- if gPlatgroup = "w95" then
- warnlog "On Win32 platform there should be only 3 tab pages in section 'Internet'!?"
- else
- Kontext "TabMozillaPlugin"
- printlog " - Mozilla Plug-in"
- if TabMozillaPlugin.IsVisible then
- gefunden = TRUE
- Call DialogTest ( TabMozillaPlugin )
- end if
- end if
- end select
- if gefunden=FALSE then
- Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
- EchteAnzahl = EchteAnzahl - 1
- if EchteAnzahl < 4 then
- i=11
- else
- i=1-1
- end if
- end if
- next i
-'/// Close the options dialog
- Kontext "OptionenDlg"
- OptionenDlg.Cancel
-'/// Close document
- if gApplication <> "BACKGROUND" then
- Call hCloseDocument
- end if
+ endif
+
+ for i=1 to EchteAnzahl
+ gefunden = FALSE
+ Kontext "OptionenDlg"
+ Optionsliste.TypeKeys "<Down>"
+ Kontext "ProxyWarnung"
+ if ProxyWarnung.Exists(1) then
+ NichtMehrAnzeigen.Check
+ ProxyWarnung.OK
+ endif
+
+ select case i
+ case 1 :
+ Kontext "TabProxyServer"
+ 'Proxy
+ printlog " - Proxy / Proxy"
+ if TabProxyServer.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabProxyServer )
+ endif
+ case 2 :
+ Kontext "Active"
+ 'Search
+ printlog " - Search / Suche"
+ if Active.Exists then
+ sErrMes = Active.GetText
+ Warnlog "A messagebox exists => BUG : " + sErrMes
+ Active.OK
+ endif
+ Kontext "TabSuche"
+ if TabSuche.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabSuche )
+ endif
+ case 3 :
+ if gPlatgroup = "unx" then
+ Kontext "TabEmail"
+ 'E-mail
+ printlog " - E-mail"
+ if TabEmail.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabEmail )
+ endif
+ endif
+ if gPlatgroup = "w95" then
+ Kontext "TabMozillaPlugin"
+ 'Mozilla Plug-in (On Win32)
+ printlog " - Mozilla Plug-in"
+ if TabMozillaPlugin.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabMozillaPlugin )
+ endif
+ endif
+ case 4 :
+ if gPlatgroup = "w95" then
+ warnlog "On Win32 platform there should be only 3 tab pages in section 'Internet'!?"
+ else
+ Kontext "TabMozillaPlugin"
+ printlog " - Mozilla Plug-in"
+ if TabMozillaPlugin.IsVisible then
+ gefunden = TRUE
+ Call DialogTest ( TabMozillaPlugin )
+ endif
+ endif
+ end select
+ if gefunden=FALSE then
+ Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
+ EchteAnzahl = EchteAnzahl - 1
+ if EchteAnzahl < 4 then
+ i=11
+ else
+ i=1-1
+ endif
+ endif
+ next i
+ '/// Close the options dialog
+ Kontext "OptionenDlg"
+ OptionenDlg.Cancel
+ '/// Close document
+ if gApplication <> "BACKGROUND" then
+ Call hCloseDocument
+ endif
endcase
'-------------------------------------------------------------------------
@@ -676,10 +734,10 @@ endcase
testcase tToolsOptionsImprovementProgram
printlog( "Update test for the tools/options dialog of the OOo Improvement Program" )
-
+
dim cLogFile as string
- cLogFile = gOfficePath & "user\temp\feedback\Current.csv"
- cLogFile = convertpath( cLogFile )
+ cLogFile = gOfficePath & "user\temp\feedback\Current.csv"
+ cLogFile = convertpath( cLogFile )
if ( hDeleteFile( cLogFile ) ) then
printlog( "Test environment is clean, no logfile present (anymore)" )
@@ -693,15 +751,15 @@ testcase tToolsOptionsImprovementProgram
ParticipateNo.check()
ParticipateYes.check()
-
- if ( ShowData.isEnabled() ) then
+
+ if ( ShowData.isEnabled() ) then
ShowData.click()
Kontext "TextImport"
if ( TextImport.exists( 1 ) ) then
printlog( "Text import dialog" )
-
+
call DialogTest( TextImport )
TextImport.cancel()
else
diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index 580b4068787b..745381b6f2fb 100755
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -886,7 +886,7 @@ sub mMakeGeneralOptionsAPI
printlog "** 'Temporary files'-path : " & sTempPath
end if
'///Check which 'Macro Security Level' is set and put it into <i>gMacroSecurityLevel</i> variable.
- gMacroSecurityLevel = fGetSetMacroSecurityUNO()
+ gMacroSecurityLevel = hSetMacroSecurityAPI( 2 )
catch
diff --git a/testautomation/global/tools/includes/optional/t_docfuncs.inc b/testautomation/global/tools/includes/optional/t_docfuncs.inc
index eb3007a528b9..f75865739f57 100755
--- a/testautomation/global/tools/includes/optional/t_docfuncs.inc
+++ b/testautomation/global/tools/includes/optional/t_docfuncs.inc
@@ -54,11 +54,11 @@ function hUseImpressAutopilot( bEnable as boolean ) as boolean
'///+<li>Open Tools/Options, go to Presentataion/General page</li>
ToolsOptions
- hToolsOptions( "IMPRESS" , "General" )
+ hToolsOptions( gApplication , "General" )
'///+<li>Check or uncheck to start with autopilot</li>
Kontext "TabSonstigesDraw"
- if ( mitAutopilotStarten.exists() ) then
+ if ( mitAutopilotStarten.exists( 2 ) ) then
if ( bEnable ) then
mitAutopilotStarten.check()
@@ -68,14 +68,14 @@ function hUseImpressAutopilot( bEnable as boolean ) as boolean
printlog( CFN & "Disable Impress Autopilot" )
endif
+ '///+<li>Return Status of Checkbox (checked=TRUE)</li>
+ hUseImpressAutopilot() = mitAutopilotStarten.isChecked()
+
else
warnlog( CFN & "Cannot find Autopilot Checkbox" )
endif
-
- '///+<li>Return Status of Checkbox (checked=TRUE)</li>
- hUseImpressAutopilot() = mitAutopilotStarten.isChecked()
'///+<li>Close Tools/Options</li>
Kontext "OptionenDlg"
diff --git a/testautomation/global/tools/includes/optional/t_xml_filter1.inc b/testautomation/global/tools/includes/optional/t_xml_filter1.inc
index f15cdef0a360..96992320558c 100644
--- a/testautomation/global/tools/includes/optional/t_xml_filter1.inc
+++ b/testautomation/global/tools/includes/optional/t_xml_filter1.inc
@@ -1,5 +1,5 @@
'encoding UTF-8 Do not remove or change this line!
-'**************************************************************************
+'*******************************************************************************
'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
'*
'* Copyright 2008 by Sun Microsystems, Inc.
@@ -29,21 +29,16 @@
'* <http://www.openoffice.org/license.html>
'* for a copy of the LGPLv3 License.
'*
-'/************************************************************************
+'/******************************************************************************
'*
'* owner : helge.delfs@sun.com
'*
'* short description : Tools / XML Filter Settings Resource Test
'*
-'************************************************************************
-'*
-' #1 tToolsXMLFilterSettings 'Resource test for 'Tools' / 'XML Filter Settings'
-' #1 fInitialXMLSetting 'Checks the availibility of the Excel XML import filter
-' #0 sRemoveXSLTFilter
-'*
-'\***********************************************************************
+'\******************************************************************************
-testcase tToolsXMLFilterSettings
+testcase tToolsXMLFilterSettings
+
Dim iCountOfXSLTStylesAtBeginning as integer
Dim iCountOfXSLTStylesAfterInstallCheck as integer
Dim iApplicationEntries as integer
@@ -153,16 +148,21 @@ testcase tToolsXMLFilterSettings
FilterList.TypeKeys "<HOME>"
for ic = 1 to iCountOfXSLTStylesAfterInstallCheck
Kontext "XMLFilterSettings"
- sleep(1)
- 'read the filter names from the dialog.
- sTempReadFilterName = FilterList.GetItemText(ic)
- 'lower case comparison!
- sTempReadFilterName = lcase(sTempReadFilterName)
- if InStr(sTempReadFilterName , sWhichFilterToUse) <> 0 then
- FilterList.TypeKeys "<DOWN> " , ic-1
- ' printlog "DEBUG: Filtername: " & FilterList.GetItemText(ic)
- sleep(1)
- end if
+ if ( XMLFilterSettings.exists( 2 ) ) then
+
+ 'read the filter names from the dialog.
+ sTempReadFilterName = FilterList.GetItemText(ic)
+
+ 'lower case comparison!
+ sTempReadFilterName = lcase(sTempReadFilterName)
+ if InStr(sTempReadFilterName , sWhichFilterToUse) <> 0 then
+ FilterList.TypeKeys "<DOWN> " , ic-1
+ ' printlog "DEBUG: Filtername: " & FilterList.GetItemText(ic)
+ WaitSlot() ' Sort of NOOP
+ endif
+ else
+ warnlog( "XML Filter Settings dialog too slow/not displayed" )
+ endif
next ic
for ia = 1 to 2
Kontext "XMLFilterSettings"
@@ -214,22 +214,26 @@ testcase tToolsXMLFilterSettings
case 4 : printlog " +- Browse button 'Template for import'"
BrowseTemplateForImport.Click
end select
- sleep(2)
+
Kontext "OeffnenDlg"
- if OeffnenDlg.Exists(1) then
+ if OeffnenDlg.Exists(3) then
'/// After every click on &quot;Browse&quot;-button an &quot;FileOpen&quot;-dialog shoud be visible. Cancel that dialog.
printlog " +- After every click on 'Browse'-button an 'FileOpen'-dialog shoud be visible. Cancel that dialog."
call Dialogtest (OeffnenDlg)
OeffnenDlg.Cancel
- sleep(3)
+
else
warnlog sErrorPointerTextForResultfile & "File Open dialog did not appeared."
end if
next ib
'/// [Loop end]
- Kontext "XMLFilter"
- printlog " +- Closing 'XML Filter: New Filter'-dialog."
- XMLFilter.Cancel
+ Kontext "XMLFilter"
+ if ( XMLFilter.exists( 3 ) ) then
+ printlog " +- Closing 'XML Filter: New Filter'-dialog."
+ XMLFilter.Cancel
+ else
+ warnlog( "XML Filter Dialog not available" )
+ endif
'/// Closing &quot;XML Filter: New Filter&quot;-dialog
else
warnlog "XML Filter dialog did not appeared!"
@@ -239,12 +243,13 @@ testcase tToolsXMLFilterSettings
'/// Clicking &quot;Test XLSTs&quot;-button.
printlog "+- Clicking 'Test XLSTs'-button."
TestXSLTs.Click
- sleep(1)
+
'If it's an Import filter it makes no sense to test the export.
if sWhichFilterToUse = "docbook" then
+
printlog "+- E X P O R T (Writer, Impress)"
Kontext "TestXMLFilter"
- if TestXMLFilter.Exists(1) then
+ if TestXMLFilter.Exists( 3 ) then
call Dialogtest(TestXMLFilter)
else
warnlog sErrorPointerTextForResultfile & "Testing of the XML filter not possible. Exiting."
@@ -270,89 +275,99 @@ testcase tToolsXMLFilterSettings
ExportBrowseBtn.Click
'/// Press first &quot;Browse&quot;-button on the &quot;Test XML Filter&quot;-dialog.
printlog " +-Press first 'Browse'-button on the 'Test XML Filter'-dialog."
- sleep(2)
+
Kontext "OeffnenDlg"
- if OeffnenDlg.Exists(1) then
+ if OeffnenDlg.Exists( 3 ) then
call Dialogtest (OeffnenDlg)
OeffnenDlg.Cancel
'/// Closing 'FileOpen'-Dialog.
printlog " +- Closing 'FileOpen'-Dialog."
- sleep(3)
else
warnlog sErrorPointerTextForResultfile & "File Open dialog did not occoured?!"
- end if
- Kontext "TestXMLFilter"
- '/// If the application is Writer (because the default XSLT stylesheets are only Writer filter).
- '///+<ul><li>Clicking on &quot;Current Document&quot;-button.</li></ul>
- if gApplication = "WRITER" then
- printlog " +- Clicking on 'Current Document'-button."
- CurrentDocument.Click
- sleep(3)
- '/// If Java is not [correctly] installed a messagebox will be shown and the test of the filter will be canceled!
- Kontext "Messagebox"
- if MessageBox.Exists(2) then
- warnlog Messagebox.GetText
- try
- Messagebox.Cancel
- catch
- Messagebox.OK
- endcatch
- else
- try
- Kontext "XMLFilterOutput"
- if XMLFilterOutput.Exists(1) then
- '/// &quot;XML Filter Output&quot;-dialog should be visible.
- printlog " +- 'XML Filter Output'-dialog should be visible."
- call Dialogtest(XMLFilterOutput)
- '/// Clicking &quot;Validate&quot;-button.
- printlog " +- Clicking 'Validate'-button."
- Validate.Click
- sleep(2)
- '/// Checking that the validate output control is visible inside the window.
- printlog " +- Checking that the validate output control is visible inside the window."
- if NOT ValidateOutput.isVisible then
- warnlog " +- Validate output is not visible!"
+ end if
+
+ Kontext "TestXMLFilter"
+ if ( TestXMLFilter.exists( 2 ) ) then
+ '/// If the application is Writer (because the default XSLT stylesheets are only Writer filter).
+ '///+<ul><li>Clicking on &quot;Current Document&quot;-button.</li></ul>
+ if gApplication = "WRITER" then
+ printlog " +- Clicking on 'Current Document'-button."
+ CurrentDocument.Click
+
+ '/// If Java is not [correctly] installed a messagebox will be shown and the test of the filter will be canceled!
+ Kontext "Messagebox"
+ if MessageBox.Exists( 5 ) then
+ warnlog Messagebox.GetText
+ try
+ Messagebox.Cancel
+ catch
+ Messagebox.OK
+ endcatch
+ else
+ try
+ Kontext "XMLFilterOutput"
+ if XMLFilterOutput.Exists(1) then
+ '/// &quot;XML Filter Output&quot;-dialog should be visible.
+ printlog " +- 'XML Filter Output'-dialog should be visible."
+ call Dialogtest(XMLFilterOutput)
+ '/// Clicking &quot;Validate&quot;-button.
+ printlog " +- Clicking 'Validate'-button."
+ Validate.Click
+ WaitSlot( 2000 )
+ '/// Checking that the validate output control is visible inside the window.
+ printlog " +- Checking that the validate output control is visible inside the window."
+ if NOT ValidateOutput.isVisible then
+ warnlog " +- Validate output is not visible!"
+ end if
+ '/// Closing &quot;XML Filter Output&quot;-dialog.
+ printlog " +- Closing 'XML Filter Output'-dialog."
+ XMLFilterOutput.Close
+
+ else
+ warnlog sErrorPointerTextForResultfile & "XML Filter Ouput dialog did not occoured."
end if
- '/// Closing &quot;XML Filter Output&quot;-dialog.
- printlog " +- Closing 'XML Filter Output'-dialog."
- XMLFilterOutput.Close
- sleep(2)
- else
- warnlog sErrorPointerTextForResultfile & "XML Filter Ouput dialog did not occoured."
- end if
- catch
- warnlog "Testing of XSLTs does not work."
- endcatch
- end if
- else
- Kontext "TestXMLFilter"
- printlog " +- 'Current Document'-button should not be enabled if no !"
- if CurrentDocument.IsEnabled then
- Kontext "DocumentWriter"
- try
- DocumentWriter.TypeKeys "A writer document exists!"
- catch
- QAErrorLog "'Current Document'-button is enabled but a 'Writer' XML filter has been selected! If there's no Writer document (may be in the background) also opened it would be a bug!"
- endcatch
+ catch
+ warnlog "Testing of XSLTs does not work."
+ endcatch
+ end if
+ else
+ Kontext "TestXMLFilter"
+ printlog " +- 'Current Document'-button should not be enabled if no !"
+ if CurrentDocument.IsEnabled then
+ Kontext "DocumentWriter"
+ try
+ DocumentWriter.TypeKeys "A writer document exists!"
+ catch
+ QAErrorLog "'Current Document'-button is enabled but a 'Writer' XML filter has been selected! If there's no Writer document (may be in the background) also opened it would be a bug!"
+ endcatch
+ end if
end if
+ else
+ warnlog( "FATAL: TestXMLFilter not available" )
end if
- end if
- printlog "+- I M P O R T"
- Kontext "TestXMLFilter"
- '/// Clicking &quot;Browse&quot;-button (Import).
- printlog " +- Clicking 'Browse'-button (Import)."
- ImportBrowseBtn.Click
- sleep(2)
- Kontext "OeffnenDlg"
- if OeffnenDlg.Exists(1) then
- call Dialogtest (OeffnenDlg)
- '/// Closing &quot;FileOpen&quot;-dialog.
- printlog " +- Closing 'FileOpen'-dialog."
- OeffnenDlg.Cancel
- sleep(3)
- else
- warnlog sErrorPointerTextForResultfile & "File Open dialog did not occoured?!"
- end if
+ printlog "+- I M P O R T"
+ endif
+
+
+ Kontext "TestXMLFilter"
+ if ( TestXMLFilter.exists( 2 ) ) then
+ '/// Clicking &quot;Browse&quot;-button (Import).
+ printlog " +- Clicking 'Browse'-button (Import)."
+ ImportBrowseBtn.Click
+
+ Kontext "OeffnenDlg"
+ if OeffnenDlg.Exists( 2 ) then
+ call Dialogtest (OeffnenDlg)
+ '/// Closing &quot;FileOpen&quot;-dialog.
+ printlog " +- Closing 'FileOpen'-dialog."
+ OeffnenDlg.Cancel
+ else
+ warnlog sErrorPointerTextForResultfile & "File Open dialog did not occoured?!"
+ end if
+ else
+ warnlog( "FATAL: Dialog <TestXMLFilter> is not available" )
+ endif
+
Kontext "TestXMLFilter"
'/// Checking if 'Display Source'-checkbox is checked (should not be!).
printlog " +- Checking if 'Display Source'-checkbox is checked (should not be!)."
@@ -397,14 +412,12 @@ testcase tToolsXMLFilterSettings
'/// Clicking &quot;Browse&quot;-button (Import) again to test it with the XML file.
printlog " +- Clicking 'Browse'-button (Import) again to test it the XML file."
ImportBrowseBtn.Click
- sleep(2)
+
Kontext "OeffnenDlg"
- if OeffnenDlg.Exists(1) then
+ if OeffnenDlg.Exists( 3 ) then
call Dialogtest (OeffnenDlg)
Dateiname.SetText sDocXMLTestFile
- sleep(3)
Oeffnen.Click
- sleep(3)
try
' If Java is not [correctly] installed a messagebox will be shown and the test of the filter will be canceled!
Kontext "Messagebox"
@@ -436,9 +449,9 @@ testcase tToolsXMLFilterSettings
'/// Clicking &quot;Validate&quot;-button.
printlog " +- Clicking 'Validate'-button."
Validate.Click
- sleep(2)
+
Kontext "Messagebox"
- if Messagebox.Exists(2) then
+ if Messagebox.Exists( 2 ) then
if bJavaBroken then
Messagebox.OK
else
@@ -456,7 +469,6 @@ testcase tToolsXMLFilterSettings
printlog " +- Closing 'XML Filter Output'-dialog."
Kontext "XMLFilterOutput"
XMLFilterOutput.Close
- sleep(1)
else
warnlog sErrorPointerTextForResultfile & "No output window was visible! Exiting routine!"
Kontext "TestXMLFilter"
@@ -485,7 +497,7 @@ testcase tToolsXMLFilterSettings
catch
'/// If Java is not [correctly] installed a messagebox will be shown and the test of the filter will be canceled!
Kontext "Messagebox"
- if MessageBox.Exists(2) then
+ if MessageBox.Exists( 2 ) then
warnlog Messagebox.GetText
Messagebox.OK
warnlog sErrorPointerTextForResultfile & "Java is not usable! Exiting routine!"
@@ -544,95 +556,126 @@ testcase tToolsXMLFilterSettings
else
QAErrorLog "#i27370# Normaly there should be a second document but there is none!"
end if
- sleep(1)
- Kontext "TestXMLFilter"
- if bJavaBroken = FALSE then
- '/// Clicking on &quot;Recent File&quot;-Button.
- printlog " +- Clicking on 'Recent File'-Button."
- RecentFile.Click
- Kontext "XMLFilterOutput"
- '/// &quot;XML Filter Output&quot;-dialog should be visible.
- printlog " +- 'XML Filter Output'-dialog should be visible."
- Kontext "XMLFilterOutput"
- '/// Closing &quot;XML Filter Output&quot;-dialog.
- printlog " +- Closing 'XML Filter Output'-dialog."
- XMLFilterOutput.Close
- sleep(1)
- '/// Closing the tested XML document
- printlog " +- Closing the tested XML document"
- '/// ...if there is more than 1 document opened.
- if GetDocumentCount > 1 then
- call hCloseDocument
- else
- QAErrorLog "#i27370# Normaly there should be a second document but there is none!"
- end if
- sleep(1)
- Kontext "TestXMLFilter"
- '/// Closing the &quot;Test XML Filter&quot;-dialog.
- printlog " +- Closing the 'Test XML Filter'-dialog"
- endif
+
+ Kontext "TestXMLFilter"
+ if ( TestXMLFilter.exists( 1 ) ) then
+ if bJavaBroken = FALSE then
+ '/// Clicking on &quot;Recent File&quot;-Button.
+ printlog " +- Clicking on 'Recent File'-Button."
+ RecentFile.Click
+
+ Kontext "XMLFilterOutput"
+ '/// &quot;XML Filter Output&quot;-dialog should be visible.
+ printlog " +- 'XML Filter Output'-dialog should be visible."
+
+ Kontext "XMLFilterOutput"
+ '/// Closing &quot;XML Filter Output&quot;-dialog.
+ printlog " +- Closing 'XML Filter Output'-dialog."
+ XMLFilterOutput.Close
+
+ '/// Closing the tested XML document
+ printlog " +- Closing the tested XML document"
+ '/// ...if there is more than 1 document opened.
+ if GetDocumentCount > 1 then
+ call hCloseDocument
+ else
+ QAErrorLog "#i27370# Normaly there should be a second document but there is none!"
+ end if
+
+ Kontext "TestXMLFilter"
+ '/// Closing the &quot;Test XML Filter&quot;-dialog.
+ printlog " +- Closing the 'Test XML Filter'-dialog"
+ endif
+ else
+ warnlog( "Dialog <TestXMLFilter> is not available" )
+ endif
+
CloseBtn.Click
- Kontext "XMLFilterSettings"
- '/// Clicking &quot;Delete&quot;-button.
- printlog " +- Clicking 'Delete'-button"
- DeleteBtn.Click
- Kontext
- if Active.Exists(1) then
- if Active.GetRT = 304 then
- Active.No
- end if
- end if
- Kontext "XMLFilterSettings"
+
+ Kontext "XMLFilterSettings"
+ if ( XMLFilterSettings.exists( 1 ) ) then
+ '/// Clicking &quot;Delete&quot;-button.
+ printlog " +- Clicking 'Delete'-button"
+ DeleteBtn.Click
+ Kontext
+ if Active.Exists(1) then
+ if Active.GetRT = 304 then
+ Active.No
+ end if
+ end if
+ else
+ warnlog( "Dialog <XMLFilterSettings> is not available" )
+ endif
+
'/// Clicking 'Save to Package'-button.
- printlog " +- Clicking 'Save to Package'-button."
- SaveToPackage.Click
- sleep(2)
- Kontext "SpeichernDlg"
- if SpeichernDlg.Exists(1) then
- call Dialogtest(SpeichernDlg)
- SpeichernDlg.Cancel
- '/// Closing 'File Save As'-Dialog.
- printlog " +- Closing 'File Save As'-Dialog."
- else
- warnlog sErrorPointerTextForResultfile & "Save As dialog missing!"
- end if
Kontext "XMLFilterSettings"
+ if ( XMLFilterSettings.exists( 1 ) ) then
+
+ printlog " +- Clicking 'Save to Package'-button."
+ SaveToPackage.Click
+
+ Kontext "SpeichernDlg"
+ if SpeichernDlg.Exists( 3 ) then
+ call Dialogtest(SpeichernDlg)
+ SpeichernDlg.Cancel
+ '/// Closing 'File Save As'-Dialog.
+ printlog " +- Closing 'File Save As'-Dialog."
+ else
+ warnlog sErrorPointerTextForResultfile & "Save As dialog missing!"
+ end if
+ else
+ warnlog( "Dialog <XMLFilterSettings> is not available" )
+ endif
+
+
'/// Clicking 'Open Package'-button.
- printlog " +- Clicking 'Open Package'-button."
- OpenPackage.Click
- sleep(2)
- Kontext "OeffnenDlg"
- if OeffnenDlg.Exists(1) then
- call Dialogtest(OeffnenDlg)
- OeffnenDlg.Cancel
- '/// Closing 'FileOpen'-Dialog.
- printlog " +- Closing 'FileOpen'-Dialog."
- else
- warnlog sErrorPointerTextForResultfile & "File open dialog missing!"
- end if
Kontext "XMLFilterSettings"
+ if ( XMLFilterSettings.exists( 1 ) ) then
+ printlog " +- Clicking 'Open Package'-button."
+ OpenPackage.Click
+
+ Kontext "OeffnenDlg"
+ if OeffnenDlg.Exists( 3 ) then
+ call Dialogtest(OeffnenDlg)
+ OeffnenDlg.Cancel
+ '/// Closing 'FileOpen'-Dialog.
+ printlog " +- Closing 'FileOpen'-Dialog."
+ else
+ warnlog sErrorPointerTextForResultfile & "File open dialog missing!"
+ end if
+ else
+ warnlog( "Dialog <XMLFilterSettings> is not available" )
+ endif
+
+
'/// Closing the &quot;XML Filter Settings&quot;-dialog.
- printlog "+- Closing the 'XML Filter Settings'-dialog."
- 'Deinstall the XSLT stylesheet if this routine has
- 'added one at the beginning.
- if bREMOVEXSLT = TRUE then
- call sRemoveXSLTFilter
- end if
+ Kontext "XMLFilterSettings"
+ if ( XMLFilterSettings.exists( 1 ) ) then
+ printlog "+- Closing the 'XML Filter Settings'-dialog."
+ 'Deinstall the XSLT stylesheet if this routine has
+ 'added one at the beginning.
+ if bREMOVEXSLT = TRUE then
+ call sRemoveXSLTFilter
+ end if
+ else
+ warnlog( "Dialog <XMLFilterSettings> is not available" )
+ endif
+
+
Kontext "XMLFilterSettings"
- CloseBtn.Click
- '/// Closing the opened application document.
+ if ( XMLFilterSettings.exists( 1 ) ) then
+ CloseBtn.Click
+ '/// Closing the opened application document.
+ else
+ warnlog( "Dialog <XMLFilterSettings> is not available" )
+ endif
+
printlog "- Closing the opened application document."
'/// ...if there is more than 1 document opened.
- if GetDocumentCount > 1 then
- call hCloseDocument
- else
+ if ( hFileCloseAll() <> 2 ) then
QAErrorLog "#i27370# Normaly there should be a second document but there is none!"
- end if
- if GetDocumentCount >= 1 then
- do until GetDocumentCount = 0
- Call hCloseDocument
- loop
- endif
+ end if
+
endcase
'-------------------------------------------------------------------------
@@ -698,34 +741,43 @@ sub fInitialXMLSetting( sXMLFilterType as string ) as boolean
case "xhtml" : sFilterPackagePath = ConvertPath(gTestToolPath & "global\input\xslt_stylesheets\xhtml.jar")
end select
OpenPackage.Click
- Kontext "OeffnenDlg"
- call Dialogtest (OeffnenDlg)
- Dateiname.SetText sFilterPackagePath
- sleep(3)
- Oeffnen.Click
- sleep(3)
- Kontext
- if Active.Exists(3) then
- if Active.GetRT = 304 then
- printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: " & Active.GetText
- Active.OK
- Kontext "XMLFilterSettings"
- iSecondCountOfDefaultXSLTStyles = FilterList.GetItemCount
- printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Checking again the count of installed XSLT stylesheets."
- if iSecondCountOfDefaultXSLTStyles <> (iCountOfDefaultXSLTStyles+1) then
- warnlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: It was not possible to add " & sXMLFilterType & "-XML filter!"
- warnlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Test aborted!"
- exit sub
- else
- printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: XML filter has been installed!"
- fInitialXMLSetting = TRUE
+
+ Kontext "OeffnenDlg"
+ if ( OeffnenDlg.exists( 2 ) ) then
+ call Dialogtest (OeffnenDlg)
+ Dateiname.SetText sFilterPackagePath
+ Oeffnen.Click
+
+ Kontext
+ if Active.Exists(3) then
+ if Active.GetRT = 304 then
+ printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: " & Active.GetText
+ Active.OK
+ Kontext "XMLFilterSettings"
+ iSecondCountOfDefaultXSLTStyles = FilterList.GetItemCount
+ printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Checking again the count of installed XSLT stylesheets."
+ if iSecondCountOfDefaultXSLTStyles <> (iCountOfDefaultXSLTStyles+1) then
+ warnlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: It was not possible to add " & sXMLFilterType & "-XML filter!"
+ warnlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Test aborted!"
+ exit sub
+ else
+ printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: XML filter has been installed!"
+ fInitialXMLSetting = TRUE
+ end if
end if
- end if
- end if
- Kontext "XMLFilterSettings"
- '/// Closing the XML Filter Settings-dialog.
- printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Closing the 'XML Filter Settings'-dialog."
- CloseBtn.Click
+ end if
+ else
+ warnlog( "Dialog <OeffnenDlg> is not available" )
+ endif
+
+ Kontext "XMLFilterSettings"
+ if ( XMLFilterSettings.exists( 1 ) ) then
+ '/// Closing the XML Filter Settings-dialog.
+ printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Closing the 'XML Filter Settings'-dialog."
+ CloseBtn.Click
+ else
+ warnlog( "Dialog <XMLFilterSettings> is not available" )
+ endif
'/// Closing the opened application document.
printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Closing the opened application document."
call hCloseDocument
@@ -756,9 +808,9 @@ sub sRemoveXSLTFilter
if InStr(sTempReadFilterName , sXMLFilterType) <> 0 then
'/// If the filter has been found delete it.
FilterList.TypeKeys "<HOME>"
- sleep(1)
+ wait( 100 )
FilterList.TypeKeys "<DOWN>" , (ia-1)
- sleep(1)
+ wait( 100 )
DeleteBtn.Click
Kontext
if Active.Exists(1) then
diff --git a/testautomation/global/tools/includes/required/t_doc2.inc b/testautomation/global/tools/includes/required/t_doc2.inc
index 973082f6ea73..522c78240660 100755
--- a/testautomation/global/tools/includes/required/t_doc2.inc
+++ b/testautomation/global/tools/includes/required/t_doc2.inc
@@ -37,6 +37,8 @@
'*
'\***********************************************************************
+private const VERBOSE = TRUE
+
sub hTabelleEinfuegen
'/// <b>WRITER only </b>///'
'/// hTabelleEinfuegen hInsertTable ///'
@@ -119,35 +121,53 @@ end sub
'
'-------------------------------------------------------------------------------
'
-sub sMakeReadOnlyDocumentEditable
- If IsItLoaded() then
- Kontext "Standardbar"
- if Bearbeiten.IsEnabled then
- 'Check if the button is enabled.
- if Bearbeiten.getState(2) = 0 then
- 'Check if the document has been loaded read-only and if yes
- 'click on the 'Edit'-button
- Bearbeiten.Click()
- sleep (2)
- Kontext
- if Active.Exists(5) then
- 'If there is a messagebox coming up, click on Yes/OK
- printlog "Document was read-only. A copy will be used."
- Active.Yes
- end if
- Kontext
- if Active.Exists(2) then
- ' Sometimes an messagebox will be opened that the file does
- ' not exists.
- QAErrorLog Active.GetText
- Active.OK
- end if
- end if
- end if
+function sMakeReadOnlyDocumentEditable() as boolean
+
+ ' Function returns TRUE if document has been made editable and FALSE if
+ ' no action was required (that is: Document was not read-only)
+
+ dim iTry as integer
+ const CFN = "sMakeReadOnlyDocumentEditable::"
+
+ if ( VERBOSE ) then printlog( CFN & "Making document editable (create a copy) if it is readonly" )
+
+ Kontext "Standardbar"
+ if ( Bearbeiten.IsEnabled() ) then
+
+ if ( Bearbeiten.getState( 2 ) = 0 ) then
+
+ Bearbeiten.Click()
+
+ for iTry = 1 to 2
+
+ Kontext "Active"
+ if ( Active.exists( 5 ) ) then
+
+ printlog( CFN & "Messagebox: " & Active.getText() )
+
+ try
+ if ( VERBOSE ) then printlog( CFN & "Document was read-only. A copy will be used." )
+ Active.Yes()
+ if ( VERBOSE ) then printlog( CFN & "Closed 'use copy' message" )
+ catch
+ if ( VERBOSE ) then printlog( CFN & "Probing for unexpected messagebox..." )
+ active.ok()
+ warnlog( "#i100701 - Object not found message" )
+ endcatch
+ else
+ printlog( CFN & "No messagebox informing about a copy being used" )
+ endif
+ sMakeReadOnlyDocumentEditable() = TRUE
+ next iTry
+ else
+ if ( VERBOSE ) then printlog( CFN & "Button <Bearbeiten> is pressed, document is editable" )
+ sMakeReadOnlyDocumentEditable() = FALSE
+ endif
else
- warnlog "The document has not been loaded correctly."
- end if
-end sub
+ if ( VERBOSE ) then printlog( CFN & "Control <Bearbeiten> is not enabled" )
+ endif
+
+end function
'
'-------------------------------------------------------------------------------
'
diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc
index 0edae832b7ff..4e4160188a57 100755
--- a/testautomation/global/tools/includes/required/t_files.inc
+++ b/testautomation/global/tools/includes/required/t_files.inc
@@ -37,7 +37,7 @@
'*
'\******************************************************************************
-private const C_INFO = FALSE ' Set this to TRUE to increase verbosity of some functions
+private const C_INFO = TRUE ' Set this to TRUE to increase verbosity of some functions
function hGrafikEinfuegen ( Grafik$ ) as Boolean
'/// hGrafikEinfuegen hGraphicInsert
@@ -722,6 +722,19 @@ end function
'
'-------------------------------------------------------------------------------
'
+function hFileCloseAll() as integer
+
+ dim iDocumentCount as integer : iDocumentCount = 0
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument()
+ iDocumentCount = iDocumentCount + 1
+ Loop
+ hFileCloseAll() = iDocumentCount
+
+end function
+'
+'-------------------------------------------------------------------------------
+'
function hFileOpen( cFile as string ) as boolean
dim sFile as string : sFile = convertToURL( convertpath( cFile ) )
@@ -904,6 +917,14 @@ function hFileWait( optional bWarn as boolean ) as integer
iWait = -4
exit do
endif
+
+ ' LOAD: Master Password Dialog
+ kontext "MasterPasswordEnter"
+ if ( MasterPasswordEnter.exists() ) then
+ iWait = -10
+ warnlog( CFN & "Master Password dialog displayed. Tests are likely to fail" )
+ exit do
+ endif
' LOAD: Filter selection dialog
Kontext "Filterauswahl"
@@ -957,6 +978,7 @@ function hFileWait( optional bWarn as boolean ) as integer
case -7 : printlog( CFN & "A dialog box is in the way (1 button), rc = " & iWait )
case -8 : printlog( CFN & "A dialog box is in the way (2 buttons), rc = " & iWait )
case -9 : printlog( CFN & "A dialog box is in the way (3 buttons), rc = " & iWait )
+ case -10 : printlog( CFN & "Master Password Dialog displayed, rc = " & iWait )
case else : printlog( CFN & "File I/O completed in " & iWait & " seconds" )
end select
endif
diff --git a/testautomation/global/tools/includes/required/t_option.inc b/testautomation/global/tools/includes/required/t_option.inc
index 5e2322c27c44..6ba837d79f84 100755
--- a/testautomation/global/tools/includes/required/t_option.inc
+++ b/testautomation/global/tools/includes/required/t_option.inc
@@ -29,25 +29,28 @@
'* <http://www.openoffice.org/license.html>
'* for a copy of the LGPLv3 License.
'*
-'/************************************************************************
+'/******************************************************************************
'*
'* owner : thorsten.bosbach@sun.com
'*
'* short description : General option test (sub-routines for options tests)
'*
-'************************************************************************
-'*
-' #1 hToolsOptions 'Select the correct page in Tools / Options
-'*
-'\***********************************************************************
+'\******************************************************************************
function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIONAL bSilent as Boolean ) as Boolean
+
+ const CFN = "global::tools::includes::required::t_option.inc:"
+
Dim bCorPage as Boolean
Dim bFirst as Boolean
- Dim AnzahlEintraegeZu as Integer
- Dim AnzahlEintraege as Integer
- Dim i as Integer
+
+ Dim InitialNodeCount as Integer ' All nodes collapsed
+ Dim CurrentNodeCount as Integer ' Number of nodes when a top node is expanded
+ Dim iCurrentPage as Integer ' Increment variable for stepping through the nodes
Dim startpos as integer
+
+ Applicationname = ucase( Applicationname )
+ Tabpagename = ucase( Tabpagename )
'///<i>hToolsOptions</i>: Routine to select the correct option page
'///+<u>input</u>: The groupname as string, name of optionpage as string
@@ -81,83 +84,44 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
if ExtrasOptionenDlg.Exists then
Optionsliste.TypeKeys "<HOME>"
- for i = 1 to 12+1
+ for iCurrentPage = 1 to 12+1
Optionsliste.TypeKeys "-<DOWN>"
- next i
+ next iCurrentPage
'Optionsliste.TypeKeys "<HOME>"
- AnzahlEintraegeZu = Optionsliste.GetItemCount
- select case Ucase$(Applicationname)
+ InitialNodeCount = Optionsliste.GetItemCount
+ select case Applicationname
case "STAROFFICE" : startpos = 1
case "LOADSAVE" : startpos = 2
case "LANGUAGESETTINGS" : startpos = 3
- case "WRITER"
- if ((gApplication = "WRITER")OR(gApplication = "MASTERDOCUMENT")OR(gApplication = "HTML")) then
- startpos = 4
- else
- qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'"
- exit function
- endif
- case "HTML"
- if ((gApplication = "WRITER")OR(gApplication = "MASTERDOCUMENT")OR(gApplication = "HTML")) then
- startpos = 5
- else
- qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'"
- exit function
- endif
-
- case "CALC"
- if (gApplication = "CALC") then
- startpos = 4
- else
- qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'"
- exit function
- endif
-
- case "IMPRESS"
- if ((gApplication = "DRAW")OR(gApplication = "DRAW")) then
- startpos = 4
- else
- qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'"
- exit function
- endif
-
- case "DRAWING"
- if ((gApplication = "DRAW")OR(gApplication = "IMPRESS")) then
- startpos = 4
- else
- qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'"
- exit function
- endif
-
- case "MATH"
- if (gApplication = "MATH") then
- startpos = 4
- else
- qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'"
- exit function
- endif
-
- case "DATASOURCES"
- startpos = AnzahlEintraegeZu -2
- case "CHART"
- startpos = AnzahlEintraegeZu -1
- case "INTERNET"
- startpos = AnzahlEintraegeZu ' always the last one
+ case "WRITER" : startpos = 4
+ case "MASTERDOCUMENT" : startpos = 4
+ case "HTML" : startpos = 5
+ case "CALC" : startpos = 4
+ case "IMPRESS" : startpos = 4
+ case "DRAW" : startpos = 4
+ case "MATH" : startpos = 4
+ case "DATASOURCES" : startpos = InitialNodeCount -2
+ case "CHART" : startpos = InitialNodeCount -1
+ case "INTERNET" : startpos = InitialNodeCount ' always the last one
case else
- warnlog "hToolsOptions(): " + Applicationname + " / " + Tabpagename + " could not be found! Please review your testscript! '" + gApplication + "'"
+ warnlog( CFN & "Invalid Application name specified: " & Applicationname )
+ printlog( "Valid options are:" )
+ printlog( "gApplications: WRITER, CALC, MASTERDOCUMENT, DRAW, IMPRESS, HTML, MATH, CHART" )
+ printlog( "additionally.: STAROFFICE, LOADSAVE, LANGUAGESETTINGS, DATASOURCES, INTERNET" )
+ printlog( "All names must be uppercase" )
exit function
end select
Optionsliste.select Startpos
Optionsliste.typekeys "+"
- AnzahlEintraege = Optionsliste.GetItemCount
+ CurrentNodeCount = Optionsliste.GetItemCount
bFirst = TRUE
- for i = 1 to AnzahlEintraege - AnzahlEintraegeZu
+ for iCurrentPage = 1 to CurrentNodeCount - InitialNodeCount
bCorPage = FALSE
Kontext "ExtrasOptionenDlg"
Optionsliste.TypeKeys "<DOWN>"
- sleep (1)
- select case ucase$(Applicationname)
+ WaitSlot() ' Some sort of NOOP
+ select case Applicationname
case "STAROFFICE"
'///Pages in group &quot;StarOffice&quot;are:
'///+<ul><li>&quot;UserData&quot;</li>
@@ -172,7 +136,7 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
'///+<li>&quot;Appearence&quot;</li>
'///+<li>&quot;Accessibility&quot;</li>
'///+<li>&quot;Java&quot;</li></ul>
- select case ucase$(Tabpagename)
+ select case Tabpagename
case "USERDATA"
Kontext "TabBenutzerdaten"
if TabBenutzerdaten.exists then bCorPage = TRUE
@@ -249,7 +213,7 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
'///+<li>&quot;VBAProperties&quot;</li>
'///+<li>&quot;MicrosoftOffice&quot;</li>
'///+<li>&quot;HTMLCompatibility&quot;</li></ul>
- select case ucase$(Tabpagename)
+ select case Tabpagename
case "GENERAL"
Kontext "TabSpeichern"
if TabSpeichern.exists then bCorPage = TRUE
@@ -280,7 +244,7 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
Kontext "Active"
if Active.Exists then Active.OK
Kontext "ExtrasOptionenDlg"
- select case ucase$(Tabpagename)
+ select case Tabpagename
case "LANGUAGES"
Kontext "TabSprachen"
If TabSprachen.exists(2) then bCorPage = TRUE
@@ -313,7 +277,7 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
Kontext "Active"
if Active.Exists then Active.OK
Kontext "ExtrasOptionenDlg"
- select case ucase$(Tabpagename)
+ select case Tabpagename
case "PROXY"
Kontext "ProxyWarnung"
if ProxyWarnung.Exists then
@@ -346,7 +310,7 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
'///+<li>&quot;Print&quot;</li>
'///+<li>&quot;Table&quot;</li>
'///+<li>&quot;Changes&quot;</li></ul>
- select case ucase$(Tabpagename)
+ select case Tabpagename
case "GENERAL"
Kontext "TabLaden"
If TabLaden.exists then bCorPage = TRUE
@@ -422,7 +386,7 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
'///+<li>&quot;Table&quot;</li>
'///+<li>&quot;Source&quot;</li>
'///+<li>&quot;Background&quot;</li></ul>
- select case ucase$(Tabpagename)
+ select case Tabpagename
case "VIEW"
Kontext "TabInhalteHTML"
If TabInhalteHTML.exists then bCorPage = TRUE
@@ -462,7 +426,7 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
'///+<li>&quot;Changes&quot;</li>
'///+<li>&quot;Grid&quot;</li>
'///+<li>&quot;Print&quot;</li></ul>
- select case ucase$(Tabpagename)
+ select case Tabpagename
case "GENERAL"
Kontext "TabLayoutCalc"
If TabLayoutCalc.exists(2) then bCorPage = TRUE
@@ -504,7 +468,7 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
'///+<li>&quot;View&quot;</li>
'///+<li>&quot;Grid&quot;</li>
'///+<li>&quot;Print&quot;</li></ul>
- select case ucase$(Tabpagename)
+ select case Tabpagename
case "GENERAL"
Kontext "TabSonstigesDraw"
If TabSonstigesDraw.exists then bCorPage = TRUE
@@ -531,7 +495,7 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
'///+<li>&quot;View&quot;</li>
'///+<li>&quot;Grid&quot;</li>
'///+<li>&quot;Print&quot;</li></ul>
- select case ucase$(Tabpagename)
+ select case Tabpagename
case "GENERAL"
Kontext "TabSonstigesDraw"
If TabSonstigesDraw.exists then bCorPage = TRUE
@@ -555,7 +519,7 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
case "MATH"
'///Page(s) in group &quot;Formula&quot;are:
'///+<ul><li>&quot;Settings&quot;</li></ul>
- select case ucase$(Tabpagename)
+ select case Tabpagename
case "SETTINGS"
Kontext "TabDruckenMath"
If TabDruckenMath.exists then bCorPage = TRUE
@@ -564,7 +528,7 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
case "CHART"
'///Pages in group &quot;Chart&quot;are:
'///+<ul><li>&quot;DefaultColors&quot;</li></ul>
- select case ucase$(Tabpagename)
+ select case Tabpagename
case "DEFAULTCOLORS"
Kontext "TabGrundfarben"
If TabGrundfarben.exists(4) then bCorPage = TRUE
@@ -573,7 +537,7 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
case "DATASOURCES"
'///Pages in group &quot;Datasource&quot;are:
'///+<ul><li>&quot;Connetions&quot;</li></ul>
- select case ucase$(Tabpagename)
+ select case Tabpagename
case "CONNECTIONS"
Kontext "TabConnections"
If TabConnections.exists(4) then bCorPage = TRUE
@@ -586,17 +550,17 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
bCorPage = False
end select
If bCorPage = TRUE then Exit for
- next i
- if bCorPage = FALSE then
- if bSilent = FALSE then
- warnlog "hToolsOptions(): "+ Applicationname + " / " + Tabpagename + " could not be found! Please review your test!"
+ next iCurrentPage
+ if ( NOT bCorPage ) then
+ if ( NOT bSilent ) then
+ warnlog CFN & Applicationname + " / " + Tabpagename + " could not be found! Please review your test!"
else
- printlog "hToolsOptions(): "+ Applicationname + " / " + Tabpagename + " should not be found!"
+ printlog CFN & Applicationname + " / " + Tabpagename + " could not be found!"
end if
end if
else
bCorPage = FALSE
- warnlog "Please open the option-dialog with 'ToolsOptions' before you called this routine!"
+ warnlog CFN & "Please open the option-dialog with 'ToolsOptions' before you called this routine!"
end if
hToolsOptions = bCorPage
end function
diff --git a/testautomation/global/tools/includes/required/t_option2.inc b/testautomation/global/tools/includes/required/t_option2.inc
index dc8e4d5817b4..74f49d9e3916 100644
--- a/testautomation/global/tools/includes/required/t_option2.inc
+++ b/testautomation/global/tools/includes/required/t_option2.inc
@@ -68,6 +68,7 @@ sub DialogeFuerTypenKontrollieren
Dim i as Integer
Dim iCount as Integer
Dim iErrorCount as integer
+ dim iExitCounter as integer : iExitCounter = 0
Kontext "TabPfade"
Typ.TypeKeys "<Down><Down><Home>"
iCount = 0
@@ -75,28 +76,40 @@ sub DialogeFuerTypenKontrollieren
for i=1 to Typ.GetItemCount
if i<>1 then Typ.TypeKeys "<Down>"
printlog " "+typ.getText
- if bAsianLan <> TRUE then
+ if ( bAsianLan <> TRUE ) then
try
Bearbeiten.Click
- kontext
- if active.exists (3) then
- iErrorCount = iErrorCount + 1
- if (iErrorCount > 1) then
- Warnlog active.getText
+
+ do while( iExitCounter <= 10 )
+
+ kontext "Active"
+ if ( active.exists() ) then
+ iErrorCount = iErrorCount + 1
+ if (iErrorCount > 1) then
+ Warnlog active.getText
+ endif
+ qaErrorlog "#i69014# gallery path doesn't exist: '" + active.getText + "'"
+ printlog active.getText
+ active.ok
endif
- qaErrorlog "#i69014# gallery path doesn't exist: '" + active.getText + "'"
- printlog active.getText
- active.ok
- endif
- Kontext "OeffnenDlg"
- if OeffnenDlg.Exists(2) then
- if Dateityp.IsVisible = TRUE then Warnlog "The normal FileOpen-Dialog is visible with the Filetype-Listbox => BUG!"
- OeffnenDlg.Cancel
- else
+
+ Kontext "OeffnenDlg"
+ if OeffnenDlg.Exists() then
+ if ( Dateityp.IsVisible ) then
+ Warnlog "The normal FileOpen-Dialog is visible with the Filetype-Listbox => BUG!"
+ endif
+ OeffnenDlg.Cancel
+ exit do
+ endif
+
Kontext "PfadeAuswaehlen"
- PfadeAuswaehlen.Cancel
- end if
- Sleep (1)
+ if ( PfadeAuswaehlen.exists() ) then
+ PfadeAuswaehlen.Cancel
+ exit do
+ endif
+
+ iExitCounter = iExitCounter + 1
+ loop
Kontext "TabPfade"
catch
Warnlog "Error on entry " & i & "!"
@@ -104,26 +117,36 @@ sub DialogeFuerTypenKontrollieren
endcatch
else
try
- if Bearbeiten.IsEnabled = TRUE then
+ if ( Bearbeiten.IsEnabled ) then
Bearbeiten.Click
- kontext
- if active.exists (3) then
- iErrorCount = iErrorCount + 1
- if (iErrorCount > 1) then
- Warnlog active.getText
+
+ do while( iExitCounter <= 10 )
+
+ kontext "Active"
+ if active.exists () then
+ iErrorCount = iErrorCount + 1
+ if (iErrorCount > 1) then
+ Warnlog active.getText
+ endif
+ qaErrorlog "WorkAround for #109107# has to come up only once @'Add-Ins'! else BUG!"
+ active.ok
endif
- qaErrorlog "WorkAround for #109107# has to come up only once @'Add-Ins'! else BUG!"
- active.ok
- endif
- Kontext "OeffnenDlg"
- if OeffnenDlg.Exists(2) then
- if Dateityp.IsVisible = TRUE then Warnlog "The normal FileOpen-Dialog is visible with the Filetype-Listbox => BUG!"
- OeffnenDlg.Cancel
- else
+
+ Kontext "OeffnenDlg"
+ if OeffnenDlg.Exists() then
+ if ( Dateityp.IsVisible ) then
+ Warnlog "The normal FileOpen-Dialog is visible with the Filetype-Listbox => BUG!"
+ OeffnenDlg.Cancel
+ exit do
+ endif
+ endif
+
Kontext "PfadeAuswaehlen"
- PfadeAuswaehlen.Cancel
- end if
- Sleep (1)
+ if ( PfadeAuswaehlen.exists() ) then
+ PfadeAuswaehlen.Cancel
+ exit do
+ end if
+ loop
Kontext "TabPfade"
else
iCount = iCount + 1
@@ -265,76 +288,6 @@ function hSetMacroSecurity( iLevel as integer ) as integer
hSetMacroSecurity() = iOldSecurityLevel
end function
-'-------------------------------------------------------------------------
-
-function fGetSetMacroSecurityUNO (optional iLevel as integer) as integer
- ' Input : Security level where 0 = low and 3 = very high; empty: just return current value
- ' Return : Previous security level, -1 on error
- ' Changes: If iLevel is given, update global variable gMacroSecurityLevel to new level
- ' NOTE : If possible use this function outside the testcase
- '///Switch between macro security levels in Tools/Options without using the UI
- Dim sFileFunction as string
- Dim iOldSecurityLevel as integer
- Dim oUnoOfficeConnection as object
- Dim oUnoConfigurationAccess as object
- Dim aPropertyValue(1) As new com.sun.star.beans.PropertyValue ' Array of pairs: Property with Value
- Dim xViewRoot
- Dim bOptional as boolean
-
- sFileFunction = "global::tools::inc::t_option2.inc::hSetMacroSecurity::"
- bOptional = isMissing(iLevel)
- iOldSecurityLevel = -1
-
- ' Open OOo UNO-Port for communication
- oUnoOfficeConnection=hGetUnoService(TRUE)
- if (NOT isNull(oUnoOfficeConnection)) then
- try
- ' Open Configuration access
- oUnoConfigurationAccess=oUnoOfficeConnection.createInstance("com.sun.star.configuration.ConfigurationProvider")
- if (NOT isNull(oUnoConfigurationAccess)) then
- ' Specifies the location of the view root in the configuration:
- ' The value is the Path name of the configuration item to change.
- aPropertyValue(0).Name="nodepath"
- ' Controls how updates are handled in the cache: If false , the cache
- ' must operate in write-through mode, where updates are written to
- ' persistent storage at once - that is before ::commitChanges() returns.
- aPropertyValue(1).Name="lazywrite"
- aPropertyValue(1).Value=False
-
- '///Tools / Options / Security
- '///Check which 'Macro Security Level' is set and put it into returnvalue.
- aPropertyValue(0).Value="/org.openoffice.Office.Common/Security/Scripting"
- xViewRoot=oUnoConfigurationAccess.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess",aPropertyValue())
- iOldSecurityLevel = xViewRoot.getByName("MacroSecurityLevel")
- ' If input is given, use it by setting the Security Level
- if NOT bOptional then
- xViewRoot.setPropertyValue("MacroSecurityLevel", iLevel)
- xViewRoot.commitChanges()
- ' Since we use lazywrite=false, the call to '.commitChanges()' returns if all data is written.
- ' This call to ask for pending changes is just to convince me;
- if xViewRoot.hasPendingChanges() then
- qaErrorLog(sFileFunction+"Changes still pending...")
- ' At this point there is no needed to think about what to do, if it doesn't work.
- ' If it doesn't work, the change is performed in the UI via
- ' global::system::inc::master.inc::mMakeGeneralOptions
- end if
- ' Update global value
- gMacroSecurityLevel = iLevel
- end if
- ' Destroy, discard, dump, get rid of, put away, throw away, trash, the object:
- xViewRoot.dispose()
- else
- qaErrorLog(sFileFunction+"Couldn't create Configuration access")
- end if
- catch
- qaErrorLog(sFileFunction+"Failure during reading or setting Configuration Value")
- endcatch
- else
- qaErrorLog(sFileFunction+"Couldn't get UNO service")
- end if
- fGetSetMacroSecurityUNO = iOldSecurityLevel
-end function
-
'*******************************************************************************
function hGetMacroSecurityAPI() as integer
@@ -477,7 +430,7 @@ function hSetMacroSecurityAPI( iSecLevel as integer ) as integer
xViewRoot.commitChanges()
xViewRoot.dispose()
- printlog( CFN & "Setting macro security level to " & caLevel( iSecLevel )
+ 'printlog( CFN & "Setting macro security level to " & caLevel( iSecLevel )
catch
diff --git a/testautomation/global/tools/includes/required/t_tools1.inc b/testautomation/global/tools/includes/required/t_tools1.inc
index 14bd3455a63c..aa9711e89952 100755
--- a/testautomation/global/tools/includes/required/t_tools1.inc
+++ b/testautomation/global/tools/includes/required/t_tools1.inc
@@ -41,7 +41,7 @@ private SLEEP_TIME_REQUESTED as integer
private SLEEP_CALLS_SUM as integer
private SLEEP_TIME_USED as integer
-private const VERBOSE = false
+private const VERBOSE = true
function GetClipboardText as string
@@ -1209,31 +1209,53 @@ function hUseAsyncSlot( cSlot as string ) as integer
for iWait = 1 to MAX_WAIT
try
select case ( lcase( cSlot ) )
- case "fileclose" : FileClose
- case "filesaveas" : FileSaveAs
- case "filesaveall" : FileSaveAll
- case "fileexport" : FileExport
+ case "fileclose" : FileClose
+ case "filesaveas" : FileSaveAs
+ case "filesaveall" : FileSaveAll
+ case "fileexport" : FileExport
+ case "filereload" : FileReload
- case "editcopy" : EditCopy
- case "editpaste" : EditPaste
- case "editcut" : EditCut
- case "editselectall" : EditSelectAll
- case "editselectallmath" : EditSelectAllMath
- case "editdeletecontents" : EditDeleteContents
- case "editundo" : EditUndo
- case "editredo" : EditRedo
- case "editrepeat" : EditRepeat
- case "editpastespecial" : EditPasteSpecial
- case "editsearchandreplace" : EditSearchAndReplace
- case "editduplicate" : EditDuplicate
- case "editgluepoints" : EditGluePoints
- case "editdeleteslide" : EditDeleteSlide
- case "editobjectproperties" : EditObjectProperties
- case "editobjectedit" : EditObjectEdit
- case "editobjectsavecopyas" : EditObjectSaveCopyAs
+ case "editcopy" : EditCopy
+ case "editchangesrecord" : EditChangesRecord
+ case "editchangesshow" : EditChangesShow
+ case "editchangesprotecttrace" : EditChangesProtectTrace
+ case "editchangescomment" : EditChangesComment
+
+ case "editpaste" : EditPaste
+ case "editcut" : EditCut
+ case "editselectall" : EditSelectAll
+ case "editselectallmath" : EditSelectAllMath
+ case "editselectionmodeblock" : EditSelectionModeBlock
+ case "editselectionmodestandard" : EditSelectionModeStandard
+ case "editdeletecontents" : EditDeleteContents
+ case "editundo" : EditUndo
+ case "editredo" : EditRedo
+ case "editrepeat" : EditRepeat
+ case "editpastespecial" : EditPasteSpecial
+ case "editpastespecialwriter" : EditPasteSpecialWriter
+ case "editsearchandreplace" : EditSearchAndReplace
+ case "editduplicate" : EditDuplicate
+ case "editgluepoints" : EditGluePoints
+ case "editdeleteslide" : EditDeleteSlide
+ case "editobjectproperties" : EditObjectProperties
+ case "editobjectedit" : EditObjectEdit
+ case "editobjectsavecopyas" : EditObjectSaveCopyAs
- case "formatcontrol" : FormatControl
- case "formateditpoints" : FormatEditPoints
+ case "formatcontrol" : FormatControl
+ case "formateditpoints" : FormatEditPoints
+ case "formatsections" : FormatSections
+ case "formatchangecaseupper" : FormatChangeCaseUpper
+ case "formatchangecaselower" : FormatChangeCaseLower
+ case "formatarea" : FormatArea
+ case "formatarrangebringtofrontcalc" : FormatArrangeBringToFrontCalc
+ case "formatflipvertically" : FormatFlipVertically
+ case "formatfliphorizontally" : FormatFlipHorizontally
+ case "formatline" : FormatLine
+ case "formatpositionandsize" : FormatPositionAndSize
+
+ case "insertindexesbibliographyentry" : InsertIndexesBibliographyEntry
+
+ case "contextpositionandsize" : ContextPositionAndSize
case else : warnlog( "Unknown slot called: " & cSlot )
end select
generated by cgit (git 2.34.1) at 2024-09-19 01:55:40 +0000