diff options
| author | sb <sb@openoffice.org> | 2010-05-20 11:37:31 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-05-20 11:37:31 +0200 |
| commit | 460257aeb5452fdba423eb00a24cf0e958878212 (patch) | |
| tree | ff916f28f6749c10df1d2f0680a4bb01b8471c0d | |
| parent | 97b3257ff315837e58582c7d7061a1ec05580aef (diff) | |
| parent | 9018d3dbb6c5d45093b15eebccb163ef15b7f954 (diff) | |
sb122: merged in DEV300_m78
42 files changed, 869 insertions, 566 deletions
diff --git a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc index 7a73842c62eb..b8e3ccc2d896 100755 --- a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc +++ b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc @@ -205,7 +205,11 @@ testcase tFF_Navigator elseif iSprache = 49 then if FilterNavigator.getSelText <> "WIE '*value*'" then warnlog "The text is not right in the filter navigator. It have to be WIE '*value*' but it is " + FilterNavigator.getSelText - endif + endif + elseif iSprache = 50 then + if FilterNavigator.getSelText <> "LIKE '*value*'" then + warnlog "The text is not right in the filter navigator. It have to be LIKE '*value*' but it is " + FilterNavigator.getSelText + endif elseif iSprache = 81 then elseif iSprache = 82 then diff --git a/testautomation/framework/optional/f_basic_vba-compat.bas b/testautomation/framework/optional/f_basic_vba-compat.bas index 363e59c70cb4..3a6d41d3e0af 100755 --- a/testautomation/framework/optional/f_basic_vba-compat.bas +++ b/testautomation/framework/optional/f_basic_vba-compat.bas @@ -36,11 +36,13 @@ sub main use "framework\optional\includes\basic_vba-compat_import_nothing.inc" use "framework\optional\includes\basic_vba-compat_import_disabled.inc" use "framework\optional\includes\basic_vba-compat_import_enabled.inc" - + use "framework\optional\includes\basic_vba-compat_security_check.inc" + call hStatusIn( "framework" , "f_basic_vba-compat.bas" ) call tBasicVBACompatImportNothing() call tBasicVBACompatImportDisabled() call tBasicVBACompatImportEnabled() + call tBasicVBACompatSecurityCheck() call hStatusOut() end sub @@ -54,6 +56,9 @@ sub LoadIncludeFiles use "global\tools\includes\optional\t_basic_organizer_tools.inc" use "global\tools\includes\optional\t_treelist_tools.inc" + use "global\tools\includes\optional\t_security_tools.inc" + use "global\tools\includes\optional\t_macro_tools.inc" + use "global\tools\includes\optional\t_docfuncs.inc" use "framework\optional\includes\basic_vba_compat_tools.inc" diff --git a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc index 98faef122a4c..0cab687d2f50 100644..100755 --- a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc +++ b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc @@ -52,6 +52,12 @@ testcase tLanguageTest_1 sKeyTypeTChinese = "Numerisch" sKeyTypeJapanese = "Numerisch" sKeyTypeKoren = "Numerisch" + case 50 :' Slovenian + sKeyTypeEnglishUSA = "Alfanumerično" + sKeyTypeSChinese = "Nabor znakov" + sKeyTypeTChinese = "Numerično" + sKeyTypeJapanese = "Nabor znakov" + sKeyTypeKoren = "Nabor znakov" case 55 :' Brazilian sKeyTypeEnglishUSA = "Alfanumérico" sKeyTypeSChinese = "Conjunto de caracteres" @@ -273,6 +279,12 @@ testcase tLanguageTest_2 sKeyTypeTChinese = "Numerisch" sKeyTypeJapanese = "Numerisch" sKeyTypeKoren = "Numerisch" + case 50 :' Slovenian + sKeyTypeEnglishUSA = "Alfanumerično" + sKeyTypeSChinese = "Nabor znakov" + sKeyTypeTChinese = "Numerično" + sKeyTypeJapanese = "Nabor znakov" + sKeyTypeKoren = "Nabor znakov" case 55 :' Brazilian sKeyTypeEnglishUSA = "numérico" sKeyTypeSChinese = "numérico" @@ -494,6 +506,8 @@ testcase tStrokeSort sKeyTypeSChinese = "Stroke" case 49 : ' German sKeyTypeSChinese = "Stroke" + case 50 : ' Slovenian + sKeyTypeSChinese = "Poteza" case 55 : ' Brazilian sKeyTypeSChinese = "Traço" case 81 : ' Japanese @@ -582,6 +596,8 @@ testcase tPinyinSort sKeyTypeSChinese = "Pinyin" case 49 : ' German sKeyTypeSChinese = "Pinyin" + case 50 : ' Slovenian + sKeyTypeSChinese = "Pinjin" case 55 : ' Brazilian sKeyTypeSChinese = "Pinyin" case 81 : ' Japanese diff --git a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc index 39c42fe75b8e..5b03be6151cb 100644..100755 --- a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc +++ b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc @@ -204,6 +204,7 @@ testcase tRubyDialog_4 case 39 : sCharacterStyle = "Testo Ruby" case 46 : sCharacterStyle = "Rubytext" case 49 : sCharacterStyle = "Rubys" + case 50 : sCharacterStyle = "Rubys" case 55 : sCharacterStyle = "Rubys" case 81 : sCharacterStyle = "ふりがな" case 82 : sCharacterStyle = "윗주 달기" ' not sure TBO @@ -251,6 +252,7 @@ testcase tRubyDialog_5 case 39 : sCharacterStyle = "Testo Ruby" case 46 : sCharacterStyle = "Rubytext" case 49 : sCharacterStyle = "Rubys" + case 50 : sCharacterStyle = "Rubys" case 55 : sCharacterStyle = "Rubys" case 81 : sCharacterStyle = "ふりがな" case 82 : sCharacterStyle = "윗주 달기" ' not sure TBO was "덧말" diff --git a/testautomation/framework/optional/includes/basic_issues.inc b/testautomation/framework/optional/includes/basic_issues.inc index 0c38e743fb93..3fec49f61fbe 100644..100755 --- a/testautomation/framework/optional/includes/basic_issues.inc +++ b/testautomation/framework/optional/includes/basic_issues.inc @@ -54,7 +54,7 @@ function hTestActive( cString as string , iMethod as integer , bExact as boolean ' 1 - 4 = Number of buttons on the dialog ' internal states, if state = 0 we return the buttoncount instead - const STATE_SUCCESS = 0 + const STATE_SUCCESS = 0 const STATE_FUZZY_MATCH = -1 const STATE_NO_MATCH = -2 const STATE_IGNORE_MSGBOX = -3 @@ -111,6 +111,17 @@ end function testcase t_macros() + const RESTYPE_1 = 1 + const RESTYPE_2 = 2 + const RESTYPE_3 = 3 + + const CLOSE_METHOD_OK = 1 + const CLOSE_METHOD_CANCEL = 2 + const CLOSE_METHOD_NO = 4 + + const REQUIRES_EXACT_MATCH = TRUE + const REQUIRES_FUZZY_MATCH = FALSE + gApplication = "WRITER" call hNewDocument() hInitBasicIDE( "TestIssues" ) @@ -119,113 +130,126 @@ testcase t_macros() printlog( " ---------- i41695 ------------ " ) hInsertMacroFromFile( "i41695" ) hIDERunMacro() - hTestActive( "i41695-1", 1 , TRUE ) - hTestActive( "i41695-2", 1 , TRUE ) + hTestActive( "i41695-1", CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) + hTestActive( "i41695-2", CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) printlog( "" ) printlog( " ---------- i83978 ------------ " ) hInsertMacroFromFile( "i83978" ) hIDERunMacro() - hTestActive( "com.sun.star.container.NoSuchElementException", 1 , FALSE ) + hTestActive( "NoSuchElementException", CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) printlog( "" ) printlog( " ---------- i82830 ------------ " ) hInsertMacroFromFile( "i82830" ) hIDERunMacro() - hTestActive( "12D687" , 1 , TRUE ) - hTestActive( "4553207", 1 , TRUE ) + hTestActive( "12D687" , CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) + hTestActive( "4553207", CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) if ( gISOLang = "en-US" ) then printlog( "" ) printlog( " ---------- i81674 ------------ " ) hInsertMacroFromFile( "i81674" ) hIDERunMacro() - hTestActive( "250" , 1 , FALSE ) - hTestActive( "Yes" , 1 , TRUE ) - hTestActive( "True", 1 , TRUE ) - hTestActive( "On" , 1 , TRUE ) + hTestActive( "250" , CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) + hTestActive( "Yes" , CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) + hTestActive( "True", CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) + hTestActive( "On" , CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) endif printlog( "" ) printlog( " ---------- i80532 ------------ " ) hInsertMacroFromFile( "i80532" ) hIDERunMacro() - hTestActive( "-10", 1 , FALSE ) - hTestActive( "1" , 1 , FALSE ) - hTestActive( "-10", 1 , FALSE ) + hTestActive( "-10", CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) + hTestActive( "1" , CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) + hTestActive( "-10", CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) printlog( "" ) printlog( " ---------- i84040 ------------ " ) hInsertMacroFromFile( "i84040" ) hIDERunMacro() - hTestActive( "False", 1 , TRUE ) - hTestActive( "False", 1 , TRUE ) + hTestActive( "False", CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) + hTestActive( "False", CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) printlog( "" ) printlog( " ---------- i86265 ------------ " ) hInsertMacroFromFile( "i86265" ) hIDERunMacro() - hTestActive( "i86265-1", 1 , TRUE ) - hTestActive( "i86265-2", 1 , TRUE ) + hTestActive( "i86265-1", CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) + hTestActive( "i86265-2", CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) printlog( "" ) printlog( " ---------- i92329 ------------ " ) hInsertMacroFromFile( "i92329" ) hIDERunMacro() - hTestActive( "Return an Array" , 1 ) + hTestActive( "Return an Array" , CLOSE_METHOD_OK ) printlog( "" ) printlog( " ---------- i97038 ------------ " ) hInsertMacroFromFile( "i97038" ) hIDERunMacro() - hTestActive( "1900" , 1 , FALSE ) - hTestActive( "2" , 1 , FALSE ) + hTestActive( "1900" , CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) + hTestActive( "2" , CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) printlog( "" ) printlog( " ---------- i103691 ------------ " ) hInsertMacroFromFile( "i103691" ) hIDERunMacro() - hTestActive( "Equal" , 1 , FALSE ) + hTestActive( "Equal" , CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) printlog( "" ) printlog( " ---------- i103697 ------------ " ) hInsertMacroFromFile( "i103697" ) hIDERunMacro() - hTestActive( "i103697" , 1 , FALSE ) + hTestActive( "i103697" , CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) printlog( "" ) printlog( " ---------- i103990 ------------ " ) hInsertMacroFromFile( "i103990" ) hIDERunMacro() - hTestActive( "42" , 1 , FALSE ) - hTestActive( "43" , 1 , FALSE ) - hTestActive( "Pi" , 1 , FALSE ) + hTestActive( "42" , CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) + hTestActive( "43" , CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) + hTestActive( "Pi" , CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) printlog( "" ) printlog( " ---------- i107070 ------------ " ) hInsertMacroFromFile( "i107070" ) hIDERunMacro() - hTestActive( "Dbg_Methods" , 1 , FALSE ) - hTestActive( "Dbg_Methods" , 1 , FALSE ) - hTestActive( "." , 1 , FALSE ) + hTestActive( "Dbg_Methods" , CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) + hTestActive( "Dbg_Methods" , CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) + hTestActive( "." , CLOSE_METHOD_OK , REQUIRES_FUZZY_MATCH ) + + printlog( "" ) + printlog( " ---------- i106744 ------------ " ) + hInsertMacroFromFile( "i106744-1" ) + hIDERunMacro() + hTestActive( "NOT EMPTY" , CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) + + printlog( "" ) + printlog( " ---------- i106744 ------------ " ) + hInsertMacroFromFile( "i106744-2" ) + hIDERunMacro() + hTestActive( "NOT EMPTY" , CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) printlog( "" ) printlog( " ---------- MessageBoxes ------------ " ) hInsertMacroFromFile( "MessageBoxes" ) hIDERunMacro() - if ( hTestActive( "0x" , 1 , TRUE ) > 1 ) then warnlog( "Wrong resource type" ) - if ( hTestActive( "1x" , 1 , TRUE ) > 2 ) then warnlog( "Wrong resource type" ) - if ( hTestActive( "2x" , 2 , TRUE ) > 3 ) then warnlog( "Wrong resource type" ) - if ( hTestActive( "3x" , 2 , TRUE ) > 3 ) then warnlog( "Wrong resource type" ) - if ( hTestActive( "4x" , 4 , TRUE ) > 2 ) then warnlog( "Wrong resource type" ) - if ( hTestActive( "5x" , 2 , TRUE ) > 2 ) then warnlog( "Wrong resource type" ) - if ( hTestActive( "16" , 2 , TRUE ) > 3 ) then warnlog( "Wrong resource type" ) - if ( hTestActive( "32" , 2 , TRUE ) > 3 ) then warnlog( "Wrong resource type" ) - if ( hTestActive( "48" , 2 , TRUE ) > 3 ) then warnlog( "Wrong resource type" ) - if ( hTestActive( "64" , 1 , TRUE ) > 1 ) then warnlog( "Wrong resource type" ) - if ( hTestActive( "128", 2 , TRUE ) > 3 ) then warnlog( "Wrong resource type" ) - if ( hTestActive( "256", 2 , TRUE ) > 3 ) then warnlog( "Wrong resource type" ) - if ( hTestActive( "512", 2 , TRUE ) > 3 ) then warnlog( "Wrong resource type" ) + + if ( hTestActive( "0x" , CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) <> RESTYPE_1 ) then warnlog( "Wrong resource type" ) + if ( hTestActive( "1x" , CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) <> RESTYPE_2 ) then warnlog( "Wrong resource type" ) + if ( hTestActive( "2x" , CLOSE_METHOD_CANCEL , REQUIRES_EXACT_MATCH ) <> RESTYPE_3 ) then warnlog( "Wrong resource type" ) + if ( hTestActive( "3x" , CLOSE_METHOD_CANCEL , REQUIRES_EXACT_MATCH ) <> RESTYPE_3 ) then warnlog( "Wrong resource type" ) + if ( hTestActive( "4x" , CLOSE_METHOD_NO , REQUIRES_EXACT_MATCH ) <> RESTYPE_2 ) then warnlog( "Wrong resource type" ) + if ( hTestActive( "5x" , CLOSE_METHOD_CANCEL , REQUIRES_EXACT_MATCH ) <> RESTYPE_2 ) then warnlog( "Wrong resource type" ) + if ( hTestActive( "16" , CLOSE_METHOD_CANCEL , REQUIRES_EXACT_MATCH ) <> RESTYPE_3 ) then warnlog( "Wrong resource type" ) + if ( hTestActive( "32" , CLOSE_METHOD_CANCEL , REQUIRES_EXACT_MATCH ) <> RESTYPE_3 ) then warnlog( "Wrong resource type" ) + if ( hTestActive( "48" , CLOSE_METHOD_CANCEL , REQUIRES_EXACT_MATCH ) <> RESTYPE_3 ) then warnlog( "Wrong resource type" ) + if ( hTestActive( "64" , CLOSE_METHOD_OK , REQUIRES_EXACT_MATCH ) <> RESTYPE_1 ) then warnlog( "Wrong resource type" ) + if ( hTestActive( "128", CLOSE_METHOD_CANCEL , REQUIRES_EXACT_MATCH ) <> RESTYPE_3 ) then warnlog( "Wrong resource type" ) + if ( hTestActive( "256", CLOSE_METHOD_CANCEL , REQUIRES_EXACT_MATCH ) <> RESTYPE_3 ) then warnlog( "Wrong resource type" ) + if ( hTestActive( "512", CLOSE_METHOD_CANCEL , REQUIRES_EXACT_MATCH ) <> RESTYPE_3 ) then warnlog( "Wrong resource type" ) printlog( "" ) hCloseBasicIDE() diff --git a/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc b/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc new file mode 100644 index 000000000000..ae26d996db6e --- /dev/null +++ b/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc @@ -0,0 +1,105 @@ +'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 : Test VBA compatibility switches +'* +'\****************************************************************************** + +testcase tBasicVBACompatSecurityCheck() + + printlog( "Test VBA Security feature" ) + printlog( "VBA macros may not ignore global macro security setting" ) + + ' This test case is based on the use cases provided in issue #i109699 + + const IMPORT_EXCEL_MACROS = TRUE + const EXEC_EXCEL_MACROS = TRUE + + const MACRO_IDENTIFICATION_MESSAGE = "Clicked" + const MACRO_NAME = "CommandButton1_Click" + + const WORK_FILE = "framework/optional/input/vba-compat/Book1.xls" + + dim cTestFile as string : cTestFile = gTesttoolPath & WORK_FILE + dim iSecurityLevel as integer + + + printlog( "Set VBA macro handling to import and execute" ) + hSetExcelBasicImportMode( IMPORT_EXCEL_MACROS, EXEC_EXCEL_MACROS ) + + for iSecurityLevel = GC_MACRO_SECURITY_LEVEL_MEDIUM to GC_MACRO_SECURITY_LEVEL_VERYHIGH + + printlog( "Adjust security level" ) + hSetMacroSecurityAPI( iSecurityLevel ) + + printlog( "Load the test file" ) + hFileOpen( cTestFile ) + + printlog( "Deny macro execution or close macros blocked message" ) + if ( iSecurityLevel = GC_MACRO_SECURITY_LEVEL_MEDIUM ) then + hDenyMacroExecution() + else + kontext "Active" + Active.ok() + endif + + printlog( "Try to execute macro via macro organizer" ) + hMacroOrganizerRunMacro( MACRO_NAME ) + + printlog( "Probe for warning message (or macro)" ) + kontext "Active" + if ( Active.exists( 2 ) ) then + if ( Active.getText() = MACRO_IDENTIFICATION_MESSAGE ) then + warnlog( "Macro was executed though macro execution has been denied" ) + Active.ok() + else + printlog( "Macro execution blocked - warning is displayed." ) + Active.ok() + endif + else + warnlog( "No warning message for blocked macro execution" ) + endif + + ' recover silently, the warnings above should say it all. + kontext "Makro" + if ( Makro.exists() ) then Makro.cancel() + + printlog( "Close file" ) + hDestroyDocument() + + next iSecurityLevel + + printlog( "Reset VBA import options to default" ) + hSetExcelImportModeDefault() + + printlog( "Reset macro security level to default" ) + hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT ) + +endcase + diff --git a/testautomation/framework/optional/includes/configuration.inc b/testautomation/framework/optional/includes/configuration.inc index 68c0aaf79082..fba0a6fe6bae 100644..100755 --- a/testautomation/framework/optional/includes/configuration.inc +++ b/testautomation/framework/optional/includes/configuration.inc @@ -253,8 +253,8 @@ testcase tToolsOptionsAPIConfiguration case 07 : iJump = 0 ' Russian case 30 : iJump = 0 ' Greek case 31 : iJump = 0 ' Netherlands - case 33 : iJump = 0 ' French - case 34 : iJump = 0 ' Spanish + case 33 : iJump = 0 ' French + case 34 : iJump = 0 ' Spanish case 35 : iJump = 0 ' Finnish case 36 : iJump = 0 ' Hungaria case 37 : iJump = 0 ' Catalan @@ -263,20 +263,21 @@ testcase tToolsOptionsAPIConfiguration case 43 : iJump = 0 ' Slowak case 44 : iJump = 0 ' English (GB) case 45 : iJump = 0 ' Danish - case 46 : iJump = 0 ' Swedish + case 46 : iJump = 0 ' Swedish case 47 : iJump = 0 ' Norwegian case 48 : iJump = 0 ' Polish case 49 : iJump = 1 ' German case 51 : iJump = 0 ' Slowak - case 55 : iJump = 0 ' Portuguese (Brazil) - case 66 : iJump = 0 ' Thai + case 50 : iJump = 0 ' Slovenian + case 55 : iJump = 0 ' Portuguese (Brazil) + case 66 : iJump = 0 ' Thai case 81 : iJump = 0 ' Japanese ' disabled, because locale dependant! case 82 : iJump = 0 ' Korean ' disabled, because locale dependant! case 86 : iJump = 0 ' Chinese (simplified) ' disabled, because locale dependant! case 88 : iJump = 0 ' Chinese (traditional) ' disabled, because locale dependant! case 90 : iJump = 0 ' Turkish case 91 : iJump = 0 ' Hindi - case 96 : iJump = 0 ' Arab + case 96 : iJump = 0 ' Arab case 97 : iJump = 0 ' Hebrew case else : qaErrorlog "The work-dir can't changed to the internal office-work-dir! Please insert the language in this list!" iJump = 0 diff --git a/testautomation/framework/optional/input/vba-compat/Book1.xls b/testautomation/framework/optional/input/vba-compat/Book1.xls Binary files differnew file mode 100644 index 000000000000..425c2e0687b0 --- /dev/null +++ b/testautomation/framework/optional/input/vba-compat/Book1.xls diff --git a/testautomation/framework/required/includes/printer_administration.inc b/testautomation/framework/required/includes/printer_administration.inc index bc9838f6063d..a05ecc6b02a1 100644..100755 --- a/testautomation/framework/required/includes/printer_administration.inc +++ b/testautomation/framework/required/includes/printer_administration.inc @@ -103,8 +103,6 @@ testcase t_updt_spadmin warnlog( "SpAdmin is not open, the test cannot continue" ) goto endsub endif - - call TestFonts( CPRINTER ) ' wait for the spadmin to open, on failure we end the test brc = hWaitForSpAdmin() @@ -270,42 +268,4 @@ sub TestRename( cPrinter as string ) printlog( "" ) -end sub - -'******************************************************************************* - -sub TestFonts( cPrinter as string ) - - - printlog( " * Open 'Fonts...' dialog" ) - - Kontext "SpAdmin" - if ( PBFonts.isEnabled() ) then - PBFonts.click() - waitslot - - printlog( " * Test the font-dialog" ) - Kontext "SPFontNameDLG" - call dialogtest( SPFontNameDLG ) - - printlog( " * Press 'Add ...'" ) - PBAdd.click() - waitslot - - printlog( " * Test the import-dialog" ) - kontext "SPFontImportDLG" - call dialogtest( SPFontImportDLG ) - - printlog( " * close import dialog" ) - SPFontImportDLG.cancel() - - Kontext "SPFontNameDLG" - printlog( " * close fonts-dialog" ) - SPFontNameDLG.ok() - waitslot - else - printlog( "Fonts... not available, skipping." ) - endif - - -end sub +end sub
\ No newline at end of file diff --git a/testautomation/framework/tools/includes/CJK_tools.inc b/testautomation/framework/tools/includes/CJK_tools.inc index bea675f69bc3..e905b55bbebc 100644..100755 --- a/testautomation/framework/tools/includes/CJK_tools.inc +++ b/testautomation/framework/tools/includes/CJK_tools.inc @@ -211,6 +211,23 @@ function fGetCountryName( CountryID as Integer ) as String QAErrorLog "Now, the test does not support for the language " +iSprache fGetCountryName = "" end select + case 50 : ' Slovenian + select case CountryID + case 1: fGetCountryName = "angleški (ZDA)" + case 33: fGetCountryName = "francoski (Francija)" + case 34: fGetCountryName = "španski (Španija)" + case 39: fGetCountryName = "italijanski (Italija)" + case 46: fGetCountryName = "švedski (Švedska)" + case 49: fGetCountryName = "nemški (Nemčija)" + case 55: fGetCountryName = "portugalski (Brazilija)" + case 81: fGetCountryName = "japonski" + case 82: fGetCountryName = "korejski (RK)" + case 86: fGetCountryName = "kitajski (poenostavljeni)" + case 88: fGetCountryName = "kitajski (tradicionalni)" + case else : + QAErrorLog "Now, the test does not support for the language " +iSprache + fGetCountryName = "" + end select case 55 : ' Portuguese select case CountryID case 1: fGetCountryName = "Inglês (EUA)" diff --git a/testautomation/framework/tools/input/i18ndata.txt b/testautomation/framework/tools/input/i18ndata.txt index 5e10d47c33c9..f8b9f88410a9 100755 --- a/testautomation/framework/tools/input/i18ndata.txt +++ b/testautomation/framework/tools/input/i18ndata.txt @@ -15,6 +15,7 @@ 46=swedish 48=polish 49=german +50=slovenian 55=portuguese brazilian 81=japanese 82=korean @@ -36,6 +37,7 @@ 46=sv 48=pl 49=de +50=sl 55=pt-BR 81=ja 82=ko diff --git a/testautomation/global/input/macros.txt b/testautomation/global/input/macros.txt index ffe95be431e3..e0423fec3858 100755 --- a/testautomation/global/input/macros.txt +++ b/testautomation/global/input/macros.txt @@ -279,3 +279,48 @@ Sub Main ' Uncommenting this should result in an error "Invalid procedure call" oInstanceErr1 = oSingleton.get( 42 ) End Sub + +# ---------------------------------------------------------------------------- # + +[i106744-1] +sub main + msgbox test1() +end sub + +Function test1() As String + + Dim foo As String : foo = "astring" + + On Error Resume Next + test1 = "GOT ERROR" + If IsEmpty(foo) Then + test1 = "EMPTY" + Else + test1 = "NOT EMPTY" + End If + +End Function + +# ---------------------------------------------------------------------------- # + +[i106744-2] +option VBASupport 1 + +sub main + msgbox test1() +end sub + +Function test1() As String + + Dim foo As String : foo = "astring" + + On Error Resume Next + test1 = "GOT ERROR" + If IsEmpty(foo) Then + test1 = "EMPTY" + Else + test1 = "NOT EMPTY" + End If + +End Function + diff --git a/testautomation/global/input/officeinfo.txt b/testautomation/global/input/officeinfo.txt index dc334737d048..92b4e492740d 100644 --- a/testautomation/global/input/officeinfo.txt +++ b/testautomation/global/input/officeinfo.txt @@ -3,4 +3,5 @@ StarOffice=9 StarSuite=9 OpenOffice.org=3.1 BrOffice.org=3.1 +Oracle Open Office=3.2 diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc index 10831114d1e3..8a2807269152 100755 --- a/testautomation/global/system/includes/iniinfo.inc +++ b/testautomation/global/system/includes/iniinfo.inc @@ -120,12 +120,14 @@ sub GetIniInformation gOOoStartupTimeOut = fgetOOoStartupTimeOut() gOOoShutdownTimeOut = fgetOOoShutdownTimeOut() call sCheckValgrindStatus() + ' set a global path for custom scripts, like basepath, but outside of current environment gPrivateEnvironmentLocation = getIniValue(gTesttoolIni, "PrivateEnvironment", "Current") - sTemp = ConvertPath (gTestToolPath + gPrivateEnvironmentLocation + "inc/privateenvironment.inc") - if fileExists(sTemp) then - use sTemp - call getUseFilesPrivateEnvironment - else + if (gPrivateEnvironmentLocation <> "" AND gPrivateEnvironmentLocation <> ".") then + if NOT fileExists(gPrivateEnvironmentLocation) then + qaErrorLog "[PrivateEnvironment] defined in: '"+gTesttoolIni+"', but the path '"+gPrivateEnvironmentLocation+"'does not exist!" + else + gPrivateEnvironmentLocation = "" + end if gPrivateEnvironmentLocation = "" end if end sub @@ -334,6 +336,7 @@ sub GetLanguageInformation case "no_no", "no-no", "no" : iSprache = 47 ' Norwegian case "pl_pl", "pl-pl", "pl" : iSprache = 48 ' Polish case "de_de", "de-de", "de" : iSprache = 49 ' German + case "sl_si", "sl-si", "sl" : iSprache = 50 ' Slovenian case "sr_rs", "sr-rs", "sr" : iSprache = 51 ' Serbian (Cyrillic) case "sh_rs", "sh-rs", "sh" : iSprache = 52 ' Serbian (Latin) case "pt_br", "pt-br", "br" : iSprache = 55 ' Portuguese (Brazil) @@ -347,7 +350,6 @@ sub GetLanguageInformation case "hi_in", "hi-in", "hi" : iSprache = 91 ' Hindi case "ar_ar", "ar-ar", "ar" : iSprache = 96 ' Arabic case "he_he", "he-he", "he" : iSprache = 97 ' Hebrew - case "sl_si", "sl-si", "sl" : iSprache = 386 ' Slovenian case "zz_zz", "zz-zz", "zz" : iSprache = 01 ' unknown warnlog "iniinfo.inc::GetLanguageInformation()" warnlog "- sLanOutIni = " & sLanOutIni & " (unknown language)" @@ -397,7 +399,8 @@ function ConvertLanguage ( Sprache as String ) as Integer case "daenisch", "danish" : ConvertLanguage = 45 case "schwedisch", "swedish" : ConvertLanguage = 46 case "norwegian", "norwegisch" : ConvertLanguage = 47 - case "polnisch", "polish" : ConvertLanguage = 48 + case "polnisch", "polish" : ConvertLanguage = 48 + case "slovenian", "slovenisch" : ConvertLanguage = 50 case "serbisch kyrillisch", "serbian cyrillic" : ConvertLanguage = 51 case "serbisch latein", "serbian latin" : ConvertLanguage = 52 case "japanisch", "japanese" : ConvertLanguage = 81 @@ -408,7 +411,6 @@ function ConvertLanguage ( Sprache as String ) as Integer case "tuerkisch", "turkish" : ConvertLanguage = 90 case "arabisch", "arab" : ConvertLanguage = 96 case "catalan", "katalanisch" : ConvertLanguage = 99 - case "slovenian", "slovenisch" : ConvertLanguage = 386 end select end function @@ -436,6 +438,7 @@ function GetLanguageText ( iLan ) as String case 47 : GetLanguageText = "Norwegian" case 48 : GetLanguageText = "Polnish" case 49 : GetLanguageText = "German" + case 50 : GetlanguageText = "Slovenian" case 51 : GetlanguageText = "Serbian (Cyrillic)" case 52 : GetlanguageText = "Serbian (Latin)" case 55 : GetLanguageText = "Portuguese (Brazil)" @@ -450,7 +453,6 @@ function GetLanguageText ( iLan ) as String case 96 : GetLanguageText = "Arabic" case 97 : GetLanguageText = "Hebrew" case 99 : GetLanguageText = "Unknown" - case 386 : GetlanguageText = "Slovenian" case else : GetLanguageText = "detection failed" end select end function @@ -480,6 +482,7 @@ function ConvertLanguage2 ( sSprache as String, optional bExact ) as Integer case "no_no", "no-no", "no" : ConvertLanguage2 = 47 ' Norwegian case "pl_pl", "pl-pl", "pl" : ConvertLanguage2 = 48 ' Polish case "de_de", "de-de", "de" : ConvertLanguage2 = 49 ' German + case "sl_si", "sl-si", "sl" : ConvertLanguage2 = 50 ' Slovenian case "sr_rs", "sr_rs", "sr" : ConvertLanguage2 = 51 ' Serbian (Cyrillic) case "sh_rs", "sh_rs", "sh" : ConvertLanguage2 = 52 ' Serbian (Latin) case "pt_br", "pt-br", "br" : ConvertLanguage2 = 55 ' Portuguese (Brazil) @@ -493,7 +496,6 @@ function ConvertLanguage2 ( sSprache as String, optional bExact ) as Integer case "hi_in", "hi-in", "hi" : ConvertLanguage2 = 91 ' Hindi case "ar_ar", "ar-ar", "ar" : ConvertLanguage2 = 96 ' Arabic case "he_he", "he-he", "he" : ConvertLanguage2 = 97 ' Hebrew - case "sl_si", "sl-si", "sl" : ConvertLanguage2 = 386 case "zz_zz", "zz-zz", "zz" : ConvertLanguage2 = 01 ' unknown case else : if isMissing (bExact) then printlog "iniinfo.inc::ConvertLanguage2(): Unknown systemlanguage '" & sSprache & "'!" @@ -535,6 +537,7 @@ function ConvertCodeToLanguage ( sSprache as String ) as Integer case "2047" : ConvertCodeToLanguage = 47 ' Norwegian case "1045" : ConvertCodeToLanguage = 48 ' Polish case "1031" : ConvertCodeToLanguage = 49 ' German + case "1060" : ConvertCodeToLanguage = 50 ' Slovenian case " " : ConvertCodeToLanguage = 55 ' Portuguese (Brazil) case "3098" : ConvertCodeToLanguage = 51 ' Serbian (Cyriliic) case "2074" : ConvertCodeToLanguage = 52 ' Serbian (Latin) @@ -548,7 +551,6 @@ function ConvertCodeToLanguage ( sSprache as String ) as Integer ' case " " : ConvertCodeToLanguage = 91 ' Hindi case "1025" : ConvertCodeToLanguage = 96 ' Arabic ' case " " : ConvertCodeToLanguage = 97 ' Hebrew - case "1060" : ConvertCodeToLanguage = 386 ' Slovenian case else : printlog "iniinfo.inc::ConvertCodeToLanguage(): Num. Code could not be detect or is unknown and will be set to 01 (English (USA))!" ConvertCodeToLanguage = 01 end select diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc index d349c3737d91..9e693eea445e 100755 --- a/testautomation/global/system/includes/master.inc +++ b/testautomation/global/system/includes/master.inc @@ -102,35 +102,6 @@ sub GetUseFiles gTestToolPath = gRemotePath end if -'/// Load private environment dependant settings -'/// BaseDirectory is the setting from the TestTool application at Extra->Settings->Profile->Base directory -'/// This path is available in the global variable: gTestToolPath -'/// The private environment location directory is taken from the file BaseDirectory+errorlog/privateenvironment.txt -'/// The default file is taken from cvs: qa/qatesttool/errorlog/privateenvironment.txt -'/// The default content is: -'/// >[PrivateEnvironment] -'/// >Current=global/private/ -'/// The path is defined relative to BaseDirectory and put into the global variable: gPrivateEnvironmentLocation -'/// At the resulting path of BaseDirectory + gPrivateEnvironmentLocation + 'inc/' there has to exist the file: privateenvironment.inc -'/// with at least the sub: getUseFilesPrivateEnvironment which will get executed - - if (gPrivateEnvironmentLocation = "") then - sPrivateEnvironmentLocation = ConvertPath (gTestToolPath + "errorlog\privateenvironment.txt") - if fileExists(sPrivateEnvironmentLocation) then - gPrivateEnvironmentLocation = getIniValue(sPrivateEnvironmentLocation, "PrivateEnvironment", "Current") - ' TODO: remove trailing path character - else - gPrivateEnvironmentLocation = "global/private/" - end if - sTemp = ConvertPath (gTestToolPath + gPrivateEnvironmentLocation + "inc/privateenvironment.inc") - if fileExists(sTemp) then - use sTemp - call getUseFilesPrivateEnvironment - else - 'qaErrorLog "Private Environment Control File Location specified in '" + sPrivateEnvironmentLocation + "', but the file doesn't exist: '" +sTemp+ "'" - end if - end if - ' Check if environment works with this OOo version '/// Control the behaviour of the environment via the file qa/qatesttool/global/version.txt: '/// [EnvironmentVersion] diff --git a/testautomation/global/system/includes/status.inc b/testautomation/global/system/includes/status.inc index 49d3a836043a..bf1ba6a74416 100644..100755 --- a/testautomation/global/system/includes/status.inc +++ b/testautomation/global/system/includes/status.inc @@ -271,8 +271,7 @@ sub hStatusWriteOutputFirstFile () sPlat = "win" end if - slVersion() = Split(gProductName, " ") '(15) - sProduct = slVersion(0) + sProduct = gProductName '(15) ' major is from start to 'm' iPosA = 1 diff --git a/testautomation/global/tools/includes/optional/t_locale_strings1.inc b/testautomation/global/tools/includes/optional/t_locale_strings1.inc index 12bc913d3bf4..d3e7708dbd30 100644..100755 --- a/testautomation/global/tools/includes/optional/t_locale_strings1.inc +++ b/testautomation/global/tools/includes/optional/t_locale_strings1.inc @@ -371,7 +371,33 @@ function fLocaleString (sReturn as string) as string sLocaleNumFormLanEng = "Englisch (USA)" sLocaleNumFormLanLith = "Litauisch" sLocaleNumFormLanDutch = "Niederländisch (Niederlande)" - + + case 50 : sLocaleTableHeading = "Glava tabele" ' Slovenian + sLocaleTableContents = "Vsebina tabele" + sLocaleNumber = "Število" + sLocaleText = "Besedilo" + sLocaleCurrency = "Valuta" + sLocaleDate = "Datum" + sLocaleTime = "Čas" + sLocalePercent = "Odstotek" + sLocaleScientific = "Znanstveno" + sLocaleFraction = "Ulomek" + sLocaleBoolean = "Dvojiška vrednost" + sLocaleTable = "Tabela" + sLocaleCurrencyValue = "10,00 €" + sLocaleDateValue = "31.03.06" + sLocaleDateOutput = "31.03.06" + sLocaleTimeInput = "15:42" + sLocaleTimeValue = "15:42:00" + slocalePercentValue = "14,00%" + sLocaleScientificValue = "1,00E+008" + sLocaleBooleanValue = "TRUE" + sLocaleLocaleSettings = "angleški (ZDA)" + sLocaleScriptType = "Zahodni" + sLocaleNumFormLanEng = "angleški (ZDA)" + sLocaleNumFormLanLith = "litovski" + sLocaleNumFormLanDutch = "nizozemski (Nizozemska)" + case 55 : sLocaleTableHeading = "Título da tabela" ' Brazil (Portuguese) sLocaleTableContents = "Conteudo da table" sLocaleNumber = "Número" diff --git a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc index 674ddd7e65e2..0bd7ae50525f 100644..100755 --- a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc +++ b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc @@ -93,6 +93,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "3D-Settings" case 46 : fGetToolbarName = "3D-Settings" case 49 : fGetToolbarName = "3D-Einstellungen" + case 50 : fGetToolbarName = "Nastavitve 3D" case 55 : fGetToolbarName = "3D-Settings" case 81 : fGetToolbarName = "3D-Settings" case 82 : fGetToolbarName = "3D-Settings" @@ -110,6 +111,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Align" case 46 : fGetToolbarName = "Align" case 49 : fGetToolbarName = "Ausrichten" + case 50 : fGetToolbarName = "Poravnava" case 55 : fGetToolbarName = "Align" case 81 : fGetToolbarName = "Align" case 82 : fGetToolbarName = "Align" @@ -127,6 +129,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Basic Shapes" case 46 : fGetToolbarName = "Basic Shapes" case 49 : fGetToolbarName = "Standardformen" + case 50 : fGetToolbarName = "Osnovni liki" case 55 : fGetToolbarName = "Basic Shapes" case 81 : fGetToolbarName = "Basic Shapes" case 82 : fGetToolbarName = "Basic Shapes" @@ -144,6 +147,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Block Arrows" case 46 : fGetToolbarName = "Block Arrows" case 49 : fGetToolbarName = "Blockpfeile" + case 50 : fGetToolbarName = "Votle puščice" case 55 : fGetToolbarName = "Block Arrows" case 81 : fGetToolbarName = "Block Arrows" case 82 : fGetToolbarName = "Block Arrows" @@ -161,6 +165,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Bullets and Numbering" case 46 : fGetToolbarName = "Bullets and Numbering" case 49 : fGetToolbarName = "Nummerierung und Aufzählungszeichen" + case 50 : fGetToolbarName = "Oznake in oštevilčevanje" case 55 : fGetToolbarName = "Bullets and Numbering" case 81 : fGetToolbarName = "Bullets and Numbering" case 82 : fGetToolbarName = "Bullets and Numbering" @@ -178,6 +183,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Database Form Design" case 46 : fGetToolbarName = "Database Form Design" case 49 : fGetToolbarName = "Datenbank Formularentwurf" + case 50 : fGetToolbarName = "Oblikovanje obrazca zbirke podatkov" case 55 : fGetToolbarName = "Database Form Design" case 81 : fGetToolbarName = "Database Form Design" case 82 : fGetToolbarName = "Database Form Design" @@ -195,6 +201,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Drawing" case 46 : fGetToolbarName = "Drawing" case 49 : fGetToolbarName = "Zeichnen" + case 50 : fGetToolbarName = "Risba" case 55 : fGetToolbarName = "Drawing" case 81 : fGetToolbarName = "Drawing" case 82 : fGetToolbarName = "Drawing" @@ -212,6 +219,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Drawing Object Properties" case 46 : fGetToolbarName = "Drawing Object Properties" case 49 : fGetToolbarName = "Zeichnungsobjekt-Eigenschaften" + case 50 : fGetToolbarName = "Lastnosti risanega predmeta" case 55 : fGetToolbarName = "Drawing Object Properties" case 81 : fGetToolbarName = "Drawing Object Properties" case 82 : fGetToolbarName = "Drawing Object Properties" @@ -229,6 +237,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Form Design" case 46 : fGetToolbarName = "Form Design" case 49 : fGetToolbarName = "Formular Entwurf" + case 50 : fGetToolbarName = "Oblikovanje obrazca" case 55 : fGetToolbarName = "Form Design" case 81 : fGetToolbarName = "Form Design" case 82 : fGetToolbarName = "Form Design" @@ -246,6 +255,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Formatting" case 46 : fGetToolbarName = "Formatting" case 49 : fGetToolbarName = "Format" + case 50 : fGetToolbarName = "Oblikovanje" case 55 : fGetToolbarName = "Formatting" case 81 : fGetToolbarName = "Formatting" case 82 : fGetToolbarName = "Formatting" @@ -263,6 +273,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Frame" case 46 : fGetToolbarName = "Frame" case 49 : fGetToolbarName = "Rahmen" + case 50 : fGetToolbarName = "Okvir" case 55 : fGetToolbarName = "Frame" case 81 : fGetToolbarName = "Frame" case 82 : fGetToolbarName = "Frame" @@ -280,6 +291,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Insert" case 46 : fGetToolbarName = "Insert" case 49 : fGetToolbarName = "Einfügen" + case 50 : fGetToolbarName = "Vstavi" case 55 : fGetToolbarName = "Insert" case 81 : fGetToolbarName = "Insert" case 82 : fGetToolbarName = "Insert" @@ -297,6 +309,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "OLE-Object" case 46 : fGetToolbarName = "OLE-Object" case 49 : fGetToolbarName = "OLE Objekt" + case 50 : fGetToolbarName = "Predmet OLE" case 55 : fGetToolbarName = "OLE-Object" case 81 : fGetToolbarName = "OLE-Object" case 82 : fGetToolbarName = "OLE-Object" @@ -314,6 +327,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Standard" case 46 : fGetToolbarName = "Standard" case 49 : fGetToolbarName = "Standard" + case 50 : fGetToolbarName = "Standardno" case 55 : fGetToolbarName = "Standard" case 81 : fGetToolbarName = "Standard" case 82 : fGetToolbarName = "Standard" @@ -331,6 +345,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Table" case 46 : fGetToolbarName = "Table" case 49 : fGetToolbarName = "Tabelle" + case 50 : fGetToolbarName = "Tabela" case 55 : fGetToolbarName = "Table" case 81 : fGetToolbarName = "Table" case 82 : fGetToolbarName = "Table" @@ -348,6 +363,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "Text Object" case 46 : fGetToolbarName = "Text Object" case 49 : fGetToolbarName = "Textobjekt" + case 50 : fGetToolbarName = "Besedilni predmet" case 55 : fGetToolbarName = "Text Object" case 81 : fGetToolbarName = "Text Object" case 82 : fGetToolbarName = "Text Object" @@ -365,6 +381,7 @@ function fGetToolbarName(sToolbar) as String case 39 : fGetToolbarName = "XML Form Design" case 46 : fGetToolbarName = "XML Form Design" case 49 : fGetToolbarName = "XML Formularentwurf" + case 50 : fGetToolbarName = "Oblikovanje obrazca XML" case 55 : fGetToolbarName = "XML Form Design" case 81 : fGetToolbarName = "XML Form Design" case 82 : fGetToolbarName = "XML Form Design" diff --git a/testautomation/global/tools/includes/required/t_doc2.inc b/testautomation/global/tools/includes/required/t_doc2.inc index fc5efb302231..efd2d2799a0e 100644..100755 --- a/testautomation/global/tools/includes/required/t_doc2.inc +++ b/testautomation/global/tools/includes/required/t_doc2.inc @@ -121,6 +121,7 @@ function sMakeReadOnlyDocumentEditable() as boolean ' no action was required (that is: Document was not read-only) dim iTry as integer + dim iWait as integer dim rc as integer const CFN = "sMakeReadOnlyDocumentEditable::" @@ -143,8 +144,27 @@ function sMakeReadOnlyDocumentEditable() as boolean wait( 1000 ) endif ' ========== Workaround end ========== - Kontext "Standardbar" + iWait = 0 + Do + if ( Bearbeiten.IsEnabled() ) then + try + if Bearbeiten.getState( 2 ) = 0 then + exit do + endif + catch + if ( VERBOSE ) then printlog "Attempt " & iWait & " to make document readable failed" + iWait = iWait + 1 + wait ( 1000 ) + endcatch + else + if ( VERBOSE ) then printlog "Attempt " & iWait & " to make document readable failed" + iWait = iWait + 1 + wait ( 1000 ) + end if + if iWait >= 5 then exit do + Loop + if ( Bearbeiten.IsEnabled() ) then if ( Bearbeiten.getState( 2 ) = 0 ) then diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index d91003bdddd6..0e2fd251d285 100755 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -316,7 +316,7 @@ ReplaceWith svx:ComboBox:RID_SVXDLG_SEARCH:ED_REPLACE ReplaceWithStyle svx:ListBox:RID_SVXDLG_SEARCH:LB_REPLACE SearchNow svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH SearchAll svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL -Replace svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE +ReplaceBtn svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE ReplaceAll svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE_ALL MatchCase svx:CheckBox:RID_SVXDLG_SEARCH:CB_MATCH_CASE WholeWordsOnly svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS @@ -454,7 +454,7 @@ HanjaOnly cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY ReplaceByCharacter cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER Ignore HID_HANGULDLG_BUTTON_IGNORE AlwaysIgnore HID_HANGULDLG_BUTTON_IGNOREALL -Replace HID_HANGULDLG_BUTTON_CHANGE +ReplaceBtn HID_HANGULDLG_BUTTON_CHANGE AlwaysReplace HID_HANGULDLG_BUTTON_CHANGEALL Options HID_HANGULDLG_BUTTON_OPTIONS Grid HID_HANGULDLG_SUGGESTIONS_GRID @@ -485,4 +485,4 @@ DeleteEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE Automatic sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_AUTOMATIC Custom sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_CUSTOM CustomLanguage sc:ListBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:LB_CUSTOM_LANG -DetectSpecialNumbers sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE
\ No newline at end of file +DetectSpecialNumbers sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE diff --git a/testautomation/global/win/spadmin.win b/testautomation/global/win/spadmin.win index 056a2605ecc9..1e8de27e9b15 100755 --- a/testautomation/global/win/spadmin.win +++ b/testautomation/global/win/spadmin.win @@ -67,7 +67,6 @@ PBDefault padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD PBRemove padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL PBTestpage padmin:PushButton:RID_PADIALOG:RID_PA_TESTPAGE PBNewPrinter padmin:PushButton:RID_PADIALOG:RID_PA_BTN_ADD -PBFonts padmin:PushButton:RID_PADIALOG:RID_PA_BTN_FONTS *TabSPACommand padmin:TabPage:RID_RTS_COMMANDPAGE EFlpr padmin:ComboBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_COMMANDS diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc index b0a0326a6f3f..74fa830a9b11 100644..100755 --- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc +++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc @@ -137,7 +137,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) ExtensionString = "odg" end if - if iSprache = "1" OR iSprache = "33" OR iSprache = "34" OR iSprache = "36" OR iSprache = "39" OR iSprache = "46" OR iSprache = "48" OR iSprache = "49" OR iSprache = "55" then + if iSprache = "1" OR iSprache = "33" OR iSprache = "34" OR iSprache = "36" OR iSprache = "39" OR iSprache = "46" OR iSprache = "48" OR iSprache = "49" OR iSprache = "50" OR iSprache = "55" then sFileName = (ConvertPath ( gTesttoolPath + "graphics\required\input\rightfont" & iSprache & "." + ExtensionString )) elseif bAsianLan = true then Printlog "Language-file for Asian language " & iSprache & " is missing. Using standard instead." @@ -179,6 +179,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) case 46 : Vorn$ = Chr(8217) : Hinten$ = Chr(8217) case 48 : Vorn$ = Chr(8216) : Hinten$ = Chr(8217) case 49 : Vorn$ = Chr(8218) : Hinten$ = Chr(8216) + case 50 : Vorn$ = Chr(8216) : Hinten$ = Chr(8217) case 55 : Vorn$ = Chr(8216) : Hinten$ = Chr(8217) case 81, 82, 86, 88 : Vorn$ = Chr(8216) : Hinten$ = Chr(8217) ' Asian case else : Warnlog "- Nothing prepared for this language, but I run: take the warnlogs an insert the numbers here.: "+iSprache @@ -202,6 +203,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) case 46 : Vorn$ = Chr(8221) : Hinten$ = Chr(8221) case 48 : Vorn$ = Chr(8222) : Hinten$ = Chr(8221) case 49 : Vorn$ = Chr(8222) : Hinten$ = Chr(8220) + case 50 : Vorn$ = Chr(8220) : Hinten$ = Chr(8221) case 55 : Vorn$ = Chr(8220) : Hinten$ = Chr(8221) case 81, 82, 86, 88 : Vorn$ = Chr(8220) : Hinten$ = Chr(8221) ' Asian case else : Warnlog "- Nothing prepared for this language: "+iSprache diff --git a/testautomation/graphics/optional/includes/global/g_find_replace.inc b/testautomation/graphics/optional/includes/global/g_find_replace.inc index 8dbff683eb83..f49de3b03d35 100644..100755 --- a/testautomation/graphics/optional/includes/global/g_find_replace.inc +++ b/testautomation/graphics/optional/includes/global/g_find_replace.inc @@ -69,6 +69,7 @@ testcase tiEditSearchAndReplace case 47 : ' Norwegian case 48 : sExpression(1) = "programmu" : sExpression(2) = "programu" ' Polish case 49 : sExpression(1) = "Texxt" : sExpression(2) = "Schrieb" ' German + case 50 : sExpression(1) = "primer" : sExpression(2) = "napakka" ' Slovenian case 55 : sExpression(1) = "esktava" : sExpression(2) = "norte" ' Portuguese (Brazil) case 66 : ' Thai ' case 81 : sExpression(1) = "���" : sExpression(2) = "���" ' Japanese @@ -204,7 +205,7 @@ testcase tiEditSearchAndReplace SearchFor.SetText sExpression(2) '/// Search for word 2 ///' ReplaceWith.SetText sExpression(1) '/// Replace with word 1 ///' - Replace.Click '/// Replace 1 ///' + ReplaceBtn.Click '/// Replace 1 ///' Kontext "Messagebox" if Messagebox.Exists(4) Then Kontext "Messagebox" diff --git a/testautomation/graphics/optional/includes/global/g_ole.inc b/testautomation/graphics/optional/includes/global/g_ole.inc index 520aa38af8a2..9689771df8a3 100644..100755 --- a/testautomation/graphics/optional/includes/global/g_ole.inc +++ b/testautomation/graphics/optional/includes/global/g_ole.inc @@ -341,7 +341,7 @@ testcase tiOpenOLECrash FileOpen sleep 1 Kontext "OeffnenDlg" - printlog " Use file: graphics\\optional\\input\\generic_de.ppt " + printlog " Use file: graphics\optional\input\generic_de.ppt " oFile = ConvertPath (gTesttoolPath + "graphics\required\input\generic_de.ppt") Printlog "file: '" + oFile + "'" Dateiname.SetText (oFile) @@ -425,7 +425,7 @@ testcase tiOpenOLECrash printlog "8. Choose OpenOffice.org 2.0 Formular" Kontext "OLEObjektInsert" - Objekttyp.Select (3) + Objekttyp.Select (4) sleep (2) PrintLog " Object: " + Objekttyp.GetSelText + " will be inserted." printlog "Leave dialog 'Insert OLE Object' with OK" diff --git a/testautomation/graphics/optional/includes/global/g_stylist.inc b/testautomation/graphics/optional/includes/global/g_stylist.inc index f82a61b608e6..dc8663425e87 100644..100755 --- a/testautomation/graphics/optional/includes/global/g_stylist.inc +++ b/testautomation/graphics/optional/includes/global/g_stylist.inc @@ -57,7 +57,11 @@ testcase tFormatStylistFlyer if Gestalter.NotExists = false Then qaErrorLog " - Expected Stylist to be closed; But is Open. Check tests." else - hTypekeys "<F11>" '/// open stylist by pressing key [F11] ///' + if lcase(gPlatform) = "osx" then + hTypekeys "<mod1 t>" + else + hTypekeys "<F11>" '/// open stylist by pressing key [F11] ///' + end if sleep 1 end if Kontext "Gestalter" @@ -200,7 +204,11 @@ testcase tFormatStylistDocuments printlog " - Close stylist using F11" Gestalter.Undock Sleep 1 - hTypeKeys "<F11>" + if lcase(gPlatform) = "osx" then + hTypekeys "<mod1 t>" + else + hTypeKeys "<F11>" + end if Kontext "Gestalter" if Gestalter.exists then warnlog " Stylist still exists - closing again" @@ -661,7 +669,11 @@ testcase tiFormatStylist TabOptionenNumerierung.Cancel sleep 1 endif - hTypeKeys "<F11>" + if lcase(gPlatform) = "osx" then + hTypekeys "<mod1 t>" + else + hTypeKeys "<F11>" + end if sleep 1 Kontext "Gestalter" if Gestalter.Exists Then Warnlog "- Stylist could not be closed pressing F11" @@ -866,7 +878,11 @@ testcase tFormatStylist if (Stylist.NotExists) then ErrorLog "There is no stylist open, should be." else - hTypekeys "<F11>" + if lcase(gPlatform) = "osx" then + hTypekeys "<mod1 t>" + else + hTypekeys "<F11>" + end if Kontext "Stylist" if (Stylist.Exists) then ErrorLog "The Stylist should be closed now." diff --git a/testautomation/graphics/optional/includes/global/gallery.inc b/testautomation/graphics/optional/includes/global/gallery.inc index c1f8e741cd44..8398395c3653 100644..100755 --- a/testautomation/graphics/optional/includes/global/gallery.inc +++ b/testautomation/graphics/optional/includes/global/gallery.inc @@ -469,6 +469,7 @@ testcase tGallery_GalleryView_Preview case 46 : jpeg_bkg = 2 : iAnimation = 1 : iSound = 17 case 48 : jpeg_bkg = 2 : iAnimation = 1 : iSound = 17 case 49 : jpeg_bkg = 12 : iAnimation = 1 : iSound = 16 + case 50 : jpeg_bkg = 12 : iAnimation = 1 : iSound = 16 case 55 : jpeg_bkg = 21 : iAnimation = 1 : iSound = 28 case 81 : jpeg_bkg = 21 : iAnimation = 1 : iSound = 10 'FHA TODO: Find out the right numbers for Asian languages. case 82 : jpeg_bkg = 1 : iAnimation = 17 : iSound = 12 @@ -489,6 +490,7 @@ testcase tGallery_GalleryView_Preview case 46 : jpeg_bkg = 2 : iAnimation = 5 : iSound = 2 case 48 : jpeg_bkg = 2 : iAnimation = 5 : iSound = 2 case 49 : jpeg_bkg = 2 : iAnimation = 5 : iSound = 2 + case 50 : jpeg_bkg = 2 : iAnimation = 5 : iSound = 2 case 55 : jpeg_bkg = 2 : iAnimation = 5 : iSound = 2 case 81 : jpeg_bkg = 2 : iAnimation = 5 : iSound = 2 'FHA TODO: Find out the right numbers for Asian languages. case 82 : jpeg_bkg = 1 : iAnimation = 5 : iSound = 2 @@ -651,6 +653,7 @@ testcase tGallery_GalleryView_Insert case 46 : jpeg_bkg = 1 : iAnimation = 2 case 48 : jpeg_bkg = 3 : iAnimation = 1 case 49 : jpeg_bkg = 1 : iAnimation = 2 + case 50 : jpeg_bkg = 1 : iAnimation = 2 case 55 : jpeg_bkg = 8 : iAnimation = 1 case 81 : jpeg_bkg = 1 : iAnimation = 3 case 82 : jpeg_bkg = 1 : iAnimation = 17 @@ -671,6 +674,7 @@ testcase tGallery_GalleryView_Insert case 46 : jpeg_bkg = 1 : iAnimation = 2 case 48 : jpeg_bkg = 3 : iAnimation = 1 case 49 : jpeg_bkg = 1 : iAnimation = 2 + case 50 : jpeg_bkg = 1 : iAnimation = 2 case 55 : jpeg_bkg = 6 : iAnimation = 1 case 81 : jpeg_bkg = 1 : iAnimation = 3 case 82 : jpeg_bkg = 1 : iAnimation = 1 @@ -859,6 +863,7 @@ testcase tGallery_GalleryView_Delete case 39 : jpeg_bkg = 10 : iAnimation = 1 : iSound = 27 case 46 : jpeg_bkg = 1 : iAnimation = 2 : iSound = 18 case 49 : jpeg_bkg = 1 : iAnimation = 2 : iSound = 17 + case 50 : jpeg_bkg = 1 : iAnimation = 2 : iSound = 17 case 55 : jpeg_bkg = 8 : iAnimation = 1 : iSound = 30 case 81 : jpeg_bkg = 1 : iAnimation = 3 : iSound = 10 case 82 : jpeg_bkg = 1 : iAnimation = 17 : iSound = 12 diff --git a/testautomation/graphics/optional/includes/global/id_005.inc b/testautomation/graphics/optional/includes/global/id_005.inc index 2de7907852f1..0741bc82c8a9 100644..100755 --- a/testautomation/graphics/optional/includes/global/id_005.inc +++ b/testautomation/graphics/optional/includes/global/id_005.inc @@ -723,7 +723,11 @@ testcase tiFormatStylesAndFormatting if (Stylist.NotExists) then ErrorLog "There was no Stylist open, should be." else - hTypekeys "<F11>" + if lcase(gPlatform) = "osx" then + hTypekeys "<mod1 t>" + else + hTypekeys "<F11>" + endif Kontext "Stylist" if (Stylist.Exists) then ErrorLog "The Stylist should be closed now." diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow.inc b/testautomation/graphics/optional/includes/impress/i_slideshow.inc index 9a8118b0cc54..3a2b56fa5511 100644..100755 --- a/testautomation/graphics/optional/includes/impress/i_slideshow.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow.inc @@ -970,7 +970,11 @@ testcase tSlideShowSlideTransition WaitSlot (3000) try '/// type key [F11] to open the stylist (to check ending of presenation) ///' - hTypeKeys "<F11>" + if lcase(gPlatform) = "osx" then + hTypekeys "<mod1 t>" + else + hTypeKeys "<F11>" + endif Sleep (3) Kontext "Gestalter" Sleep (3) diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc index 9272fda4c2a7..d161ab4f9de2 100644..100755 --- a/testautomation/graphics/optional/includes/impress/i_us_present.inc +++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc @@ -40,18 +40,15 @@ '\******************************************************************** testcase i_us_presentation1 - dim iPictures as integer - dim PresentationFile1 as string - PresentationFile1 = ConvertPath ((ConvertPath (gOfficePath + "user\work\PowerPes1.odp"))) - Call hNewDocument '/// New impress document ///' + dim iPictures as integer + dim PresentationFile1 as string + PresentationFile1 = ConvertPath ((ConvertPath (gOfficePath + "user\work\PowerPes1.odp"))) + printlog "New impress document" + Call hNewDocument WaitSlot (2000) kontext "DocumentImpress" - '/// 1. ViewMaster: 2nd master - Background: picture (Gallery) ///' - '/// - 50% Transparency ///' - '/// - Mosaic 16px x 16px ///' - '/// - Close Master ///' - '/// Add second Master-Page ///' + printlog "Add second Master-Page" ViewMasterPage kontext "Slides" SlidesControl.OpenContextMenu(true) @@ -60,7 +57,7 @@ testcase i_us_presentation1 sleep (1) printlog " Inserted second Master-Slide" - '/// - Background: picture (Gallery) ///' + printlog "Background: picture (Gallery)" Kontext "Gallery" if Gallery.Exists(2) then warnlog " The Gallery was already visible. Check earlier ran tests for inconsistency." @@ -103,13 +100,14 @@ testcase i_us_presentation1 Gallerys.Select (iPictures) View.TypeKeys "<HOME><RIGHT><RIGHT>" - View.TypeKeys "<SHIFT F10>" 'OpenContextMenu(true) + printlog "'OpenContextMenu" + View.TypeKeys "<SHIFT F10>" sleep (2) MenuSelect(MenuGetItemID(1)) 'Insert sleep (2) MenuSelect(MenuGetItemID(1)) 'Copy sleep (2) - '/// Check that we really got a copy of the object ///' + printlog "Check that we really got a copy of the object " kontext "DocumentImpress" DocumentImpress.OpenContextMenu(true) sleep (2) @@ -128,13 +126,13 @@ testcase i_us_presentation1 ViewToolbarsPicture end if - '/// - 50% Transparency ///' + printlog "50% Transparency" WaitSlot (2000) kontext "GraphicObjectbar" ' the one with Transparency Transparenz.SetText "50" sleep (1) - '/// - Mosaic 16px x 16px ///' + printlog "Mosaic 16px x 16px" Filter.TearOff sleep (1) kontext "GraphicFilterBar" @@ -153,7 +151,6 @@ testcase i_us_presentation1 kontext "DocumentImpress" gMouseClick 50,50 sleep (1) -' DocumentImpress.TypeKeys "<TAB>", 6 FormatPositionAndSize WaitSlot (1000) kontext @@ -164,23 +161,22 @@ testcase i_us_presentation1 SizePosition.TypeKeys "<RIGHT><DOWN>" TabPositionAndSize.OK - '/// - Close Master ///' + printlog "Close Master" ViewNormal WaitSlot (1000) - '/// Save Document ///' + printlog "Save Document" call hFileSaveAsKill (PresentationFile1) printlog "OK saved at ", PresentationFile1 WaitSlot (1000) ActiveDeactivateCTLSupport (FALSE) WaitSlot (2000) - '/// Close Document ///' + printlog "Close Document" Call hCloseDocument -endcase - -'00oo...//==---...---...---...---....---...---...---...---...---...---...--..--.--.-.-.-.-....---.... +endcase 'i_us_presentation1 +'------------------------------------------------------------------------------- testcase i_us_presentation2 dim PresentationFile1 as string dim PresentationFile2 as string @@ -192,12 +188,12 @@ testcase i_us_presentation2 WaitSlot (10000) else warnlog " This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester." - '/// New impress document ///' + printlog "New impress document" Call hNewDocument WaitSlot (2000) end if - '/// New Slide ///' + printlog "New Slide" kontext "slides" SlidesControl.TypeKeys "<PAGEDOWN>" SlidesControl.TypeKeys "<PAGEDOWN>" @@ -208,21 +204,23 @@ testcase i_us_presentation2 MenuSelect(MenuGetItemID(1)) 'New Slide 'No 2 printlog " Inserted second normal Slide" - '/// 2. Layouts: Text. Bild: Gallery: Animation - Gif ///' + printlog "2. Layouts: Text. Bild: Gallery: Animation - Gif" Kontext "Tasks" - LayoutsPreview.TypeKeys "<HOME>" 'to get to the very first position - LayoutsPreview.TypeKeys "<RIGHT>", 9 'to get to the right position + printlog "to get to the very first position" + LayoutsPreview.TypeKeys "<HOME>" + printlog "'to get to the right position" + LayoutsPreview.TypeKeys "<RIGHT>", 9 LayoutsPreview.TypeKeys "<RETURN>" Sleep (1) ViewNormal - '/// 3. Hide Slidepane (Oops! The user were too fast: accidently hide the pane) ///' + printlog "3. Hide Slidepane (Oops! The user were too fast: accidently hide the pane)" kontext "Slides" SlidesControl.FadeOut WaitSlot (1000) - '/// 4. Restore Pane. ///' + printlog "4. Restore Pane." SlidesControl.FadeIn printlog " Did the 'mistake' to FadeIn/Out the Slidepane" @@ -233,7 +231,7 @@ testcase i_us_presentation2 DocumentImpress.TypeKeys "<RETURN>" sleep (1) - '/// Graphics-Import-dialogue. Select "i_us_large.jpg" ///' + printlog "Graphics-Import-dialogue. Select i_us_large.jpg" Kontext "GrafikEinfuegenDlg" sleep (2) Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\i_us_large.jpg") @@ -242,11 +240,11 @@ testcase i_us_presentation2 WaitSlot (1000) Kontext "DocumentImpress" - '/// Deselect graphic ///' + printlog "Deselect graphic" DocumentImpress.MouseDoubleClick 90,90 printlog " Inserted Graphic into the second Slide" - '/// Change text on the two text-boxes ///' + printlog "Change text on the two text-boxes" DocumentImpress.TypeKeys "<TAB>" 'First text. DocumentImpress.TypeKeys "<RETURN>" 'To get into edit-mode. DocumentImpress.TypeKeys "The World has just become a bit easier" @@ -264,19 +262,18 @@ testcase i_us_presentation2 DocumentImpress.TypeKeys "Energy-efficient" DocumentImpress.TypeKeys "<ESCAPE><ESCAPE>" - '/// Save Document ///' + printlog "Save Document" call hFileSaveAsKill (PresentationFile2) printlog "OK saved at ", PresentationFile1 sleep (1) ActiveDeactivateCTLSupport (FALSE) sleep (2) - '/// Close Document ///' + printlog "Close Document" Call hCloseDocument endcase 'i_us_presentation2 -'00oo...//==---...---...---...---....---...---...---...---...---...---...--..--.--.-.-.-.-....---.... - +'------------------------------------------------------------------------------- testcase i_us_presentation3 dim PresentationFile2 as string dim PresentationFile3 as string @@ -288,12 +285,12 @@ testcase i_us_presentation3 WaitSlot (10000) else warnlog " This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester." - '/// New impress document ///' + printlog "New impress document" Call hNewDocument WaitSlot (2000) end if - '/// Insert New Slide ///' + printlog "Insert New Slide" kontext "slides" SlidesControl.TypeKeys "<PAGEDOWN>" SlidesControl.TypeKeys "<PAGEDOWN>" @@ -302,7 +299,7 @@ testcase i_us_presentation3 kontext "DocumentImpress" InsertSlide 'No 3 - '/// 5. Layout. Clip/Text ///' + printlog "5. Layout. Clip/Text" kontext "Tasks" LayoutsPreview.TypeKeys "<HOME>" 'to get to the very first position LayoutsPreview.TypeKeys "<RIGHT>", 4 'to get to the right position @@ -316,8 +313,9 @@ testcase i_us_presentation3 DocumentImpress.TypeKeys "<TAB><RETURN>" DocumentImpress.TypeKeys "A new form" - '/// 6. (Fat picture) InsertPictureFromFile: (empty slide) (ev size-fit) ///' - InsertGraphicsFromFile '/// insert graphic file (i_us_large.jpg) ///' + printlog "6. (Fat picture) InsertPictureFromFile: (empty slide) (ev size-fit)" + printlog "insert graphic file (i_us_large.jpg)" + InsertGraphicsFromFile WaitSlot (1000) Kontext "GrafikEinfuegenDlg" Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\i_us_large.jpg") @@ -326,29 +324,28 @@ testcase i_us_presentation3 WaitSlot (2000) Kontext "DocumentImpress" - '/// The user corrects the picture ///' + printlog "The user corrects the picture" DocumentImpress.MouseDown 50,50 DocumentImpress.MouseUp 50,50 DocumentImpress.TypeKeys "<DOWN>", 30 - '/// Deselect graphic ///' + printlog "Deselect graphic" DocumentImpress.MouseDoubleClick 90,90 printlog " Wrote Text, Inserted Graphic, and moved it in the third Slide" - '/// Save Document ///' + printlog "Save Document" call hFileSaveAsKill (PresentationFile3) printlog "OK saved at ", PresentationFile3 sleep (1) ActiveDeactivateCTLSupport (FALSE) sleep (2) - '/// Close Document ///' + printlog "Close Document" Call hCloseDocument endcase 'i_us_presentation3 -'00oo...//==---...---...---...---....---...---...---...---...---...---...--..--.--.-.-.-.-....---.... - +'------------------------------------------------------------------------------- testcase i_us_presentation4 dim PresentationFile3 as string dim PresentationFile4 as string @@ -361,7 +358,7 @@ testcase i_us_presentation4 WaitSlot (10000) else warnlog " This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester." - '/// New impress document ///' + printlog "New impress document" Call hNewDocument WaitSlot (2000) end if @@ -374,9 +371,10 @@ testcase i_us_presentation4 SlidesControl.TypeKeys "<PAGEDOWN>" kontext "DocumentImpress" - InsertSlide 'No 4 +printlog "insert slide no 4" +InsertSlide - '/// - Background: picture (Gallery) ///' + printlog "Background: picture (Gallery)" Kontext "Gallery" if Gallery.Exists(2) then warnlog " The Gallery was already visible. Check earlier ran tests for inconsistency." @@ -418,7 +416,7 @@ testcase i_us_presentation4 sleep (1) MenuSelect(MenuGetItemID(1)) 'Copy - '/// Check that we really got a copy of the object ///' + printlog "Check that we really got a copy of the object" kontext "DocumentImpress" DocumentImpress.OpenContextMenu(true) WaitSlot (1000) @@ -436,13 +434,13 @@ testcase i_us_presentation4 DocumentImpress.TypeKeys "<UP>", 82 DocumentImpress.TypeKeys "<LEFT>", 130 - '/// Deselect graphic ///' + printlog "Deselect graphic" DocumentImpress.MouseDoubleClick 90,90 - '/// Close the Gallery ///' + printlog "Close the Gallery" ToolsGallery - '/// Change Text on slide ///' + printlog "Change Text on slide" DocumentImpress.TypeKeys "<TAB>" DocumentImpress.TypeKeys "<RETURN>" DocumentImpress.TypeKeys "The process starts to flourish" @@ -493,19 +491,18 @@ testcase i_us_presentation4 printlog " Inserted fourth slide with Gallery-object." - '/// Save Document ///' + printlog "Save Document" call hFileSaveAsKill (PresentationFile4) printlog "OK saved at ", PresentationFile4 sleep (1) ActiveDeactivateCTLSupport (FALSE) sleep (2) - '/// Close Document ///' + printlog "Close Document" Call hCloseDocument endcase 'i_us_presentation4 -'00oo...//==---...---...---...---....---...---...---...---...---...---...--..--.--.-.-.-.-....---.... - +'------------------------------------------------------------------------------- testcase i_us_presentation5 dim PresentationFile4 as string dim PresentationFile5 as string @@ -517,7 +514,7 @@ testcase i_us_presentation5 WaitSlot (10000) else warnlog " This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester." - '/// New impress document ///' + printlog "New impress document" Call hNewDocument WaitSlot (2000) end if @@ -532,30 +529,29 @@ testcase i_us_presentation5 SlidesControl.TypeKeys "<PAGEDOWN>" kontext "DocumentImpress" - '/// 8. New Slide. (Insert Menu) (Duplicate slide) ///' + printlog "8. New Slide. (Insert Menu) (Duplicate slide)" InsertDuplicateSlide 'No 5 - 'Change the text in some way. (the user is making a joke with the audience) + printlog "Change the text in some way. (the user is making a joke with the audience)" gMouseClick 90,90 DocumentImpress.TypeKeys "<TAB>" DocumentImpress.TypeKeys "<RETURN>" - EditSelectAll 'DocumentImpress.TypeKeys "<MOD1 A>" + EditSelectAll DocumentImpress.TypeKeys "And does it with strength..." printlog " Inserted fifth slide with audience-joke." - '/// Save Document ///' + printlog "Save Document" call hFileSaveAsKill (PresentationFile5) printlog "OK saved at ", PresentationFile5 sleep (1) ActiveDeactivateCTLSupport (FALSE) sleep (2) - '/// Close Document///' + printlog "Close Document" Call hCloseDocument endcase 'i_us_presentation5 -'00oo...//==---...---...---...---....---...---...---...---...---...---...--..--.--.-.-.-.-....---.... - +'------------------------------------------------------------------------------- testcase i_us_presentation6 dim PresentationFile5 as string dim PresentationFile6 as string @@ -567,7 +563,7 @@ testcase i_us_presentation6 WaitSlot (10000) else warnlog " This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester." - '/// New impress document ///' + printlog "New impress document" Call hNewDocument WaitSlot (2000) end if @@ -581,8 +577,8 @@ testcase i_us_presentation6 SlidesControl.TypeKeys "<PAGEDOWN>" kontext "DocumentImpress" - '/// 9. Q&A Slide ///' - InsertSlide 'No 6 + printlog "9. Q&A Slide" + InsertSlide WaitSlot (1000) kontext "DocumentImpress" DocumentImpress.TypeKeys "<TAB>" @@ -611,19 +607,18 @@ testcase i_us_presentation6 kontext "DocumentImpress" printlog " Inserted sixth slide with Q&A." - '/// Save Document ///' + printlog "Save Document" call hFileSaveAsKill (PresentationFile6) printlog "OK saved at ", PresentationFile6 sleep (1) ActiveDeactivateCTLSupport (FALSE) WaitSlot (2000) - '/// Close Document ///' + printlog "Close Document" Call hCloseDocument endcase 'i_us_presentation6 -'00oo...//==---...---...---...---....---...---...---...---...---...---...--..--.--.-.-.-.-....---.... - +'------------------------------------------------------------------------------- testcase i_us_presentation7 dim sFilter as string @@ -639,7 +634,7 @@ testcase i_us_presentation7 WaitSlot (10000) else warnlog " This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester." - '/// New impress document ///' + printlog "New impress document" Call hNewDocument WaitSlot (2000) end if @@ -655,7 +650,7 @@ testcase i_us_presentation7 SlidesControl.TypeKeys "<PAGEDOWN>" kontext "DocumentImpress" - '/// 10. Ending Slide ///' + printlog " inserting Ending Slide" InsertSlide 'No 7 DocumentImpress.TypeKeys "Ende" printlog " Inserted ending -slide." @@ -676,36 +671,35 @@ testcase i_us_presentation7 hTypeKeys "<F5>" kontext "DocumentPresentation" - sleep (3) - DocumentPresentation.TypeKeys "<PAGEDOWN>" - sleep (2) - DocumentPresentation.TypeKeys "<PAGEDOWN>" - sleep (2) + sleep (5) DocumentPresentation.TypeKeys "<PAGEDOWN>" + sleep (5) DocumentPresentation.TypeKeys "<PAGEDOWN>" + sleep (5) DocumentPresentation.TypeKeys "<PAGEDOWN>" sleep (10) DocumentPresentation.TypeKeys "<PAGEDOWN>" + sleep (10) DocumentPresentation.TypeKeys "<PAGEDOWN>" - sleep (2) - DocumentPresentation.TypeKeys "<PAGEDOWN>" + sleep (5) DocumentPresentation.TypeKeys "<PAGEDOWN>" - sleep (2) + sleep (5) DocumentPresentation.TypeKeys "<PAGEDOWN>" + sleep (5) DocumentPresentation.TypeKeys "<PAGEDOWN>" - sleep (2) - DocumentPresentation.TypeKeys "<ESCAPE>" + if DocumentPresentation.Exists(5) then + hTypeKeys "<ESC>" warnlog " Presentation should have ended. Please inform Automatic Tester." end if kontext "DocumentImpress" - '/// Save Document ///' + printlog "Save Document" call hFileSaveAsKill (PresentationFile7) printlog "OK saved at ", PresentationFile7 sleep (1) - '/// Save as Powerpoint-file ///' + printlog "Save as Powerpoint-file" FileSaveAs Kontext "SpeichernDlg" Dateiname.SetText sFileName @@ -719,21 +713,19 @@ testcase i_us_presentation7 printlog "Saved as: " + sFileName sleep (3) - '/// Close the office and reload the file ///' + printlog "Close the office and reload the file" FileClose Kontext "Messagebox" if Messagebox.Exists(2) then Messagebox.Yes sleep (3) - '/// Open the saved file ///' + printlog "Open the saved file" hFileOpen sFileName printlog "File opened: " + sFileName sleep (3) - '/// Close the office-session ///' + printlog "Close the office-session" ActiveDeactivateCTLSupport (FALSE) sleep (2) - '/// Close Document ///' + printlog "Close Document" Call hCloseDocument endcase 'i_us_presentation7 - -'00oo...//==---...---...---...---....---...---...---...---...---...---...--..--.--.-.-.-.-....---.... diff --git a/testautomation/graphics/required/includes/global/id_005.inc b/testautomation/graphics/required/includes/global/id_005.inc index 8b19fd601948..23d311d27cac 100644..100755 --- a/testautomation/graphics/required/includes/global/id_005.inc +++ b/testautomation/graphics/required/includes/global/id_005.inc @@ -923,7 +923,11 @@ testcase tiFormatStylesAndFormatting ErrorLog "There was no Stylist open, should be." else printlog "Close Stylist" - hTypekeys "<F11>" + if lcase(gPlatform) = "osx" then + hTypekeys "<mod1 t>" + else + hTypekeys "<F11>" + endif Kontext "Stylist" if (Stylist.Exists) then ErrorLog "The Stylist should be closed now." diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc index 2a39ad34911b..32eee7e6040c 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc @@ -310,6 +310,7 @@ testcase tFileOpenHTML Call hNewDocument Printlog " Open File-Open-dialog" FileOpen + waitslot (5) Kontext "OeffnenDlg" Printlog " Enter filename spreadsheet/required/input/HTML_Doc_Numberformats_in_table.html" Dateiname.settext (sTestFile) @@ -317,7 +318,6 @@ testcase tFileOpenHTML Call hSelectUIFilter (sTestFilter1) Printlog " Click on Open" Oeffnen.Click - sleep (1) Kontext "HTMLImportOptions" Printlog " Use every control on dialog Import Options" Custom.Check @@ -325,11 +325,13 @@ testcase tFileOpenHTML Automatic.Check DetectSpecialNumbers.Check HTMLImportOptions.OK + sleep (2) Printlog " Close recent document" Call hCloseDocument Printlog " Retry with Calc Web Querry filter" Printlog " Open File-Open-dialog" FileOpen + waitslot (5) Kontext "OeffnenDlg" Printlog " Enter filename spreadsheet/required/input/HTML_Doc_Numberformats_in_table.html" Dateiname.settext (sTestFile) @@ -337,7 +339,6 @@ testcase tFileOpenHTML Call hSelectUIFilter (sTestFilter2) Printlog " Click on Open" Oeffnen.Click - sleep (1) Kontext "HTMLImportOptions" Printlog " Use every control on dialog Import Options" Custom.Check @@ -345,6 +346,7 @@ testcase tFileOpenHTML Automatic.Check DetectSpecialNumbers.Check HTMLImportOptions.OK + sleep (2) Printlog " Close recent document" Call hCloseDocument diff --git a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc index 5e8e5c1f0fdb..293418b76c2b 100644..100755 --- a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc @@ -324,13 +324,14 @@ testcase tViewNavigator Szenarien.Click Szenarien.Click '/// Check that the dragmodus has 3 modes - printlog " Check that the dragmodus has 3 modes" - Dragmodus.OpenMenu - waitslot(1000) - if hMenuItemGetCount <> 3 then - warnlog "Not enough modes for dragmodus" - end if - hMenuSelectNr (0) + qaerrorlog "Dragmodus disabled because of unreliability" +' printlog " Check that the dragmodus has 3 modes" +' Dragmodus.OpenMenu +' waitslot(1000) +' if hMenuItemGetCount <> 3 then +' warnlog "Not enough modes for dragmodus" +' end if +' hMenuSelectNr (0) '/// Close Navigator printlog " Close Navigator" Kontext "Navigator" diff --git a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc index 5285a94e71bc..e58a4a2a94da 100644..100755 --- a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc +++ b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc @@ -75,8 +75,8 @@ testcase tHHNoSelction_1 Kontext "HangulHanjaConversion" '/// Press Peplace button - if Replace.IsEnabled then - Replace.Click + if ReplaceBtn.IsEnabled then + ReplaceBtn.Click else Warnlog "Replace button is disabled !" HangulHanjaConversion.Close @@ -140,12 +140,12 @@ testcase tHHNoSelction_2 Kontext "HangulHanjaConversion" '/// Press Peplace button - if Replace.IsEnabled then - Replace.Click + if ReplaceBtn.IsEnabled then + ReplaceBtn.Click else Ignore.Click Sleep 1 - Replace.Click + ReplaceBtn.Click end if if HangulHanjaConversion.Exists then HangulHanjaConversion.Close @@ -194,13 +194,13 @@ testcase tHHNoSelction_3 Kontext "HangulHanjaConversion" '/// Press Peplace button - if Replace.IsEnabled then - Replace.Click + if ReplaceBtn.IsEnabled then + ReplaceBtn.Click else Sleep 1 Ignore.Click Sleep 1 - Replace.Click + ReplaceBtn.Click Sleep 1 HangulHanjaConversion.Close end if @@ -325,16 +325,16 @@ testcase tHHNoSelction_6 Warnlog "Suggestion should be empty !" end if try - Replace.Click + ReplaceBtn.Click Warnlog "Replace button should NOT work !" AlwaysReplace.Click Warnlog "Always Replace button should NOT work !" catch Ignore.Click endcatch - Replace.Click + ReplaceBtn.Click Sleep 1 - Replace.Click + ReplaceBtn.Click Sleep 1 if HangulHanjaConversion.Exists then HangulHanjaConversion.Close @@ -388,16 +388,16 @@ testcase tHHNoSelction_7 Warnlog "Suggestion should be empty !" end if try - Replace.Click + ReplaceBtn.Click Warnlog "Replace button should NOT work !" AlwaysReplace.Click Warnlog "Always Replace button should NOT work !" catch Ignore.Click endcatch - Replace.Click + ReplaceBtn.Click Sleep 1 - Replace.Click + ReplaceBtn.Click Sleep 1 HangulHanjaConversion.Close @@ -446,11 +446,11 @@ testcase tHHSingleSelction_1 '/// + Press Peplace button ToolsLanguageHangulHanjaConversion Kontext "HangulHanjaConversion" - if Replace.IsEnabled then - Replace.Click + if ReplaceBtn.IsEnabled then + ReplaceBtn.Click Sleep 1 try - Replace.Click + ReplaceBtn.Click Sleep 1 catch endcatch @@ -501,9 +501,9 @@ testcase tHHMultiSelction_1 '/// + Press Peplace button ToolsLanguageHangulHanjaConversion Kontext "HangulHanjaConversion" - Replace.Click + ReplaceBtn.Click Sleep 1 - Replace.Click + ReplaceBtn.Click Sleep 1 '/// Check if the result is correct diff --git a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc index 1b17e9df8107..2d57bfc19d7e 100644..100755 --- a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc +++ b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc @@ -88,7 +88,7 @@ testcase tHHConversion_1 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -135,7 +135,7 @@ testcase tHHConversion_2 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -184,7 +184,7 @@ testcase tHHConversion_3 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -233,7 +233,7 @@ testcase tHHConversion_4 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -282,7 +282,7 @@ testcase tHHConversion_5 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -332,7 +332,7 @@ testcase tHHConversion_6 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -378,7 +378,7 @@ testcase tHHConversion_7 Kontext "HangulHanjaConversion" HanjaAsRubyAbove.Check Sleep 1 - Replace.Click + ReplaceBtn.Click Sleep 1 HangulHanjaConversion.Close @@ -435,7 +435,7 @@ testcase tHHConversion_8 Kontext "HangulHanjaConversion" HanjaAsRubyAbove.Check Sleep 1 - Replace.Click + ReplaceBtn.Click Sleep 1 HangulHanjaConversion.Close @@ -492,7 +492,7 @@ testcase tHHConversion_9 Kontext "HangulHanjaConversion" HanjaAsRubyBelow.Check Sleep 1 - Replace.Click + ReplaceBtn.Click Sleep 1 HangulHanjaConversion.Close @@ -549,7 +549,7 @@ testcase tHHConversion_10 Kontext "HangulHanjaConversion" HanjaAsRubyBelow.Check Sleep 1 - Replace.Click + ReplaceBtn.Click Sleep 1 HangulHanjaConversion.Close @@ -606,7 +606,7 @@ testcase tHHConversion_11 Kontext "HangulHanjaConversion" HangulAsRubyAbove.Check Sleep 1 - Replace.Click + ReplaceBtn.Click Sleep 1 HangulHanjaConversion.Close @@ -663,7 +663,7 @@ testcase tHHConversion_12 Kontext "HangulHanjaConversion" HangulAsRubyAbove.Check Sleep 1 - Replace.Click + ReplaceBtn.Click Sleep 1 HangulHanjaConversion.Close @@ -720,7 +720,7 @@ testcase tHHConversion_13 Kontext "HangulHanjaConversion" HangulAsRubyBelow.Check Sleep 1 - Replace.Click + ReplaceBtn.Click Sleep 1 HangulHanjaConversion.Close @@ -777,7 +777,7 @@ testcase tHHConversion_14 Kontext "HangulHanjaConversion" HangulAsRubyBelow.Check Sleep 1 - Replace.Click + ReplaceBtn.Click Sleep 1 HangulHanjaConversion.Close @@ -925,7 +925,7 @@ testcase tHHConversion_17 if Word.GetText <> sWord then Warnlog "Hope get " & sWord & " in Word" & " but get " & Word.GetText end if - Replace.Click + ReplaceBtn.Click Sleep 1 HangulHanjaConversion.Close @@ -974,7 +974,7 @@ testcase tHHConversion_18 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -1007,7 +1007,7 @@ testcase tHHConversion_18 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -1121,7 +1121,7 @@ testcase tHHConversion_20 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -1185,7 +1185,7 @@ testcase tHHConversion_21 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -1220,7 +1220,7 @@ testcase tHHConversion_21 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -1328,7 +1328,7 @@ testcase tHHConversion_23 ToolsLanguageHangulHanjaConversion Kontext "HangulHanjaConversion" for i = 1 to 2 - if Replace.IsEnabled then + if ReplaceBtn.IsEnabled then try Suggestions.Select 1 catch @@ -1348,7 +1348,7 @@ testcase tHHConversion_23 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -1398,7 +1398,7 @@ testcase tHHConversion_24 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -1449,7 +1449,7 @@ testcase tHHConversion_25 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i @@ -1513,7 +1513,7 @@ testcase tHHConversion_26 if NOT HangulHanjaConversion.Exists then Exit for end if - Replace.Click + ReplaceBtn.Click Sleep 1 next i diff --git a/testautomation/writer/optional/includes/regexp/search.inc b/testautomation/writer/optional/includes/regexp/search.inc index a44b6a69372c..ce3d946fe3b9 100755 --- a/testautomation/writer/optional/includes/regexp/search.inc +++ b/testautomation/writer/optional/includes/regexp/search.inc @@ -170,6 +170,7 @@ testcase tCallDialog case 39 : Shortcut = "<Mod1 f>" case 46 : Shortcut = "<Mod1 f>" case 49 : Shortcut = "<Mod1 f>" + case 50 : Shortcut = "<Mod1 f>" case 55 : Shortcut = "<Mod1 f>" case 81 : Shortcut = "<Mod1 f>" case 82 : Shortcut = "<Mod1 f>" @@ -474,6 +475,7 @@ testcase tUnderline_Search case 39: ToggleAttribute(27,"True") case 46: ToggleAttribute(30,"True") case 49: ToggleAttribute(28,"True") + case 50: ToggleAttribute(15,"True") case 55: ToggleAttribute(29,"True") case 88: ToggleAttribute(13,"True") case else : QAErrorlog "Please adapt test for this language!" @@ -490,6 +492,7 @@ testcase tUnderline_Search case 39: ToggleAttribute(35,"True") ' Sottolineato case 46: ToggleAttribute(40,"True") ' Understruken case 49: ToggleAttribute(37,"True") ' Unterstrichen + case 50: ToggleAttribute(24,"True") ' Podčrtano case 55: ToggleAttribute(38,"True") ' Sublinhado case 88: ToggleAttribute(13,"True") case else : QAErrorlog "Please adapt test for this language!" @@ -525,6 +528,7 @@ testcase tUnderline_Replace case 39: ToggleAttribute(27,"True") case 46: ToggleAttribute(30,"True") case 49: ToggleAttribute(28,"True") + case 50: ToggleAttribute(15,"True") case 55: ToggleAttribute(29,"True") case 88: ToggleAttribute(13,"True") case else : QAErrorlog "Please adapt test for this language!" @@ -541,6 +545,7 @@ testcase tUnderline_Replace case 39: ToggleAttribute(35,"True") ' Sottolineato case 46: ToggleAttribute(40,"True") ' Understruken case 49: ToggleAttribute(37,"True") ' Unterstrichen + case 50: ToggleAttribute(24,"True") ' Podčrtano case 55: ToggleAttribute(38,"True") ' Sublinhado case 88: ToggleAttribute(13,"True") case else : QAErrorlog "Please adapt test for this language!" @@ -788,6 +793,7 @@ testcase tParagraphStyle_Search Case 39 : Such_Text = "Intestazione" Case 46 : Such_Text = "Överskrift" Case 49 : Such_Text = "Überschrift" 'Suchen Absatzformat "Überschrift" + Case 50 : Such_Text = "Naslov" Case 55 : Such_Text = "Título Principal" Case 81 : Such_Text = "見出し" Case 86 : Such_Text = "标题" @@ -1625,6 +1631,7 @@ sub Meldungs_Test Case 39 : Text_In_Meldung = sProduct & " Writer ha cercato fino alla fine del documento. Volete continuare dall'inizio del documento?" Case 46 : Text_In_Meldung = sProduct & " Writer har sökt till slutet av dokument. Vill du fortsätta sökningen i början av dokumentet?" Case 49 : Text_In_Meldung = sProduct & " Writer hat bis zum Ende des Dokumentes gesucht. Möchten Sie die Suche am Dokumentanfang fortsetzen?" + Case 50 : Text_In_Meldung = sProduct & " Writer je preiskal do konca dokumenta. Ali želite nadaljevati na začetku?" Case 55 : Text_In_Meldung = sProduct & " Writer pesquisou até o final do documento. Deseja continuar do início?" Case 81 : Text_In_Meldung = sProduct & " Writer は、文書末まで検索しました。文書の始めに戻って続行しますか。" Case 82 : Text_In_Meldung = sProduct & " Writer가 문서의 끝까지 검색했습니다. 문서의 시작부분에서 검색을 계속하겠습니까?" diff --git a/testautomation/writer/optional/includes/stylist/w_stylist.inc b/testautomation/writer/optional/includes/stylist/w_stylist.inc index 9a8589e34da5..b2e582045f27 100644..100755 --- a/testautomation/writer/optional/includes/stylist/w_stylist.inc +++ b/testautomation/writer/optional/includes/stylist/w_stylist.inc @@ -78,69 +78,73 @@ testcase tFormatStylist1 Dim xSize% Dim ySize% - printlog "- Format / Stylist : all methods with Navigator as window" - printlog "New writerdocument" - Call hNewDocument - printlog " - Call Stylist with F11" - printlog "Call stylist with <F11> aand proof all windowmethods at stylist" - Call wTypeKeys "<F11>" - Kontext "Stylist" - if Stylist.NotExists then - Warnlog "No Stylist with <F11>" - FormatStylist - end if - xPos = Stylist.GetPosX - yPos = Stylist.GetPosY - xSize% = Stylist.GetSizeX - ySize% = Stylist.GetSizeY - - printlog " - move Stylist" - Stylist.Move 10, 10 - Sleep 1 - Stylist.Move 300, 400 - Sleep 1 - Stylist.Move 590, 790 - Sleep 1 - Stylist.Move xPos, yPos - Sleep 1 - - printlog " - size Stylist" - try - Stylist.Size 300, 400 - catch - Warnlog "Sizen Stylist doesn't work.. see #i32449" - endcatch - Sleep 1 - try - Stylist.Size xSize%, ySize% - catch - Warnlog "Sizen Stylist doesn't work.. see #i32449" - endcatch - Sleep 1 - - printlog " - close Stylist and reopen ( has to be the same size )" - xPos = Stylist.GetPosX - yPos = Stylist.GetPosY - xSize% = Stylist.GetSizeX - ySize% = Stylist.GetSizeY - FormatStylist - Sleep 1 - FormatStylist - if xPos <> Stylist.GetPosX then Warnlog "x-Pos. has been changed : Not -> "+ xPos + " but -> "+ Stylist.GetPosX - if yPos <> Stylist.GetPosY then Warnlog "y-Pos. has been changed : Not -> "+ yPos + " but -> "+ Stylist.GetPosY - if xSize% <> Stylist.GetSizeX then Warnlog "x-Size has been changed : Not -> "+ xSize% + " but -> "+ Stylist.GetSizeX - if ySize% <> Stylist.GetSizeY then Warnlog "y-Size has been changed : Not -> "+ ySize% + " but -> "+ Stylist.GetSizeY - - printlog " - dock Stylist" - Stylist.Dock - Sleep 1 - if NOT Stylist.IsDocked then Warnlog "Stylist has not been docked in" - Stylist.Undock - Sleep 1 - - Stylist.Close - printlog "Close document" - Call hCloseDocument + printlog "- Format / Stylist : all methods with Navigator as window" + printlog "New writerdocument" + Call hNewDocument + printlog " - Call Stylist with F11" + printlog "Call stylist with <F11> aand proof all windowmethods at stylist" + if lcase(gPlatform) = "osx" then + call hTypekeys "<mod1 t>" + else + Call wTypeKeys "<F11>" + end if + Kontext "Stylist" + if Stylist.NotExists then + Warnlog "No Stylist with <F11>" + FormatStylist + end if + xPos = Stylist.GetPosX + yPos = Stylist.GetPosY + xSize% = Stylist.GetSizeX + ySize% = Stylist.GetSizeY + + printlog " - move Stylist" + Stylist.Move 10, 10 + Sleep 1 + Stylist.Move 300, 400 + Sleep 1 + Stylist.Move 590, 790 + Sleep 1 + Stylist.Move xPos, yPos + Sleep 1 + + printlog " - size Stylist" + try + Stylist.Size 300, 400 + catch + Warnlog "Sizen Stylist doesn't work.. see #i32449" + endcatch + Sleep 1 + try + Stylist.Size xSize%, ySize% + catch + Warnlog "Sizen Stylist doesn't work.. see #i32449" + endcatch + Sleep 1 + + printlog " - close Stylist and reopen ( has to be the same size )" + xPos = Stylist.GetPosX + yPos = Stylist.GetPosY + xSize% = Stylist.GetSizeX + ySize% = Stylist.GetSizeY + FormatStylist + Sleep 1 + FormatStylist + if xPos <> Stylist.GetPosX then Warnlog "x-Pos. has been changed : Not -> "+ xPos + " but -> "+ Stylist.GetPosX + if yPos <> Stylist.GetPosY then Warnlog "y-Pos. has been changed : Not -> "+ yPos + " but -> "+ Stylist.GetPosY + if xSize% <> Stylist.GetSizeX then Warnlog "x-Size has been changed : Not -> "+ xSize% + " but -> "+ Stylist.GetSizeX + if ySize% <> Stylist.GetSizeY then Warnlog "y-Size has been changed : Not -> "+ ySize% + " but -> "+ Stylist.GetSizeY + + printlog " - dock Stylist" + Stylist.Dock + Sleep 1 + if NOT Stylist.IsDocked then Warnlog "Stylist has not been docked in" + Stylist.Undock + Sleep 1 + + Stylist.Close + printlog "Close document" + Call hCloseDocument endcase @@ -152,64 +156,68 @@ testcase tFormatStylist2 Dim xSize% Dim ySize% - printlog "- Format/Stylist : Methods from Stylist as Window between more than one document" - printlog " New document" - Call hNewDocument - printlog "check all methods of Stylist as Window between more than one document" - Call wTypeKeys "Test the stylist functions" - printlog " - Call Stylist in first document and check in a second document" - Sleep 2 - Kontext "Stylist" - If Not Stylist.Exists then FormatStylist - Sleep 2 - Call hNewDocument - Call wTypeKeys "Test the stylist functions" - Sleep 2 - Kontext "Stylist" - if Stylist.NotExists then Warnlog "No Stylist in new document" - - printlog " - Close all documents and reopen" - Sleep 2 - Call hCloseDocument - Sleep 2 - Call hCloseDocument - Sleep 2 - Call hNewDocument - Sleep 2 - Call wTypeKeys "Test the stylist functions" - Kontext "Stylist" - if Stylist.NotExists then Warnlog "No Stylist in a new document" - - printlog " - Dock Stylist in first document and check in a new if docked" - Sleep 2 - Stylist.Dock - Sleep 1 - Call hNewDocument - Call wTypeKeys "Test the stylist functions" - Kontext "Stylist" - if NOT Stylist.IsDocked then Warnlog "Stylist is not docked in new document" - - printlog " - Close all documents, reopen one and check docked Stylist" - Call hCloseDocument - Sleep 2 - Call hCloseDocument - Sleep 2 - Call hNewDocument - Kontext "Stylist" - if NOT Stylist.IsDocked then Warnlog "Stylist is not docked in new document" - - printlog " - Close Stylist with <F11>" - Stylist.Undock - Sleep 1 - Call wTypeKeys "<F11>" - Kontext "Stylist" - if NOT Stylist.NotExists then - Warnlog "Stylist is still open" - Stylist.Close - end if - printlog "Close document" - Call hCloseDocument - + printlog "- Format/Stylist : Methods from Stylist as Window between more than one document" + printlog " New document" + Call hNewDocument + printlog "check all methods of Stylist as Window between more than one document" + Call wTypeKeys "Test the stylist functions" + printlog " - Call Stylist in first document and check in a second document" + Sleep 2 + Kontext "Stylist" + If Not Stylist.Exists then FormatStylist + Sleep 2 + Call hNewDocument + Call wTypeKeys "Test the stylist functions" + Sleep 2 + Kontext "Stylist" + if Stylist.NotExists then Warnlog "No Stylist in new document" + + printlog " - Close all documents and reopen" + Sleep 2 + Call hCloseDocument + Sleep 2 + Call hCloseDocument + Sleep 2 + Call hNewDocument + Sleep 2 + Call wTypeKeys "Test the stylist functions" + Kontext "Stylist" + if Stylist.NotExists then Warnlog "No Stylist in a new document" + + printlog " - Dock Stylist in first document and check in a new if docked" + Sleep 2 + Stylist.Dock + Sleep 1 + Call hNewDocument + Call wTypeKeys "Test the stylist functions" + Kontext "Stylist" + if NOT Stylist.IsDocked then Warnlog "Stylist is not docked in new document" + + printlog " - Close all documents, reopen one and check docked Stylist" + Call hCloseDocument + Sleep 2 + Call hCloseDocument + Sleep 2 + Call hNewDocument + Kontext "Stylist" + if NOT Stylist.IsDocked then Warnlog "Stylist is not docked in new document" + + printlog " - Close Stylist with <F11>" + Stylist.Undock + Sleep 1 + if lcase(gPlatform) = "osx" then + call hTypekeys "<mod1 t>" + else + Call wTypeKeys "<F11>" + end if + Kontext "Stylist" + if NOT Stylist.NotExists then + Warnlog "Stylist is still open" + Stylist.Close + end if + printlog "Close document" + Call hCloseDocument + endcase ' ********************************************************************** @@ -295,7 +303,7 @@ testcase tFormatStylist3 Sleep 1 next i Stylist.Close - printlog "Close document" + printlog "Close document" Call hCloseDocument endcase @@ -307,31 +315,31 @@ testcase tFormatStylist4 Dim NeuerWert$ printlog "- Format / Stylist : check created Styles" - printlog "New writerdocument" - Call hNewDocument - printlog " - create Paragraph Style in Stylist" - Call wStyleCreate ( "ATesttool", "Paragraph", true ) - Kontext "Stylist" - printlog "Check if Style has been added in stylist" + printlog "New writerdocument" + Call hNewDocument + printlog " - create Paragraph Style in Stylist" + Call wStyleCreate ( "ATesttool", "Paragraph", true ) + Kontext "Stylist" + printlog "Check if Style has been added in stylist" if wStyleSelect ( "ATesttool", "Paragraph" ) = false then Warnlog "Paragraph Style has not been found" - printlog " - Create Character Style in Stylist" - Call wStyleCreate ( "BTesttool", "Character", true ) - if wStyleSelect ( "BTesttool", "Character" ) = false then Warnlog "Character Style has not been found!" - printlog " - Create Frame Style in Stylist" + printlog " - Create Character Style in Stylist" + Call wStyleCreate ( "BTesttool", "Character", true ) + if wStyleSelect ( "BTesttool", "Character" ) = false then Warnlog "Character Style has not been found!" + printlog " - Create Frame Style in Stylist" Call wStyleCreate ( "CTesttool", "Frame", true ) if wStyleSelect ( "CTesttool", "Frame" ) = false then Warnlog "Frame Style has not been found!" - printlog " - Create Page Style in Stylist" - Call wStyleCreate ( "DTesttool", "Page", true ) - if wStyleSelect ( "DTesttool", "Page" ) = false then Warnlog "Page Style has not been found" + printlog " - Create Page Style in Stylist" + Call wStyleCreate ( "DTesttool", "Page", true ) + if wStyleSelect ( "DTesttool", "Page" ) = false then Warnlog "Page Style has not been found" - printlog " - creating Styles should not have been affecting to new documents" + printlog " - creating Styles should not have been affecting to new documents" ' To avoid focus problems on unix first close stylist - Kontext "Stylist" + Kontext "Stylist" if Stylist.Exists then FormatStylist - Call hNewDocument - Kontext "Stylist" + Call hNewDocument + Kontext "Stylist" if Not Stylist.Exists then FormatStylist if wStyleSelect ( "ATesttool", "Paragraph" ) = true then Warnlog "Paragraph Style has been found in new document" @@ -351,32 +359,32 @@ testcase tFormatStylist5 Dim bStyleFound as boolean printlog "- Format / Stylist : select Style" - printlog "New writerdocument" - if bAsianLan = True then - printlog "- Not in Asian languages!" - goto endsub - end if - Call hNewDocument - Call wTypeKeys "Dies ist ein formatierter Text <Shift Home>" - printlog " - format Text" - FormatCharacter - Kontext - Active.SetPage TabFontEffects - Kontext "TabFontEffects" - StrikeThrough.Select 2 - Outline.Check - TabFontEffects.OK - - printlog " - adjust to Standard-Format through the Stylist" - printlog "adjust to Standard-Format through the Stylist" - FormatStylist - Kontext "Stylist" - if Stylist.NotExists then FormatStylist - 'Get name for 'default' template - Kontext "TextObjectbar" - SuchMal = Vorlage.GetSelText - printlog "Using " & SuchMal & " as 'default'" - Kontext "Stylist" + printlog "New writerdocument" + if bAsianLan = True then + printlog "- Not in Asian languages!" + goto endsub + end if + Call hNewDocument + Call wTypeKeys "Dies ist ein formatierter Text <Shift Home>" + printlog " - format Text" + FormatCharacter + Kontext + Active.SetPage TabFontEffects + Kontext "TabFontEffects" + StrikeThrough.Select 2 + Outline.Check + TabFontEffects.OK + + printlog " - adjust to Standard-Format through the Stylist" + printlog "adjust to Standard-Format through the Stylist" + FormatStylist + Kontext "Stylist" + if Stylist.NotExists then FormatStylist + 'Get name for 'default' template + Kontext "TextObjectbar" + SuchMal = Vorlage.GetSelText + printlog "Using " & SuchMal & " as 'default'" + Kontext "Stylist" Vorlagenliste.TypeKeys "<Home>" bStyleFound = false @@ -394,19 +402,19 @@ testcase tFormatStylist5 Warnlog "Style: " & Suchmal & " has not been found in Stylist" Call hCloseDocument goto endsub - end if - - printlog " - check format" - FormatCharacter - Kontext - Active.SetPage TabFontEffects - Kontext "TabFontEffects" - if StrikeThrough.GetSelIndex = 2 then Warnlog "Wrong entry selected in StrikeThrough" - if Outline.IsChecked then Warnlog "Format Outline is still checked" - TabFontEffects.OK - - printlog "Close document" - Call hCloseDocument + end if + + printlog " - check format" + FormatCharacter + Kontext + Active.SetPage TabFontEffects + Kontext "TabFontEffects" + if StrikeThrough.GetSelIndex = 2 then Warnlog "Wrong entry selected in StrikeThrough" + if Outline.IsChecked then Warnlog "Format Outline is still checked" + TabFontEffects.OK + + printlog "Close document" + Call hCloseDocument endcase ' ********************************************************************** @@ -463,7 +471,7 @@ testcase tFormatStylist6 TBGestalter.Click ZeichenVorlagen if Vorlagenliste.GetSeltext <> "Testtool" then 'Go find the entry. Vorlagenliste.TypeKeys "<Home>" - For i = 1 to 100 + For i = 1 to 100 Vorlagenliste.TypeKeys "<Down>" if Vorlagenliste.GetSeltext = "Testtool" then 'Found it! i = 102 @@ -483,7 +491,7 @@ testcase tFormatStylist6 if NOT Shadow.IsChecked then Warnlog "Shadow is not checked anymore" if StrikeThrough.GetSelIndex <> 2 then Warnlog "Wrong entry selection in StrikeThrough" if Overline.GetSelIndex <> 2 then Warnlog "Overline is not checked anymore" - if OverlineColor.GetSelIndex <> 6 then Warnlog "Wrong Overline Color selected" + if OverlineColor.GetSelIndex <> 6 then Warnlog "Wrong Overline Color selected" if NOT Outline.IsChecked then Warnlog "Outline is not checked anymore" if Effects.GetSelIndex <> 3 then Warnlog "Wrong effect selected" if NOT Blinking.IsChecked then Warnlog "Blinking is not checked anymore" @@ -542,10 +550,10 @@ testcase tFormatStylist7 i = 102 end if next i - if i = 101 then - warnlog "No Testtool -Stylist found. Check if new stylists can be created. Test ends." - goto endsub - end if + if i = 101 then + warnlog "No Testtool -Stylist found. Check if new stylists can be created. Test ends." + goto endsub + end if end if Vorlagenliste.TypeKeys "<SHIFT F10>" 'Open ContextMenu Sleep 1 @@ -573,7 +581,7 @@ testcase tFormatStylist7 TBGestalter.Click ZeichenVorlagen if Vorlagenliste.GetSeltext <> "Testtool" then - Vorlagenliste.TypeKeys "<Home>" + Vorlagenliste.TypeKeys "<Home>" For i = 1 to 100 Vorlagenliste.TypeKeys "<Down>" if Vorlagenliste.GetSeltext = "Testtool" then 'Found it! @@ -614,17 +622,17 @@ testcase tAssigningStyles1 Dim j as integer Dim bStyleInList as boolean - printlog "UI and Strings check" + printlog "UI and Strings check" Call hNewDocument - printlog "Open a new writerdocument" - printlog "Check if the following strings and only those strings are present:" - printlog "Clear formatting" - printlog "Heading 1" - printlog "Heading 2" - printlog "Heading 3" - printlog "Default" - printlog "Text body" - printlog "More..." + printlog "Open a new writerdocument" + printlog "Check if the following strings and only those strings are present:" + printlog "Clear formatting" + printlog "Heading 1" + printlog "Heading 2" + printlog "Heading 3" + printlog "Default" + printlog "Text body" + printlog "More..." Select Case iSprache Case 01 : sStyles = Array("Clear formatting", "Default", "Heading 1", "Heading 2", "Heading 3", "Text body", "More...") Case 07 : sStyles = Array("Отменить форматирование", "Базовый", "Заголовок 1", "Заголовок 2", "Заголовок 3", "Основной текст", "Дополнительно...") @@ -690,17 +698,17 @@ testcase tAssigningStyles2 Dim sTemp as string printlog "- Apply Style" - printlog "New writerdocument" + printlog "New writerdocument" Call hNewDocument - printlog "Insert dummytext" + printlog "Insert dummytext" if wBlindtextEinfuegen = false then Call hCloseDocument exit sub end if - printlog "Select whole dummytext" + printlog "Select whole dummytext" Call wTypeKeys "<Mod1 A>" - printlog "Apply style 'Heading 1' through Styles & Formatting combobox" + printlog "Apply style 'Heading 1' through Styles & Formatting combobox" Kontext "Textobjectbar" for i = 1 to Vorlage.GetItemCount Vorlage.Select i @@ -711,7 +719,7 @@ testcase tAssigningStyles2 end if next i - printlog "Check if style has been applied to paragraph" + printlog "Check if style has been applied to paragraph" Call wTypeKeys "<Mod1 Home><End>" Call wTypeKeys "<Left>", 2 @@ -740,17 +748,17 @@ testcase tAssigningStyles3 Call wTypeKeys "<Mod1 A>" printlog "Format / Character" FormatCharacter - Kontext - Active.Setpage TabFont - Kontext "TabFont" + Kontext + Active.Setpage TabFont + Kontext "TabFont" printlog "Apply first font in list and select 2nd Typeface" - if gAsianSup = True then - FontWest.Select 1 + if gAsianSup = True then + FontWest.Select 1 StyleWest.Select 2 - else - Font.Select 1 + else + Font.Select 1 Style.Select 1 - end if + end if TabFont.Ok printlog "Enter 'MyStyle' in Stylelistbox" @@ -838,7 +846,7 @@ endcase testcase tAssigningStyles5 printlog "- Clear formatting: whole paragraph with hard formatting of some characters" - printlog " - 1. Cursor outside of hard formatted string" + printlog " - 1. Cursor outside of hard formatted string" printlog "Open a new writer document" Call hNewDocument printlog "Insert a dummytext" @@ -848,28 +856,28 @@ testcase tAssigningStyles5 end if printlog "Highlight first line in dummy text" - Call wTypeKeys "<Mod1 Home>" - Call wTypeKeys "<Shift End>" - + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<Shift End>" + printlog "Format / Bold" - Kontext "TextObjectbar" + Kontext "TextObjectbar" if Not TextObjectbar.Exists then Call hToolbarSelect ( "FORMATTING", true ) - Fett.Click - Wait 500 + Fett.Click + Wait 500 printlog "Set cursor outside of bold formatted text" - Call wTypeKeys "<Mod1 Home>" - Call wTypeKeys "<Down><Right>" - + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<Down><Right>" + printlog "Select 'Clear Formatting' in Style-Listbox" - Kontext "Textobjectbar" + Kontext "Textobjectbar" Vorlage.Select 1 Vorlage.TypeKeys "<Return>" wait 500 printlog "Check that first line is still bold and has not been reset" - Call wTypeKeys "<Mod1 Home>" - Call wTypeKeys "<Right>" + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<Right>" Kontext "TextObjectbar" if Fett.Getstate(2) = 0 then @@ -877,7 +885,7 @@ testcase tAssigningStyles5 end if printlog "Close document" - Call hCloseDocument + Call hCloseDocument endcase ' ********************************************************************** @@ -887,7 +895,7 @@ testcase tAssigningStyles6 Dim iStandard as integer printlog "- Clear formatting: whole paragraph with hard formatting of some characters" - printlog " - 2. Cursor inside of hard formatted string" + printlog " - 2. Cursor inside of hard formatted string" printlog "Open a new writer document" Call hNewDocument printlog "Insert a dummytext" @@ -897,34 +905,34 @@ testcase tAssigningStyles6 end if printlog "Highlight first line in dummy text" - Call wTypeKeys "<Mod1 Home>" - Call wTypeKeys "<Shift End>" - + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<Shift End>" + printlog "Format / Bold" - Kontext "TextObjectbar" + Kontext "TextObjectbar" if Not TextObjectbar.Exists then Call hToolbarSelect ( "FORMATTING", true ) - Fett.Click - Wait 500 + Fett.Click + Wait 500 printlog "Point cursor to first highlighted word of bold formatted text" - Call wTypeKeys "<Mod1 Home>" - Call wTypeKeys "<Right>" - + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<Right>" + printlog "Select 'Format / Default Formatting' in Style-Listbox" - FormatDefaultWriter + FormatDefaultWriter wait 500 printlog "first highlighted word should be set to 'Standard'" - Call wTypeKeys "<Mod1 Home>" - Call wTypeKeys "<Right>" + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<Right>" Kontext "TextObjectbar" if Fett.Getstate(2) = 1 then Warnlog "Style 'Bold' has not been reset!" end if - + printlog "Check that rest of first line is still bold and has not been reset" - Call wTypeKeys "<Mod1 Home>" - Call wTypeKeys "<End><Left>" + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<End><Left>" Kontext "TextObjectbar" if Fett.Getstate(2) = 1 then @@ -932,7 +940,7 @@ testcase tAssigningStyles6 end if printlog "Close document" - Call hCloseDocument + Call hCloseDocument endcase ' ********************************************************************** @@ -942,27 +950,27 @@ testcase tAssigningStyles7 printlog "More ..." printlog "Open a new writer document" Call hNewDocument - + printlog "Select 'More...' in Style-Listbox" - Kontext "Textobjectbar" + Kontext "Textobjectbar" Vorlage.Select Vorlage.GetItemCount Vorlage.TypeKeys "<Return>" wait 500 printlog "The Stylist should have been opened" - Kontext "Stylist" - if Not Stylist.Exists then - Warnlog "'Styles and Formatting' doesn't open if 'More...' is selected in Style-Listbox" - else + Kontext "Stylist" + if Not Stylist.Exists then + Warnlog "'Styles and Formatting' doesn't open if 'More...' is selected in Style-Listbox" + else printlog "In Style group listbox 'Automatic' should be selected" - if Gruppenliste.GetSelIndex <> 5 then - Warnlog "Seems 'Automatic' is not selected per default in 'Styles and Formatting'" - end if - Stylist.Close - end if + if Gruppenliste.GetSelIndex <> 5 then + Warnlog "Seems 'Automatic' is not selected per default in 'Styles and Formatting'" + end if + Stylist.Close + end if printlog "Close document" - Call hCloseDocument + Call hCloseDocument endcase ' ********************************************************************** diff --git a/testautomation/writer/optional/includes/undo/w_undo_history_1.inc b/testautomation/writer/optional/includes/undo/w_undo_history_1.inc index f97c7b53be60..43356c09017c 100644..100755 --- a/testautomation/writer/optional/includes/undo/w_undo_history_1.inc +++ b/testautomation/writer/optional/includes/undo/w_undo_history_1.inc @@ -84,7 +84,7 @@ testcase tUndoFindAndReplace '/// Type 'ThisReplacementText' in 'Replace with' field ReplaceWith.Settext "ThisReplacementText" '/// Choose Button 'Replace' and close dialog - Replace.Click + ReplaceBtn.Click wait 500 Kontext "Active" if Active.Exists then diff --git a/testautomation/writer/optional/includes/undo/w_undo_history_2.inc b/testautomation/writer/optional/includes/undo/w_undo_history_2.inc index dd36e286233f..a2f305a45f8c 100644..100755 --- a/testautomation/writer/optional/includes/undo/w_undo_history_2.inc +++ b/testautomation/writer/optional/includes/undo/w_undo_history_2.inc @@ -94,7 +94,7 @@ testcase tUndoFindAndReplaceLong '/// Type 'ThisIsAboutALongTextThatHadToBeReplaced' in 'Replace with' field ReplaceWith.Settext "ThisIsAboutALongTextThatHadToBeReplaced" '/// Choose Button 'Replace' and close dialog - Replace.Click + ReplaceBtn.Click wait 500 Kontext "Active" if Active.Exists then @@ -452,7 +452,7 @@ testcase tUndoStyles Sleep 1 ReplaceWithStyle.Select 4 wait 500 - Replace.Click + ReplaceBtn.Click NewStyle = ReplaceWithStyle.GetSelText Select Case iSprache Case 01: StyleText = "Replace style: AUndoHistory -> " & NewStyle diff --git a/testautomation/writer/required/includes/w_002_.inc b/testautomation/writer/required/includes/w_002_.inc index 1c86e8f01a47..73de7ba6edeb 100644..100755 --- a/testautomation/writer/required/includes/w_002_.inc +++ b/testautomation/writer/required/includes/w_002_.inc @@ -658,7 +658,7 @@ endcase '--------------------------------------------------- testcase tEditAutotext - Dim k as integer + Dim j as integer Dim i as integer Dim CurrentEntryNr as integer Dim unxAutotextCategorie as integer @@ -678,6 +678,7 @@ testcase tEditAutotext end if PrintLog "Click Categories" + Kontext "Autotext" Bereiche.Click Sleep 1 Kontext "BereicheBearbeitenAutoText" @@ -880,8 +881,7 @@ testcase tEditAutotext if GetDocumentCount = 1 then Warnlog "The autotext has been edited in current document!" else - hUseAsyncSlot( "FileClose" ) - + hUseAsyncSlot( "FileClose" ) Kontext "Active" PrintLog "A message that module has been changed should come up" if Active.Exists then @@ -890,11 +890,6 @@ testcase tEditAutotext Warnlog "Though changing the text module the document could be closed without a query!" end if end if - if wDeleteAutotext("DummyAutotext") = false then - Warnlog "Unable to delete created autotext" - end if - Kontext "Autotext" - if Autotext.Exists then Autotext.Close catch Warnlog "Menu Autotext->'Edit' disabled !" Kontext "Active" @@ -908,16 +903,17 @@ testcase tEditAutotext endcatch end if end if - Kontext "Autotext" - PrintLog "Close 'Autotext' dialog" - Autotext.Close - if wDeleteAutotext("DummyAutotext") = false then - Warnlog "Unable to delete created autotext" - end if - Kontext "Autotext" - if Autotext.Exists then Autotext.Close endcatch + PrintLog "Close 'Autotext' dialog" + Kontext "Autotext" + if Autotext.Exists then Autotext.Close + if wDeleteAutotext("DummyAutotext") = false then + Warnlog "Unable to delete created autotext" + end if + Kontext "Autotext" + if Autotext.Exists then Autotext.Close + PrintLog "Close active document" Call hCloseDocument endcase diff --git a/testautomation/writer/required/includes/w_011_.inc b/testautomation/writer/required/includes/w_011_.inc index 754d4c58e538..61a20821349f 100644..100755 --- a/testautomation/writer/required/includes/w_011_.inc +++ b/testautomation/writer/required/includes/w_011_.inc @@ -411,7 +411,9 @@ testcase tZOArea Call hNewDocument printlog "Insert a draw object ( rectangle )" Call wZeichenobjektEinfuegen ( "Rechteck", 30, 30, 50, 60 ) - Call gMouseClick ( 25, 25 ) + ' Set focus to document + Call gMouseMove2 ( 50, 25 ) + Call gMouseClick ( 50, 25 ) printlog "Select drawing object with shortcut 'Shift F4'" Call wTypeKeys ( "<Shift F4>" ) @@ -452,6 +454,8 @@ testcase tZORest Call hNewDocument printlog "Insert a draw object ( rectangle )" Call wZeichenobjektEinfuegen ( "Rechteck", 30, 30, 50, 60 ) + ' Set focus to document + Call gMouseMove2 ( 50, 25 ) Call gMouseClick ( 50, 25 ) printlog "Select drawing object with shortcut 'Shift F4'" Call wTypeKeys ( "<Shift F4>" ) @@ -464,7 +468,7 @@ testcase tZORest Drehen.Click wait 500 catch - Warnlog "#i56594#Shortcut selecting objects doesn't work" + Warnlog "Shortcut selecting objects doesn't work" Call hCloseDocument goto endsub endcatch diff --git a/testautomation/writer/tools/includes/w_locale_strings2.inc b/testautomation/writer/tools/includes/w_locale_strings2.inc index a679ecbabc04..73b987fb2c7e 100644..100755 --- a/testautomation/writer/tools/includes/w_locale_strings2.inc +++ b/testautomation/writer/tools/includes/w_locale_strings2.inc @@ -47,6 +47,7 @@ function wGetLanguageGuessString(sValue as string, iLanguageCount as integer) as '///swedish 46 ///' '///polish 48 ///' '///german 49 ///' + '///slovenian 50 ///' '///german 55 ///' '///already covered languages in the test document: ///' @@ -324,6 +325,32 @@ function wGetLanguageGuessString(sValue as string, iLanguageCount as integer) as ParagraphPreSet = "Absatz ist Deutsch (Deutschland)" end select '----------------------------------------------------------------------- + Case 50 'Case 50: slovenian + Select Case iLanguageCount + Case 1: WordPreSet = "Jezik besede je angleški (ZDA)" + ParagraphPreSet = "Jezik odstavka je angleški (ZDA)" + Case 2: WordPreSet = "Jezik besede je portugalski (Portugalska)" + ParagraphPreSet = "Jezik odstavka je portugalski (Portugalska)" + Case 3: WordPreSet = "Jezik besede je ruski" + ParagraphPreSet = "Jezik odstavka je ruski" + Case 4: WordPreSet = "Jezik besede je nizozemski (Nizozemska)" + ParagraphPreSet = "Jezik odstavka je nizozemski (Nizozemska)" + Case 5: WordPreSet = "Jezik besede je francoski (Francija)" + ParagraphPreSet = "Jezik odstavka je francoski (Francija)" + Case 6: WordPreSet = "Jezik besede je španski (Španija)" + ParagraphPreSet = "Jezik odstavka je španski (Španija)" + Case 7: WordPreSet = "Jezik besede je madžarski" + ParagraphPreSet = "Jezik odstavka je madžarski" + Case 8: WordPreSet = "Jezik besede je italijanski (Italija)" + ParagraphPreSet = "Jezik odstavka je italijanski (Italija)" + Case 9: WordPreSet = "Jezik besede je švedski (Švedska)" + ParagraphPreSet = "Jezik odstavka je švedski (Švedska)" + Case 10:WordPreSet = "Jezik besede je poljski" + ParagraphPreSet = "Jezik odstavka je poljski" + Case 11:WordPreSet = "Jezik besede je nemški (Nemčija)" + ParagraphPreSet = "Jezik odstavka je nemški (Nemčija)" + end select + '----------------------------------------------------------------------- Case 55 'Case 55: Portuguese (Brazil) Select Case iLanguageCount Case 1: WordPreSet = "a palavra é Inglês (EUA)" diff --git a/testautomation/writer/tools/includes/w_tool1.inc b/testautomation/writer/tools/includes/w_tool1.inc index 2131b1bd7dfd..34b83bc5e97b 100644..100755 --- a/testautomation/writer/tools/includes/w_tool1.inc +++ b/testautomation/writer/tools/includes/w_tool1.inc @@ -434,6 +434,8 @@ end sub '---------------------------------------------------------------- sub sAutopilot_ListboxCombobox(WhichBox as String) + Dim iCount as integer + iCount = 1 Kontext "AutoPilotListComboBox" if AutoPilotListComboBox.Exists then printlog " -Autopilot-Listbox Page 1" @@ -441,6 +443,18 @@ sub sAutopilot_ListboxCombobox(WhichBox as String) if TabListboxData.Exists then Call DialogTest( TabListBoxData ) DataSource.Select 1 + Do + if iCount >= 15 then exit do + try + Table.Select 1 + exit do + catch + wait 500 + printlog " - attempt " & i & " to select table" + iCount = iCount + 1 + endcatch + Loop + if Table.GetItemCount > 0 then Table.Select 1 else |