CWS-TOOLING: integrate CWS greenstate30_DEV300

10 files changed, 18 insertions, 218 deletions

diff --git a/testautomation/extensions/optional/e_errors.bas b/testautomation/extensions/optional/e_errors.bas
deleted file mode 100755
index d23bf348608d..000000000000
--- a/testautomation/extensions/optional/e_errors.bas
+++ /dev/null
@@ -1,70 +0,0 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
-'* Copyright 2008 by Sun Microsystems, Inc.
-'*
-'* OpenOffice.org - a multi-platform office productivity suite
-'*
-'* $RCSfile: e_errors.bas,v $
-'*
-'* $Revision: 1.3 $
-'*
-'* last change: $Author: jsk $ $Date: 2008-06-20 08:07:01 $
-'*
-'* 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 : Install extensions that caused unopkg to fail
-'*
-'\******************************************************************************
-
-sub main
-
-    use "extensions\optional\includes\errors.inc"
- 
-    call hStatusIn( "extensions" , "e_errors.bas" )
-    call tExtensionError77436()
-    call hStatusOut()
-
-end sub
-
-'-------------------------------------------------------------------------
-
-sub LoadIncludeFiles
-
-    use "global\system\includes\gvariabl.inc"
-    use "global\system\includes\master.inc"
-    
-    use "global\tools\includes\optional\t_extension_manager_tools.inc"
-    use "global\tools\includes\optional\t_stringtools.inc"
-    use "global\tools\includes\optional\t_accels.inc"
-    use "global\tools\includes\optional\t_docfuncs.inc"
-    use "global\tools\includes\optional\t_listfuncs.inc"
-    use "global\tools\includes\optional\t_macro_tools.inc"
-    use "global\tools\includes\optional\t_basic_ide_tools.inc"
-    use "global\tools\includes\optional\t_basic_organizer_tools.inc"
-   
-    gApplication = "WRITER"
-    call GetUseFiles()
-
-end sub
-
diff --git a/testautomation/extensions/optional/e_platforms.bas b/testautomation/extensions/optional/e_platforms.bas
index b01174542b06..f25751588759 100755
--- a/testautomation/extensions/optional/e_platforms.bas
+++ b/testautomation/extensions/optional/e_platforms.bas
@@ -55,7 +55,7 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
 
     use "global\tools\includes\optional\t_extension_manager_tools.inc"
-    use "global\tools\includes\optional\key_tools.inc"
+    use "global\tools\includes\optional\t_key_tools.inc"
 
     gApplication = "WRITER"
     call GetUseFiles()
