diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2010-11-11 09:36:28 +0100 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2010-11-11 09:36:28 +0100 |
commit | fd8af45f19e3d0acc4887f3b07239875485647b5 (patch) | |
tree | b32259007ec6cd0d28b44b95a1b3f3f003af0a79 | |
parent | 613bb74489551580b417968af125de803c684a39 (diff) | |
parent | 02582fe488fb679284c108413c7d2f6fd3d730cc (diff) |
CWS-TOOLING: integrate CWS automationdev300m91
Notes
split repo tag: testing_ooo/DEV300_m93
16 files changed, 89 insertions, 60 deletions
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc index 82fa9229b1f8..717cf149b902 100644 --- a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc @@ -293,7 +293,7 @@ testcase tImageControl sleep(2) '/// set HelpURL printlog "set HelpURL" - fsetControlProperty("ImageControl","HelpURL","HID:1234567") + fsetControlProperty("ImageControl","HelpURL","customcontrol2") '/// save the document printlog "save the document" hFileSaveAsKill ( gOfficePath + ConvertPath("user/work/TT_ImageControl.odt")) @@ -315,7 +315,7 @@ testcase tImageControl Kontext "TabGeneralControl" dim bScrOK as boolean 'control variable if all properties are correct bScrOK = true - if fgetControlProperty("ImageControl","HelpURL") <> "HID:1234567" then + if fgetControlProperty("ImageControl","HelpURL") <> "customcontrol2" then warnlog "the imagecontrol is not saved with property: HelpURL" bScrOK = false endif diff --git a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc index 49bcaceb6ac7..2f51183a40a1 100644 --- a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc @@ -239,7 +239,7 @@ testcase tGroupBoxWithDatasource Kontext "TabGeneralControl" TabGeneralControl.TypeKeys "<TAB>" , true 'this tab is importent, I don't not why but it is. sleep(1) - HelpURL.setText "HID:123456" + HelpURL.setText "customcontrol1" HelpURL.TypeKeys "<RETURN>",true sleep(1) Kontext "ControlPropertiesDialog" @@ -276,7 +276,7 @@ testcase tGroupBoxWithDatasource Kontext "TabGeneralControl" TabGeneralControl.TypeKeys "<TAB>" , true 'this tab is importent, I don't not why but it is. sleep(1) - HelpURL.setText "HID:1234567" + HelpURL.setText "customcontrol2" HelpURL.TypeKeys "<RETURN>", true sleep(1) Kontext "ControlPropertiesDialog" @@ -314,7 +314,7 @@ testcase tGroupBoxWithDatasource Kontext "TabGeneralControl" TabGeneralControl.TypeKeys "<TAB>" , true ' this tab is importent, I don't not why but it is. - HelpURL.setText "HID:12345678" + HelpURL.setText "customcontrol3" HelpURL.TypeKeys "<RETURN>", true sleep(1) Kontext "ControlPropertiesDialog" @@ -660,7 +660,7 @@ testcase tListBox warnlog "The dropdown style is not active." endif sleep(1) - fSetControlProperty("ListBox","HelpURL","HID:123456") + fSetControlProperty("ListBox","HelpURL","customcontrol1") sleep(1) '/// save the document printlog "save the document" diff --git a/testautomation/dbaccess/tools/dbcreatetools.inc b/testautomation/dbaccess/tools/dbcreatetools.inc index 2658281f65be..cc99d8d203c5 100644 --- a/testautomation/dbaccess/tools/dbcreatetools.inc +++ b/testautomation/dbaccess/tools/dbcreatetools.inc @@ -1375,8 +1375,17 @@ function fRegisterDatabaseFile( sFileName, sName) NewBtn.Click sleep(1) Kontext "CreateDatabaseLink" - DatabaseFile.setText(sFileName) + RegisteredName.setText(sName) + + ' this does not work due to issue 115468 + ' DatabaseFile.setText(sFileName) + ' workaround + CreatedatabaseLink.typeKeys("<shift tab>") + CreatedatabaseLink.typeKeys("<shift tab>") + CreatedatabaseLink.typeKeys(sFileName) + ' - + CreateDatabaseLink.OK sleep(1) diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl index 7820e3d52c59..75e1ceb1e019 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> -<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="192" dlg:top="127" dlg:width="174" dlg:height="147" dlg:closeable="true" dlg:moveable="true" dlg:help-url="HID:123456" dlg:withtitlebar="false"> +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="192" dlg:top="127" dlg:width="174" dlg:height="147" dlg:closeable="true" dlg:moveable="true" dlg:help-url="customcontrol1" dlg:withtitlebar="false"> <dlg:bulletinboard> <dlg:button dlg:id="CommandButton1" dlg:tab-index="0" dlg:left="6" dlg:top="8" dlg:width="64" dlg:height="20" dlg:value="a wonderful button"/> <dlg:textfield dlg:id="TextField1" dlg:textarea-vertical-align="top" dlg:tab-index="1" dlg:left="6" dlg:top="38" dlg:width="64" dlg:height="59" dlg:value="a wonderful text"/> diff --git a/testautomation/global/hid/hid.lst b/testautomation/global/hid/hid.lst index 3257e92a9066..a07f54c87773 100755 --- a/testautomation/global/hid/hid.lst +++ b/testautomation/global/hid/hid.lst @@ -1,5 +1,3 @@ -DEV300.m85 010101010101010 - 1 1 SID_OPENDOC 5501 SID_SAVEASDOC 5502 diff --git a/testautomation/global/required/includes/g_printing.inc b/testautomation/global/required/includes/g_printing.inc index 15ee12c4308d..2d0bd716e551 100644 --- a/testautomation/global/required/includes/g_printing.inc +++ b/testautomation/global/required/includes/g_printing.inc @@ -408,7 +408,7 @@ testcase tPrintLayout() endif endif - lb_test( PrintOrder, 2, 1, "" ) + lb_test( PrintOrder, 4, 1, "" ) cb_test( BorderAroundPages, false, "" ) select case( gApplication ) diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc index 3825dadff409..40a1f504ed64 100644 --- a/testautomation/global/system/includes/master.inc +++ b/testautomation/global/system/includes/master.inc @@ -84,6 +84,10 @@ sub GetUseFiles Call GetIniInformation '///+<li><b>GetIniInformation</b>: Get all information out of the <i>testtool.ini/.testtoolrc</i> and set it on global variables (iniinfo.inc)</li> Call GetOfficeInformation '///+<li><b>GetOfficeInformation</b>: Set <i>sAppExe</i> for startup (iniinfo.inc)</li> + gVersionsnummer = FindBuildID + ' split versionstring into its parts + call hSetBuildVersionInformation(False) + Call LoadDeclaration '///+<ul><li><b>LoadDeclaration</b>: Load all declaration files (master.inc)</li> Call FirstOfficeStart '///+<li><b>FirstOfficeStart</b>: Try to start the office for first time (master.inc)</li> diff --git a/testautomation/global/tools/includes/optional/t_control_objects.inc b/testautomation/global/tools/includes/optional/t_control_objects.inc index b1da7d7e8d95..4ee8b908c93f 100644 --- a/testautomation/global/tools/includes/optional/t_control_objects.inc +++ b/testautomation/global/tools/includes/optional/t_control_objects.inc @@ -115,7 +115,7 @@ function lb_test( oControl as object, items as integer, preset as integer, issue endif endif - for con_iterator = 1 to items + for con_iterator = 1 to con_items oControl.select( con_iterator ) next con_iterator diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win index 6a80e4209cbc..ba6673edb39d 100644 --- a/testautomation/global/win/dial_d_h.win +++ b/testautomation/global/win/dial_d_h.win @@ -401,7 +401,7 @@ Schattenfarbe sym:svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR FormName sym:sw:Edit:DLG_NUM_NAMES:ED_FORM FormListe sym:sw:ListBox:DLG_NUM_NAMES:LB_FORM -*FormularNavigator .uno:ShowFmExplorer +*FormularNavigator sym:SFXDOCKINGWINDOW_ShowFmExplorer Liste sym:SVX_HID_FORM_NAVIGATOR *FussnoteBearbeiten .uno:EditFootnote diff --git a/testautomation/global/win/sys_dial.win b/testautomation/global/win/sys_dial.win index b63417e56b9f..15e8035d8b74 100644 --- a/testautomation/global/win/sys_dial.win +++ b/testautomation/global/win/sys_dial.win @@ -126,3 +126,8 @@ OrdnerName sym:fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_N ' **** *TranslationWindow sym:svtools:WorkWindow:TT_INLINE_TRANSLATION svtools:FloatingWindow:TT_INLINE_TRANSLATION +' **** specal longnames for bas test +' **** author marc.neumann@oracle.com +*MSC_Special_Dialog sym:customcontrol1 +*MSC_Special_Dialog2 sym:customcontrol2 +*MSC_Special_Dialog3 sym:customcontrol3
\ No newline at end of file diff --git a/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc b/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc index d53c23fbbe3d..a12fbb764115 100644 --- a/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc +++ b/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc @@ -57,31 +57,6 @@ end sub ' '------------------------------------------------------------------------------- ' -function IsItLoaded as boolean - '/// IsItLoaded - '/// Wait until document is loaded - Dim iLoop as integer - - IsItLoaded = FALSE - sleep(3) - for iLoop =1 to 20 - try - 'Calling slot 'IsDocLoading' - IsItLoaded = IsDocLoading - catch - IsItLoaded = FALSE - endcatch - - if IsItLoaded = TRUE then - exit for - end if - sleep(1) - next iLoop - sleep(2) -end function -' -'------------------------------------------------------------------------------- -' testcase tLoadSpreadsheetDocument (SourceFile) Dim sOnlyFileName as string @@ -102,7 +77,7 @@ testcase tLoadSpreadsheetDocument (SourceFile) if sOnlyFileName > "" then 'Some extensions make no sense to load if sOnlyFileExtension <> "so" AND sOnlyFileExtension <> "tmp" AND sOnlyFileExtension <> "dbt" then - if fCalcFileOpen(SourceFile) AND IsItLoaded()then + if fCalcFileOpen(SourceFile) then if (hIsNamedDocLoaded (SourceFile)) then printlog "- loaded" sleep(15) diff --git a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc index 9e25d898d8ce..f55bd6318ffd 100644 --- a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc +++ b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc @@ -125,10 +125,10 @@ testcase tIBIS111158 Kontext "TabGeneralControl" '/// Enter in 'Help URL' as value exactly 'HID:123456' TabGeneralControl.TypeKeys "<TAB>" , true - HelpURL.setText "HID:123456" + HelpURL.setText "customcontrol1" HelpURL.TypeKeys "<RETURN>",true - if HelpURL.GetText <> "HID:123456" then - warnlog "'HID:123456' has not been accepted as 'Help URL' value." + if HelpURL.GetText <> "customcontrol1" then + warnlog "'customcontrol1' has not been accepted as 'Help URL' value." end if Kontext "ControlPropertiesDialog" diff --git a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc index 25a762297df7..08ebbfed45d4 100644 --- a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc +++ b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc @@ -283,7 +283,7 @@ testcase tGroup_6 Sleep 2 Call gMouseClick(80,80) - Call wObjektSelektieren ( 28, 28, 70, 80 ) + Call wObjektSelektieren ( 31, 31, 70, 80 ) Sleep 2 FormatGroupGroup Sleep 1 @@ -351,7 +351,7 @@ testcase tGroup_7 Sleep 2 Call gMouseClick(80,80) - Call wObjektSelektieren ( 28, 28, 70, 80 ) + Call wObjektSelektieren ( 31, 31, 70, 80 ) Sleep 2 FormatGroupGroup Sleep 1 @@ -667,7 +667,7 @@ testcase tEncapsulatedGroup_1 Sleep 1 Call wZeichenobjektEinfuegen("ELLIPSE", 40, 45, 60, 70, false) Sleep 1 - Call wObjektSelektieren ( 28, 28, 70, 80 ) + Call wObjektSelektieren ( 31, 31, 70, 80 ) Sleep 1 FormatGroupGroup @@ -677,20 +677,37 @@ testcase tEncapsulatedGroup_1 PrintLog "- insert 2 drawing objects (rectangle and ellipse) in the group" Call wZeichenobjektEinfuegen("RECHTECK", 35, 40, 38, 45, false) - Call wZeichenobjektEinfuegen("ELLIPSE", 52, 40, 78, 45, false) - Call wObjektSelektieren ( 28, 38, 80, 48 ) + Call wZeichenobjektEinfuegen("ELLIPSE", 40, 40, 58, 45, false, true) + Call wObjektSelektieren ( 31, 31, 80, 80 ) + + Sleep 1 + PrintLog "- generate a new group" try - PrintLog "- generate a new group" FormatGroupGroup - PrintLog "- edit the new group" + catch + Warnlog "Unable to execute Format / Group" + endcatch + + PrintLog "- edit the new group" + try FormatGroupEditGroup - PrintLog "- leave the new group" + catch + Warnlog "Unable to execute Group / Enter Group" + endcatch + + PrintLog "- leave the new group" + try FormatGroupExitGroup - PrintLog "- Undo the new group" + catch + Warnlog "Unable to exceute Format / Exit Group" + endcatch + + PrintLog "- Undo the new group" + try FormatGroupUnGroup catch - Warnlog "Something wrong where operating the Encapsulated group!" + Warnlog "Unable to execute Format / Ungroup" endcatch Call hCloseDocument diff --git a/testautomation/writer/optional/includes/fields/w_fields1.inc b/testautomation/writer/optional/includes/fields/w_fields1.inc index 2f727260b6c2..c6caf2c5fade 100644 --- a/testautomation/writer/optional/includes/fields/w_fields1.inc +++ b/testautomation/writer/optional/includes/fields/w_fields1.inc @@ -151,13 +151,23 @@ testcase tInsertFieldsTime if NOT Len(sTime2) > 7 then Warnlog "Time-format is wrong !" printlog "Stop for a while ..." + '/// Stop for a while , check if the time is still correct Sleep 2 + ' update fields + Call wTypeKeys "<F9>" + ' read field content Call wTypeKeys "<MOD1 Home>" Call wTypeKeys "<Shift Right>" EditCopy if GetClipboard <> sTime1 then Warnlog "Fixed time is wrong !" - + + '/// Stop for a while , check if the time is still correct + Sleep 2 + ' update fields + Call wTypeKeys "<F9>" + ' read field content + Call wTypeKeys "<MOD1 Home>" Call wTypeKeys "<Down><Home>" Call wTypeKeys "<Shift Right>" EditCopy diff --git a/testautomation/writer/required/includes/w_001b_.inc b/testautomation/writer/required/includes/w_001b_.inc index 297d04b579bb..4d8e6883891a 100644 --- a/testautomation/writer/required/includes/w_001b_.inc +++ b/testautomation/writer/required/includes/w_001b_.inc @@ -198,6 +198,7 @@ testcase tFileSendOutlineToClipboard PrintLog "Paste outline in new document" hUseAsyncSlot( "EditPaste" ) + WaitSlot(1000) Call wTypeKeys("<Up>", 6) Call wTypeKeys("<Home><Shift End>") hUseAsyncSlot( "EditCopy" ) diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc index e6bd4f92afa0..cfe0aa6e07f3 100755 --- a/testautomation/writer/tools/includes/w_tools.inc +++ b/testautomation/writer/tools/includes/w_tools.inc @@ -141,11 +141,14 @@ end function ' ----------------------------------------------------------------------- -sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optional sCloseToolbar as boolean ) +sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optional sCloseToolbar as boolean, optional bLeaveSelected as boolean ) Kontext "DrawBar" if Not DrawBar.Exists then Call hToolbarSelect("Drawing", true) Sleep 2 + if IsMissing(bLeaveSelected) then + bLeaveSelected = false + endif Objekt = UCase( Objekt ) select case Objekt @@ -187,8 +190,10 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona end if if Objekt <> "TEXT" and Objekt <> "VTEXT" then Kontext "DocumentWriter" - Call gMouseClick (10, 10) - wait 100 + if bLeaveSelected = false then + Call gMouseClick (10, 10) + wait 100 + endif end if Case "MASTERDOCUMENT" @@ -205,8 +210,10 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona end if if Objekt <> "TEXT" and Objekt <> "VTEXT" then Kontext "DocumentMasterDoc" - Call gMouseClick (10, 10) - wait 100 + if bLeaveSelected = false then + Call gMouseClick (10, 10) + wait 100 + endif end if end select sleep (1) @@ -215,18 +222,21 @@ end sub ' ----------------------------------------------------------------------- sub wObjektSelektieren ( xStart%, yStart%, xEnde%, yEnde% ) - ' Call gMouseClick(90,90) Call hToolbarSelect("DRAWING",true) - Auswahl.Click + if Auswahl.Getstate(2) = 0 then + Auswahl.Click + endif Select Case gApplication Case "WRITER" Kontext "DocumentWriter" DocumentWriter.MouseDown xStart%, yStart% + wait 500 DocumentWriter.MouseMove xEnde%, yEnde% DocumentWriter.MouseUp xEnde%, yEnde% Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.MouseDown xStart%, yStart% + wait 500 DocumentMasterDoc.MouseMove xEnde%, yEnde% DocumentMasterDoc.MouseUp xEnde%, yEnde% end select |