diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 14:22:27 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 14:22:27 +0000 |
commit | 9e1d27a380a4d415152e9cd7bf533f19ba79cef0 (patch) | |
tree | d23057fb93e53b20391a0aa8154a5609baae50a2 /testautomation | |
parent | 2e7644ecb37379b0d54c7dec03a7fc6f3f1a6f27 (diff) |
CWS-TOOLING: integrate CWS sjfixes10
2009-01-15 14:02:24 +0100 af r266369 : #i88851# Finding the right font size is now an iterative process.
2009-01-15 11:01:59 +0100 wg r266354 : i97985
2009-01-15 10:57:33 +0100 wg r266353 : i97985
2009-01-15 10:48:53 +0100 wg r266347 : i97985
2009-01-15 10:48:23 +0100 wg r266346 : i97985
2009-01-15 10:46:47 +0100 wg r266345 : i97985
2009-01-15 10:45:43 +0100 wg r266344 : i97985
2009-01-15 10:45:14 +0100 wg r266343 : i97985
2009-01-15 10:44:38 +0100 wg r266342 : i97985
2009-01-15 10:43:56 +0100 wg r266341 : i97985
2009-01-15 10:42:50 +0100 wg r266340 : i97985
2009-01-15 10:41:40 +0100 wg r266339 : i97985
2009-01-15 10:39:46 +0100 wg r266337 : i97985
2009-01-15 10:00:09 +0100 hde r266336 : i98065
2009-01-13 15:48:20 +0100 wg r266232 : i97985
2009-01-13 13:22:05 +0100 wg r266217 : i97985
2009-01-13 12:34:05 +0100 wg r266210 : i97985
2009-01-13 12:30:56 +0100 wg r266209 : i97985
2009-01-13 12:26:56 +0100 wg r266208 : i97985
2009-01-12 15:58:06 +0100 wg r266165 : i97985
2009-01-12 15:43:24 +0100 wg r266163 : i97985
2009-01-08 16:21:47 +0100 sj r266023 : fixed warning
2009-01-08 15:33:34 +0100 sj r266017 : fixed warning
2009-01-06 18:13:42 +0100 sj r265935 : CWS-TOOLING: rebase CWS sjfixes10 to trunk@265758 (milestone: DEV300:m38)
2008-12-10 16:54:02 +0100 af r265206 : #i43354# Do not delete all unused master pages automatically.
2008-12-04 13:12:50 +0100 af r264836 : #i92795# Use BitmapEx for icons to allow transparency.
2008-12-02 17:01:49 +0100 af r264723 : #i93082# Fixed SID_INSERTPAGE_LAYOUT_MENU.
2008-11-28 14:37:28 +0100 af r264555 : #i88851# Changed association of Ctrl-'?' to views.
2008-11-28 11:38:52 +0100 af r264535 : #i96681# Set version to 1.0.2
2008-11-28 11:30:04 +0100 af r264533 : #i88851# Ctrl-1,2,3 switch to slide overview, notes, normal view.
2008-11-27 16:41:25 +0100 af r264505 : #i92144# Removed unused code.
2008-11-26 15:29:56 +0100 af r264401 : #i92574# Do not lock configuration controller when main pane is not available.
2008-11-21 10:13:40 +0100 sj r264112 : #i96146# applied patch (ambiguous && ||)
2008-11-20 20:12:06 +0100 sj r264097 : #i96083# applied patch (ambigous && ||)
2008-11-20 19:13:53 +0100 sj r264096 : #i96163# applied patch (ambigous && ||)
2008-11-20 18:39:10 +0100 sj r264093 : #i96165# applied patch (ambigous && ||)
2008-11-03 18:12:29 +0100 sj r263303 : #i93996# fixed word wrapping problem
2008-11-03 18:11:02 +0100 sj r263302 : #i93996# fixed word wrapping problem
2008-11-03 18:08:41 +0100 sj r263301 : #i93996# fixed word wrapping problem
2008-11-03 18:06:45 +0100 sj r263300 : #i93996# fixed word wrapping problem
2008-11-03 18:05:00 +0100 sj r263299 : #i94831,i93616# fixed crash when importing diagonal cell border lines, fixed table import
2008-11-03 18:00:43 +0100 sj r263298 : #i93718# spellchecking is no longer triggering the autolayout of connector objects
Diffstat (limited to 'testautomation')
18 files changed, 70 insertions, 50 deletions
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc index 0cfe210efe8f..7500462615bf 100755 --- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc +++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc @@ -230,7 +230,7 @@ testcase tSVM if Filterauswahl.exists then Warnlog "Error when loading the file. The Filter-dialogue came up. Test aborted." Filterauswahl.Cancel - exit sub + goto endsub endif kontext "DocumentDraw" DocumentDraw.TypeKeys ("<escape><tab>") @@ -782,7 +782,7 @@ qaerrorlog 'if Filterauswahl.exists(10) then ' Warnlog "Error when loading the file. The Filter-dialogue came up. Test aborted." ' Filterauswahl.Cancel - ' exit sub + ' goto endsub 'endif '' check if the document is writable @@ -850,7 +850,7 @@ qaerrorlog if Filterauswahl.exists then Warnlog "Error when loading the file. The Filter-dialogue came up. Test aborted." Filterauswahl.Cancel - exit sub + goto endsub endif kontext "DocumentDraw" DocumentDraw.TypeKeys ("<escape><tab>") @@ -971,7 +971,7 @@ testcase tEMF if Filterauswahl.Exists(10) then Warnlog "Error when loading the file. The Filter-dialogue came up. Test aborted." Filterauswahl.Cancel - exit sub + goto endsub endif ' check if the document is writable if fIsDocumentWritable = false then diff --git a/testautomation/graphics/optional/includes/global/g_clipexport2.inc b/testautomation/graphics/optional/includes/global/g_clipexport2.inc index 46beba0cb591..18f64b5c0632 100755 --- a/testautomation/graphics/optional/includes/global/g_clipexport2.inc +++ b/testautomation/graphics/optional/includes/global/g_clipexport2.inc @@ -75,11 +75,11 @@ sub MakeCircle printlog "Create Circle" if gApplication = "WRITER" then Warnlog "Cant make circle in this application" - exit sub + goto endsub end if if gApplication = "CALC" then Warnlog "Cant make circle in this application" - exit sub + goto endsub end if printlog "we run Circle" Kontext "Toolbar" @@ -99,11 +99,11 @@ sub Make3dObject printlog "Create 3dObject" if (Ucase(gApplication) = "CALC") then warnlog "Cant make circle in this application" - exit sub + goto endsub end if if (Ucase(gApplication) = "WRITER") then warnlog "Cant make circle in this application" - exit sub + goto endsub end if printlog "we run 3d-Object" @@ -180,11 +180,11 @@ sub MakeCurveObject if (Ucase(gApplication) = "WRITER") then warnlog "Cant make circle in this application" - exit sub + goto endsub end if if (Ucase(gApplication) = "CALC") then warnlog "Cant make circle in this application" - exit sub + goto endsub end if printlog "we run Curve-object" @@ -220,11 +220,11 @@ sub MakeLineObject if gApplication = "WRITER" then warnlog "Currently no support for line-object in this application" - exit sub + goto endsub end if if gApplication = "CALC" then warnlog "Currently no support for line-object in this application" - exit sub + goto endsub end if printlog "we run Line-object" '/// Insert Line /// @@ -251,11 +251,11 @@ sub MakeConnectorObject if gApplication = "WRITER" then warnlog "Cant make connector in this application" - exit sub + goto endsub end if if gApplication = "CALC" then warnlog "Cant make connector in this application" - exit sub + goto endsub end if printlog "we run Connector-object" '/// Insert Connector /// diff --git a/testautomation/graphics/optional/includes/global/g_clipexport3.inc b/testautomation/graphics/optional/includes/global/g_clipexport3.inc index 1abd421f5a53..a2a337b483da 100755 --- a/testautomation/graphics/optional/includes/global/g_clipexport3.inc +++ b/testautomation/graphics/optional/includes/global/g_clipexport3.inc @@ -782,7 +782,7 @@ sub Choose_Toapplication gApplication = "WRITER" printlog "to app: " + gApplication ToApp = "WRITER" - case else : exit sub + case else : goto endsub End select next ToAppCounter '/// Open second application ///' diff --git a/testautomation/graphics/optional/includes/global/g_format.inc b/testautomation/graphics/optional/includes/global/g_format.inc index 9969195c9a09..47a29d10a399 100755 --- a/testautomation/graphics/optional/includes/global/g_format.inc +++ b/testautomation/graphics/optional/includes/global/g_format.inc @@ -732,9 +732,9 @@ testcase tiFormat3D_Effekte Active.SetPage TabPositionAndSize Kontext "TabPositionAndSize" if PositionX.GetText = X Then - qaerrorlog "#i94832# - Perspective not acitvated x: "+PositionX.GetText + printlog "- Perspective acitvated x: "+PositionX.GetText else - Printlog "- Perspective seems to work" + warnlog "- Perspective seems to have a problem, x value has changed!" end if TabPositionAndSize.OK Kontext "Drei_D_Effekte" @@ -961,7 +961,11 @@ testcase tiFormat3D_Effekte Kontext Active.SetPage TabPositionAndSize Kontext "TabPositionAndSize" - If PositionX.GetText = Posi Then qaerrorlog "#i94832#- Raising value for focal length has not changed optical appearence of object" + If PositionX.GetText = Posi Then + printlog "- Raising value for focal length has not changed optical appearence of object, ok." + else + warnlog "Problem with focal lenght here!" + endif TabPositionAndSize.OK WaitSlot (1000) Kontext "Drei_D_Effekte" @@ -977,7 +981,11 @@ testcase tiFormat3D_Effekte Active.SetPage TabPositionAndSize Kontext "TabPositionAndSize" Sleep (2) - if PositionX.GetText = Posi Then qaerrorlog "#i94832#- Lowering focus length value has not changed optical appearence of object" + if PositionX.GetText = Posi Then + printlog "- Lowering focus length value has not changed optical appearence of object, ok." + else + warnlog "problem with focus, check!" + endif TabPositionAndSize.OK Kontext "Drei_D_Effekte" '/// close document ///' diff --git a/testautomation/graphics/optional/includes/global/id_001.inc b/testautomation/graphics/optional/includes/global/id_001.inc index 24391ec7911a..a54ab85474d4 100755 --- a/testautomation/graphics/optional/includes/global/id_001.inc +++ b/testautomation/graphics/optional/includes/global/id_001.inc @@ -267,7 +267,7 @@ testcase tiFileVersion FileVersions catch Warnlog "- File / Versions not accessible!" - exit sub + goto endsub endcatch Kontext "Versionen" @@ -583,7 +583,7 @@ testcase tmFileNewFromTemplate '/// Check if dialog has been opened /// if TemplateAndDocuments.NotExists then Warnlog "Dialog Templates and Documents are not up!" - exit sub + goto endsub end if Call DialogTest (TemplateAndDocuments) WaitSlot (5000) diff --git a/testautomation/graphics/optional/includes/global/id_002.inc b/testautomation/graphics/optional/includes/global/id_002.inc index 0d8d040ab96e..75bee17d8b94 100755 --- a/testautomation/graphics/optional/includes/global/id_002.inc +++ b/testautomation/graphics/optional/includes/global/id_002.inc @@ -268,7 +268,7 @@ testcase tdEditDeleteSlide Kontext "Navigator" Navigator.Close Call hCloseDocument - exit sub + goto endsub else Liste.Select 2 Liste.Typekeys "<RETURN>" '/// Press Return to go to the selected slide ///' diff --git a/testautomation/graphics/optional/includes/global/id_007.inc b/testautomation/graphics/optional/includes/global/id_007.inc index 070b8ad25c23..97130d44568e 100755 --- a/testautomation/graphics/optional/includes/global/id_007.inc +++ b/testautomation/graphics/optional/includes/global/id_007.inc @@ -129,7 +129,7 @@ testcase tdContextConvertIntoPolygon if NOT GrafikEinfuegenDlg.Exists AND iWaitIndex = 10 then warnlog "Dialogue Insert Graphics didnt work. Ending testcase." Call hCloseDocument - Exit Sub + goto endsub end if '/// insert graphic: "global\input\graf_inp\enter.bmp" ///' Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp") diff --git a/testautomation/graphics/optional/includes/global/id_011.inc b/testautomation/graphics/optional/includes/global/id_011.inc index ea630fc6cec3..75f4c1e3a66d 100755 --- a/testautomation/graphics/optional/includes/global/id_011.inc +++ b/testautomation/graphics/optional/includes/global/id_011.inc @@ -158,7 +158,7 @@ testcase tiTextToolbar if NOT TextObjectbar.isEnabled AND iWaitIndex = 10 then warnlog "Dialogue TextObjectbar didnt work. Ending testcase." Call hCloseDocument - Exit Sub + goto endsub end if '/// Activate the Font spacing-buttons ///' TextObjectbar.OpenContextMenu @@ -352,7 +352,7 @@ testcase tiTextToolbar if TextObjectbar.isEnabled = FALSE AND iWaitIndex = 10 then warnlog "Dialogue TextObjectbar didnt work. Ending testcase." Call hCloseDocument - Exit Sub + goto endsub end if '/// Reset the original value of the Font spacing-buttons ///' sleep 2 diff --git a/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc b/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc index 661636c16593..8cfcba8f25b2 100755 --- a/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc +++ b/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc @@ -116,7 +116,7 @@ testcase tSaveLoadLayoutOLE end if kontext "Tasks" '/// select the OLE placeholder and activate it with [Return] ///' - LayoutsPreview.TypeKeys ("<RIGHT>",12) + LayoutsPreview.TypeKeys ("<RIGHT>",13) sleep (1) LayoutsPreview.TypeKeys ("<Return>") sleep (1) diff --git a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc index d7537c4e3ba4..d2254637a474 100755 --- a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc +++ b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc @@ -378,7 +378,7 @@ testcase t114174 dim i as integer dim sFile as string - if lCase(gApplication = "Impress") then + if lCase(gApplication) = "impress" then ExtensionString = "odp" else ExtensionString = "odg" diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc index fdc87d40b742..4fd1ed58fda4 100755 --- a/testautomation/graphics/optional/includes/impress/i_us_present.inc +++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc @@ -217,7 +217,7 @@ testcase i_us_presentation2 '/// 2. Layouts: Text. Bild: Gallery: Animation - Gif ///' Kontext "Tasks" LayoutsPreview.TypeKeys "<HOME>" 'to get to the very first position - LayoutsPreview.TypeKeys "<RIGHT>", 8 'to get to the right position + LayoutsPreview.TypeKeys "<RIGHT>", 9 'to get to the right position LayoutsPreview.TypeKeys "<RETURN>" Sleep (1) diff --git a/testautomation/graphics/required/includes/global/gallery.inc b/testautomation/graphics/required/includes/global/gallery.inc index a5bf84ea4e2d..9d13d3783817 100755 --- a/testautomation/graphics/required/includes/global/gallery.inc +++ b/testautomation/graphics/required/includes/global/gallery.inc @@ -308,7 +308,7 @@ testcase tGallery_CreateAndWorkWithANewGalleryThemes Pfad.SetText ( convertPath ( gTesttoolPath + "global\input\graf_inp" ) ) sleep (1) Auswaehlen.Click - sleep (2) + sleep (10) '/// +Click on <i>Add</i> for some graphics printlog " - 'add' one by one" Kontext "TabDateien" @@ -421,7 +421,7 @@ testcase tGallery_CreateAndWorkWithANewGalleryThemes Kontext "OeffnenDlg" Pfad.SetText ( convertPath ( gTesttoolPath + "global\input\graf_inp" ) ) Auswaehlen.Click - sleep (3) + sleep (10) Kontext "TabDateien" DateiListe.Select 1 Hinzufuegen.Click diff --git a/testautomation/graphics/required/includes/global/id_001.inc b/testautomation/graphics/required/includes/global/id_001.inc index 27d07ca468c0..87b7eadf4c18 100755 --- a/testautomation/graphics/required/includes/global/id_001.inc +++ b/testautomation/graphics/required/includes/global/id_001.inc @@ -147,11 +147,23 @@ testcase tiFileSaveAs sFileNameLoaded = Dateiname.GetSelText printlog "File will be loaded: " & sFileNameLoaded Oeffnen.Click - WaitSlot (5000) - hCloseDocument - printlog "Closing doc " & sFileNameLoaded - WaitSlot (2000) - + printlog "Closing doc if it gets loaded: " & sFileNameLoaded + if lCase(gApplication) = "impress" then + Kontext "DocumentImpress" + if DocumentImpress.exists(5) then + Call hCloseDocument + else + warnlog "File did not get loaded." + endif + else + Kontext "DocumentDraw" + if DocumentDraw.exists(5) then + Call hCloseDocument + else + warnlog "File did not get loaded." + endif + endif + WaitSlot (2000) next i endcase 'tiFileSaveAs @@ -250,7 +262,7 @@ testcase tiFileVersion FileVersions catch Warnlog "- File / Versions not accessible!" - exit sub + goto endsub endcatch Kontext "Versionen" @@ -570,7 +582,7 @@ testcase tmFileNewFromTemplate '/// Check if dialog has been opened /// if TemplateAndDocuments.NotExists then Warnlog "Dialog Templates and Documents are not up!" - exit sub + goto endsub end if Call DialogTest (TemplateAndDocuments) WaitSlot (5000) diff --git a/testautomation/graphics/required/includes/global/id_002.inc b/testautomation/graphics/required/includes/global/id_002.inc index bdbd82f74efb..a6de96980cbd 100755 --- a/testautomation/graphics/required/includes/global/id_002.inc +++ b/testautomation/graphics/required/includes/global/id_002.inc @@ -268,7 +268,7 @@ testcase tdEditDeleteSlide Kontext "Navigator" Navigator.Close Call hCloseDocument - exit sub + goto endsub else Liste.Select 2 Liste.Typekeys "<RETURN>" '/// Press Return to go to the selected slide ///' diff --git a/testautomation/graphics/required/includes/global/id_007.inc b/testautomation/graphics/required/includes/global/id_007.inc index bfbba7e3b782..cb4aa40a3dc6 100755 --- a/testautomation/graphics/required/includes/global/id_007.inc +++ b/testautomation/graphics/required/includes/global/id_007.inc @@ -129,7 +129,7 @@ testcase tdContextConvertIntoPolygon if NOT GrafikEinfuegenDlg.Exists AND iWaitIndex = 10 then warnlog "Dialogue Insert Graphics didnt work. Ending testcase." Call hCloseDocument - Exit Sub + goto endsub end if '/// insert graphic: "global\input\graf_inp\enter.bmp" ///' Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp") diff --git a/testautomation/graphics/required/includes/global/id_011.inc b/testautomation/graphics/required/includes/global/id_011.inc index 5fcf49a0218d..95cdd4f8f774 100755 --- a/testautomation/graphics/required/includes/global/id_011.inc +++ b/testautomation/graphics/required/includes/global/id_011.inc @@ -158,7 +158,7 @@ testcase tiTextToolbar if NOT TextObjectbar.isEnabled AND iWaitIndex = 10 then warnlog "Dialogue TextObjectbar didnt work. Ending testcase." Call hCloseDocument - Exit Sub + goto endsub end if '/// Activate the Font spacing-buttons ///' TextObjectbar.OpenContextMenu @@ -352,7 +352,7 @@ testcase tiTextToolbar if TextObjectbar.isEnabled = FALSE AND iWaitIndex = 10 then warnlog "Dialogue TextObjectbar didnt work. Ending testcase." Call hCloseDocument - Exit Sub + goto endsub end if '/// Reset the original value of the Font spacing-buttons ///' sleep 2 diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc index a81162988fb8..420577894486 100755 --- a/testautomation/graphics/tools/id_tools_2.inc +++ b/testautomation/graphics/tools/id_tools_2.inc @@ -119,7 +119,7 @@ sub sFileExport end if catch Warnlog "An error at creating the export-dir, the test ends!" - exit sub + goto endsub endcatch '///+ open the test document qatesttool/graphics/required/input/graphicexport.od ? ] ///' @@ -284,12 +284,12 @@ sub tClipboardFromDrawTest if gApplication = "WRITER" then call writertest - exit sub + goto endsub end if if gApplication = "CALC" then call calctest - exit sub + goto endsub end if end sub diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index 9afd9a3d6689..eaea4da36a32 100755 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -90,7 +90,7 @@ testcase tToolsSpellcheck TheFile = Convertpath (gTesttoolpath + "writer\optional\input\spellcheck\spellcheck_" + iSprache + ".odt") if hFileExists ( TheFile ) <> TRUE then Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer." - exit sub + goto endsub end if call hFileOpen (TheFile,false) Call sMakeReadOnlyDocumentEditable @@ -246,7 +246,7 @@ testcase tToolsThesaurus TheFile = Convertpath (gTesttoolpath + "writer\optional\input\spellcheck\spellcheck_" + iSprache + ".odt") if hFileExists ( TheFile ) <> TRUE then Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer." - exit sub + goto endsub end if call hFileOpen (TheFile,false) Call sMakeReadOnlyDocumentEditable @@ -956,9 +956,9 @@ endcase ' ------------------------------------------- testcase tToolsHangulHanjaConversion - - WarnLog "#i96838# - tToolsHangulHanjaConversion outcommented due to unreability." - exit sub + + WarnLog "#i96838# - tToolsHangulHanjaConversion outcommented due to unreability." + goto endsub Dim bAsianLanguage as Boolean Dim sTestFile as String @@ -1108,7 +1108,7 @@ endcase testcase tHtmlDocToolsHangulHanjaConversion WarnLog "#96838# - tToolsHangulHanjaConversion outcommented due to unreability." - exit sub + goto endsub Dim bAsianLanguage as Boolean Dim sTestFile as String |