diff --git a/testautomation/extensions/optional/includes/errors.inc b/testautomation/extensions/optional/includes/errors.inc
deleted file mode 100755
index 76303448b01b..000000000000
--- a/testautomation/extensions/optional/includes/errors.inc
+++ /dev/null
@@ -1,134 +0,0 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
-'* Copyright 2008 by Sun Microsystems, Inc.
-'*
-'* OpenOffice.org - a multi-platform office productivity suite
-'*
-'* $RCSfile: errors.inc,v $
-'*
-'* $Revision: 1.2 $
-'*
-'* last change: $Author: jsk $ $Date: 2008-06-19 09:02:09 $
-'*
-'* 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 : Reproduction of misc errors when working with extensions
-'*
-'\******************************************************************************
-
-testcase tExtensionError77436
-
-    '///<h3>Registration error when installing extension, Linux/UNIX only</h3>
-    '///<ul>
-    
-    warnlog( "#i87453# - Failure to load sample extension" )
-    goto endsub
-    
-    if ( lcase( gtSysName ) <> "linux" ) then 
-        printlog( "Sample extension is not suitable for Windows or Solaris" )
-        goto endsub
-    endif
-    
-    dim irc as integer
-    dim brc as boolean
-    dim cMsg as string
-    
-    dim cWorkPath as string
-        cWorkPath = gTesttoolPath & "extensions\optional\input\errors\"
-        cWorkPath = convertpath( cWorkPath )
-        
-    const EXTENSION_NAME = "i77436-extension.oxt"
-    const MACRO_NAME = "i77436"
-    
-    '///+<li>Create an initial document, change it so it cannot be replaced</li>
-    gApplication = "WRITER"
-    do while ( getDocumentCount > 0 ) 
-        hCloseDoc()
-    loop
-    hNewDocument()
-    kontext "DocumentWriter"
-    DocumentWriter.typeKeys( "Testdocument for tExtensionError77436" )
-    
-    '///+<li>Add the extension (see code for details)</li>
-    irc = hExtensionAddGUI( cWorkPath & EXTENSION_NAME , "verbose,InstallForUser" )
-    
-    '///+<li>Go to the BASIC IDE, create a new module</li>
-    brc = hInitBasicIde( MACRO_NAME )
-    if ( not brc ) then
-        warnlog( "Failed to init BASIC IDE, fatal" )
-        call ExitRestartTheOffice()
-        goto endsub
-    endif
-    
-    '///+<li>Insert the macro (that comes with the extension</li>
-    irc = hInsertMacroFromFile( MACRO_NAME )
-    if ( irc <> 9 ) then
-        warnlog( "Retrieved/inserted wrong macro, please check" )
-    endif
-    
-    '///+<li>Close the BASIC IDE</li>
-    irc = hCloseBasicIDE()
-    
-    '///+<li>Run the macro from the Run Macro dialog</li>
-    irc = hMacroOrganizerRunMacro( MACRO_NAME )
-    
-    '///+<li>Verify that the macro was indeed executed - messagebox 1</li>
-    kontext "Active"
-    if ( Active.exists( 2 ) ) then
-        cMsg = Active.getText()
-        cMsg = hRemoveLineBreaks( cMsg )
-        printlog( "Message 1: " & cMsg )
-        active.ok()
-    endif
-    
-    '///+<li>Verify that the macro was indeed executed - messagebox 2</li>
-    kontext "Active"
-    if ( Active.exists( 2 ) ) then
-        cMsg = Active.getText()
-        cMsg = hRemoveLineBreaks( cMsg )
-        printlog( "Message 2: " & cMsg )
-        active.ok()
-    endif
-    
-    '///+<li>Remove the extension again</li>
-    irc = hExtensionRemoveGUI( EXTENSION_NAME )
-    select case irc
-    case 0    : printlog( "Extension was removed, ok" )
-    case else : warnlog( "Removing extension failed with rc = " & irc )
-    end select
-    
-    '///+<li>Verify that the number of documents is still correct (should be two)</li>
-    if ( getDocumentCount() = 2 ) then  
-        warnlog( "Document left over by some error. Closing" )
-        hCloseDocument()
-    endif
-    
-    '///+<li>Close all documents until we are on backing window</li>
-    do while ( getDocumentCount > 0 ) 
-        hCloseDocument()
-    loop
-    '///</ul>
-
-endcase
-
diff --git a/testautomation/extensions/optional/includes/extensions.inc b/testautomation/extensions/optional/includes/extensions.inc
index fd9f8b3e932f..1b4da462a9cb 100755
--- a/testautomation/extensions/optional/includes/extensions.inc
+++ b/testautomation/extensions/optional/includes/extensions.inc
@@ -148,13 +148,11 @@ testcase tExtensionsFunction
     '/// - UnsatisfiedDependencies dialog exists ///'
     '///     (1/1): Unknown ///'
     '/// - will not install ///'
-    '/// (28/31): dependencies\version22.oxt ///'
-    '/// - installs and is enabled ///'
-    '/// (29/31): dependencies\version23.oxt ///'
+    '/// (25/31): dependencies\version25.oxt ///'
     '/// - installs and is enabled ///'
