diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-29 16:33:44 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-29 16:33:44 +0000 |
commit | 32b596fdfb8637d117c8cbb9f891d366fdc59dae (patch) | |
tree | ce32c86c75b9557142a531d1d0206aa19f4107e5 /testautomation | |
parent | 89c9c545f47381d26a3b97b8b78d4bdb41a2914c (diff) |
CWS-TOOLING: integrate CWS native216
2008-12-18 10:50:56 +0100 jsk r265675 : #i97390#
2008-12-18 09:35:32 +0100 jsk r265668 : #i97110#
2008-12-17 17:38:44 +0100 tbo r265649 : #i97365# double entries in hid.lst
2008-12-17 09:01:55 +0100 jsk r265580 : #i97343#
2008-12-16 21:11:08 +0100 jsk r265574 : #i97110#
2008-12-16 15:59:30 +0100 jsk r265555 : #i97110#
2008-12-16 15:57:57 +0100 jsk r265554 : #i97110#
2008-12-11 11:49:29 +0100 is r265274 : #i97101# new oooimprovement extension
2008-12-11 11:48:33 +0100 is r265272 : #i97101# new oooimprovement extension
Diffstat (limited to 'testautomation')
9 files changed, 167 insertions, 1 deletions
diff --git a/testautomation/extensions/required/e_update.bas b/testautomation/extensions/required/e_update.bas index bcf8471ed619..62ebf2331c43 100644 --- a/testautomation/extensions/required/e_update.bas +++ b/testautomation/extensions/required/e_update.bas @@ -40,9 +40,11 @@ sub main use "extensions\required\includes\e_update.inc" + use "extensions\required\includes\e_update_oooimprovement.inc" call hStatusIn( "extensions" , "e_update.bas" ) call tExtensionManagerResources() + call tUpdtOOoImprovement() call hStatusOut() end sub @@ -55,6 +57,7 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\tools\includes\optional\t_user_info.inc" + use "global\tools\includes\optional\t_filetools.inc" gApplication = "WRITER" call GetUseFiles() diff --git a/testautomation/extensions/required/includes/e_update_oooimprovement.inc b/testautomation/extensions/required/includes/e_update_oooimprovement.inc new file mode 100644 index 000000000000..b41a197dff6a --- /dev/null +++ b/testautomation/extensions/required/includes/e_update_oooimprovement.inc @@ -0,0 +1,100 @@ +'encoding UTF-8 Do not remove or change this line! +'************************************************************************** +'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +'* +'* Copyright 2008 by Sun Microsystems, Inc. +'* +'* OpenOffice.org - a multi-platform office productivity suite +'* +'* $RCSfile: e_update.inc,v $ +'* +'* $Revision: 1.1.2.3 $ +'* +'* last change: $Author: jsk $ $Date: 2008/10/08 09:05:51 $ +'* +'* This file is part of OpenOffice.org. +'* +'* OpenOffice.org is free software: you can redistribute it and/or modify +'* it under the terms of the GNU Lesser General Public License version 3 +'* only, as published by the Free Software Foundation. +'* +'* OpenOffice.org is distributed in the hope that it will be useful, +'* but WITHOUT ANY WARRANTY; without even the implied warranty of +'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +'* GNU Lesser General Public License version 3 for more details +'* (a copy is included in the LICENSE file that accompanied this code). +'* +'* You should have received a copy of the GNU Lesser General Public License +'* version 3 along with OpenOffice.org. If not, see +'* <http://www.openoffice.org/license.html> +'* for a copy of the LGPLv3 License. +'* +'/****************************************************************************** +'* +'* owner : joerg.skottke@sun.com +'* +'* short description : Extension Update Test +'* +'\****************************************************************************** + +testcase tUpdtOOoImprovement + + printlog( "Update test for the tools/options dialog of the OOo Improvement extension" ) + if ( not gExtensionOOoImprovementIsInstalled ) then + qaerrorlog( "The extension is not installed." ) + goto endsub + endif + + dim cLogFile as string + cLogFile = gOfficePath & "user\temp\feedback\Current.csv" + cLogFile = convertpath( cLogFile ) + + if ( hDeleteFile( cLogFile ) ) then + printlog( "Test environment is clean, no logfile present (anymore)" ) + endif + + ToolsOptions + hToolsOptions( "StarOffice", "Improvement" ) + printlog( "Improvement Program tabpage" ) + + call DialogTest( TabOOoImprovement ) + + ParticipateNo.check() + ParticipateYes.check() + + if ( ShowData.isEnabled() ) then + + ShowData.click() + + Kontext "TextImport" + if ( TextImport.exists( 1 ) ) then + printlog( "Text import dialog" ) + + call DialogTest( TextImport ) + TextImport.cancel() + else + warnlog( "#i97340# Show Data button enabled but no logged data found" ) + endif + + Kontext "Active" + if ( Active.exists( 1 ) ) then + printlog( "Messagebox: " & Active.getText() ) + Active.ok() + else + warnlog( "No warning for missing file: " & cLogFile ) + endif + + Kontext "Active" + if ( Active.exists( 1 ) ) then + warnlog( "#97342# Second message for missing " & cLogFile ) + Active.ok() + endif + else + printlog( "Show data is disabled" ) + endif + + Kontext "OptionenDlg" + OptionenDlg.cancel() + +endcase + diff --git a/testautomation/framework/required/includes/wizard_euroconverter.inc b/testautomation/framework/required/includes/wizard_euroconverter.inc index b8f5e52b3a39..e9a42117eccd 100755 --- a/testautomation/framework/required/includes/wizard_euroconverter.inc +++ b/testautomation/framework/required/includes/wizard_euroconverter.inc @@ -93,6 +93,7 @@ testcase tUpdtWizardEuroconverter kontext "FilePicker" EFFilename.setText( cTargetDir ) PBSelect.click() + WaitSlot() kontext "AutopilotEuroKonverter" Waehrungen.Select(1) 'Setting to first entry of listbox diff --git a/testautomation/global/hid/hid.lst b/testautomation/global/hid/hid.lst index 35990cc11edf..330ae19ba0a5 100755 --- a/testautomation/global/hid/hid.lst +++ b/testautomation/global/hid/hid.lst @@ -7180,6 +7180,10 @@ svx:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW 705597967 svx:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH 705597971 svx:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST 705613314 svx:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT 705614341 +svx:TabPage:RID_SVXPAGE_IMPROVEMENT 705658880 +svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES 705659404 +svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO 705659405 +svx:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA 705663507 svx:TabPage:RID_SVX_GRFFILTER_DLG_EMBOSS_TAB 706232320 svx:Edit:RID_SVXTABPAGE_GALLERY_GENERAL:EDT_MS_NAME 706627585 svx:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW 706675715 @@ -8091,6 +8095,9 @@ sw:Edit:TP_MAILCONFIG:ED_SERVER 879364107 sw:PushButton:TP_MAILCONFIG:PB_AUTHENTICATION 879366672 sw:PushButton:TP_MAILCONFIG:PB_TEST 879366677 sw:NumericField:TP_MAILCONFIG:NF_PORT 879368205 +sd:TriStateBox:RID_TABPAGE_PARA_NUMBERING:CB_NEW_START 880543233 +sd:TriStateBox:RID_TABPAGE_PARA_NUMBERING:CB_NUMBER_NEW_START 880543234 +sd:NumericField:RID_TABPAGE_PARA_NUMBERING:NF_NEW_START 880547843 sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_PAGE 881132033 sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_CHAPTER 881132034 sw:Edit:TP_FOOTNOTEOPTION:ED_CONT 881133609 @@ -8839,6 +8846,9 @@ svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK 1242498074 svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE 1242518028 svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL 1242518029 svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE 1242518030 +svx:ModalDialog:RID_SVXPAGE_IMPROVEMENT 1242529792 +svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES_b 1242530316 +svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO_b 1242530317 svx:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES 1243022341 svx:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH 1243027970 svx:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT 1243027972 diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc index 22566d212b1c..e5a15dbf602e 100755 --- a/testautomation/global/required/includes/g_option.inc +++ b/testautomation/global/required/includes/g_option.inc @@ -120,6 +120,15 @@ testcase tToolsOptionsStarOffice Kontext "ExtrasOptionenDlg" EchteAnzahl = Optionsliste.GetItemCount - iSectionNumber iMenuShould = 13 + + + if ( gExtensionOOoImprovementIsInstalled ) then + iMenuShould = iMenuShould + 1 + printlog( "The OOoImprovementExtension is installed" ) + else + qaerrorlog( "The OOoImprovementExtension is not installed" ) + endif + if EchteAnzahl <> iMenuShould then if ((gtplatform = "sol") OR (gtplatform = "x86") OR gOOO) AND EchteAnzahl = 12 then printLog "One Tabpage is missing. This is ok for a patched Solaris (sparc and x86) or OOo installation." @@ -302,6 +311,14 @@ testcase tToolsOptionsStarOffice Call DialogTest( TabOnlineUpdate ) endif 'CheckNow.click + case 14: Kontext "TabOOoImprovement" + if ( gExtensionOOoImprovementIsInstalled ) then + printlog( " - OpenOffice.org Improvement Program" ) + if ( TabOOoImprovement.isVisible() ) then + gefunden = TRUE + Call DialogTest( TabOOoImprovement ) + endif + endif end select if gefunden=FALSE then Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!" diff --git a/testautomation/global/system/includes/gvariabl.inc b/testautomation/global/system/includes/gvariabl.inc index 30f65c97db59..d5c1aee37046 100755 --- a/testautomation/global/system/includes/gvariabl.inc +++ b/testautomation/global/system/includes/gvariabl.inc @@ -172,6 +172,9 @@ Global Const GC_MACRO_SECURITY_LEVEL_HIGH = 2 '///+ GC_MACRO_SECURITY_LEVEL Global Const GC_MACRO_SECURITY_LEVEL_VERYHIGH = 3 '///+ GC_MACRO_SECURITY_LEVEL_VERYHIGH: Symbolic name for very high macro security Global Const GC_MACRO_SECURITY_LEVEL_DEFAULT = 2 '///+ GC_MACRO_SECURITY_LEVEL_DEFAULT: Symbolic name for default macro security level +'///* Extensions +Global gExtensionOOoImprovementIsInstalled as boolean + sub OnlyForDocuGVariables '///<b>System for the installed Office</b> '///<i>gPlatform</i>: Operatingsystem (internal shortkey) diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc index 71aad97a5520..460a48f3e06b 100755 --- a/testautomation/global/system/includes/master.inc +++ b/testautomation/global/system/includes/master.inc @@ -707,6 +707,8 @@ sub mMakeGeneralOptionsAPI Dim xViewRoot Dim sTempList Dim bError as boolean + + Dim oOOoImprovementController as object ' Check presence of the OOo Improvement Extension sFileFunction="global::system::inc::master.inc::hMakeGeneralOptionsAPI:: " @@ -819,6 +821,25 @@ sub mMakeGeneralOptionsAPI end if xViewRoot.dispose() + '///+ OOo Improvement Extension + ' Note: Logging is disabled the hard way. The UI will not notice the change so even if logging is disabled + ' the UI will claim that it is. You can verify the status manually though by performing some action + ' in the application and looking for the log file in user/temp/Feedback. + oOOoImprovementController = oUnoOfficeConnection.createInstance( "com.sun.star.oooimprovement.CoreController" ) + if ( isNull( oOOoImprovementController ) ) then + gExtensionOOoImprovementIsInstalled = FALSE + else + gExtensionOOoImprovementIsInstalled = TRUE + aPropertyValue(0).Value="/org.openoffice.Office.Logging/OOoImprovement" + xViewRoot=oUnoConfigurationAccess.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess",aPropertyValue()) + xViewRoot.replaceByName("EnablingAllowed", false) + xViewRoot.commitChanges() + if xViewRoot.hasPendingChanges() then + qaErrorLog("Configuration not flushed: OOoImprovementProgram/InvitationAccepted: FALSE") + end if + xViewRoot.dispose() + endif + '///+<li>Setting the <i>work</i> directory in Tools / Options, sTempPath = ConvertPath (gOfficePath + "user\work") '///+<li>If the temp-path does not exist it will be created. @@ -863,6 +884,7 @@ sub mMakeGeneralOptionsAPI '///Check which 'Macro Security Level' is set and put it into <i>gMacroSecurityLevel</i> variable. gMacroSecurityLevel = fGetSetMacroSecurityUNO() + catch ExceptLog MsgBox (sFileFunction + "The test did not start correctly or the application has been crashed." & Chr(13) & _ @@ -1086,7 +1108,7 @@ sub sStartUpOffice (optional sProfPath as String, optional sProfParameter as Str '///+ <li><i>-autocrashreport</i> to enable the non-GUI crash report functionality</li> '///+ <li><i>-accept=socket,host=localhost,port=12345;urp</i> to enable UNO connection</li> '///+ <li><i>OPTIONAL application parameters</i> for profiling tests</li> - sParameter = "-enableautomation -norestore -nolockcheck -autocrashreport " & sUnoPort & sAppParameter & " " + sParameter = "-enableautomation -norestore -nolockcheck -autocrashreport -nofirststartwizard " & sUnoPort & sAppParameter & " " if IsMissing (sProfPath) then '///+ <li><i>Factory</i>-parameter which depends on the value of <b>gApplication</b> (WRITER, CALC, ...)</li></ol> sParameter = sParameter & sFactory diff --git a/testautomation/global/tools/includes/required/t_option.inc b/testautomation/global/tools/includes/required/t_option.inc index a23c19afeb1d..2de122dc747c 100755 --- a/testautomation/global/tools/includes/required/t_option.inc +++ b/testautomation/global/tools/includes/required/t_option.inc @@ -226,6 +226,11 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO bFirst = FALSE Kontext "TabOnlineUpdate" If TabOnlineUpdate.exists(2) then bCorPage = TRUE + case "IMPROVEMENT" + if bFirst = TRUE then Optionsliste.Select ( startpos + 14 ) + bFirst = FALSE + Kontext "TabOOoImprovement" + If TabOOoImprovement.exists(2) then bCorPage = TRUE case else : bCorPage = FALSE end select case "LOADSAVE" diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win index bc619d032f28..66ce34a2c5a6 100755 --- a/testautomation/global/win/etab_h_o.win +++ b/testautomation/global/win/etab_h_o.win @@ -11,6 +11,11 @@ URL sfx2:Edit:TP_DOCINFORELOAD:ED_URL BrowseURL sfx2:PushButton:TP_DOCINFORELOAD:PB_BROWSEURL Frame sfx2:ComboBox:TP_DOCINFORELOAD:CB_FRAME +*TabOOoImprovement svx:TabPage:RID_SVXPAGE_IMPROVEMENT +ParticipateYes svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES +ParticipateNo svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO +ShowData svx:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA + *TabJava HID_OPTIONS_JAVA UseJava svx:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE JavaList HID_OPTIONS_JAVA_LIST |