jl152: Local merge

3 files changed, 19 insertions, 243 deletions

diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc
index fcf4400ae748..6bda65c781fc 100644..100755
--- a/testautomation/extensions/optional/includes/publisher.inc
+++ b/testautomation/extensions/optional/includes/publisher.inc
@@ -40,6 +40,7 @@ testcase tExtensionPublisher
         goto endsub
     endif
 
+    const EXTENSION_LIST_OFFSET = 1 ' French dictionary is usually listed before the test extensions
     ' Specification document
     ' http://specs.openoffice.org/appwide/packagemanager/online_update_for_extensions.odt
     ' http://specs.openoffice.org/appwide/packagemanager/online_update_for_extensions.odt
@@ -190,7 +191,7 @@ testcase tExtensionPublisher
                         cHasPublisher = hGetValueForKeyAsString( cConfigArray() , "has_publisher" )
                         cPublisher    = hGetValueForKeyAsString( cConfigArray() , "publisher" )
                         
-                        AvailableUpdatesList.select( iCurrentFile )
+                        AvailableUpdatesList.select( iCurrentFile + EXTENSION_LIST_OFFSET )
                         
                         if ( AvailableUpdatesList.getText() = cCurrentFileName ) then
                             printlog( "Testing extension: " & cCurrentFileName )
diff --git a/testautomation/extensions/required/includes/e_update.inc b/testautomation/extensions/required/includes/e_update.inc
index c3114a65dbbc..769259aeaa7c 100644..100755
--- a/testautomation/extensions/required/includes/e_update.inc
+++ b/testautomation/extensions/required/includes/e_update.inc
@@ -120,161 +120,30 @@ testcase tExtensionManagerResources()
             printlog( "Extension Options button does not exist, no options available" )
         endif
         
-        if ( bUserIsAdmin ) then
-        
-            ' If the user is Admin or the office was installed in the users
-            ' home directory we have access to the extensions that reside in 
-            ' the shared layer. This means that the user can remove and disable
-            ' these extensions.
-        
-            kontext "PackageManager"
-            BrowsePackages.select( 1 )
-            if ( disable.exists() ) then
-                if ( disable.isEnabled() ) then
-                
-                    disable.click()
-
-                    kontext "Active"
-                    if ( Active.exists( 1 ) ) then
-                        printlog( "Disable extension: Warning for other office instance. Good." )
-                        active.ok()
-                    else
-                        warnlog( "No warning for other office instances running" )
-                    endif
-                    
-                    ' We now re-enable the extensions. Depending on the "size"
-                    ' of the extension it might take the Extension Manager UI
-                    ' a few seconds to complete the "disable" action. We need to
-                    ' wait for that.
-                    kontext "PackageManager"
-                    BrowsePackages.select( 1 )
-                    iBreakCounter = 0
-                    do while( not enable.exists() ) 
-                        iBreakCounter = iBreakCounter + 1
-                        wait( 100 )
-                        if ( iBreakCounter = MAX_ITERATIONS ) then
-                            warnlog( "Extension not ready within timeframe. Aborting" )
-                            goto endsub
-                        endif
-                    loop
-                    enable.click()
-                    
-                    kontext "Active"
-                    if ( Active.exists( 1 ) ) then
-                        printlog( "Enable extension: Warning for other office instance. Good." )
-                        active.ok()
-                    else
-                        warnlog( "No warning for other office instances running" )
-                    endif
-
-                    ' The Extension Manager UI remembers when it has warned about 
-                    ' other running instances of the office, so the next time we try
-                    ' to disable/enable the extension there should be no warning.
-                    
-                    kontext "PackageManager"
-                    iBreakCounter = 0
-                    do while( not disable.exists() ) 
-                        iBreakCounter = iBreakCounter + 1
-                        wait( 100 )
-                        if ( iBreakCounter = MAX_ITERATIONS ) then
-                            warnlog( "Extension not ready within timeframe. Aborting" )
-                            goto endsub
-                        endif
-                    loop
-                    disable.click()
+        kontext "PackageManager"
+        BrowsePackages.select( 1 )
 
-                    kontext "Active"
-                    if ( Active.exists( 1 ) ) then
-                        warnlog( "There should be no warning when disabling the extension a second time" )
-                        active.ok()
-                    else
-                        printlog( "Disable extension: No warning for other office instances. Good." )
-                    endif
-                    
-                    kontext "PackageManager"
-                    iBreakCounter = 0
-                    do while( not enable.exists() ) 
-                        iBreakCounter = iBreakCounter + 1
-                        wait( 100 )
-                        if ( iBreakCounter = MAX_ITERATIONS ) then
-                            warnlog( "Extension not ready within timeframe. Aborting" )
-                            goto endsub
-                        endif
-                    loop
-                    enable.click()
-                    
-                    kontext "Active"
-                    if ( Active.exists( 1 ) ) then
-                        warnlog( "There should be no warning when enabling the extension a second time" )
-                        active.ok()
-                    else
-                        printlog( "Enable extension: No warning for other office instances. Good." )
-                    endif
-                    WaitSlot()
-                    
-                else
-                    warnlog( "User should be able to disable shared extension" )
-                endif
+        printlog( "Check visibility of some controls, many are hidden for bundled extensions" )
+        if ( disable.exists() ) then
+            if ( disable.isVisible() ) then
+                warnlog( "Button <Disable> should not be visible for shared extensions" )
             else
-                warnlog( "Cannot disable extension. It might be disabled already or defunct" )
+                printlog( "Button <Disable> is hidden" )
             endif
