jl152: #i120023 - Adjustments to publisher.inc done. The extension manager now populates more slowly than before and the position of the extension in the update dialog has changed.

1 files changed, 50 insertions, 50 deletions

diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc
index 6bda65c781fc..ca8e31bb07b6 100755
--- a/testautomation/extensions/optional/includes/publisher.inc
+++ b/testautomation/extensions/optional/includes/publisher.inc
@@ -40,19 +40,18 @@ 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
-    
+
     ' This is the path where the test-extensions and the info file are located
     dim cBasePath as string
         cBasePath = gTesttoolPath & "extensions/optional/input/publisher/"
         cBasePath = convertpath( cBasePath )
-    
+
     ' Modify this file to add test cases or attributes
     dim cInfoFile as string : cinfoFile = cBasePath & "extension.info"
-        
+
     ' The number of files to test. Information about this is stored in the file
     ' specified by cInfoFile
     dim iFileCount as integer
@@ -61,72 +60,73 @@ testcase tExtensionPublisher
     dim iExitCounter as integer
     dim iCurrentExtensionCount as integer : iCurrentExtensionCount = 0
     dim iTry as integer
-    
+
     ' This is the data we get from the configuration file
     dim cCurrentFileName as string
     dim cHasReleaseNotes as string
     dim cReleaseNotes as string
     dim cHasPublisher as string
     dim cPublisher as string
-                        
+
     ' This is where we store the configuration data. This array must have more
     ' lines than cInfoFile contains.
     dim cConfigArray( 60 ) as string
-    
+
     dim cTestString as string
     dim bInstallationComplete as boolean : bInstallationComplete = false
-    
+
     iExtensionCount = hGetExtensionCount()
-    
-    
+
+
     hGetDataFileSection( cInfoFile, cConfigArray(), "info", "", "" )
     iFileCount = int( hGetValueForKeyAsString( cConfigArray() , "filecount" ) )
     printlog( cInfoFile & " specifies " & iFileCount & " documents to load" )
-    
+
     iExtensionCount = iExtensionCount + iFileCount
     printlog( "Expected number of extensions after installation: " & iExtensionCount )
 
     printlog( "Installing extensions" )
     for iCurrentFile = 1 to iFileCount
-        
+
         hGetDataFileSection( cInfoFile, cConfigArray(), iCurrentFile, "", "" )
         cCurrentFileName = hGetValueForKeyAsString( cConfigArray() , "file" )
         cCurrentFileName = cBasePath & cCurrentFileName
         sExtensionCLI( "add" , cCurrentFileName )
         wait 1000 ' This is required, sExtensionCLI is asynchronous.
-        
+
     next iCurrentFile
     printlog( "Finished installing extensions, now verifying..." )
-    
+
     hNewDocument()
     ToolsPackageManager
-   
+
     kontext "PackageManager"
     if ( PackageManager.exists( 3 ) ) then
-    
-        for iTry = 1 to 30 
-        
+
+        for iTry = 1 to 30
+
             iCurrentExtensionCount = BrowsePackages.getItemCount()
-            
+
             if ( iCurrentExtensionCount = iExtensionCount ) then
                 printlog( "All extensions have been installed, good." )
                 bInstallationComplete = true
                 exit for
             endif
-            
+
             printlog( "Waiting for listbox: Number of extensions: " & iCurrentExtensionCount )
-            
+            wait( 1000 ) ' Required, the list takes considerable time to fill.
+
         next iTry
-        
+
         ' If one or more extensions have not been added to the list we better abort the
         ' test as the remaining parts need all extensions to be installed causing
         ' lots of cryptig errors to appear in the log.
         if ( not bInstallationComplete ) then
             warnlog( "Not all extensions have been installed. Aborting test." )
-            kontext "PackageManager" 
+            kontext "PackageManager"
             if ( PackageManager.exists() ) then
                 PackageManager.cancel()
-                PackageManager.notExists( 2 ) 
+                PackageManager.notExists( 2 )
             endif
             goto endsub
         endif
@@ -134,24 +134,24 @@ testcase tExtensionPublisher
         warnlog( "The Extension Manager did not open, Aborting test" )
         goto endsub
     endif
-            
-    
+
+
     kontext "PackageManager"
     printlog( "Going for the update-dialog" )
     if ( Updates.isEnabled() ) then
-    
+
         printlog( "Updates-button is enabled" )
         Updates.click()
