diff options
| -rwxr-xr-x | testautomation/framework/required/includes/wizard_firsttime.inc | 18 | ||||
| -rwxr-xr-x | testautomation/global/system/includes/gvariabl.inc | 1 | ||||
| -rwxr-xr-x | testautomation/global/system/includes/master.inc | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/testautomation/framework/required/includes/wizard_firsttime.inc b/testautomation/framework/required/includes/wizard_firsttime.inc index 104f683b8442..9efcca098624 100755 --- a/testautomation/framework/required/includes/wizard_firsttime.inc +++ b/testautomation/framework/required/includes/wizard_firsttime.inc @@ -141,14 +141,18 @@ testcase tUpdtWizardFirsttime warnlog( "Could not access TabFirstStartUser" ) endif - kontext "TabFirstStartOnlineUpdate" - if ( TabFirstStartOnlineUpdate.exists( 2 ) ) then - call dialogtest( TabFirstStartOnlineUpdate ) - CheckForUpdates.unCheck() - kontext "WelcomeDialog" - NextBtn.click() + if (gAutoUpdate) then + kontext "TabFirstStartOnlineUpdate" + if ( TabFirstStartOnlineUpdate.exists( 2 ) ) then + call dialogtest( TabFirstStartOnlineUpdate ) + CheckForUpdates.unCheck() + kontext "WelcomeDialog" + NextBtn.click() + else + warnlog( "Online Update Page is missing" ) + endif else - warnlog( "Online Update Page is missing" ) + qaErrorlog( "Online Update Page is missing" ) endif diff --git a/testautomation/global/system/includes/gvariabl.inc b/testautomation/global/system/includes/gvariabl.inc index 52c9f9f54dd0..aef5a2dfb126 100755 --- a/testautomation/global/system/includes/gvariabl.inc +++ b/testautomation/global/system/includes/gvariabl.inc @@ -91,6 +91,7 @@ Global gAccessibility as Boolean '///+ gAccessibility => If an accessibility Global gProductName as string '///+ gProductName => Name of the product (StarOffice, OpenOffice.org, ...) Global gMacroSecurityLevel as integer'///+ gMacroSecurityLevel => Macro Security Level (0: Low ... 3: Very High) Global gOfficeVersion as string '///+ gOfficeVersion => The version number of the office like 3.1, 9.0 ... +Global gAutoUpdate as boolean '///+ gAutoUpdate => if office is able to request update streams '/// - global OLE-objectnames global gOLEWriter as String '///+ gOLEWriter => OLE-object-name for Writer diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc index 718a7cf066cc..37f8320b804c 100755 --- a/testautomation/global/system/includes/master.inc +++ b/testautomation/global/system/includes/master.inc @@ -924,8 +924,10 @@ sub mMakeGeneralOptionsAPI ' At this point there is no needed to think about what to do, if it doesn't work. end if xViewRoot.dispose() + gAutoUpdate = TRUE catch qaErrorLog( sFileFunction & "This build does not support online update." ) + gAutoUpdate = FALSE endcatch '///+ OOo Improvement - only if BUILD_SPECIAL is set we have this file created. |