-            
-            kontext "PackageManager"
-            iBreakCounter = 0
-            do while( not remove.isEnabled() ) 
-                iBreakCounter = iBreakCounter + 1
-                wait( 100 )
-                if ( iBreakCounter = MAX_ITERATIONS ) then
-                    warnlog( "Extension not ready within timeframe. Aborting" )
-                    goto endsub
-                endif
-            loop
-    
-            kontext "PackageManager"
-            if ( remove.isEnabled() ) then
-            
-                remove.click()
-                
-                ' Note: First time we try to remove an extension we should get a 
-                ' warning that we must make sure that no other office instances 
-                ' are running. If this warning is missing we actually remove the 
-                ' extension which leaves the installation in an inconsistent
-                ' state. In a "real life" installation this would not work, in a
-                ' "user space" installation we have to reinstall. Bad that is.
-                
-                kontext "Active"
-                if ( Active.exists( 1 ) ) then
-                    printlog( "Remove extension: Warning for other office instances. Good." )
-                    active.cancel()
-                else
-                    warnlog( "No warning for other office instances running" )
-                    warnlog( "Installation inconsistency: Extension was removed!" )
-                endif
-                WaitSlot()
-                
-                ' Note: Like for the disable/enable buttons we should not get 
-                ' a warning for another running office instance when removing
-                ' an extension for the second time. 
-            
+        else
+            printlog( "The control <Disable> is not defined in this context" )
+        endif
+
+        if ( remove.exists() ) then
+            if ( remove.isVisible() ) then
+                warnlog( "Button <Remove> should not be visible for shared extensions" )
             else
-                warnlog( "User should be able to remove extension" )
+                printlog( "Button <Remove> is hidden" )
             endif
         else
-       
-            ' if the user does not have Administrator rights he may neither 
-            ' he may neither disable or remove extensions.
-             
-            kontext "PackageManager"
-            if ( disable.isEnabled() ) then
-                warnlog( "Disable-button enabled for shared extension" )
-            endif
-            
-            kontext "PackageManager"
-            if ( remove.isEnabled() ) then
-                warnlog( "Remove-button enabled for shared extension" )
-            endif
+            printlog( "The control <Remove> is not defined in this context" )
         endif
-        
+
         kontext "PackageManager"
         PackageManager.close()
         
diff --git a/testautomation/extensions/required/includes/e_update_oooimprovement.inc b/testautomation/extensions/required/includes/e_update_oooimprovement.inc
deleted file mode 100644
index 0981a1836937..000000000000
--- a/testautomation/extensions/required/includes/e_update_oooimprovement.inc
+++ /dev/null
@@ -1,94 +0,0 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'
-' Copyright 2000, 2010 Oracle and/or its affiliates.
-'
-' OpenOffice.org - a multi-platform office productivity suite
-'
-' This file is part of OpenOffice.org.
-'
-' OpenOffice.org is free software: you can redistribute it and/or modify
-' it under the terms of the GNU Lesser General Public License version 3
-' only, as published by the Free Software Foundation.
-'
-' OpenOffice.org is distributed in the hope that it will be useful,
-' but WITHOUT ANY WARRANTY; without even the implied warranty of
-' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-' GNU Lesser General Public License version 3 for more details
-' (a copy is included in the LICENSE file that accompanied this code).
-'
-' You should have received a copy of the GNU Lesser General Public License
-' version 3 along with OpenOffice.org.  If not, see
-' <http://www.openoffice.org/license.html>
-' for a copy of the LGPLv3 License.
-'
-'/******************************************************************************
-'*
-'*  owner : joerg.skottke@sun.com
-'*
-'*  short description : Extension Update Test
-'*
-'\******************************************************************************
-
-testcase tUpdtOOoImprovement
-
-    printlog( "Update test for the tools/options dialog of the OOo Improvement extension" )
-    if ( not gExtensionOOoImprovementIsInstalled ) then
-	qaerrorlog( "The extension is not installed." )  
-        goto endsub
-    endif
-
-    dim cLogFile as string
-        cLogFile = gOfficePath & "user\temp\feedback\Current.csv"
-        cLogFile = convertpath( cLogFile )
-
-    if ( hDeleteFile( cLogFile ) ) then
-        printlog( "Test environment is clean, no logfile present (anymore)" )
-    endif
-
-    ToolsOptions
-    hToolsOptions( "StarOffice", "Improvement" )
-    printlog( "Improvement Program tabpage" )
-
-    call DialogTest( TabOOoImprovement )
-
-    ParticipateNo.check()
-    ParticipateYes.check()
-  
-    if ( ShowData.isEnabled() ) then 
-
-        ShowData.click()
-
-        Kontext "TextImport"
-        if ( TextImport.exists( 1 ) ) then
-            printlog( "Text import dialog" )
-                
-            call DialogTest( TextImport )
-            TextImport.cancel()
-        else
-            warnlog( "#i97340# Show Data button enabled but no logged data found" )
-        endif
-
-        Kontext "Active"
-        if ( Active.exists( 1 ) ) then
-            printlog( "Messagebox: " & Active.getText() )
-            Active.ok()
-        else
-            warnlog( "No warning for missing file: " & cLogFile )
-        endif
-
-        Kontext "Active"
-        if ( Active.exists( 1 ) ) then
-            warnlog( "#97342# Second message for missing " & cLogFile )
-            Active.ok()
-        endif
-    else
-        printlog( "Show data is disabled" )
-    endif
-
-    Kontext "OptionenDlg"
-    OptionenDlg.cancel()
-
-endcase
-