diff options
Diffstat (limited to 'testautomation/extensions')
43 files changed, 107 insertions, 322 deletions
diff --git a/testautomation/extensions/optional/e_display_name.bas b/testautomation/extensions/optional/e_display_name.bas index 61c57458b374..c05ce235cb25 100755 --- a/testautomation/extensions/optional/e_display_name.bas +++ b/testautomation/extensions/optional/e_display_name.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension display names '* diff --git a/testautomation/extensions/optional/e_extensions.bas b/testautomation/extensions/optional/e_extensions.bas index 2ea2a68a0ef5..fb7decd9eed6 100755 --- a/testautomation/extensions/optional/e_extensions.bas +++ b/testautomation/extensions/optional/e_extensions.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Function test of extension manager '* diff --git a/testautomation/extensions/optional/e_fileopen.bas b/testautomation/extensions/optional/e_fileopen.bas index 3cc2ea374869..63afebe693ba 100755 --- a/testautomation/extensions/optional/e_fileopen.bas +++ b/testautomation/extensions/optional/e_fileopen.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : CWS oxtsysint01 enables installing extensions via file open dialog '* diff --git a/testautomation/extensions/optional/e_help.bas b/testautomation/extensions/optional/e_help.bas index 3f18db86689d..79420ad9d4de 100755 --- a/testautomation/extensions/optional/e_help.bas +++ b/testautomation/extensions/optional/e_help.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extensible help '* diff --git a/testautomation/extensions/optional/e_identifiers.bas b/testautomation/extensions/optional/e_identifiers.bas index 526447987d2e..3eea26b9d46f 100755 --- a/testautomation/extensions/optional/e_identifiers.bas +++ b/testautomation/extensions/optional/e_identifiers.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Use unique identifiers instead of filenames for extensions '* diff --git a/testautomation/extensions/optional/e_issues.bas b/testautomation/extensions/optional/e_issues.bas index 549ad69b1a2e..cd3a4fe2f2ad 100755 --- a/testautomation/extensions/optional/e_issues.bas +++ b/testautomation/extensions/optional/e_issues.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension publisher string '* diff --git a/testautomation/extensions/optional/e_location.bas b/testautomation/extensions/optional/e_location.bas index bec66a615c99..cfe2f0c0fb19 100755 --- a/testautomation/extensions/optional/e_location.bas +++ b/testautomation/extensions/optional/e_location.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test the extension locator service '* diff --git a/testautomation/extensions/optional/e_meta-inf.bas b/testautomation/extensions/optional/e_meta-inf.bas index 7eb96001aed0..1e4e80dc1f0b 100755 --- a/testautomation/extensions/optional/e_meta-inf.bas +++ b/testautomation/extensions/optional/e_meta-inf.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Case sensitive META-INF file '* diff --git a/testautomation/extensions/optional/e_online_update.bas b/testautomation/extensions/optional/e_online_update.bas index f0f63c3514ed..0a23d2ad4aa7 100755 --- a/testautomation/extensions/optional/e_online_update.bas +++ b/testautomation/extensions/optional/e_online_update.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Hit update button for an extension '* diff --git a/testautomation/extensions/optional/e_options.bas b/testautomation/extensions/optional/e_options.bas index 97126a333bb8..bfa0a14e16a5 100755 --- a/testautomation/extensions/optional/e_options.bas +++ b/testautomation/extensions/optional/e_options.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Options for extensions '* diff --git a/testautomation/extensions/optional/e_platforms.bas b/testautomation/extensions/optional/e_platforms.bas index fa8a348733b7..3884e374317f 100755 --- a/testautomation/extensions/optional/e_platforms.bas +++ b/testautomation/extensions/optional/e_platforms.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Supported extension platforms '* diff --git a/testautomation/extensions/optional/e_publisher.bas b/testautomation/extensions/optional/e_publisher.bas index c1dde48729dc..e87d84d05f49 100755 --- a/testautomation/extensions/optional/e_publisher.bas +++ b/testautomation/extensions/optional/e_publisher.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension publisher string '* diff --git a/testautomation/extensions/optional/includes/display_name.inc b/testautomation/extensions/optional/includes/display_name.inc index c77fb413e016..080c22fa3a98 100644..100755 --- a/testautomation/extensions/optional/includes/display_name.inc +++ b/testautomation/extensions/optional/includes/display_name.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension display names '* diff --git a/testautomation/extensions/optional/includes/extensions.inc b/testautomation/extensions/optional/includes/extensions.inc index 8d1c63ea7bab..90a7e17e16cc 100644..100755 --- a/testautomation/extensions/optional/includes/extensions.inc +++ b/testautomation/extensions/optional/includes/extensions.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Function test of extension manager '* diff --git a/testautomation/extensions/optional/includes/fileopen.inc b/testautomation/extensions/optional/includes/fileopen.inc index 481cce7d4e14..922e5ece9adc 100644..100755 --- a/testautomation/extensions/optional/includes/fileopen.inc +++ b/testautomation/extensions/optional/includes/fileopen.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : CWS oxtsysint01 enables installing extensions via file open dialog '* diff --git a/testautomation/extensions/optional/includes/help.inc b/testautomation/extensions/optional/includes/help.inc index ee313b8d0cc7..004fd70ac429 100644..100755 --- a/testautomation/extensions/optional/includes/help.inc +++ b/testautomation/extensions/optional/includes/help.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extensible help '* diff --git a/testautomation/extensions/optional/includes/identifiers.inc b/testautomation/extensions/optional/includes/identifiers.inc index 377db6e2d89e..1a183f6c8025 100644..100755 --- a/testautomation/extensions/optional/includes/identifiers.inc +++ b/testautomation/extensions/optional/includes/identifiers.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Use unique identifiers instead of filenames for extensions '* diff --git a/testautomation/extensions/optional/includes/issue110083.inc b/testautomation/extensions/optional/includes/issue110083.inc index 8940f7f8274c..73f7ad108322 100755 --- a/testautomation/extensions/optional/includes/issue110083.inc +++ b/testautomation/extensions/optional/includes/issue110083.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : CWS sb112 fixes a problem with configuration schemas '* diff --git a/testautomation/extensions/optional/includes/location.inc b/testautomation/extensions/optional/includes/location.inc index 4730f8a7bfec..c23fdfdf922b 100644..100755 --- a/testautomation/extensions/optional/includes/location.inc +++ b/testautomation/extensions/optional/includes/location.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test the extension locator service '* diff --git a/testautomation/extensions/optional/includes/meta-inf.inc b/testautomation/extensions/optional/includes/meta-inf.inc index 0187e6302c2b..4d36586dd908 100644..100755 --- a/testautomation/extensions/optional/includes/meta-inf.inc +++ b/testautomation/extensions/optional/includes/meta-inf.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Case sensitive META-INF in packages '* diff --git a/testautomation/extensions/optional/includes/online_update.inc b/testautomation/extensions/optional/includes/online_update.inc index c107c1df0f3d..24739132beaa 100644..100755 --- a/testautomation/extensions/optional/includes/online_update.inc +++ b/testautomation/extensions/optional/includes/online_update.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Hit update button for an extension '* diff --git a/testautomation/extensions/optional/includes/options.inc b/testautomation/extensions/optional/includes/options.inc index 43588b748ea0..ff30ba00847b 100644..100755 --- a/testautomation/extensions/optional/includes/options.inc +++ b/testautomation/extensions/optional/includes/options.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Options for extensions '* diff --git a/testautomation/extensions/optional/includes/platforms.inc b/testautomation/extensions/optional/includes/platforms.inc index 4f96701afd20..db5d791498c6 100755 --- a/testautomation/extensions/optional/includes/platforms.inc +++ b/testautomation/extensions/optional/includes/platforms.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Supported extension platforms '* diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc index fcf4400ae748..739b28edaef8 100644..100755 --- a/testautomation/extensions/optional/includes/publisher.inc +++ b/testautomation/extensions/optional/includes/publisher.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension publisher and release notes '* @@ -43,15 +43,15 @@ testcase tExtensionPublisher ' 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 @@ -60,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 @@ -133,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" @@ -162,7 +163,7 @@ testcase tExtensionPublisher goto endsub endif loop - + if ( ShowAllUpdates.exists() ) then if ( ShowAllUpdates.isEnabled() ) then warnlog( """Show all updates"" should be disabled" ) @@ -172,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 ) - + 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." ) @@ -217,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." ) @@ -240,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" ) @@ -262,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, "", "" ) @@ -278,7 +279,7 @@ testcase tExtensionPublisher sExtensionCLI( "remove" , cCurrentFileName ) next iCurrentFile printlog( "Finished removing extensions" ) - + hFileCloseAll() endcase diff --git a/testautomation/extensions/optional/input/dependencies/version30.oxt b/testautomation/extensions/optional/input/dependencies/version30.oxt Binary files differindex 8750e712f8cd..59b8dc545973 100755 --- a/testautomation/extensions/optional/input/dependencies/version30.oxt +++ b/testautomation/extensions/optional/input/dependencies/version30.oxt diff --git a/testautomation/extensions/optional/input/dependencies/version31.oxt b/testautomation/extensions/optional/input/dependencies/version31.oxt Binary files differindex 870b4cc97a9a..843cb02f10ec 100644 --- a/testautomation/extensions/optional/input/dependencies/version31.oxt +++ b/testautomation/extensions/optional/input/dependencies/version31.oxt diff --git a/testautomation/extensions/optional/input/dependencies/version310.oxt b/testautomation/extensions/optional/input/dependencies/version310.oxt Binary files differnew file mode 100644 index 000000000000..40b66db99b65 --- /dev/null +++ b/testautomation/extensions/optional/input/dependencies/version310.oxt diff --git a/testautomation/extensions/optional/input/dependencies/version33.oxt b/testautomation/extensions/optional/input/dependencies/version33.oxt Binary files differnew file mode 100644 index 000000000000..11525f5be3bd --- /dev/null +++ b/testautomation/extensions/optional/input/dependencies/version33.oxt diff --git a/testautomation/extensions/optional/input/dependencies/version330.oxt b/testautomation/extensions/optional/input/dependencies/version330.oxt Binary files differnew file mode 100644 index 000000000000..abc13cdc07a2 --- /dev/null +++ b/testautomation/extensions/optional/input/dependencies/version330.oxt diff --git a/testautomation/extensions/optional/input/dependencies/version34.oxt b/testautomation/extensions/optional/input/dependencies/version34.oxt Binary files differnew file mode 100644 index 000000000000..e14671c77e92 --- /dev/null +++ b/testautomation/extensions/optional/input/dependencies/version34.oxt diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/genfiles.properties b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/genfiles.properties index e4e5fc11997d..2f144fe1f264 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/genfiles.properties +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/genfiles.properties @@ -1,3 +1,4 @@ +# x-no-translate build.xml.data.CRC32=2b754fcd build.xml.script.CRC32=0a20deac build.xml.stylesheet.CRC32=d5b6853a diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/private.properties b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/private.properties index c090eb0e8f9c..1b26762e782d 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/private.properties +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/private.properties @@ -1,3 +1,4 @@ +# x-no-translate compile.on.save=false do.depend=false do.jar=true diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project-uno.properties b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project-uno.properties index 35a0535e7d02..8abadd201d42 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project-uno.properties +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project-uno.properties @@ -1,3 +1,4 @@ +# x-no-translate uno.project.type=office.component.project project.name=TaskPaneComponent registration.classname=com.example.TaskPaneComponent diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.properties b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.properties index b6059cf3113c..7ca12dec0468 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.properties +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.properties @@ -1,3 +1,4 @@ +# x-no-translate application.args= application.title=TaskPaneComponent application.vendor=qamsc diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu index ba2c8c692d4e..367281d0deaf 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu @@ -4,7 +4,7 @@ <node oor:name="States"> <node oor:name="private:resource/toolpanel/com.example.TestPanel1" oor:op="replace"> <prop oor:name="UIName" oor:type="xs:string"> - <value xml:lang="en-US">ein Panel</value> + <value>ein Panel</value> </prop> <prop oor:name="Visible" oor:type="xs:boolean"> <value>true</value> @@ -12,7 +12,7 @@ </node> <node oor:name="private:resource/toolpanel/com.example.TestPanel2" oor:op="replace"> <prop oor:name="UIName" oor:type="xs:string"> - <value xml:lang="en-US">noch ein Panel</value> + <value>noch ein Panel</value> </prop> <prop oor:name="Visible" oor:type="xs:boolean"> <value>true</value> diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java index a28e07d5847b..fcebd804ec1f 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java @@ -33,7 +33,7 @@ import com.sun.star.uno.UnoRuntime; /** * - * @author frank.schoenheit@sun.com + * @author frank.schoenheit@oracle.com */ public class ToolPanel implements XToolPanel { diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java index 6fb17d17f3d6..599850e00ef1 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java @@ -44,7 +44,7 @@ import java.util.logging.Logger; /** * - * @author frank.schoenheit@sun.com + * @author frank.schoenheit@oracle.com */ public class ToolPanelUIElement extends ComponentBase implements XUIElement { diff --git a/testautomation/extensions/optional/input/files.txt b/testautomation/extensions/optional/input/files.txt index 5e37bbd64659..369cb99b74d2 100755 --- a/testautomation/extensions/optional/input/files.txt +++ b/testautomation/extensions/optional/input/files.txt @@ -29,8 +29,12 @@ 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;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 @@ -43,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 Binary files differnew file mode 100644 index 000000000000..d88965e803f1 --- /dev/null +++ b/testautomation/extensions/optional/input/issues/111434.oxt diff --git a/testautomation/extensions/optional/input/issues/LoggingOptions.xcs b/testautomation/extensions/optional/input/issues/LoggingOptions.xcs index e87474bba2a2..ca1ee9a4b6cb 100644 --- a/testautomation/extensions/optional/input/issues/LoggingOptions.xcs +++ b/testautomation/extensions/optional/input/issues/LoggingOptions.xcs @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Logging" oor:package="org.openoffice.Office" xml:lang="en-US"> +<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Logging" oor:package="org.openoffice.Office"> <templates> <group oor:name="LoggerSettings"> <group oor:name="HandlerSettings" oor:extensible="true"> diff --git a/testautomation/extensions/required/e_update.bas b/testautomation/extensions/required/e_update.bas index b5bc2775a646..89c85cb139fc 100755..100644 --- a/testautomation/extensions/required/e_update.bas +++ b/testautomation/extensions/required/e_update.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension Update Test '* diff --git a/testautomation/extensions/required/includes/e_update.inc b/testautomation/extensions/required/includes/e_update.inc index c3114a65dbbc..e563b5ae3a45 100644..100755 --- a/testautomation/extensions/required/includes/e_update.inc +++ b/testautomation/extensions/required/includes/e_update.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension Update Test '* @@ -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 - |