diff options
Diffstat (limited to 'testautomation/framework/optional')
8 files changed, 77 insertions, 47 deletions
diff --git a/testautomation/framework/optional/f_extras_templatefileopen.bas b/testautomation/framework/optional/f_extras_templatefileopen.bas index 3743fc8f0c18..a6f8c71d302e 100755 --- a/testautomation/framework/optional/f_extras_templatefileopen.bas +++ b/testautomation/framework/optional/f_extras_templatefileopen.bas @@ -39,15 +39,15 @@ sub main - use "framework\optional\includes\extras_file_open.inc" + use "framework\optional\includes\extras_file_open.inc" - hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_LOW ) + hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_LOW ) - call hStatusIn( "framework", "f_extras_templatefileopen.bas" ) - call tOpenObjectsWithFileDialog( "TEMPLATES" ) - call hStatusOut + call hStatusIn( "framework", "f_extras_templatefileopen.bas" ) + call tOpenObjectsWithFileDialog( "TEMPLATES" ) + call hStatusOut - hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT ) + hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT ) end sub @@ -55,19 +55,19 @@ end sub sub LoadIncludeFiles - use "global\system\includes\master.inc" - use "global\system\includes\gvariabl.inc" + use "global\system\includes\master.inc" + use "global\system\includes\gvariabl.inc" - use "global\tools\includes\optional\t_docfuncs.inc" - use "global\tools\includes\optional\t_filetools.inc" - use "global\tools\includes\optional\t_security_tools.inc" - use "global\tools\includes\optional\t_listfuncs.inc" + use "global\tools\includes\optional\t_docfuncs.inc" + use "global\tools\includes\optional\t_filetools.inc" + use "global\tools\includes\optional\t_security_tools.inc" + use "global\tools\includes\optional\t_listfuncs.inc" - use "framework\tools\includes\apicalls.inc" - use "framework\tools\includes\template_tools.inc" + use "framework\tools\includes\apicalls.inc" + use "framework\tools\includes\template_tools.inc" - gApplication = "WRITER" - GetUseFiles + gApplication = "WRITER" + GetUseFiles end sub diff --git a/testautomation/framework/optional/includes/basic_formcontrols.inc b/testautomation/framework/optional/includes/basic_formcontrols.inc index 5d7ae8b7045c..78f4002670d8 100755 --- a/testautomation/framework/optional/includes/basic_formcontrols.inc +++ b/testautomation/framework/optional/includes/basic_formcontrols.inc @@ -192,12 +192,16 @@ testcase tAllControlsOnDialog( cMajor as string ) '///+<li>Select every control, open its properties and verify its name, close properties</li> for iCurrentControl = 1 to ICONTROLCOUNT - - hSelectControl( iCurrentControl ) - hOpenPropertyBrowser() - sCurrentControl = lsControlNames( iCurrentControl ) - hPBGetControlName( sCurrentControl ) - hClosePropertyBrowser() + + if ( instr( gtSysName, "Solaris" ) > 0 ) then + qaerrorlog( "Skipping frame control on Solaris" ) + else + hSelectControl( iCurrentControl ) + hOpenPropertyBrowser() + sCurrentControl = lsControlNames( iCurrentControl ) + hPBGetControlName( sCurrentControl ) + hClosePropertyBrowser() + endif next iCurrentControl diff --git a/testautomation/framework/optional/includes/basic_issues.inc b/testautomation/framework/optional/includes/basic_issues.inc index 7a0b4ccecaed..63186f36a94d 100755 --- a/testautomation/framework/optional/includes/basic_issues.inc +++ b/testautomation/framework/optional/includes/basic_issues.inc @@ -114,14 +114,16 @@ testcase t_macros() hTestActive( "12D687", 1 ) hTestActive( "4553207", 1 ) - printlog( "" ) - printlog( " ---------- i81674 ------------ " ) - hInsertMacroFromFile( "i81674" ) - hIDERunMacro() - hTestActive( "250", 1 ) - hTestActive( "Yes", 1 ) - hTestActive( "True", 1 ) - hTestActive( "On", 1 ) + if ( gISOLang = "en-US" ) then + printlog( "" ) + printlog( " ---------- i81674 ------------ " ) + hInsertMacroFromFile( "i81674" ) + hIDERunMacro() + hTestActive( "250", 1 ) + hTestActive( "Yes", 1 ) + hTestActive( "True", 1 ) + hTestActive( "On", 1 ) + endif printlog( "" ) printlog( " ---------- i80532 ------------ " ) diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc index e0f6a7724ec5..ad50332fe7ab 100755 --- a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc @@ -96,7 +96,7 @@ testcase tBasicVBACompatImportDisabled() printlog( "Verify position of the document node" ) MakroAus.select( cNodeCount + DOCUMENT_POSITION_OFFSET ) if ( MakroAus.getSelText() <> "vba-test" ) then - warnlog( "The document node is not at the expected position" ) + qaerrorlog( "The document node is not at the expected position" ) endif for iCurrentModule = 2 to 7 diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc index c8f6352ba1c9..9434fdd3af7d 100755 --- a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc @@ -97,7 +97,7 @@ testcase tBasicVBACompatImportEnabled() printlog( "Verify position of the document node" ) MakroAus.select( cNodeCount + DOCUMENT_POSITION_OFFSET ) if ( MakroAus.getSelText() <> "vba-test" ) then - warnlog( "The document node is not at the expected position" ) + qaerrorlog( "The document node is not at the expected position" ) endif for iCurrentModule = 2 to 3 diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc index 260ca94e1cba..a962d527d415 100755 --- a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc @@ -82,7 +82,7 @@ testcase tBasicVBACompatImportNothing() printlog( "Verify position of the document node" ) MakroAus.select( cNodeCount + DOCUMENT_POSITION_OFFSET ) if ( MakroAus.getSelText() <> "vba-test" ) then - warnlog( "The document node is not at the expected position" ) + qaerrorlog( "The document node is not at the expected position" ) endif printlog( "Select the last node, this should be the standard Library for the document" ) diff --git a/testautomation/framework/optional/includes/extras_file_open.inc b/testautomation/framework/optional/includes/extras_file_open.inc index 303d46f2a060..7996a21ff6e7 100755 --- a/testautomation/framework/optional/includes/extras_file_open.inc +++ b/testautomation/framework/optional/includes/extras_file_open.inc @@ -45,7 +45,7 @@ private const MAX_FILE_COUNT = 3000 ' the max number of templates or samples testcase tOpenObjectsWithFileDialog( cCategory as string ) - const CFN = "tOpenObjectsWithFileDialog::" + const CFN = "tOpenObjectsWithFileDialog::" '///<h1>Open all templates using the File-Open dialog</h1> '///<i>Retrieve the templates out of ..\share\template\-directory</i><br> @@ -69,20 +69,24 @@ testcase tOpenObjectsWithFileDialog( cCategory as string ) dim bSkipFile as boolean ' turns true if file is to be skipped dim brc as boolean ' some multi purpose boolan returncode dim cOfficePath as string - + ' the path where the samples/templates are located, verify function params ' note that for some time the suffixes for the different filetypes are changed, ' so we have separate names for samples and templates. - cOfficePath = mid( gOfficeBasisPath, len( gNetzOfficePath ) + 1 ) + if ( FileExists( gOfficeBasisPath ) ) then + cOfficePath = gOfficeBasisPath + else + cOfficePath = mid( gOfficeBasisPath, len( gNetzOfficePath ) + 1 ) + endif printlog( "Using: " & cOfficePath ) select case cCategory - case "SAMPLES" : sRootPath = cOfficePath & "share\samples" - sRootPathFallback = "/opt/openoffice.org/basis3.0/share/samples" + case "SAMPLES" : sRootPath = cOfficePath & "share\samples\" & gISOLang + sRootPathFallback = "/opt/openoffice.org/basis3.0/share/samples/" & gISOLang sFIlter = "*.od*" - case "TEMPLATES" : sRootPath = cOfficePath & "share\template" - sRootPathFallback = "/opt/openoffice.org/basis3.0/share/template" + case "TEMPLATES" : sRootPath = cOfficePath & "share\template\" & gISOLang + sRootPathFallback = "/opt/openoffice.org/basis3.0/share/template/" & gISOLang sFilter = "*.ot*" case default warnlog( CFN & "Invalid category passed to function" ) @@ -106,16 +110,31 @@ testcase tOpenObjectsWithFileDialog( cCategory as string ) printlog( "Using filter: " & sFilter ) GetAllFileList ( sRootPath, sFilter, lsFile() ) hListDelete( lsFile(), 1 ) - iTemplateCount = listCount( lsFile() ) - for iCurrentTemplate = 1 to iTemplateCount + + ' Remove .lock-files + iTemplateCount = listCount( lsFile() ) + iCurrentTemplate = 1 + while( iCurrentTemplate <= iTemplateCount ) if ( instr( lsFile( iCurrentTemplate ), "~lock." ) > 0 ) then - qaerrorlog( "There are lock-files in the shared layer. They will be removed" ) - kill( lsFile( iCurrentTemplate ) ) hListDelete( lsFile(), iCurrentTemplate ) + iTemplateCount = iTemplateCount - 1 + else + iCurrentTemplate = iCurrentTemplate + 1 endif - next iCurrentTemplate - - + wend + + ' do not test wizard related files + iTemplateCount = listCount( lsFile() ) + iCurrentTemplate = 1 + while( iCurrentTemplate <= iTemplateCount ) + if ( instr( lsFile( iCurrentTemplate ), "wizard" ) > 0 ) then + hListDelete( lsFile(), iCurrentTemplate ) + iTemplateCount = iTemplateCount - 1 + else + iCurrentTemplate = iCurrentTemplate + 1 + endif + wend + hListPrint ( lsFile() , "" , "" ) if ( listcount( lsfile() ) = 1 ) then if ( gProductName = "OpenOffice.org" ) then diff --git a/testautomation/framework/optional/includes/scripting_organizers.inc b/testautomation/framework/optional/includes/scripting_organizers.inc index 60ba71bb500c..4afcf2373aca 100755 --- a/testautomation/framework/optional/includes/scripting_organizers.inc +++ b/testautomation/framework/optional/includes/scripting_organizers.inc @@ -39,6 +39,11 @@ testcase tScriptingOrganizers( iDialog as integer ) + if ( instr( gtSysName , "Solaris" ) > 0 ) then + qaerrorlog( "#i93502# JavaScript organizer broken" ) + goto endsub + endif + '///<H1>Test scripting-organizers</H1> ' 1 = BeanShell (.bsh) ' 2 = JavaScript (.js) |