-        
+
         kontext "ExtensionUpdate"
         if ( ExtensionUpdate.exists( 2 ) ) then
-        
+
             iExitCounter = 0
-            do while ( AvailableUpdatesList.getItemCount() < iFileCount ) 
+            do while ( AvailableUpdatesList.getItemCount() < iFileCount )
                 printlog( "Waiting for Updates List to populate..." )
                 wait( 1000 )
                 iExitCounter = iExitCounter + 1
-                if ( iExitCounter = 200 ) then 
+                if ( iExitCounter = 200 ) then
                     warnlog( "Update list for extensions is stalled (expected: 7), " & _
                              "found: " & AvailableUpdatesList.getItemCount() )
                     kontext "ExtensionUpdate"
@@ -163,7 +163,7 @@ testcase tExtensionPublisher
                     goto endsub
                 endif
             loop
-            
+
             if ( ShowAllUpdates.exists() ) then
                 if ( ShowAllUpdates.isEnabled() ) then
                     warnlog( """Show all updates"" should be disabled" )
@@ -173,29 +173,29 @@ testcase tExtensionPublisher
             else
                 qaerrorlog( """Show all updates"" checkbox could not be accessed" )
             endif
-            
+
             if ( AvailableUpdatesList.isEnabled() ) then
-            
+
                 printlog( "Available updates list populated in " & iExitCounter & " seconds" )
-                
+
                 if ( iExitCounter < 20 ) then
 
                     for iCurrentFile = 1 to iFileCount
-                    
+
                         hGetDataFileSection( cInfoFile, cConfigArray(), iCurrentFile, "", "" )
                         cCurrentFileName = hGetValueForKeyAsString( cConfigArray() , "display_name" )
-                        
+
                         cHasReleaseNotes = hGetValueForKeyAsString( cConfigArray() , "has_release_notes" )
                         cReleaseNotes    = hGetValueForKeyAsString( cConfigArray() , "release_notes" )
-                        
+
                         cHasPublisher = hGetValueForKeyAsString( cConfigArray() , "has_publisher" )
                         cPublisher    = hGetValueForKeyAsString( cConfigArray() , "publisher" )
-                        
-                        AvailableUpdatesList.select( iCurrentFile + EXTENSION_LIST_OFFSET )
-                        
+
+                        AvailableUpdatesList.select( iCurrentFile )
+
                         if ( AvailableUpdatesList.getText() = cCurrentFileName ) then
                             printlog( "Testing extension: " & cCurrentFileName )
-                            
+
                             if ( lcase( cHasReleaseNotes ) = "yes" ) then
                                 if ( ReleaseNotesText.isVisible() ) then
                                     printlog( " - Release notes text is visible. Good." )
@@ -218,7 +218,7 @@ testcase tExtensionPublisher
                                     printlog( " - No release notes for this extension." )
                                 endif
                             endif
-                            
+
                             if ( lcase( cHasPublisher ) = "yes" ) then
                                 if ( UpdatePublisherText.isVisible() ) then
                                     printlog( " - Publisher text is visible. Good." )
@@ -241,14 +241,14 @@ testcase tExtensionPublisher
                                     printlog( " - No Publisher for this extension." )
                                 endif
                             endif
-                            
+
                         else
-                            warnlog( "The extension is not at the expected position" )
+                            printlog( "The extension is not at the expected position" )
                             printlog( "Expected: " & cCurrentFileName )
                             printlog( "Found...: " & AvailableUpdatesList.getText() )
                             exit for
                         endif
-                        
+
                     next iCurrentFile
                 else
                     warnlog( "Updates list not fully populated in 15 seconds -> fail" )
@@ -263,15 +263,15 @@ testcase tExtensionPublisher
         else
             warnlog( "Extension Update dialog is not open" )
         endif
-        
+
     else
         warnlog( "Update-button on extension manager ui is disabled" )
     endif
-    
+
     kontext "PackageManager"
     PackageManager.close()
     PackageManager.notExists( 2 )
-    
+
     printlog( "Removing extensions" )
     for iCurrentFile = 1 to iFileCount
         hGetDataFileSection( cInfoFile, cConfigArray(), iCurrentFile, "", "" )
@@ -279,7 +279,7 @@ testcase tExtensionPublisher
         sExtensionCLI( "remove" , cCurrentFileName )
     next iCurrentFile
     printlog( "Finished removing extensions" )
-    
+
     hFileCloseAll()
 
 endcase