-    '/// (25/31): dependencies\version24.oxt ///'
+    '/// (25/31): dependencies\version30.oxt ///'
     '/// - installs and is enabled ///'
-    '/// (25/31): dependencies\version25.oxt ///'
+    '/// (25/31): dependencies\version31.oxt ///'
     '/// - UnsatisfiedDependencies dialog exists ///'
     '///     (1/1): Unknown ///'
     '/// - will not install ///'
@@ -234,7 +232,7 @@ testcase tExtensionsFunction
     ' 5th number: If active is expected the expected version information after selecting a file for installation the value is one, else zero and if an upgrade/downgrade is expected, the number is 2.
     
     ' Base path for test files
-    sPath = convertPath(gTestToolPath+"framework/basic/input/extensions/")
+    sPath = convertPath(gTestToolPath+"extensions/optional/input/")
     ' read filelist and expected features
     ListRead(aFileList(), sPath+"files.txt")
     a = listCount(aFileList())
diff --git a/testautomation/extensions/optional/input/dependencies/version22.oxt b/testautomation/extensions/optional/input/dependencies/version22.oxt
deleted file mode 100755
index 4c8a207b68ba..000000000000
--- a/testautomation/extensions/optional/input/dependencies/version22.oxt
+++ /dev/null
diff --git a/testautomation/extensions/optional/input/dependencies/version23.oxt b/testautomation/extensions/optional/input/dependencies/version23.oxt
deleted file mode 100755
index 6c08d2949ced..000000000000
--- a/testautomation/extensions/optional/input/dependencies/version23.oxt
+++ /dev/null
diff --git a/testautomation/extensions/optional/input/dependencies/version24.oxt b/testautomation/extensions/optional/input/dependencies/version24.oxt
deleted file mode 100755
index 232aa924527a..000000000000
--- a/testautomation/extensions/optional/input/dependencies/version24.oxt
+++ /dev/null
diff --git a/testautomation/extensions/optional/input/dependencies/version30.oxt b/testautomation/extensions/optional/input/dependencies/version30.oxt
new file mode 100755
index 000000000000..3795804bae0d
--- /dev/null
+++ b/testautomation/extensions/optional/input/dependencies/version30.oxt
@@ -0,0 +1,3 @@
+PK
+m��m�Q|�M����$���/ut��������������M����a�2 ��V(s��P��3�^���SQn��~K�ܨF��
+�?���6(b�)�FՒYF,��|�G�~�tB҃��D�+�i6��9\btD�,v�̳l�C�'2��%�&��W;J�P�����sZ�<���Z�B䞵��#Z�<���=�U����5����x�!2/N��F��R���0F��"d��-�"I�u�=����D�T<~G)E������7�^��f�zT�T��
v�X>����:�b���Q�WJS%��
K\eQ�q.�+��FW�^���`(���7�lh����h];�߯�܎oP���f*l5G��;����/�)t�
PK@rWn�:_�t����^���c~�48 |7�j~�ga����utF�/ዞ���@��f�
����'f0A���{�n`C�϶n_� ����G���%��s=�
�_����v��x��2���F6�����P���N4�/��?������JC����A
�c�;/�.���?���2xyT�[���R��J�
R0���Д2p���L�����Է28��,39Ո.�`8ƿ±�p�
-�:�&��w@�J�O|YbN�H��a��|��Z�!��}G�$T
�
bFpE��!��pg��<��Y5��HE�禖dd楃�x�%�?7h���I�/����pLs3��g�@���A5�
@�����Pp-���\��!�����ñ��r���o���L�9���������ie�O�_��m��
\ No newline at end of file
diff --git a/testautomation/extensions/optional/input/dependencies/version31.oxt b/testautomation/extensions/optional/input/dependencies/version31.oxt
new file mode 100644
index 000000000000..1b7440af66ac
--- /dev/null
+++ b/testautomation/extensions/optional/input/dependencies/version31.oxt
@@ -0,0 +1,4 @@
+PK
+m��m�Q|�M����$���/ut��������������M����a�2 ��V(s��P��3�^���SQn��~K�ܨF��
+�?���6(b�)�FՒYF,��|�G�~�tB҃��D�+�i6��9\btD�,v�̳l�C�'2��%�&��W;J�P�����sZ�<���Z�B䞵��#Z�<���=�U����5����x�!2/N��F��R��C5��0F��"�^�-�"I�u�=���
�DL*������n~��U-C/f����rH�����[z��$�bh'7F�LP���q,��#��:�b槧�%"�� w�<����ѥ��7,�$X��0�ͨj��?E:8rCӧ߯���o�p�
+��f�戈u'7�<��>�I>PK@rWn�:_�t����^���c~�48 |7�j~�ga����utF�/ዞ���@��f�
����'f0A���{�n`C�϶n_� ����G���%��s=�
�_����v��x��2���F6�����P���N4�/��?������JC����A
�c�;/�.���?���2xyT�[���R��J�
R0���Д2p���L�����Է28��,39Ո.�`8ƿ±�p�
-�:�&��w@�J�O|YbN�H��a��|��Z�!��}G�$T
�
bFpE��!��pg��<��Y5��HE�禖dd楃�x�%�?7h���I�/����pLs3��g�@���A5�
@�����Pp-���\��!�����ñ��r���o���L�9���������ie�O�_��m��C5�
\ No newline at end of file
diff --git a/testautomation/extensions/optional/input/files.txt b/testautomation/extensions/optional/input/files.txt
index f4213818094f..a34a10d3d708 100755
--- a/testautomation/extensions/optional/input/files.txt
+++ b/testautomation/extensions/optional/input/files.txt
@@ -2,13 +2,13 @@ simpleLicense\BadDesc.oxt;0,0,0,1,0
 simpleLicense\BadNamespace.oxt;0,0,0,1,0
 simpleLicense\BadRoot.oxt;0,0,0,1,0
 simpleLicense\IncompAttr1.oxt;0,1,1,0,0
-simpleLicense\IncompAttr2.oxt;0,1,1,1,0
+simpleLicense\IncompAttr2.oxt;0,1,1,0,0
 simpleLicense\LongLic.oxt;0,2,1,0,0
 simpleLicense\MissingLic.oxt;0,0,0,1,0
 simpleLicense\MissingLicRef.oxt;0,0,0,1,0
 simpleLicense\NoDesc.oxt;0,0,1,0,0
-simpleLicense\NoLangNoDefault.oxt;0,1,1,1,0
-simpleLicense\OnlyDefault.oxt;0,1,1,1,0
+simpleLicense\NoLangNoDefault.oxt;0,1,1,0,0
+simpleLicense\OnlyDefault.oxt;0,1,1,0,0
 simpleLicense\ShortLicense.oxt;0,1,1,0,0
 simpleLicense\CancelLicense.oxt;0,3,0,0,0
 simpleLicense\ShortLicenseShared.oxt;0,1,1,0,0
@@ -25,10 +25,9 @@ dependencies\version21.oxt;0,0,1,0,0
 dependencies\version10000.oxt;1,0,0,0,0
 dependencies\version21ns.oxt;0,0,1,0,0
 dependencies\version21other.oxt;1,0,0,0,0
-dependencies\version22.oxt;0,0,1,0,0
-dependencies\version23.oxt;0,0,1,0,0
-dependencies\version24.oxt;0,0,1,0,0
-dependencies\version25.oxt;1,0,0,0,0
+dependencies\version25.oxt;0,0,1,0,0
+dependencies\version30.oxt;0,0,1,0,0
+dependencies\version31.oxt;1,0,0,0,0
 dependencies\versionempty.oxt;0,0,1,0,0
 dependencies\versionnone.oxt;0,0,1,0,0
 versions/plain.oxt;0,0,1,0,0