From a68bbed73a3c306cb0a3c707397096a70bb61013 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 2 Jun 2010 11:30:00 +0200 Subject: jl152: #i112023 - Removed unused file - Inproved checking for controls in e_update.bas --- .../extensions/required/includes/e_update.inc | 250 +++++++++++---------- .../required/includes/e_update_oooimprovement.inc | 94 -------- 2 files changed, 135 insertions(+), 209 deletions(-) mode change 100644 => 100755 testautomation/extensions/required/includes/e_update.inc delete mode 100644 testautomation/extensions/required/includes/e_update_oooimprovement.inc (limited to 'testautomation') diff --git a/testautomation/extensions/required/includes/e_update.inc b/testautomation/extensions/required/includes/e_update.inc old mode 100644 new mode 100755 index c3114a65dbbc..c7f049ead764 --- a/testautomation/extensions/required/includes/e_update.inc +++ b/testautomation/extensions/required/includes/e_update.inc @@ -126,138 +126,150 @@ testcase tExtensionManagerResources() ' 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. + + ' Modifications to unopkg and Extension Manager frequently cause + ' controls to disappear so a more finegrained control checking is done here + ' to avoid getting too much warnings in QUASTe. kontext "PackageManager" BrowsePackages.select( 1 ) if ( disable.exists() ) then - if ( disable.isEnabled() ) then - - disable.click() + if ( disable.isVisible() ) then + if ( disable.isEnabled() ) then - 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 + 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 - 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 + ' 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 - loop - disable.click() - 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 + ' 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 "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 - 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() + + 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 - printlog( "Enable extension: No warning for other office instances. Good." ) + warnlog( "User should be able to disable shared extension" ) endif - WaitSlot() - else - warnlog( "User should be able to disable shared extension" ) + warnlog( " button exists but is not visible" ) endif else warnlog( "Cannot disable extension. It might be disabled already or defunct" ) 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() + if ( remove.exists() ) then + 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 - warnlog( "No warning for other office instances running" ) - warnlog( "Installation inconsistency: Extension was removed!" ) + warnlog( "User should be able to remove extension" ) 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 - warnlog( "User should be able to remove extension" ) + warnlog( "Button does not exist" ) endif else @@ -265,13 +277,21 @@ testcase tExtensionManagerResources() ' he may neither disable or remove extensions. kontext "PackageManager" - if ( disable.isEnabled() ) then - warnlog( "Disable-button enabled for shared extension" ) + if ( disable.exists() ) then + if ( disable.isEnabled() ) then + warnlog( "Disable-button enabled for shared extension" ) + endif + else + warnlog( "Button does not exist" ) endif - + kontext "PackageManager" - if ( remove.isEnabled() ) then - warnlog( "Remove-button enabled for shared extension" ) + if ( remove.exists() ) then + if ( remove.isEnabled() ) then + warnlog( "Remove-button enabled for shared extension" ) + endif + else + ' do nothing, if the button is missing we already get a warning earlier in this test endif endif 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 -' -' 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 - -- cgit From 20c9135b759b11411b9b4e9ca7b219de535f38c1 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 2 Jun 2010 13:53:02 +0200 Subject: jl152: #i112023 - Fixed e_publisher.inc (has new offset in updates list) --- testautomation/extensions/optional/includes/publisher.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 testautomation/extensions/optional/includes/publisher.inc (limited to 'testautomation') diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc old mode 100644 new mode 100755 index fcf4400ae748..6bda65c781fc --- 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 ) -- cgit From 7fce4e6b09189dfb23469b555224b80c8cea63b0 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 9 Jun 2010 09:46:57 +0200 Subject: jl152: #i112023 - Removed parts that covered disabling and removing extensions. They are no longer valid as the user cannot remove bundled extensions. --- .../extensions/required/includes/e_update.inc | 183 ++------------------- 1 file changed, 16 insertions(+), 167 deletions(-) (limited to 'testautomation') diff --git a/testautomation/extensions/required/includes/e_update.inc b/testautomation/extensions/required/includes/e_update.inc index c7f049ead764..c2ad5a58a396 100755 --- a/testautomation/extensions/required/includes/e_update.inc +++ b/testautomation/extensions/required/includes/e_update.inc @@ -120,181 +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. - - ' Modifications to unopkg and Extension Manager frequently cause - ' controls to disappear so a more finegrained control checking is done here - ' to avoid getting too much warnings in QUASTe. - - kontext "PackageManager" - BrowsePackages.select( 1 ) - if ( disable.exists() ) then - if ( disable.isVisible() ) 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 "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 - else - warnlog( " button exists but is not visible" ) - endif - else - warnlog( "Cannot disable extension. It might be disabled already or defunct" ) - endif - - kontext "PackageManager" - if ( remove.exists() ) then - 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. + kontext "PackageManager" + BrowsePackages.select( 1 ) - else - warnlog( "User should be able to remove extension" ) - endif + printlog( "Check visibility of some controls, many are hidden for bundled extensions" ) + if ( disable.exists() ) then + if ( disable.isVisible() ) then + warnlog( "Button should not be visible for shared extensions" ) else - warnlog( "Button does not exist" ) + printlog( "Button 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.exists() ) then - if ( disable.isEnabled() ) then - warnlog( "Disable-button enabled for shared extension" ) - endif - else - warnlog( "Button does not exist" ) - endif + warnlog( "The control is not defined in this context" ) + endif - kontext "PackageManager" - if ( remove.exists() ) then - if ( remove.isEnabled() ) then - warnlog( "Remove-button enabled for shared extension" ) - endif + if ( remove.exists() ) then + if ( remove.isVisible() ) then + warnlog( "Button should not be visible for shared extensions" ) else - ' do nothing, if the button is missing we already get a warning earlier in this test + printlog( "Button is hidden" ) endif + else + warnlog( "The control is not defined in this context" ) endif - + kontext "PackageManager" PackageManager.close() -- cgit From 1b37ad14d1178ac6a46a4893187fd21b95df5788 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 9 Jun 2010 10:02:02 +0200 Subject: jl152: #i112023 - Changed warnlog to printlog for non existing control. This is acceptable because the control may not be accessible at all for the user and this can be obtained by hiding it or by simply not adding it to the dialog. --- testautomation/extensions/required/includes/e_update.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testautomation') diff --git a/testautomation/extensions/required/includes/e_update.inc b/testautomation/extensions/required/includes/e_update.inc index c2ad5a58a396..769259aeaa7c 100755 --- a/testautomation/extensions/required/includes/e_update.inc +++ b/testautomation/extensions/required/includes/e_update.inc @@ -131,7 +131,7 @@ testcase tExtensionManagerResources() printlog( "Button is hidden" ) endif else - warnlog( "The control is not defined in this context" ) + printlog( "The control is not defined in this context" ) endif if ( remove.exists() ) then @@ -141,7 +141,7 @@ testcase tExtensionManagerResources() printlog( "Button is hidden" ) endif else - warnlog( "The control is not defined in this context" ) + printlog( "The control is not defined in this context" ) endif kontext "PackageManager" -- cgit From 0b9ef10c3e14b90c52d2d854dd9df29f2bcd6418 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 14 Jun 2010 11:36:30 +0200 Subject: jl152: #i112023 - Fix incorrect description.xml within version30.oxt and version31.oxt. The extensions had incorrect version strings and one extension was completely broken, probably checked in as plain text --- .../optional/input/dependencies/version30.oxt | Bin 766 -> 1493 bytes .../optional/input/dependencies/version31.oxt | Bin 1440 -> 1495 bytes 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 testautomation/extensions/optional/input/dependencies/version30.oxt (limited to 'testautomation') diff --git a/testautomation/extensions/optional/input/dependencies/version30.oxt b/testautomation/extensions/optional/input/dependencies/version30.oxt old mode 100755 new mode 100644 index 8750e712f8cd..59b8dc545973 Binary files a/testautomation/extensions/optional/input/dependencies/version30.oxt and b/testautomation/extensions/optional/input/dependencies/version30.oxt differ diff --git a/testautomation/extensions/optional/input/dependencies/version31.oxt b/testautomation/extensions/optional/input/dependencies/version31.oxt index 870b4cc97a9a..843cb02f10ec 100644 Binary files a/testautomation/extensions/optional/input/dependencies/version31.oxt and b/testautomation/extensions/optional/input/dependencies/version31.oxt differ -- cgit From efa6641d45d9973f1e986d114af389ed56ea7f6d Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Tue, 15 Jun 2010 09:19:32 +0200 Subject: jl152: #i112023 - Added version33.oxt, version34.oxt and updated files.txt --- .../extensions/optional/input/dependencies/version33.oxt | Bin 0 -> 1494 bytes .../extensions/optional/input/dependencies/version34.oxt | Bin 0 -> 1494 bytes testautomation/extensions/optional/input/files.txt | 4 +++- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 testautomation/extensions/optional/input/dependencies/version33.oxt create mode 100644 testautomation/extensions/optional/input/dependencies/version34.oxt (limited to 'testautomation') diff --git a/testautomation/extensions/optional/input/dependencies/version33.oxt b/testautomation/extensions/optional/input/dependencies/version33.oxt new file mode 100644 index 000000000000..11525f5be3bd Binary files /dev/null and b/testautomation/extensions/optional/input/dependencies/version33.oxt differ diff --git a/testautomation/extensions/optional/input/dependencies/version34.oxt b/testautomation/extensions/optional/input/dependencies/version34.oxt new file mode 100644 index 000000000000..e14671c77e92 Binary files /dev/null and b/testautomation/extensions/optional/input/dependencies/version34.oxt differ diff --git a/testautomation/extensions/optional/input/files.txt b/testautomation/extensions/optional/input/files.txt index 5e37bbd64659..5e5f5bb033c9 100755 --- a/testautomation/extensions/optional/input/files.txt +++ b/testautomation/extensions/optional/input/files.txt @@ -30,7 +30,9 @@ dependencies\version30.oxt;0,0,1,0,0 dependencies\version300.oxt;0,0,1,0,0 dependencies\version301.oxt;0,0,1,0,0 dependencies\versionempty.oxt;0,0,1,0,0 -dependencies\version31.oxt;1,0,0,0,0 +dependencies\version31.oxt;0,0,1,0,0 +dependencies\version33.oxt;0,0,1,0,0 +dependencies\version34.oxt;1,0,0,0,0 dependencies\version937.oxt;1,0,0,0,0 dependencies\versionnone.oxt;0,0,1,0,0 versions/plain.oxt;0,0,1,0,0 -- cgit From ffc40b7487914e3eda29d0ea9e1cc16c48449f32 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Tue, 15 Jun 2010 14:51:49 +0200 Subject: 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. --- .../extensions/optional/includes/publisher.inc | 100 ++++++++++----------- 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'testautomation') 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 -- cgit From 170b41b511df2f9786b7dab236fa9f3d45f2a05a Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 16 Jun 2010 07:58:56 +0200 Subject: jl152: #i112023 - Added test extension for #i111434 and two version test extensions --- .../optional/input/dependencies/version310.oxt | Bin 0 -> 1493 bytes .../optional/input/dependencies/version330.oxt | Bin 0 -> 1494 bytes testautomation/extensions/optional/input/files.txt | 3 +++ .../extensions/optional/input/issues/111434.oxt | Bin 0 -> 1166 bytes 4 files changed, 3 insertions(+) create mode 100644 testautomation/extensions/optional/input/dependencies/version310.oxt create mode 100644 testautomation/extensions/optional/input/dependencies/version330.oxt create mode 100644 testautomation/extensions/optional/input/issues/111434.oxt (limited to 'testautomation') diff --git a/testautomation/extensions/optional/input/dependencies/version310.oxt b/testautomation/extensions/optional/input/dependencies/version310.oxt new file mode 100644 index 000000000000..40b66db99b65 Binary files /dev/null and b/testautomation/extensions/optional/input/dependencies/version310.oxt differ diff --git a/testautomation/extensions/optional/input/dependencies/version330.oxt b/testautomation/extensions/optional/input/dependencies/version330.oxt new file mode 100644 index 000000000000..abc13cdc07a2 Binary files /dev/null and b/testautomation/extensions/optional/input/dependencies/version330.oxt differ diff --git a/testautomation/extensions/optional/input/files.txt b/testautomation/extensions/optional/input/files.txt index 5e5f5bb033c9..369cb99b74d2 100755 --- a/testautomation/extensions/optional/input/files.txt +++ b/testautomation/extensions/optional/input/files.txt @@ -29,6 +29,8 @@ dependencies\version25.oxt;0,0,1,0,0 dependencies\version30.oxt;0,0,1,0,0 dependencies\version300.oxt;0,0,1,0,0 dependencies\version301.oxt;0,0,1,0,0 +dependencies\version310.oxt;0,0,1,0,0 +dependencies\version330.oxt;0,0,1,0,0 dependencies\versionempty.oxt;0,0,1,0,0 dependencies\version31.oxt;0,0,1,0,0 dependencies\version33.oxt;0,0,1,0,0 @@ -45,3 +47,4 @@ versions/version_1.2.4.7/plain.oxt;0,0,1,0,2 versions/version_1.02.4.7.0/plain.oxt;0,0,1,0,1 versions/version_1.2.3/plain.oxt;0,0,1,0,2 versions/version_1.2.15.3/plain.oxt;0,0,1,0,2 +issues/111434.oxt;0,1,1,0,0 diff --git a/testautomation/extensions/optional/input/issues/111434.oxt b/testautomation/extensions/optional/input/issues/111434.oxt new file mode 100644 index 000000000000..d88965e803f1 Binary files /dev/null and b/testautomation/extensions/optional/input/issues/111434.oxt differ -- cgit From 905b11b344fa13112f571a5f287de6236f96c18b Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Fri, 18 Jun 2010 08:12:02 +0200 Subject: jl152: #i112023 - Added issue #i112496 to warnlogs for incorrect menuitem count --- testautomation/dbaccess/required/includes/MainApp.inc | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'testautomation') diff --git a/testautomation/dbaccess/required/includes/MainApp.inc b/testautomation/dbaccess/required/includes/MainApp.inc index fa3c1a4b0a14..0c53fa08a3e6 100755 --- a/testautomation/dbaccess/required/includes/MainApp.inc +++ b/testautomation/dbaccess/required/includes/MainApp.inc @@ -29,18 +29,8 @@ '* '* short description : test the Main Application Window '* -'************************************************************************ -'* -' #1 tMainApp -' #1 tMainMenuBar -' #1 tDatabaseProperties -' #1 tTableView -' #1 tPreview -' #1 tTableFilters -' #1 tRegisterDatabaseDialog -' #1 tDatabaseBeamer -'* -'\*********************************************************************************** +'\****************************************************************************** + sub MainApp printlog "------------------ MainApp.inc ---------------------" @@ -299,7 +289,7 @@ testcase tMainMenuBar hMenuSelectNr(1) ' FILE/NEW menu iCount = hMenuItemGetCount() if (iCount <> 12) then - warnlog "There should 12 items in the FILE/NEW menu but there are " + iCount + " items." + warnlog "#i112496# - There should 12 items in the FILE/NEW menu but there are " + iCount + " items." end if call hMenuClose() ' close the FILE menu -- cgit From cbb634dc19b24cd0c4a9338c8a4d1ee5391c5517 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Fri, 18 Jun 2010 20:35:54 +0200 Subject: jl152: New issue #i112522 to be fixed later (probably not related to this CWS) --- testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc (limited to 'testautomation') diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc old mode 100644 new mode 100755 index 10ba7eb017e1..6bcf3399796d --- a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc +++ b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc @@ -199,7 +199,7 @@ testcase tCreateNew3DChart endif printlog "Check that 3D look is 'simple' (=default)" if Scheme3D.GetSelIndex <> 1 then - warnlog "Default 3D Look ('simple') has not been preserved after save and reload." + warnlog "#i112522# - Default 3D Look ('simple') has not been preserved after save and reload." endif printlog "Check that 3D shape 'cone' is selected" if BarColumnShape.GetSelIndex <> 3 Then -- cgit From 6582b74f567a1a41ef20cf1649d8818d9bcb3a16 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Fri, 18 Jun 2010 20:44:21 +0200 Subject: jl152: New issue #i112523 to be fixed later (probably not related to this CWS) --- testautomation/writer/required/includes/w_007_.inc | 3 +++ 1 file changed, 3 insertions(+) mode change 100644 => 100755 testautomation/writer/required/includes/w_007_.inc (limited to 'testautomation') diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc old mode 100644 new mode 100755 index 57c83706029f..694c71be71bf --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -983,6 +983,9 @@ testcase tToolsHangulHanjaConversion goto endsub end if + warnlog( "#i112523# - Hangul Hanya Conversion dialog causes crash." ) + goto endsub + select case gApplication case "HTML" : sTestFile = gTesttoolpath & "writer\required\input\hangul.html" case "WRITER" : sTestFile = gTesttoolpath & "writer\required\input\hangul.sxw" -- cgit From 3ec2f280695e2ff95b3ad1ce1f58cad47db7a0bf Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Fri, 18 Jun 2010 21:31:05 +0200 Subject: jl152: New issue #i112523 to be fixed later (probably not related to this CWS) --- testautomation/writer/required/includes/w_007_.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'testautomation') diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index 694c71be71bf..14c1943c29d3 100755 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -983,9 +983,6 @@ testcase tToolsHangulHanjaConversion goto endsub end if - warnlog( "#i112523# - Hangul Hanya Conversion dialog causes crash." ) - goto endsub - select case gApplication case "HTML" : sTestFile = gTesttoolpath & "writer\required\input\hangul.html" case "WRITER" : sTestFile = gTesttoolpath & "writer\required\input\hangul.sxw" @@ -1126,6 +1123,10 @@ endcase ' ------------------------------------------- testcase tHtmlDocToolsHangulHanjaConversion + + warnlog( "#i112523# - Hangul Hanya Conversion dialog causes crash." ) + goto endsub + Dim bAsianLanguage as Boolean Dim sTestFile as String -- cgit