summaryrefslogtreecommitdiff
path: root/testautomation/global
diff options
context:
space:
mode:
Diffstat (limited to 'testautomation/global')
-rw-r--r--testautomation/global/input/officeinfo.txt6
-rwxr-xr-xtestautomation/global/required/includes/g_option.inc30
-rwxr-xr-xtestautomation/global/system/includes/iniinfo.inc2
-rwxr-xr-xtestautomation/global/tools/includes/required/t_files.inc17
-rwxr-xr-xtestautomation/global/tools/includes/required/t_tools3.inc4
-rwxr-xr-xtestautomation/global/win/edia_d_h.win3
-rwxr-xr-xtestautomation/global/win/edia_t_z.win5
-rwxr-xr-xtestautomation/global/win/etab_h_o.win1
-rwxr-xr-xtestautomation/global/win/etab_t_z.win2
9 files changed, 57 insertions, 13 deletions
diff --git a/testautomation/global/input/officeinfo.txt b/testautomation/global/input/officeinfo.txt
index 966fba456718..dbca05ecb083 100644
--- a/testautomation/global/input/officeinfo.txt
+++ b/testautomation/global/input/officeinfo.txt
@@ -1,4 +1,4 @@
[Current program versions]
-Oracle Open Office=3.3
-OpenOffice.org=3.3
-BrOffice.org=3.3
+Oracle Open Office=3.4
+OpenOffice.org=3.4
+BrOffice.org=3.4
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index b14ceca82c9f..fe462038899f 100755
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -579,14 +579,28 @@ testcase tToolsOptionsInternet
'///+<ol><li>Proxy</li>
'///+<li>Search</li>
'///+<li>Mozilla Plugin</li></ol>
- EchteAnzahl = OptionTabPageZaehler ( 3 , FALSE )
+ EchteAnzahl = OptionTabPageZaehler ( 3 , TRUE )
+ if (EchteAnzahl > 3) then
+ qaErrorLog ("Due to some installed extensions the tabpage count is not 3 it is: " + EchteAnzahl)
+ else
+ if (EchteAnzahl < 3) then
+ warnlog "Number of tabpages old : 3 new : " + EchteAnzahl
+ endif
+ endif
else
'/// On Unix systems this section includes four tab pages.
'///+<ol><li>Proxy</li>
'///+<li>Search</li>
'///+<li>E-Mail</li>
'///+<li>Mozilla Plugin</li></ol>
- EchteAnzahl = OptionTabPageZaehler ( 4 , FALSE )
+ EchteAnzahl = OptionTabPageZaehler ( 4 , TRUE )
+ if (EchteAnzahl > 4) then
+ qaErrorLog ("Due to some installed extensions the tabpage count is not 3 it is: " + EchteAnzahl)
+ else
+ if (EchteAnzahl < 4) then
+ warnlog "Number of tabpages old : 3 new : " + EchteAnzahl
+ endif
+ endif
endif
for i=1 to EchteAnzahl
@@ -647,6 +661,18 @@ testcase tToolsOptionsInternet
Call DialogTest ( TabMozillaPlugin )
endif
endif
+ case 5,6 : Kontext "TabMediaWiki"
+ if TabMediaWiki.exists then
+ qaerrorlog " - Wiki Publisher"
+ Call DialogTest ( TabMediaWiki )
+ gefunden = TRUE
+ endif
+ Kontext "TabWeblog"
+ if TabWeblog.exists then
+ qaerrorlog " - Weblog Publisher"
+ Call DialogTest ( TabWeblog )
+ gefunden = TRUE
+ endif
end select
if gefunden=FALSE then
Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index 552102588405..aa305b9a1a21 100755
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -125,9 +125,9 @@ sub GetIniInformation
if (gPrivateEnvironmentLocation <> "" AND gPrivateEnvironmentLocation <> ".") then
if NOT fileExists(gPrivateEnvironmentLocation) then
qaErrorLog "[PrivateEnvironment] defined in: '"+gTesttoolIni+"', but the path '"+gPrivateEnvironmentLocation+"'does not exist!"
- else
gPrivateEnvironmentLocation = ""
end if
+ else
gPrivateEnvironmentLocation = ""
end if
end sub
diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc
index 42b575c1187a..d9da7ce5191a 100755
--- a/testautomation/global/tools/includes/required/t_files.inc
+++ b/testautomation/global/tools/includes/required/t_files.inc
@@ -114,11 +114,28 @@ function hIsNamedDocLoaded( cFileName as string ) as boolean
dim cDocumentName as string
dim iDocumentNameLength as integer
+ dim bTemplateDocument as boolean
hIsNamedDocLoaded() = false
+ ' If the requested document is a template, we cannot use its filename to
+ ' identify the document as it is named "Untitled 1" or "Untitled" in the
+ ' FileSave dialog and the document properties dialog. The string is locale
+ ' dependent. So we do a shortcut here, the calling tests fail at a later
+ ' point if this function does not work properly
+
+ select case( right( cFileName, 4 ) )
+ case ".vor", ".dot", ".sti", ".pot", ".std", ".xlt", ".stc", ".ots", "xltm", "xltx"
+ if ( GVERBOSE ) then printlog( CFN & "Template document filtered" )
+ hIsNamedDocLoaded() = true
+ exit function
+ end select
+
if ( hUseAsyncSlot( "FileProperties" ) <> RC_FAILURE ) then
+ kontext
+ active.setpage(tabdokument)
+
kontext "TabDokument"
if ( TabDokument.exists( 2 ) ) then
diff --git a/testautomation/global/tools/includes/required/t_tools3.inc b/testautomation/global/tools/includes/required/t_tools3.inc
index 27ac128437ee..987a6ded6bb6 100755
--- a/testautomation/global/tools/includes/required/t_tools3.inc
+++ b/testautomation/global/tools/includes/required/t_tools3.inc
@@ -1108,7 +1108,7 @@ function hUseAsyncSlot( cSlot as string ) as integer
iTime = iRetries * DELAY
' Timeout is -1
- if ( iRetries = MAX_RETRIES ) then iTime = RC_TIMEOUT
+ if ( iRetries >= MAX_RETRIES ) then iTime = RC_TIMEOUT
if ( GVERBOSE ) then printlog( CFN & "Exit with rc=" & iTime )
hUseAsyncSlot() = iTime
@@ -1142,7 +1142,7 @@ function hClickButton( oButton as object ) as integer
' Total time used
iTime = iRetries * DELAY
- if ( iRetries = MAX_RETRIES ) then iTime = RC_TIMEOUT
+ if ( iRetries >= MAX_RETRIES ) then iTime = RC_TIMEOUT
if ( GVERBOSE ) then printlog( CFN & "Exit with rc=" & iTime )
hClickButton() = iTime
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index 35869e0c2b72..19ba11ec6695 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -503,3 +503,6 @@ CustomLanguage sc:ListBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:LB_CUSTOM_LANG
DetectSpecialNumbers sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE
*HyperlinkDialog HID_HYPERLINK_DIALOG
+CloseButton HID_ICCDIALOG_CANCEL_BTN
+ApplyButton HID_ICCDIALOG_OK_BTN
+BackButton HID_ICCDIALOG_RESET_BTN
diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win
index 4104b70f0f2a..4e3e0cd2a1be 100755
--- a/testautomation/global/win/edia_t_z.win
+++ b/testautomation/global/win/edia_t_z.win
@@ -159,11 +159,6 @@ Preview HID_SC_ASCII_TABCTR
*UnsatisfiedDependencies desktop:ModalDialog:RID_DLG_DEPENDENCIES
UnsatisfiedDependencyList desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST
-*WarningPrintOptions sd:ModalDialog:DLG_PRINT_WARNINGS
-FitPage sd:RadioButton:DLG_PRINT_WARNINGS:RBT_SCALE
-Posterize sd:RadioButton:DLG_PRINT_WARNINGS:RBT_POSTER
-TrimPage sd:RadioButton:DLG_PRINT_WARNINGS:RBT_CUT
-
*WarningPrintTransparency sfx2:ModalDialog:RID_WARN_PRINTTRANSPARENCY
NoButton sfx2:PushButton:RID_WARN_PRINTTRANSPARENCY:BTN_PRINTTRANS_NO
DoNotShowAgain sfx2:CheckBox:RID_WARN_PRINTTRANSPARENCY:CBX_NOPRINTTRANSWARN
diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win
index 244e02f717bc..de5481e2e3c2 100755
--- a/testautomation/global/win/etab_h_o.win
+++ b/testautomation/global/win/etab_h_o.win
@@ -180,6 +180,7 @@ LastRecordButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_LAST
ExcludeCheckBox sw:CheckBox:DLG_MM_PREPAREMERGE_PAGE:CB_EXCLUDE
EditButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_EDIT
+*TabMediaWiki sym:vnd.com.sun.star.wiki:settings
*TabMemory HID_OFA_TP_MEMORY
UndoSteps cui:NumericField:OFA_TP_MEMORY:ED_UNDO
diff --git a/testautomation/global/win/etab_t_z.win b/testautomation/global/win/etab_t_z.win
index aa0155908c5d..b7db16fd1ef4 100755
--- a/testautomation/global/win/etab_t_z.win
+++ b/testautomation/global/win/etab_t_z.win
@@ -101,6 +101,8 @@ ColumnLength HID_TAB_ENT_TEXT_LEN
ColumnAutoValue dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO
ColumnAuto dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO
+*TabWeblog sym:vnd.com.sun.star.blogger:settings
+
*TabXMLGeneral HID_XML_FILTER_TABPAGE_BASIC
FilterName HID_XML_FILTER_NAME
Application HID_XML_FILTER_APPLICATION
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-15 22:40:30 +0000