diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-07 16:36:05 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-07 16:36:05 +0000 |
| commit | 4328033727ddff29c06a10640f7dcd76590b6050 (patch) | |
| tree | c89083f066aa5922d6312bdeafddae642064411b | |
| parent | 0c881ed110a0b925ce8554aa54c674dee1c9b2dc (diff) | |
CWS-TOOLING: integrate CWS menuchanges
2009-01-07 17:12:18 +0100 mod r265974 : throw out comment tracking accellerator
2009-01-07 16:23:35 +0100 mod r265972 : CWS-TOOLING: rebase CWS menuchanges to trunk@265758 (milestone: DEV300:m38)
2008-12-03 16:21:15 +0100 mod r264798 : menu shortcut fixes
2008-12-03 15:53:23 +0100 mod r264794 : some shortcut changes
2008-12-02 13:35:56 +0100 fredrikh r264696 : i96794
2008-12-01 20:09:07 +0100 fredrikh r264633 : i96768
2008-12-01 20:08:37 +0100 fredrikh r264632 : i96768
2008-12-01 16:40:18 +0100 fredrikh r264619 : i96762
2008-12-01 16:37:37 +0100 fredrikh r264618 : i96762
2008-12-01 16:37:09 +0100 fredrikh r264617 : i96762
2008-12-01 13:14:43 +0100 fredrikh r264595 : i90650
2008-11-28 18:26:38 +0100 fredrikh r264569 : i94758
2008-11-28 18:22:31 +0100 fredrikh r264568 : i94758
2008-11-28 12:46:26 +0100 fredrikh r264541 : i94758
2008-11-26 16:58:51 +0100 fredrikh r264423 : i96625
2008-11-26 16:14:10 +0100 fredrikh r264412 : i96623
2008-11-26 16:13:02 +0100 fredrikh r264410 : i96623
2008-11-25 19:46:42 +0100 fredrikh r264330 : i96359
2008-11-25 13:50:34 +0100 fredrikh r264307 : i96556
2008-11-25 13:49:46 +0100 fredrikh r264306 : i96556
2008-11-25 13:48:32 +0100 fredrikh r264305 : i96556
2008-11-25 13:46:55 +0100 fredrikh r264304 : i96556
2008-11-25 13:45:29 +0100 fredrikh r264303 : i96357
2008-11-25 13:42:11 +0100 fredrikh r264302 : i96556 & i94758
2008-11-25 13:34:54 +0100 fredrikh r264301 : i96556
2008-11-25 13:33:30 +0100 fredrikh r264300 : i96556
2008-11-25 13:32:31 +0100 fredrikh r264299 : i96556
2008-11-25 13:31:57 +0100 fredrikh r264298 : i96556
2008-11-25 13:31:27 +0100 fredrikh r264297 : i96556
2008-11-25 13:30:31 +0100 fredrikh r264295 : i96556
2008-11-25 13:29:29 +0100 fredrikh r264294 : i96556
2008-11-25 13:28:17 +0100 fredrikh r264292 : i96556
2008-11-25 13:27:44 +0100 fredrikh r264290 : i96556
2008-11-25 13:26:54 +0100 fredrikh r264288 : i96556
2008-11-25 13:25:03 +0100 fredrikh r264287 : i96556
2008-11-25 13:21:29 +0100 fredrikh r264286 : i96556
2008-11-19 16:14:07 +0100 fredrikh r264004 : i96359
2008-11-19 14:35:43 +0100 fredrikh r263995 : i96353
2008-11-19 14:05:58 +0100 fredrikh r263991 : i96347
2008-11-19 14:05:36 +0100 fredrikh r263990 : i96347
2008-11-19 14:05:07 +0100 fredrikh r263989 : i96347
2008-11-19 13:11:59 +0100 fredrikh r263983 : i96347
2008-11-19 13:00:09 +0100 fredrikh r263982 : i96347
2008-10-29 14:54:51 +0100 mod r262804 : 94633
2008-10-29 14:54:10 +0100 mod r262803 : #i94633#
2008-10-29 12:58:38 +0100 ufi r262787 : i94958,3rd
2008-10-29 12:42:41 +0100 ufi r262783 : i94958,2nd
2008-10-29 12:00:23 +0100 ufi r262777 : i94958
2008-10-28 23:45:34 +0100 mod r262766 : #i95457#
2008-10-18 19:09:38 +0200 mod r262295 : accelerator change
2008-10-17 15:45:11 +0200 mod r262289 : fix typo
2008-10-15 23:17:04 +0200 mod r262245 : menu fix
2008-10-15 22:58:30 +0200 mod r262244 : fix footnote setting dialog
2008-10-15 22:58:01 +0200 mod r262243 : further changes to menu
2008-10-14 10:27:46 +0200 mod r262195 : new accelerator and menu changes
2008-10-14 10:27:37 +0200 mod r262194 : new accelerator and menu changes
2008-10-07 14:23:26 +0200 mod r262081 : #i79329# #i85158# #i88351#
2008-10-02 10:31:52 +0200 mod r262026 : #i94551#
2008-10-02 10:23:57 +0200 mod r262025 : #i87347#
61 files changed, 770 insertions, 506 deletions
diff --git a/testautomation/chart2/tools/ch_tools_select.inc b/testautomation/chart2/tools/ch_tools_select.inc index c45a15780832..62bb768f9753 100644 --- a/testautomation/chart2/tools/ch_tools_select.inc +++ b/testautomation/chart2/tools/ch_tools_select.inc @@ -63,7 +63,7 @@ function fSelectChartByNumber ( iObjectPosition as INTEGER ) bNavigatorWasVisible = TRUE else '/// Invoke navigator if not visible - EditNavigator + ViewNavigator end if try @@ -92,7 +92,7 @@ function fSelectChartByNumber ( iObjectPosition as INTEGER ) if bNavigatorWasVisible = TRUE then printlog "Leaving navigator open as initially found" else - EditNavigator + ViewNavigator printlog "Closing navigator as initially found" end if end function diff --git a/testautomation/framework/optional/includes/ole_3.inc b/testautomation/framework/optional/includes/ole_3.inc index 36dc350b7b95..7fd9bbf34b08 100755 --- a/testautomation/framework/optional/includes/ole_3.inc +++ b/testautomation/framework/optional/includes/ole_3.inc @@ -306,7 +306,7 @@ function isOleAvailable() as boolean else Kontext "NavigatorWriter" if NOT NavigatorWriter.exists( 1 ) then - EditNavigator + ViewNavigator endif Kontext "NavigatorWriter" if NavigatorWriter.exists( 2 ) then ' was 5 secs @@ -364,7 +364,7 @@ function isOleAvailable() as boolean if NavigatorDraw.exists( 2 ) then ' was 5 secs printlog CFN & "Navigator draw is available" else - EditNavigator + ViewNavigator endif kontext "NavigatorDraw" if NavigatorDraw.exists( 2 ) then ' was 5 secs diff --git a/testautomation/framework/optional/includes/ole_tools.inc b/testautomation/framework/optional/includes/ole_tools.inc index d74d289bca70..1217c412fd14 100755 --- a/testautomation/framework/optional/includes/ole_tools.inc +++ b/testautomation/framework/optional/includes/ole_tools.inc @@ -143,11 +143,11 @@ sub DisableNavigator() select case gApplication case "GLOBALDOC" : Kontext "NavigatorGlobalDoc" if NavigatorGlobalDoc.Exists() then - EditNavigator + ViewNavigator endif case "WRITER" : Kontext "NavigatorWriter" if NavigatorWriter.Exists() then - EditNavigator + ViewNavigator endif end select sleep( 1) diff --git a/testautomation/framework/optional/includes/w_grid_layout1.inc b/testautomation/framework/optional/includes/w_grid_layout1.inc index 2c084a5e83a2..02f78ed3027d 100755 --- a/testautomation/framework/optional/includes/w_grid_layout1.inc +++ b/testautomation/framework/optional/includes/w_grid_layout1.inc @@ -113,7 +113,7 @@ testcase tTextGridDialog_2 '/// Active navigator dialogue , set page to '2' and wait for a while Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText "2" @@ -162,7 +162,7 @@ testcase tTextGridDialog_3 '/// Active navigator dialogue , set page to '2' and wait for a while Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText "2" @@ -213,7 +213,7 @@ testcase tTextGridDialog_4 '/// Active navigator dialogue , set page to '2' and wait for a while Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText "2" @@ -408,7 +408,7 @@ testcase tFontSizeChanges_1 '/// Active navigator dialogue , set page to '2' and wait for a while Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" if NavigatorWriter.exists(5) then Seitennummer.SetText "2" @@ -499,7 +499,7 @@ testcase tIndentsTest_1 '/// Active navigator dialogue , check if the page number is 1 Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" if Seitennummer.GetText <> sCorrectPage1 then Warnlog "First test :Something wrong in indents test!" fCloseNavigator @@ -515,7 +515,7 @@ testcase tIndentsTest_1 '/// Active navigator dialogue , check if the page number is 2 Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Second test :Something wrong in indents test!" fCloseNavigator @@ -551,7 +551,7 @@ testcase tObjectsTest_1 FormatAnchorAsCharacter Sleep 1 - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText sCorrectPage2 Sleep 5 @@ -566,7 +566,7 @@ testcase tObjectsTest_1 Kontext FormatAnchorToCharacter - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText sCorrectPage2 Sleep 5 diff --git a/testautomation/framework/tools/includes/CJK_tools.inc b/testautomation/framework/tools/includes/CJK_tools.inc index eaa48693ae5b..e877bbb2b3c5 100755 --- a/testautomation/framework/tools/includes/CJK_tools.inc +++ b/testautomation/framework/tools/includes/CJK_tools.inc @@ -78,7 +78,7 @@ function fStartupNavigator(navigatorItem as String , subItemNum as Integer) Kontext "Navigator" if NOT Navigator.Exists then ' If you don' t ask for the Navigator and it's open it would be clodes and test fails ! - EditNavigator + ViewNavigator end if Kontext "NavigatorWriter" if Auswahlliste.GetItemCount < 11 then diff --git a/testautomation/framework/tools/includes/options_tools.inc b/testautomation/framework/tools/includes/options_tools.inc index 0a9d60cf7163..078f8db67024 100755 --- a/testautomation/framework/tools/includes/options_tools.inc +++ b/testautomation/framework/tools/includes/options_tools.inc @@ -239,7 +239,7 @@ sub DialogTextForViewOptions_move Kontext "NavigatorWriter" if Not NavigatorWriter.Exists then - EditNavigator + ViewNavigator endif Kontext "Navigator" diff --git a/testautomation/graphics/optional/g_navigator.bas b/testautomation/graphics/optional/g_navigator.bas index c440bf88559b..bef4fe20088a 100755 --- a/testautomation/graphics/optional/g_navigator.bas +++ b/testautomation/graphics/optional/g_navigator.bas @@ -46,17 +46,17 @@ sub main Call hStatusIn ( "Graphics","g_navigator.bas") PrintLog "-------------------------" + gApplication + "-------------------" - Call tEditNavigatorZOrder - Call tdEditNavigator - Call tEditNavigatorGroupedObjects - Call tEditNavigatorNameActivated + Call tViewNavigatorZOrder + Call tdViewNavigator + Call tViewNavigatorGroupedObjects + Call tViewNavigatorNameActivated gApplication = "Draw" PrintLog "-------------------------" + gApplication + "-------------------" - Call tEditNavigatorZOrder - Call tdEditNavigator - Call tEditNavigatorGroupedObjects - Call tEditNavigatorNameActivated + Call tViewNavigatorZOrder + Call tdViewNavigator + Call tViewNavigatorGroupedObjects + Call tViewNavigatorNameActivated Call hStatusOut end sub diff --git a/testautomation/graphics/optional/includes/global/g_navigator.inc b/testautomation/graphics/optional/includes/global/g_navigator.inc index b1d846b81d6d..e33101ebdab0 100755 --- a/testautomation/graphics/optional/includes/global/g_navigator.inc +++ b/testautomation/graphics/optional/includes/global/g_navigator.inc @@ -36,13 +36,13 @@ '* short description : '* '************************************************************************************** -' #1 tdEditNavigator -' #1 tEditNavigatorZOrder -' #1 tEditNavigatorNameActivated -' #1 tEditNavigatorGroupedObjects +' #1 tdViewNavigator +' #1 tViewNavigatorZOrder +' #1 tViewNavigatorNameActivated +' #1 tViewNavigatorGroupedObjects '\************************************************************************************* -testcase tdEditNavigator +testcase tdViewNavigator dim position1 as integer dim zaehler as integer dim Ueber_Text_1 as string @@ -82,7 +82,7 @@ testcase tdEditNavigator Next Zaehler WaitSlot (1000) - EditNavigator '/// open navigator flyer ///' + ViewNavigator '/// open navigator flyer ///' Kontext "NavigatorDraw" if NavigatorDraw.exists (5) then printlog "OK" Erste.Click '/// jump to 1st slide ///' @@ -136,11 +136,11 @@ testcase tdEditNavigator WaitSlot (1000) '/// Close the document ///' Call hCloseDocument -endcase 'tdEditNavigator +endcase 'tdViewNavigator '-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -testcase tEditNavigatorZOrder +testcase tViewNavigatorZOrder qaerrorlog "Not yet ready." goto endsub @@ -299,11 +299,11 @@ testcase tEditNavigatorZOrder '/// Close the document ///' Call hCloseDocument -endcase 'tEditNavigatorZOrder +endcase 'tViewNavigatorZOrder '-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -testcase tEditNavigatorNameActivated +testcase tViewNavigatorNameActivated qaerrorlog "Not yet ready." goto endsub dim zPosition1 as integer @@ -322,11 +322,11 @@ testcase tEditNavigatorNameActivated '/// Open the Navigator ///' '/// Close the Navigator ///' '/// Close the document ///' -endcase 'tEditNavigatorNameActivated +endcase 'tViewNavigatorNameActivated '-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -testcase tEditNavigatorGroupedObjects +testcase tViewNavigatorGroupedObjects qaerrorlog "Not yet ready." goto endsub dim zPosition1 as integer @@ -346,6 +346,6 @@ testcase tEditNavigatorGroupedObjects '/// Open the Navigator ///' '/// Close the Navigator ///' '/// Close the document ///' -endcase 'tEditNavigatorGroupedObjects +endcase 'tViewNavigatorGroupedObjects '-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index d889fdfcb216..cf700cbd9632 100755 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -373,11 +373,11 @@ testcase tToolsMacro Bearbeiten.Click try sleep 1 ' this sleep is necessary. it takes some time, until focuse switched to basic window! - editnavigator + ViewNavigator kontext "NavigatorDraw" if NavigatorDraw.exists (5) then Warnlog " - Edit macro does not work" - editnavigator + ViewNavigator endif catch hCloseDocument diff --git a/testautomation/graphics/optional/includes/global/id_002.inc b/testautomation/graphics/optional/includes/global/id_002.inc index 7742d56df334..0d8d040ab96e 100755 --- a/testautomation/graphics/optional/includes/global/id_002.inc +++ b/testautomation/graphics/optional/includes/global/id_002.inc @@ -41,7 +41,6 @@ ' #1 tiEditCutPasteCopySelectall ' #1 tiEditPasteSpecial ' #1 tiEditSearchAndReplace -' #1 tiEditNavigator ' #1 tiEditDuplicate ' #1 tiEditFields ' #1 tdEditDeleteSlide @@ -181,30 +180,6 @@ testcase tiEditSearchAndReplace Call hCloseDocument endcase -testcase tiEditNavigator - '/// open application ///' - Call hNewDocument - - Kontext "NavigatorDraw" - '/// if 'Navigator' isn't already open, open it (Edit->Navigator)///' - if Not NavigatorDraw.Exists Then - EditNavigator - end if - Kontext "NavigatorDraw" - Call DialogTest ( NavigatorDraw ) - - try - Kontext "Navigator" - '/// close 'Navigator' ///' - Navigator.Close - catch - Errorlog " Navigator wasn't closed, second try with Menu" - EditNavigator - endcatch - '/// close application ///' - Call hCloseDocument -endcase - testcase tiEditDuplicate '/// open application ///' Call hNewDocument @@ -284,7 +259,7 @@ testcase tdEditDeleteSlide printlog "Navigator: open :-)" else printlog "Navigator: NOT available :-( Will be opened now!" - EditNavigator + ViewNavigator end if WaitSlot (2000) Kontext "NavigatorDraw" diff --git a/testautomation/graphics/optional/includes/global/id_003.inc b/testautomation/graphics/optional/includes/global/id_003.inc index cbd12ce7c203..9c8798b3aa77 100755 --- a/testautomation/graphics/optional/includes/global/id_003.inc +++ b/testautomation/graphics/optional/includes/global/id_003.inc @@ -36,6 +36,7 @@ '* short description : '* '*********************************************************************************** +' #1 tiViewNavigator ' #1 tiViewZoom ' #1 tiViewToolbar ' #1 tiViewDisplayQuality @@ -44,6 +45,32 @@ ' #1 tViewGrid '\********************************************************************************** +testcase tiViewNavigator + '/// open application ///' + Call hNewDocument + + Kontext "NavigatorDraw" + '/// if 'Navigator' isn't already open, open it (View->Navigator)///' + if Not NavigatorDraw.Exists Then + ViewNavigator + end if + Kontext "NavigatorDraw" + Call DialogTest ( NavigatorDraw ) + + try + Kontext "Navigator" + '/// close 'Navigator' ///' + Navigator.Close + catch + Errorlog " Navigator wasn't closed, second try with Menu" + ViewNavigator + endcatch + '/// close application ///' + Call hCloseDocument +endcase + +'------------------------------------------------------------------------- + testcase tiViewZoom '/// open application ///' Call hNewDocument diff --git a/testautomation/graphics/optional/includes/impress/i_pengine.inc b/testautomation/graphics/optional/includes/impress/i_pengine.inc index 16b99582692d..77b4be07f510 100755 --- a/testautomation/graphics/optional/includes/impress/i_pengine.inc +++ b/testautomation/graphics/optional/includes/impress/i_pengine.inc @@ -234,7 +234,7 @@ testcase tSlideShowInteraction warnlog "Navigator: already open :-(" else printlog "Navigator: NOT available :-( will be opened now!" - EditNavigator + ViewNavigator endif sleep 3 diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc index 1419862ccf22..5d37b2e53132 100755 --- a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc @@ -442,7 +442,7 @@ testcase tSlideShowInteraction printlog "Navigator: NOT available :-) will be opened now." Kontext "DocumentImpress" DocumentImpress.TypeKeys "<MOD1 SHIFT F5>" -' EditNavigator +' ViewNavigator endif sleep 3 diff --git a/testautomation/graphics/required/includes/global/id_002.inc b/testautomation/graphics/required/includes/global/id_002.inc index 9ce054f1ec50..bdbd82f74efb 100755 --- a/testautomation/graphics/required/includes/global/id_002.inc +++ b/testautomation/graphics/required/includes/global/id_002.inc @@ -41,7 +41,6 @@ ' #1 tiEditCutPasteCopySelectall ' #1 tiEditPasteSpecial ' #1 tiEditSearchAndReplace -' #1 tiEditNavigator ' #1 tiEditDuplicate ' #1 tiEditFields ' #1 tdEditDeleteSlide @@ -181,30 +180,6 @@ testcase tiEditSearchAndReplace Call hCloseDocument endcase -testcase tiEditNavigator - '/// open application ///' - Call hNewDocument - - Kontext "NavigatorDraw" - '/// if 'Navigator' isn't already open, open it (Edit->Navigator)///' - if Not NavigatorDraw.Exists Then - EditNavigator - end if - Kontext "NavigatorDraw" - Call DialogTest ( NavigatorDraw ) - - try - Kontext "Navigator" - '/// close 'Navigator' ///' - Navigator.Close - catch - Errorlog " Navigator wasn't closed, second try with Menu" - EditNavigator - endcatch - '/// close application ///' - Call hCloseDocument -endcase - testcase tiEditDuplicate '/// open application ///' Call hNewDocument @@ -284,7 +259,7 @@ testcase tdEditDeleteSlide printlog "Navigator: open :-)" else printlog "Navigator: NOT available :-( Will be opened now!" - EditNavigator + ViewNavigator end if WaitSlot (2000) Kontext "NavigatorDraw" diff --git a/testautomation/graphics/required/includes/global/id_003.inc b/testautomation/graphics/required/includes/global/id_003.inc index 4f3e134b07a1..551fd6d133d8 100755 --- a/testautomation/graphics/required/includes/global/id_003.inc +++ b/testautomation/graphics/required/includes/global/id_003.inc @@ -36,6 +36,7 @@ '* short description : '* '*********************************************************************************** +' #1 tiViewNavigator ' #1 tiViewZoom ' #1 tiViewToolbar ' #1 tiViewDisplayQuality @@ -44,6 +45,32 @@ ' #1 tViewGrid '\********************************************************************************** +testcase tiViewNavigator + '/// open application ///' + Call hNewDocument + + Kontext "NavigatorDraw" + '/// if 'Navigator' isn't already open, open it (View->Navigator)///' + if Not NavigatorDraw.Exists Then + ViewNavigator + end if + Kontext "NavigatorDraw" + Call DialogTest ( NavigatorDraw ) + + try + Kontext "Navigator" + '/// close 'Navigator' ///' + Navigator.Close + catch + Errorlog " Navigator wasn't closed, second try with Menu" + ViewNavigator + endcatch + '/// close application ///' + Call hCloseDocument +endcase + +'------------------------------------------------------------------------- + testcase tiViewZoom '/// open application ///' Call hNewDocument diff --git a/testautomation/graphics/required/includes/impress/i_opt_1_.inc b/testautomation/graphics/required/includes/impress/i_opt_1_.inc index 4d1b10e2f617..167752f26556 100755 --- a/testautomation/graphics/required/includes/impress/i_opt_1_.inc +++ b/testautomation/graphics/required/includes/impress/i_opt_1_.inc @@ -66,7 +66,7 @@ testcase tiAlwaysWithCurrentPage() if NavigatorDraw.exists (5) then warnlog "presupposition not met: navigator should be closed on loading the document!" else - EditNavigator + ViewNavigator WaitSlot (2000) end if @@ -81,11 +81,11 @@ testcase tiAlwaysWithCurrentPage() printlog "Start the slideshow with 'Slide Show->Slide Show." SlideShowSlideshow kontext "DocumentPresentation" - printlog "Open the navigator Edit->Navigator." + printlog "Open the navigator View->Navigator." Kontext "NavigatorDraw" printlog "Opening navigator if none is there." if (not NavigatorDraw.exists(5)) then - EditNavigator + ViewNavigator endif printlog "The slideshow has to start on slide 3." printlog "running routine for slide 3 and 4." @@ -93,7 +93,7 @@ testcase tiAlwaysWithCurrentPage() Kontext "NavigatorDraw" printlog "Checking for navigator.." if (not NavigatorDraw.exists(5)) then - EditNavigator + ViewNavigator endif printlog "Getting number of current slide." printlog "Countervariable is " & i @@ -135,7 +135,7 @@ testcase tiAlwaysWithCurrentPage() printlog "Making sure navigator is open." Kontext "NavigatorDraw" if (not NavigatorDraw.exists(5)) then - EditNavigator + ViewNavigator endif printlog "Checking if we are on slide one." i = fGetSlideNumber() @@ -147,18 +147,18 @@ testcase tiAlwaysWithCurrentPage() printlog "Start the slideshow with 'Slide Show->Slide Show." SlideShowSlideshow kontext "DocumentPresentation" - printlog "Open the navigator Edit->Navigator." + printlog "Open the navigator View->Navigator." Kontext "NavigatorDraw" printlog "Checking if navigator is open." if (not NavigatorDraw.exists(5)) then - EditNavigator + ViewNavigator endif printlog "The slideshow has to start on slide 1." printlog "Running routine for slide 1-4. i = 1 to 3 because we start already on slide 1." for i = 1 to 3 Kontext "NavigatorDraw" if (not NavigatorDraw.exists(5)) then - EditNavigator + ViewNavigator endif printlog "Getting number of current slide." fGetSlideNumber(i) @@ -184,7 +184,7 @@ testcase tiAlwaysWithCurrentPage() Kontext "NavigatorDraw" printlog "Checking if navigator is open." if (not NavigatorDraw.exists(5)) then - EditNavigator + ViewNavigator endif printlog "Checking if we are on slide 3." i = fGetSlideNumber() @@ -192,10 +192,10 @@ testcase tiAlwaysWithCurrentPage() warnlog "We are on the wrong slide! Should be 2 but it is: " & i endif - printlog "Close the navigator Edit->Navigator." + printlog "Close the navigator View->Navigator." Kontext "NavigatorDraw" if NavigatorDraw.exists(5) then - EditNavigator + ViewNavigator endif printlog "Restore: check Always with current page." diff --git a/testautomation/graphics/tools/id_tools.inc b/testautomation/graphics/tools/id_tools.inc index 1bec888ca50b..c32f7b4b5d2c 100755 --- a/testautomation/graphics/tools/id_tools.inc +++ b/testautomation/graphics/tools/id_tools.inc @@ -969,15 +969,15 @@ function fGetSlideNumber (optional sCompare as integer) as integer Kontext "NavigatorDraw" printlog "Checking if navigator is open, closing and opening for updating.." if NavigatorDraw.exists (5) then - EditNavigator ' to Workaround not updated navi :-( + ViewNavigator ' to Workaround not updated navi :-( sleep 3 - EditNavigator + ViewNavigator sleep 3 '/// check in list, if the page changed ///' else printlog "If Navigator is not open, opening it now." - EditNavigator + ViewNavigator endif printlog "Getting current slide number from navigator." fGetSlideNumber = val (right (Liste.GetSelText, 1)) @@ -1006,7 +1006,7 @@ function fGetSlideCount (optional iCount as integer) as integer Printlog "Navigator: open :-)" else Printlog "Navigator: NOT available :-( will be opened now!" - EditNavigator + ViewNavigator endif Sleep 1 '/// count rows in list of navigator: usually number of slides ///' @@ -1020,7 +1020,7 @@ function fGetSlideCount (optional iCount as integer) as integer endif endif '/// close navigator ///' - EditNavigator + ViewNavigator fGetSlideCount = i end function diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc index aa488a625c52..a81162988fb8 100755 --- a/testautomation/graphics/tools/id_tools_2.inc +++ b/testautomation/graphics/tools/id_tools_2.inc @@ -769,7 +769,6 @@ sub id_002 call tiEditCutPasteCopySelectall call tiEditPasteSpecial call tiEditSearchAndReplace - call tiEditNavigator call tiEditDuplicate call tEditPoints call tiEditFields @@ -787,6 +786,7 @@ sub id_003 printLog Chr(13) + "--------- id_003 ----------" + call tiViewNavigator call tiViewZoom call tiViewToolbar Call tToolsCustomize 'global\required\include diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc index 8019a6daa58d..89783c395cc2 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc @@ -47,7 +47,6 @@ ' #1 tEditChanges ' #1 tEditCompareDocuments ' #1 tEditFindAndReplace -' #1 tEditNavigator ' #1 tEditHeadersAndFooters '* '\*********************************************************************** @@ -66,7 +65,6 @@ sub c_upd_editmenu1 call tEditChanges call tEditCompareDocuments call tEditFindAndReplace - call tEditNavigator call tEditHeadersAndFooters end sub @@ -608,58 +606,6 @@ endcase '----------------------------------------------------------- -testcase tEditNavigator -'///<u><b>Edit - Navigator</b></u> - - '/// Open new Spreadsheet document - printlog " Open new Spreadsheet document" - call hNewDocument - '/// Check if Navigator already exists. If not open Navigator by Edit-Navigator. - printlog " Check if Navigator already exists. If not open Navigator by Edit-Navigator." - Kontext "NavigatorCalc" - if NavigatorCalc.exists then - warnlog "Navigator is already enabled" - else - EditNavigator - end if - Kontext "NavigatorCalc" - call DialogTest ( NavigatorCalc ) - '/// Check functionality of button for content by clicking it twice - printlog " Check functionality of button for content by clicking it twice" - Inhalte.Click - Inhalte.Click - '/// Check functionality of toggle button by clicking it twice - printlog " Check functionality of toggle button by clicking it twice" - Umschalten.Click - Umschalten.Click - '/// Check functionality of button for scenarios by clicking it twice - printlog " Check functionality of button for scenarios by clicking it twice" - Szenarien.Click - Szenarien.Click - '/// Check that the dragmodus has 3 modes - printlog " Check that the dragmodus has 3 modes" - Dragmodus.OpenMenu - if MenuGetItemCount <> 3 then - warnlog "Not enough modes for dragmodus" - end if - MenuSelect (0) - '/// Close Navigator - printlog " Close Navigator" - Kontext "Navigator" - Navigator.Close 'Because of #i78307 the navigatorwindow has to be closed by Navigator.close - Kontext "NavigatorCalc" - if NavigatorCalc.exists then - EditNavigator - Warnlog "NavigatorCalc.Close doesn't close the navigator" - end if - '/// Close document - printlog " Close document" - hCloseDocument - -endcase - -'----------------------------------------------------------- - testcase tEditHeadersAndFooters '///<u><b>Edit - Headers and Footers</b></u> diff --git a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc index d60e34964866..a529e7b79931 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc @@ -45,6 +45,7 @@ ' #1 tViewColumnRowHeaders ' #1 tViewValueHighlighting ' #1 tViewDataSources +' #1 tViewNavigator ' #1 tViewFullScreen ' #1 tViewZoom '* @@ -62,6 +63,7 @@ sub c_upd_viewmenu call tViewColumnRowHeaders call tViewValueHighlighting call tViewDataSources + call tViewNavigator call tViewFullScreen call tViewZoom @@ -299,6 +301,58 @@ endcase '----------------------------------------------------------- +testcase tViewNavigator +'///<u><b>Edit - Navigator</b></u> + + '/// Open new Spreadsheet document + printlog " Open new Spreadsheet document" + call hNewDocument + '/// Check if Navigator already exists. If not open Navigator by View-Navigator. + printlog " Check if Navigator already exists. If not open Navigator by View-Navigator." + Kontext "NavigatorCalc" + if NavigatorCalc.exists then + warnlog "Navigator is already enabled" + else + ViewNavigator + end if + Kontext "NavigatorCalc" + call DialogTest ( NavigatorCalc ) + '/// Check functionality of button for content by clicking it twice + printlog " Check functionality of button for content by clicking it twice" + Inhalte.Click + Inhalte.Click + '/// Check functionality of toggle button by clicking it twice + printlog " Check functionality of toggle button by clicking it twice" + Umschalten.Click + Umschalten.Click + '/// Check functionality of button for scenarios by clicking it twice + printlog " Check functionality of button for scenarios by clicking it twice" + Szenarien.Click + Szenarien.Click + '/// Check that the dragmodus has 3 modes + printlog " Check that the dragmodus has 3 modes" + Dragmodus.OpenMenu + if MenuGetItemCount <> 3 then + warnlog "Not enough modes for dragmodus" + end if + MenuSelect (0) + '/// Close Navigator + printlog " Close Navigator" + Kontext "Navigator" + Navigator.Close 'Because of #i78307 the navigatorwindow has to be closed by Navigator.close + Kontext "NavigatorCalc" + if NavigatorCalc.exists then + ViewNavigator + Warnlog "NavigatorCalc.Close doesn't close the navigator" + end if + '/// Close document + printlog " Close document" + hCloseDocument + +endcase + +'----------------------------------------------------------- + testcase tViewFullScreen '///<u><b>View - Full Screen</b></u> diff --git a/testautomation/spreadsheet/tools/includes/c_select_tools.inc b/testautomation/spreadsheet/tools/includes/c_select_tools.inc index 46f6a63ccba4..ef44ee41c4a5 100755 --- a/testautomation/spreadsheet/tools/includes/c_select_tools.inc +++ b/testautomation/spreadsheet/tools/includes/c_select_tools.inc @@ -201,7 +201,7 @@ function fNavigatorSelectObject ( sWhatObject as STRING , iObjectPosition as INT bNavigatorWasVisible = TRUE else '///<li>Invoke navigator if not visible</li>/// - EditNavigator + ViewNavigator end if try @@ -230,7 +230,7 @@ function fNavigatorSelectObject ( sWhatObject as STRING , iObjectPosition as INT if bNavigatorWasVisible = TRUE then printlog "Leaving navigator open as initially found" else - EditNavigator + ViewNavigator printlog "Closing navigator as initially found" end if '///</ul> diff --git a/testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate1.inc b/testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate1.inc index ebb1f133a29f..c52fb5a1980b 100755 --- a/testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate1.inc +++ b/testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate1.inc @@ -77,7 +77,7 @@ testcase tDefaultSetting_1 printlog " 'Simplified Chinese to Traditional Chinese' should be Checked by default" if NOT SChineseToTChinese.IsChecked then - Warnlog "'Simplified Chinese to Traditional Chinese' should be Checked by default !" + Warnlog "#i96768# 'Simplified Chinese to Traditional Chinese' should be Checked by default !" end if ChineseTranslation.Cancel @@ -331,6 +331,11 @@ endcase '----------------------------------------------------------------- testcase tChineseTranslate_5 + if bAsianLan <> True then + 'This testcase might only run with 'Use Taiwan , Hongkong SAR...'s status. + QaErrorLog "Testing with Asian languages only" + goto endsub + end if printlog "'Use Taiwan , Hongkong SAR...'s statue" diff --git a/testautomation/writer/optional/includes/fields/w_fields1.inc b/testautomation/writer/optional/includes/fields/w_fields1.inc index 811d8b010e8d..2da1bd844161 100755 --- a/testautomation/writer/optional/includes/fields/w_fields1.inc +++ b/testautomation/writer/optional/includes/fields/w_fields1.inc @@ -201,9 +201,7 @@ goto endsub '/// Check if the page number is correct Call wTypeKeys "<Shift Right>" - ToolsCalculate - EditCopy - if GetClipboardText <> sPage1 then + if fGetFieldContent( ) <> sPage1 then QAErrorLog "#i31214# The 1st page number isn't correct ! should be: '" + sPage1 + "', but was: '" + GetClipboard + "'." end if @@ -239,8 +237,8 @@ goto endsub '/// Check if the 1st page count is correct Call wTypeKeys "<Shift Right>" - ToolsCalculate - if GetClipboardText <> sPage1 then + EditCopy + if GetClipboard <> sPage1 then Warnlog "1-The 1st page count isn't correct !" end if Call wTypeKeys "<End>" @@ -259,15 +257,15 @@ goto endsub '/// Check if the page count is correct Call wTypeKeys "<Shift Right>" - ToolsCalculate - if GetClipboardText <> sPage2 then + 'EditCopy + if fGetFieldContent( ) <> sPage2 then Warnlog "2-The 1st page count isn't correct" end if Call wTypeKeys "<MOD1 End>" Call wTypeKeys "<Shift Left>" - ToolsCalculate - if GetClipboardText <> sPage2 then + EditCopy + if GetClipboard <> sPage2 then Warnlog "The 2nd page count isn't correct !" end if diff --git a/testautomation/writer/optional/includes/fields/w_fields2.inc b/testautomation/writer/optional/includes/fields/w_fields2.inc index f800eb781a2a..6ab38e5187cb 100755 --- a/testautomation/writer/optional/includes/fields/w_fields2.inc +++ b/testautomation/writer/optional/includes/fields/w_fields2.inc @@ -89,6 +89,10 @@ endcase '----------------------------------------------------------------- testcase tFieldsOther_1_1 + if iSprache <> 1 then + QaErrorLog "Currently no any other language than English. Aborting." + exit sub + end if Dim sFirstName , sLastName as String Dim sFirstName1 , sLastName1 as String @@ -187,6 +191,10 @@ endcase '----------------------------------------------------------------- testcase tFieldsOther_1_2 + if iSprache <> 1 then + QaErrorLog "Currently no any other language than English. Aborting." + exit sub + end if Dim sFirstName , sLastName as String Dim sFirstName1 , sLastName1 as String @@ -330,7 +338,7 @@ testcase tFieldsOther_2 Call wTypeKeys "<Shift Home>" Sleep 1 if fGetFieldContent() <> sChapter(i) then - Warnlog i &"#i40625# Should get " & sChapter(i) & " but get " & fGetFieldContent() + QaErrorLog i &"#94997# Should get " & sChapter(i) & " but get " & fGetFieldContent() end if Call wTypeKeys "<Delete>" next i @@ -375,6 +383,10 @@ endcase '----------------------------------------------------------------- testcase tFieldsOther_4 + if bAsianLan = true then + QaErrorLog "No testing with Asian language. Aborting." + exit sub + end if Dim sTestFile as String Dim sFilename(4) as String @@ -489,6 +501,10 @@ endcase '----------------------------------------------------------------- testcase tFieldsOther_6_1 + if iSprache <> 1 then + QaErrorLog "Currently no testing with other languages than English. (ID's are not the same) Aborting." + exit sub + end if Dim aUserData(14) , aUserData1() , aUserData2() as String @@ -660,6 +676,10 @@ endcase '----------------------------------------------------------------- testcase tFieldsOther_6_2 + if iSprache <> 1 then + QaErrorLog "Currently no testing with other languages than English. (ID's are not the same) Aborting." + exit sub + end if Dim aUserData(16) as String Dim aUserData1() as String diff --git a/testautomation/writer/optional/includes/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc index 38e2e53049c4..cb801f3a2344 100755 --- a/testautomation/writer/optional/includes/fields/w_fields4.inc +++ b/testautomation/writer/optional/includes/fields/w_fields4.inc @@ -743,7 +743,11 @@ testcase tDocInformation_8 Kontext "DruckenDlg" Sleep 1 DruckenDlg.OK - Sleep 5 + kontext "active" + if active.exists(5) then + QaErrorLog "Error Printing..." + Active.ok + end if end if '/// Check if the Printed field is changed in the document diff --git a/testautomation/writer/optional/includes/fields/w_fields5.inc b/testautomation/writer/optional/includes/fields/w_fields5.inc index ea7bceeccf80..df42c017f125 100755 --- a/testautomation/writer/optional/includes/fields/w_fields5.inc +++ b/testautomation/writer/optional/includes/fields/w_fields5.inc @@ -54,6 +54,10 @@ sub w_fields5 end sub testcase tVariables_1 + if bAsianLan = true then + QaErrorLog "No testing with Asian language. Aborting." + exit sub + end if Dim sName() as String Dim sValue as String @@ -122,6 +126,10 @@ endcase '----------------------------------------------------------------- testcase tVariables_2 + if bAsianLan = true then + QaErrorLog "No testing with Asian language. Aborting." + exit sub + end if Dim sName() as String Dim sValue as String @@ -178,7 +186,7 @@ testcase tVariables_2 for i = 0 to j Call wTypeKeys "<Shift Right>" if fGetFieldContent() <> sResult(i) then - Warnlog i & "Should get " & sResult(i) & " but get " & fGetFieldContent() + QaErrorLog i & "#i94596# - Should get " & sResult(i) & " but get " & fGetFieldContent() end if Call wTypeKeys "<Down><Home>" next i diff --git a/testautomation/writer/optional/includes/fields/w_fields7.inc b/testautomation/writer/optional/includes/fields/w_fields7.inc index 3a9335d5cf2f..d7f7bdafa9d4 100755 --- a/testautomation/writer/optional/includes/fields/w_fields7.inc +++ b/testautomation/writer/optional/includes/fields/w_fields7.inc @@ -47,6 +47,11 @@ end sub testcase tL10N_1 + if iSprache <> 1 then + QaErrorLog "Currently no any other language than English. Aborting." + exit sub + end if + Dim sTestFile as String Dim sAbove() as String Dim sBelow() as String @@ -175,7 +180,11 @@ endcase '----------------------------------------------------------------- testcase tL10N_2 - + if iSprache <> 1 then + QaErrorLog "Currently no any other language than English. Aborting." + exit sub + end if + Dim sTestFile as String Dim sDate() as String Dim iCountry() as Integer @@ -283,6 +292,10 @@ endcase '----------------------------------------------------------------- testcase tL10N_3 + if iSprache <> 1 then + QaErrorLog "Currently no any other language than English. Aborting." + exit sub + end if Dim sTestFile as String Dim sTime() as String diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc index 8f30309910b2..85b32b751553 100755 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc @@ -747,7 +747,7 @@ testcase tFormatPage_13 Call wTypeKeys "<Tab>" Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> sPage1 then Warnlog "1st pic isn't in page 1 !" @@ -758,7 +758,7 @@ testcase tFormatPage_13 Call wTypeKeys "<Tab>" Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> sPage2 then Warnlog "#i40333# 2nd pic isn't in page 3 !" @@ -804,7 +804,7 @@ testcase tFormatPage_14 Call wTypeKeys "<Tab>" Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> sPage1 then Warnlog "1st pic isn't in page 2 !" @@ -815,7 +815,7 @@ testcase tFormatPage_14 Call wTypeKeys "<Tab>" Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> sPage2 then Warnlog "#i40333# 2nd pic isn't in page 4 !" diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc index fc8c5601b356..ca005fac02f0 100755 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc @@ -71,12 +71,12 @@ testcase tFormatPage_16 '/// Open Navigator and enter as page number 2 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText "2" Seitennummer.TypeKeys "<Return>" '/// Close Navigator - EditNavigator + ViewNavigator '/// Step 3 times up in document Call wTypeKeys "<Up>" , 3 @@ -129,7 +129,7 @@ testcase tFormatPage_16 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "Something wrong in AutoFit Height!" @@ -159,12 +159,12 @@ testcase tFormatPage_17 '/// Open Navigator and enter as page number 2 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText "2" Seitennummer.TypeKeys "<Return>" '/// Close Navigator - EditNavigator + ViewNavigator '/// Step 3 times up in document Call wTypeKeys "<Up>" , 3 @@ -215,7 +215,7 @@ testcase tFormatPage_17 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "Something wrong in AutoFit Height --1 !" @@ -231,7 +231,7 @@ testcase tFormatPage_17 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "Something wrong in AutoFit Height --2 !" @@ -261,12 +261,12 @@ testcase tFormatPage_18 '/// Open Navigator and enter as page number 2 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText "2" Seitennummer.TypeKeys "<Return>" '/// Close Navigator - EditNavigator + ViewNavigator '/// Step 3 times up in document Call wTypeKeys "<Up>" , 3 @@ -314,7 +314,7 @@ testcase tFormatPage_18 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "Something wrong in AutoFit Height!" @@ -344,12 +344,12 @@ testcase tFormatPage_19 '/// Open Navigator and enter as page number 2 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText "2" Seitennummer.TypeKeys "<Return>" '/// Close Navigator - EditNavigator + ViewNavigator '/// Step 3 times up in document Call wTypeKeys "<Up>" , 3 @@ -389,7 +389,7 @@ testcase tFormatPage_19 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "Something wrong in AutoFit Height!" @@ -419,12 +419,12 @@ testcase tFormatPage_20 '/// Open Navigator and enter as page number 2 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText "2" Seitennummer.TypeKeys "<Return>" '/// Close Navigator - EditNavigator + ViewNavigator '/// Step 3 times up in document Call wTypeKeys "<Up>" , 3 @@ -477,7 +477,7 @@ testcase tFormatPage_20 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "Something wrong in AutoFit Height!" @@ -507,12 +507,12 @@ testcase tFormatPage_21 '/// Open Navigator and enter as page number 2 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText "2" Seitennummer.TypeKeys "<Return>" '/// Close Navigator - EditNavigator + ViewNavigator '/// Step 3 times up in document Call wTypeKeys "<Up>" , 3 @@ -565,7 +565,7 @@ testcase tFormatPage_21 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "Something wrong in AutoFit Height --1 !" @@ -581,7 +581,7 @@ testcase tFormatPage_21 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "Something wrong in AutoFit Height --2 !" @@ -611,12 +611,12 @@ testcase tFormatPage_22 '/// Open Navigator and enter as page number 2 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText "2" Seitennummer.TypeKeys "<Return>" '/// Close Navigator - EditNavigator + ViewNavigator '/// Step 3 times up in document Call wTypeKeys "<Up>" , 3 @@ -664,7 +664,7 @@ testcase tFormatPage_22 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "Something wrong in AutoFit Height!" @@ -694,12 +694,12 @@ testcase tFormatPage_23 '/// Open Navigator and enter as page number 2 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText "2" Seitennummer.TypeKeys "<Return>" '/// Close Navigator - EditNavigator + ViewNavigator '/// Step 3 times up in document Call wTypeKeys "<Up>" , 3 @@ -739,7 +739,7 @@ testcase tFormatPage_23 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "Something wrong in AutoFit Height!" diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc index 133b924b1ab0..53c8f4b69b50 100755 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc @@ -197,7 +197,7 @@ testcase tFormatPage_30 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "Something wrong in Header in 1st page!" @@ -348,7 +348,7 @@ testcase tFormatPage_32 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "Something wrong in Footer in 1st page!" @@ -774,7 +774,7 @@ testcase tFormatPage_39 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "the second column isn't right!" @@ -841,7 +841,7 @@ testcase tFormatPage_40 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "the second column isn't right!" diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc index 59a15c2074b9..8370846338bc 100755 --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc @@ -391,7 +391,7 @@ testcase tParagraphIndent5 '/// check if the 2nd paragraph is in 2nd page Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "Something wrong in 'Above paraghraph'! The end of 2nd paragraph should be 2nd page !" @@ -450,7 +450,7 @@ testcase tParagraphIndent6 '/// check if the 2nd paragraph is in 2nd page Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "Something wrong in 'Above paraghraph'! The end of 2nd paragraph should be 2nd page !" @@ -522,7 +522,7 @@ testcase tParagraphIndent7 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "The start of paragraph2 should be in 1st page !" @@ -538,7 +538,7 @@ testcase tParagraphIndent7 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The end of paragraph2 should be in 2nd page !" @@ -609,7 +609,7 @@ testcase tParagraphIndent8 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The start of paragraph2 should be in 2nd page !" @@ -649,7 +649,7 @@ testcase tParagraphIndent9 '/// check if the last line is in 1 page (it should be) Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "The end of paragraph should be in 1st page !" @@ -694,7 +694,7 @@ testcase tParagraphIndent10 '/// check if the last 2 lines(7th and 8th) is in 2nd page (it should be) Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The 8th line should be in 2nd page !" @@ -706,7 +706,7 @@ testcase tParagraphIndent10 Sleep 1 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The 7th line should be in 2nd page !" @@ -719,7 +719,7 @@ testcase tParagraphIndent10 '/// check if the 5th lines is in 1st page (it should be) Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "The 5th line should be in 1st page !" @@ -763,7 +763,7 @@ testcase tParagraphIndent11 '/// check if the last 4 lines is in 2nd page (it should be) Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The 8th line should be in 2nd page !" @@ -773,7 +773,7 @@ testcase tParagraphIndent11 Sleep 1 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The 5th line should be in 2nd page !" @@ -784,7 +784,7 @@ testcase tParagraphIndent11 '/// check if the first 4 lines is in 1st page (it should be) Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "The 4th line should be in 1st page !" @@ -796,7 +796,7 @@ testcase tParagraphIndent11 Call wTypeKeys "m" Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "3" then warnlog "The 9th line should be in 3rd page !" @@ -860,7 +860,7 @@ testcase tParagraphIndent12 '/// check if the last 2 lines is in 2nd page (it should be) Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The 8th line should be in 2nd page !" @@ -870,7 +870,7 @@ testcase tParagraphIndent12 Sleep 1 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "The 6th line should be in 2nd page !" @@ -929,7 +929,7 @@ testcase tParagraphIndent13 '/// check if it is 1 line /page Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "8" then Warnlog "#i73903#The 8th line should be in 8th page !" @@ -998,7 +998,7 @@ testcase tParagraphIndent14 '/// check if it is 1 line /page Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "8" then Warnlog "#i73903#The 8th line should be in 8th page !" @@ -1064,7 +1064,7 @@ testcase tParagraphIndent15 Call wTypeKeys "<Down>" , 7 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "The 8th line should be in 1st page !" @@ -1073,7 +1073,7 @@ testcase tParagraphIndent15 Call wTypeKeys "<Down>" Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The 9th line should be in 2nd page !" diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc index 3897a9cca68b..f3c6f5624994 100755 --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc @@ -966,7 +966,7 @@ testcase tParagraphTextFlow5 '/// + check if the 2nd paragraph is in 2nd page Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "Something wrong in 'Paragraph break before Column'!" @@ -1012,7 +1012,7 @@ testcase tParagraphTextFlow6 '/// + check if the 2nd paragraph is in 2nd page Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "Something wrong in 'Paragraph break after Column'! " @@ -1068,7 +1068,7 @@ testcase tParagraphTextFlow7 '/// + check if the 2nd paragraph is in 4th page Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "Something wrong in ' Column break after paragraph'! " @@ -1117,7 +1117,7 @@ testcase tParagraphTextFlow8 '/// + check if the 2nd paragraph is in 2nd page Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "Something wrong in 'Paragraph break after page'! " @@ -1160,7 +1160,7 @@ testcase tParagraphTextFlow9 TabTextfluss.OK Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "The head of the paragraph should be in 1st page !" @@ -1168,7 +1168,7 @@ testcase tParagraphTextFlow9 Call wTypeKeys "<MOD1 End>" Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The end of the paragraph should be in 2nd page !" @@ -1194,7 +1194,7 @@ testcase tParagraphTextFlow9 TabTextfluss.OK Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The head of the paragraph should be in 2nd page !" @@ -1202,7 +1202,7 @@ testcase tParagraphTextFlow9 Call wTypeKeys "<MOD1 End>" Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The end of the paragraph should be in 2nd page !" @@ -1250,7 +1250,7 @@ testcase tParagraphTextFlow10 TabTextfluss.OK Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "The head of the 1st paragraph should be in 1st page ! == " &i @@ -1264,7 +1264,7 @@ testcase tParagraphTextFlow10 Sleep 1 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The head of the 2nd paragraph should be in 2nd page !" @@ -1294,7 +1294,7 @@ testcase tParagraphTextFlow10 TabTextfluss.OK Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The head of the 1st paragraph should be in 2nd page !" @@ -1310,7 +1310,7 @@ testcase tParagraphTextFlow10 FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The head of the 2nd paragraph should be in 2nd page !" @@ -1353,7 +1353,7 @@ testcase tParagraphTextFlow11 '/// + check if the 1st line is in 1st page Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "The 1st line should be in 1st page!" @@ -1364,7 +1364,7 @@ testcase tParagraphTextFlow11 '/// + check if the 1st line is in 2nd page Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The 1st line should be in 2nd page!" @@ -1407,7 +1407,7 @@ testcase tParagraphTextFlow12 '/// + check if the lastest 3rd line(6th line) is in 2nd page Call wTypeKeys "<Down>" , 5 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then warnlog "The 6th line should be in 2nd page!" @@ -1416,7 +1416,7 @@ testcase tParagraphTextFlow12 '/// + check if the 5th line is in 1st page Call wTypeKeys "<Up>" Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then warnlog "The 5th line should be in 1st page!" diff --git a/testautomation/writer/optional/includes/navigator/w_navigator.inc b/testautomation/writer/optional/includes/navigator/w_navigator.inc index 0d433c128538..eb70fc160db2 100755 --- a/testautomation/writer/optional/includes/navigator/w_navigator.inc +++ b/testautomation/writer/optional/includes/navigator/w_navigator.inc @@ -39,20 +39,20 @@ sub w_navigator printLog Chr(13) + "--------- Navigator Functions - ----------" - Call tEditNavigator1 ' alle Methoden am Dockingwindow - Navigator + Call tViewNavigator1 ' alle Methoden am Dockingwindow - Navigator if gApplication = "WRITER" then - Call tEditNavigator2 ' dokument?bergreifenden Methoden am Dockingwindow - Call tEditNavigator3 ' Funktionen testen - Call tEditNavigator4 ' Inhaltsansicht des Navigators ?berpr?fen - Call tEditNavigator5 ' Anspringen von Punkten im Dokument ?ber die Inhaltsansicht - Call tEditNavigator6 ' Umbenennen von Objekten aus dem Navigator + Call tViewNavigator2 ' dokument?bergreifenden Methoden am Dockingwindow + Call tViewNavigator3 ' Funktionen testen + Call tViewNavigator4 ' Inhaltsansicht des Navigators ?berpr?fen + Call tViewNavigator5 ' Anspringen von Punkten im Dokument ?ber die Inhaltsansicht + Call tViewNavigator6 ' Umbenennen von Objekten aus dem Navigator end if end sub ' ********************************************************************** -testcase tEditNavigator1 +testcase tViewNavigator1 Dim xPos as long : Dim yPos as long: Dim xSize% : Dim ySize% '/// Edit / Navigator ( all methods from Navigator as Window ) /// @@ -66,7 +66,7 @@ testcase tEditNavigator1 Kontext "Navigator" if Navigator.NotExists then Warnlog "No Navigator with F5" - EditNavigator + ViewNavigator end if '/// Move Navigator /// @@ -105,9 +105,9 @@ testcase tEditNavigator1 yPos = Navigator.GetPosY xSize% = Navigator.GetSizeX ySize% = Navigator.GetSizeY - EditNavigator + ViewNavigator Sleep 1 - EditNavigator + ViewNavigator if xPos <> Navigator.GetPosX then Warnlog "X-Pos. has been changed : Should -> "+ xPos + " Is -> "+ Navigator.GetPosX if yPos <> Navigator.GetPosY then Warnlog "Y-Pos. has been changed : Should -> "+ yPos + " Is -> "+ Navigator.GetPosY if xSize% <> Navigator.GetSizeX then Warnlog "X-Size has been changed : Should -> "+ xSize% + " Is -> "+ Navigator.GetSizeX @@ -125,7 +125,7 @@ endcase ' ********************************************************************** -testcase tEditNavigator2 +testcase tViewNavigator2 Dim xPos% : Dim yPos% : Dim xSize% : Dim ySize% Dim datgeht as boolean '/// Edit / Navigator ( document-spreading methods with Navigator as Window ) /// @@ -138,7 +138,7 @@ testcase tEditNavigator2 '/// Edit / Navigator /// Kontext "Navigator" - if Navigator.NotExists then EditNavigator + if Navigator.NotExists then ViewNavigator '/// New document /// Call hNewDocument '/// Insert some text in second document /// @@ -215,7 +215,7 @@ endcase ' ********************************************************************** -testcase tEditNavigator3 +testcase tViewNavigator3 QaErrorLog "#i94614# - tEditNavigator3 outcommented" exit sub @@ -227,7 +227,7 @@ exit sub Call sMakeReadOnlyDocumentEditable '/// Open Navigator /// Kontext "Navigator" - if Navigator.NotExists then EditNavigator + if Navigator.NotExists then ViewNavigator Kontext "NavigatorWriter" '/// Enter Pagenumber '5' in Navigator Seitennummer.Settext "5" @@ -361,7 +361,7 @@ endcase ' ********************************************************************** -testcase tEditNavigator4 +testcase tViewNavigator4 Dim i : Dim j : Dim Ende : Dim k Dim AlteGruppe$ : Dim AlterUnterwert$ Ende=1000 @@ -371,7 +371,7 @@ testcase tEditNavigator4 Call hFileOpen ( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" ) Call sMakeReadOnlyDocumentEditable '/// Open Navigator through Edit / Navigator /// - EditNavigator + ViewNavigator Kontext "NavigatorWriter" '/// Check all entrys in Navigator and notice the name /// for i= 1 to 12 @@ -422,7 +422,7 @@ endcase ' ********************************************************************** -testcase tEditNavigator5 +testcase tViewNavigator5 QaErrorLog "#i94614# - tEditNavigator5 outcommented" exit sub @@ -438,7 +438,7 @@ exit sub '/// Open Navigator /// Kontext "NavigatorWriter" if Not NavigatorWriter.Exists then - EditNavigator + ViewNavigator Kontext "NavigatorWriter" end if @@ -608,7 +608,7 @@ endcase ' ********************************************************************** -testcase tEditNavigator6 +testcase tViewNavigator6 Dim j as integer Dim datIsderAlte(4) as string @@ -618,7 +618,7 @@ testcase tEditNavigator6 Call sMakeReadOnlyDocumentEditable Kontext "Navigator" '/// Open Navigator /// - if Navigator.NotExists then EditNavigator + if Navigator.NotExists then ViewNavigator Kontext "NavigatorWriter" Call wNavigatorAuswahl(1,0) @@ -676,7 +676,7 @@ testcase tEditNavigator6 Kontext "Navigator" if Navigator.NotExists then Warnlog "- The Navigator should have been opened!" - EditNavigator + ViewNavigator end if Kontext "NavigatorWriter" @@ -797,7 +797,7 @@ testcase tEditNavigator6 TabZusaetze.Cancel Kontext '/// Close Navigator /// - EditNavigator + ViewNavigator Sleep 1 '/// Close document /// Call hCloseDocument diff --git a/testautomation/writer/optional/includes/number/w_205a_.inc b/testautomation/writer/optional/includes/number/w_205a_.inc index 3eabdde61964..38efe1a1728c 100755 --- a/testautomation/writer/optional/includes/number/w_205a_.inc +++ b/testautomation/writer/optional/includes/number/w_205a_.inc @@ -54,6 +54,8 @@ testcase tToolsOutlineNumbering1 PrintLog "- Tools / Outline Numbering: Part 1 - Numbering" Call hFileOpen ( gTesttoolPath + "writer\optional\input\number\numbering1.sxw" ) + Call sMakeReadOnlyDocumentEditable + ToolsOutlineNumbering Kontext Active.SetPage TabKapitelnumerierung @@ -348,6 +350,8 @@ testcase tToolsOutlineNumbering2 PrintLog "- Tools / Outline Numbering: Part 2 - Tabpage Position" Call hFileOpen ( gTesttoolPath + "writer\optional\input\number\numbering1.sxw" ) + Call sMakeReadOnlyDocumentEditable + ToolsOutlineNumbering Kontext Active.SetPage TabKapitelnumerierung diff --git a/testautomation/writer/optional/includes/number/w_207_.inc b/testautomation/writer/optional/includes/number/w_207_.inc index a1fc3e17581f..89e533dd6466 100755 --- a/testautomation/writer/optional/includes/number/w_207_.inc +++ b/testautomation/writer/optional/includes/number/w_207_.inc @@ -85,6 +85,7 @@ testcase tToolsNumbering12 '/// open file sleep 2 Call hFileOpen ( DocFileList(i) ) + Call sMakeReadOnlyDocumentEditable Kontext "Filterauswahl" if Filterauswahl.Exists then @@ -133,6 +134,7 @@ testcase tToolsNumbering13 printlog "#i73790 regression testing" '/// Load document 'writer\\optional\\input\\number\\regression\\73790.doc' Call hFileOpen ( gTesttoolPath + "writer\optional\input\number\regression\73790.doc" ) + Call sMakeReadOnlyDocumentEditable '/// Document has Heading1-Heading3 formatted, be sure it is call wTypeKeys ("<Mod1 Home>") '/// Point cursor to top of document with <STRG HOME> diff --git a/testautomation/writer/optional/includes/option/wh_o_1.inc b/testautomation/writer/optional/includes/option/wh_o_1.inc index 69bfac7d89ba..4095cca4febe 100755 --- a/testautomation/writer/optional/includes/option/wh_o_1.inc +++ b/testautomation/writer/optional/includes/option/wh_o_1.inc @@ -584,7 +584,7 @@ testcase tToolsOptionsHTMLGrid ' select grafik element Call wNavigatorAuswahl(4,1) - EditNavigator + ViewNavigator sleep (2) FormatGraphics Kontext @@ -618,7 +618,7 @@ testcase tToolsOptionsHTMLGrid ' check if @ (1,1) Current-Measure-Unit :-) Call wNavigatorAuswahl(4,1) - EditNavigator + ViewNavigator sleep (2) FormatGraphics Kontext diff --git a/testautomation/writer/optional/includes/option/wr_o_1.inc b/testautomation/writer/optional/includes/option/wr_o_1.inc index a4fe4516652e..0a671b404a7b 100755 --- a/testautomation/writer/optional/includes/option/wr_o_1.inc +++ b/testautomation/writer/optional/includes/option/wr_o_1.inc @@ -873,7 +873,7 @@ testcase tToolsOptionsWriterGrid4 ' check if @ (0,0) Pineapples ;-) wait 500 - EditNavigator + ViewNavigator wait 500 FormatGraphics wait 500 @@ -906,7 +906,7 @@ testcase tToolsOptionsWriterGrid4 ' check if @ (1,1) Current-Measure-Unit :-) Call wNavigatorAuswahl(4,1) - EditNavigator + ViewNavigator sleep (3) try FormatGraphics diff --git a/testautomation/writer/optional/includes/option/wr_o_4.inc b/testautomation/writer/optional/includes/option/wr_o_4.inc index 6167ca0fe1f7..776a87c67d28 100755 --- a/testautomation/writer/optional/includes/option/wr_o_4.inc +++ b/testautomation/writer/optional/includes/option/wr_o_4.inc @@ -873,7 +873,7 @@ testcase tToolsOptionsWriterMailMerge Call hNewDocument printlog ("'///- Tools/Options/Writer: Mail Merge ///") Kontext "Navigator" - if Navigator.Exists then EditNavigator + if Navigator.Exists then ViewNavigator ToolsOptions Call hToolsOptions ("TextDocument","MailMergeEMail") diff --git a/testautomation/writer/optional/includes/regexp/search.inc b/testautomation/writer/optional/includes/regexp/search.inc index 45e9fe6c060a..9a8462eb0b27 100755 --- a/testautomation/writer/optional/includes/regexp/search.inc +++ b/testautomation/writer/optional/includes/regexp/search.inc @@ -198,7 +198,7 @@ testcase tCallDialog Call hNewDocument '/// Open new document /// Kontext "Navigator" - If Navigator.Exists then EditNavigator + If Navigator.Exists then ViewNavigator printlog "- Check, if dialog is not present in a new document" '/// Check, if dialog is not present in a new document /// kontext "FindAndReplace" diff --git a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc index b34463a8fef0..8646edf18a00 100755 --- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc +++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc @@ -53,7 +53,7 @@ end sub testcase i64991 Dim PrevMacroSetting as integer - Dim sDocName as string, i as integer, j as integer + Dim sDocName as string, i as integer, j as integer sDocName = ConvertPath(gtesttoolpath & "writer\optional\input\regression\issuezilla\i64991.odt") '/// New writer document @@ -62,13 +62,7 @@ testcase i64991 PrevMacroSetting = hSetMacroSecurity(1) '/// Open file \\writer\\optional\\input\\regression\\issuezilla\\i64991.odt printlog "- Open file: " & sDocName - FileOpen - sleep (1) - Kontext "OeffnenDlg" - Dateiname.SetText sDocName - sleep (3) - Oeffnen.Click - sleep(2) + call hFileOpen (sDocName,false) Kontext "SecurityWarning" if SecurityWarning.Exists(2) then SecurityWarning.OK @@ -77,6 +71,7 @@ testcase i64991 Call hCloseDocument goto endsub end if + Call sMakeReadOnlyDocumentEditable '/// Now Execute Macro 'Main' in Node 'i64991'->'check_page_style' printlog "- execute macro" ToolsMacrosRunMacro @@ -92,7 +87,7 @@ testcase i64991 LibraryTreeList.Select i if InStr(LibraryTreeList.GetSelText,"i64991") then printlog " - open node 'i64991' in Library list" - i = LibraryTreeList.GetItemCount + 1 + i = LibraryTreeList.GetItemCount + 1 LibraryTreeList.TypeKeys "+" wait 500 printlog " - select 'Standard' in Library list" diff --git a/testautomation/writer/optional/includes/section/w_section_1.inc b/testautomation/writer/optional/includes/section/w_section_1.inc index e9d1402bfb8a..7a306ec3b42f 100755 --- a/testautomation/writer/optional/includes/section/w_section_1.inc +++ b/testautomation/writer/optional/includes/section/w_section_1.inc @@ -334,7 +334,7 @@ testcase tInsertSection_4 TabBereiche.OK sleep(1) Kontext - EditNavigator + ViewNavigator sleep(1) Kontext "NavigatorWriter" Seitennummer.SetText "2" diff --git a/testautomation/writer/optional/includes/section/w_section_4.inc b/testautomation/writer/optional/includes/section/w_section_4.inc index 4bf1ce5821f4..1978968f667f 100755 --- a/testautomation/writer/optional/includes/section/w_section_4.inc +++ b/testautomation/writer/optional/includes/section/w_section_4.inc @@ -536,7 +536,7 @@ testcase tSectionInFootnotes_2 Call wBlindtextEinfuegen Kontext - EditNavigator + ViewNavigator sleep(1) Kontext "NavigatorWriter" @@ -884,7 +884,7 @@ testcase tParagraphSection_1 'Set the focus to the head of second page Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Seitennummer.SetText "2" Sleep 2 diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc index 71213beaa479..179ff0c3a37f 100755 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc @@ -69,11 +69,11 @@ DIM WordLanguageTemp AS string 'variable for checking if Office language is a printlog "Autospellcheck is already checked" end if '---------------------------------------------------------------- - EditNavigator 'opening navigator and selecting table + ViewNavigator 'opening navigator and selecting table sleep(1) Call wNavigatorAuswahl(2,1) DocumentWriter.TypeKeys "<MOD1 UP>" - EditNavigator 'closing navigator + ViewNavigator 'closing navigator printlog "-----------------" '---------------------------------------------------------------- '///Put the cursor in the first wrong word/// diff --git a/testautomation/writer/optional/includes/textframes/w_textframes1.inc b/testautomation/writer/optional/includes/textframes/w_textframes1.inc index 57cf80e53c5e..fbbbbee3043f 100755 --- a/testautomation/writer/optional/includes/textframes/w_textframes1.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes1.inc @@ -430,7 +430,7 @@ testcase tTextframes_6 FindAndReplace.Cancel Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -459,7 +459,7 @@ testcase tTextframes_6 if GetClipboardText <> sTestText then Warnlog "The test text isn't right !" Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then Warnlog "The test text should be in second page !" @@ -472,7 +472,7 @@ testcase tTextframes_6 Sleep 1 Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then Warnlog "The test frame should be still in first page !" @@ -510,7 +510,7 @@ testcase tTextframes_7 Check: Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -549,7 +549,7 @@ testcase tTextframes_7 Sleep 1 Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then Warnlog "The test frame should be in second page !" @@ -587,7 +587,7 @@ testcase tTextframes_8 Check1: Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -626,7 +626,7 @@ testcase tTextframes_8 Sleep 1 Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then Warnlog "The test frame should be in first page !" @@ -643,7 +643,7 @@ testcase tTextframes_8 Check2: Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -679,7 +679,7 @@ testcase tTextframes_8 Sleep 1 Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then Warnlog "The test frame should be in second page !" @@ -716,7 +716,7 @@ testcase tTextframes_9 Check1: Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -755,7 +755,7 @@ testcase tTextframes_9 Sleep 1 Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then Warnlog "The test frame should be in first page !" @@ -769,7 +769,7 @@ testcase tTextframes_9 Check2: Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -807,7 +807,7 @@ testcase tTextframes_9 Sleep 1 Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then Warnlog "The test frame should be in second page !" @@ -856,7 +856,7 @@ testcase tTextframes_10 Sleep 1 Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then Warnlog "The test frame should be in second page -1!" @@ -880,7 +880,7 @@ testcase tTextframes_10 Sleep 1 Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then @@ -907,7 +907,7 @@ testcase tTextframes_10 Sleep 1 Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then Warnlog "The test frame should be in first page ! -2" @@ -965,7 +965,7 @@ Check1: FindAndReplace.Cancel Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -1005,7 +1005,7 @@ Check2: FindAndReplace.Close Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then @@ -1032,7 +1032,7 @@ Check2: '/// Check if frame is in 1st page Kontext "Navigator" - if Not Navigator.Exists then EditNavigator + if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then diff --git a/testautomation/writer/optional/includes/textframes/w_textframes2.inc b/testautomation/writer/optional/includes/textframes/w_textframes2.inc index 627225f1632e..bfe9c112a7b4 100755 --- a/testautomation/writer/optional/includes/textframes/w_textframes2.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes2.inc @@ -83,7 +83,7 @@ goto endsub Call wTypeKeys "<ESCAPE>" Wait 500 - Call gMouseClick(32,55) + Call gMouseClick(25,15) Wait 500 '/// check if contents can be inserted into frame @@ -129,7 +129,7 @@ goto endsub Call wTypeKeys "<ESCAPE>" Wait 500 - Call gMouseClick(55,50) + Call gMouseClick(30,15) Sleep 2 '/// check if the frame is moved @@ -236,7 +236,7 @@ testcase tTextframes_20 '/// Check if frame is in 1st page Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -257,7 +257,7 @@ testcase tTextframes_20 endcatch Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then @@ -302,7 +302,7 @@ testcase tTextframes_21 '/// Check if frame are in 1st page Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -323,7 +323,7 @@ testcase tTextframes_21 endcatch Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -371,7 +371,7 @@ testcase tTextframes_22 '/// Check if frame are in 1st page Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -393,7 +393,7 @@ testcase tTextframes_22 endcatch Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -416,7 +416,7 @@ testcase tTextframes_22 '/// Check if frame are in 1st page Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -438,7 +438,7 @@ testcase tTextframes_22 endcatch Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then @@ -486,7 +486,7 @@ testcase tTextframes_23 '/// Check if frame are in 1st page Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -508,7 +508,7 @@ testcase tTextframes_23 endcatch Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then @@ -531,7 +531,7 @@ testcase tTextframes_23 '/// Check if frame are in 1st page Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -553,7 +553,7 @@ testcase tTextframes_23 endcatch Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -852,6 +852,9 @@ testcase tTextframes_28 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sFrameName1 as String Dim sFrameName2 as String @@ -882,6 +885,10 @@ goto endsub '/// Insert another frame Call fInsertFrame(50, 35, 30, 55) + printlog "Move second frame away from the first frame." + Call wTypeKeys "<RIGHT>", 10 + Call wTypeKeys "<DOWN>", 7 + '/// + Naming the frame Call fFormatFrame("TabZusaetze") ObjektName.SetText sFrameName2 @@ -1131,7 +1138,7 @@ goto endsub '/// Check if the text can be inputed into frame Call hFileOpen(sTestFile,false) - Call gMouseClick(35,40) + Call gMouseClick(25,20) Wait 500 try diff --git a/testautomation/writer/optional/includes/textframes/w_textframes3.inc b/testautomation/writer/optional/includes/textframes/w_textframes3.inc index 315ce23eb94e..49e42833f849 100755 --- a/testautomation/writer/optional/includes/textframes/w_textframes3.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes3.inc @@ -64,19 +64,26 @@ testcase tTextframes_33 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + printlog "- Test attribute 'AutoSize' in linked frames" '/// Test attribute 'AutoSize' in linked frames Call hNewDocument '/// insert a frame - Call fInsertFrame(30,30 , 30,40) + Call fInsertFrame(30,30 , 40,40) Call wTypeKeys "<ESCAPE>" Wait 500 '/// insert another frame - Call fInsertFrame(40,55 , 60,65) + Call fInsertFrame(50,50 , 65,65) + + printlog "Move the second frame away from the first one." + Call wTypeKeys "<RIGHT>",10 + Call wTypeKeys "<DOWN>",7 '/// Set focus to first frame Call wTypeKeys "<TAB>" @@ -90,8 +97,8 @@ goto endsub Verketten.Click Wait 500 - '/// Click second frame - Call gMouseClick(50,60) + '/// Target the second frame + Call gMouseClick(60,60) Wait 500 '/// Format/Frame / Type , @@ -125,8 +132,12 @@ endcase testcase tTextframes_34 - Dim sText as String - Dim sOriginalName , sTargetName as String + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + + Dim sText as String + Dim sOriginalName + Dim sTargetName as String sOriginalName = "TEST1" sTargetName = "TEST2" @@ -137,7 +148,7 @@ testcase tTextframes_34 Call hNewDocument '/// insert a frame , set frame name - Call fInsertFrame(30,30 , 34,40) + Call fInsertFrame(30,30 , 40,40) Call fFormatFrame("TabZusaetze") ObjektName.SetText sOriginalName @@ -147,8 +158,13 @@ testcase tTextframes_34 Wait 500 '/// insert another frame , set frame name - Call fInsertFrame(40,50 , 60,80) + Call fInsertFrame(50,50 , 65,65) + printlog "Move second frame away from the first frame." + Call wTypeKeys "<RIGHT>", 10 + Call wTypeKeys "<DOWN>", 10 + + printlog "Name second object." Call fFormatFrame("TabZusaetze") ObjektName.SetText sTargetName TabZusaetze.OK @@ -165,8 +181,8 @@ testcase tTextframes_34 Verketten.Click Wait 500 - '/// Click second frame - Call wTypeKeys "<TAB>" + '/// Target the second frame + Call gMouseClick(60,80) Wait 500 Call wTypeKeys "<RETURN>" @@ -194,6 +210,9 @@ testcase tTextframes_35 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim iNoLink , iLink as Integer iNoLink = 1 @@ -205,13 +224,17 @@ goto endsub Call hNewDocument '/// insert a frame - Call fInsertFrame(30,30 , 30,40) + Call fInsertFrame(30,30 , 40,40) Call wTypeKeys "<ESCAPE>" Wait 500 '/// insert another frame - Call fInsertFrame(40,50 , 60,65) + Call fInsertFrame(50,50 , 65,65) + + printlog "Move the second frame away from the first one." + Call wTypeKeys "<RIGHT>",10 + Call wTypeKeys "<DOWN>",7 '/// Set focus to first frame Call wTypeKeys "<TAB>" @@ -225,8 +248,8 @@ goto endsub Verketten.Click Wait 500 - '/// Click second frame - Call gMouseClick(50,55) + '/// Target the second frame + Call gMouseClick(60,60) Wait 500 '/// Check if the link is showed correctly (Format.Frame.Options) @@ -255,8 +278,13 @@ testcase tTextframes_36 QaErrorLog "#i94758# - Testcase outcommented" goto endsub - Dim sTestFile , sTestText as String - Dim iNoLink , iLink as Integer + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + + Dim sTestFile as String + Dim sTestText as String + Dim iNoLink as Integer + Dim iLink as Integer sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\twopages.sxw") iNoLink = 1 @@ -280,7 +308,7 @@ goto endsub 'Check if frame is in 1st page Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -294,7 +322,7 @@ goto endsub 'Check if frame is in 2nd page Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then @@ -342,6 +370,9 @@ testcase tTextframes_37 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile , sTestText as String Dim iNoLink , iLink as Integer @@ -403,6 +434,9 @@ testcase tTextframes_38 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile , sTestText as String Dim iNoLink , iLink as Integer @@ -462,10 +496,14 @@ testcase tTextframes_39 QaErrorLog "#i94758# - Testcase outcommented" goto endsub - Dim sHorizontalBy1 , sVerticalBy1 as String - Dim sHorizontalBy2 , sVerticalBy2 as String - Dim sHorizontalByNew1 , sVerticalByNew1 as String - Dim sHorizontalByNew2 , sVerticalByNew2 as String + Dim sHorizontalBy1 as String + Dim sHorizontalBy2 as String + Dim sVerticalBy1 as String + Dim sVerticalBy2 as String + Dim sHorizontalByNew1 as String + Dim sHorizontalByNew2 as String + Dim sVerticalByNew1 as String + Dim sVerticalByNew2 as String sHorizontalBy1 = "2"+ gSeperator + "00" + gMeasurementUnit sVerticalBy1 = "1"+ gSeperator + "00" + gMeasurementUnit @@ -482,7 +520,7 @@ goto endsub Call hNewDocument '/// insert a frame and set Horizontal and Vertical - Call fInsertFrame(30,40 , 30,50) + Call fInsertFrame(40,40 , 50,50) Call fFormatFrame("TabType") HorizontalBy.SetText sHorizontalBy1 @@ -495,7 +533,7 @@ goto endsub Wait 500 '/// insert another frame and set Horizontal and Vertical - Call fInsertFrame(40,70 , 60,80) + Call fInsertFrame(50,50 , 60,60) Call fFormatFrame("TabType") HorizontalBy.SetText sHorizontalBy2 @@ -547,6 +585,9 @@ testcase tTextframes_40 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sHorizontalBy as String sHorizontalBy = "2"+ gSeperator + "00" + gMeasurementUnit @@ -557,7 +598,7 @@ goto endsub Call hNewDocument '/// insert a frame - Call fInsertFrame(30,50 , 30,60) + Call fInsertFrame(30,30 , 50,50) Call fFormatFrame("TabType") HorizontalBy.SetText sHorizontalBy @@ -568,7 +609,11 @@ goto endsub Wait 500 '/// insert another frame - Call fInsertFrame(40,80 , 60,95) + Call fInsertFrame(50,50 , 65,65) + + printlog "Move the second frame away from the first one." + Call wTypeKeys "<RIGHT>",10 + Call wTypeKeys "<DOWN>",7 Call wTypeKeys "<Tab>" @@ -580,11 +625,12 @@ goto endsub Verketten.Click Wait 500 - Call gMouseClick(50,85) + '/// Target the second frame + Call gMouseClick(60,60) Wait 500 - '/// Move 1st frame with keyboard (right) - Call wTypeKeys "<Right>" + '/// Move 1st frame with keyboard (Left) + Call wTypeKeys "<Left>" Sleep 1 '/// Edit / Undo @@ -606,6 +652,9 @@ testcase tTextframes_41 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim iLink , iNolink as Integer iLink = 2 @@ -617,13 +666,17 @@ goto endsub Call hNewDocument '/// insert a frame - Call fInsertFrame(30,30 , 30,40) + Call fInsertFrame(30,30 , 50,50) Call wTypeKeys "<ESCAPE>" Wait 500 '/// insert another frame - Call fInsertFrame(40,50 , 60,65) + Call fInsertFrame(50,50 , 65,65) + + printlog "Move the second frame away from the first one." + Call wTypeKeys "<RIGHT>",10 + Call wTypeKeys "<DOWN>",7 '/// Set focus to 1st frame Call wTypeKeys "<Tab>" @@ -636,7 +689,8 @@ goto endsub Verketten.Click Wait 500 - Call gMouseClick(50,60) + '/// Target the second frame + Call gMouseClick(60,60) Wait 500 '/// Remove link @@ -689,7 +743,7 @@ testcase tTextframes_42 Wait 500 '/// insert another frame in bodytext - Call fInsertFrame(40,50 , 60,65) + Call fInsertFrame(50,50 , 70,65) Call wTypeKeys "<Tab>" @@ -698,7 +752,7 @@ testcase tTextframes_42 Wait 500 Verketten.Click Wait 500 - Call gMouseClick(50,60) + Call gMouseClick(60,60) Wait 500 Call fFormatFrame("TabZusaetze") @@ -737,7 +791,7 @@ testcase tTextframes_43 Wait 500 '/// insert another frame in bodytext - Call fInsertFrame(40,50 , 60,70) + Call fInsertFrame(50,50 , 70,70) Call wTypeKeys "<Tab>" @@ -772,17 +826,17 @@ testcase tTextframes_44 Call hNewDocument '/// insert a frame - Call fInsertFrame(30,30 , 30,40) + Call fInsertFrame(50,30 , 50,40) Call wTypeKeys "<ESCAPE>" Wait 500 '/// insert another frame - Call fInsertFrame(40,50 , 60,65) + Call fInsertFrame(60,50 , 70,65) Call wTypeKeys "<ESCAPE>" '/// input some text in the target frame(2nd frame) - Call gMouseClick(50,60) + Call gMouseClick(65,60) Call wTypeKeys sText Call wTypeKeys ( "<Shift F4>" ) @@ -807,6 +861,9 @@ endcase testcase tTextframes_45 + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim iNoLink as Integer iNoLink = 1 @@ -817,13 +874,17 @@ testcase tTextframes_45 Call hNewDocument '/// insert a frame - Call fInsertFrame(30,30 , 30,40) + Call fInsertFrame(30,30 , 35,40) Call wTypeKeys "<ESCAPE>" Wait 500 '/// insert another frame - Call fInsertFrame(40,50 , 60,65) + Call fInsertFrame(50,50 , 65,65) + + printlog "Move the second frame away from the first one." + Call wTypeKeys "<RIGHT>",10 + Call wTypeKeys "<DOWN>",7 '/// set focus to 1st frame Call wTypeKeys "<TAB>" @@ -834,7 +895,7 @@ testcase tTextframes_45 Sleep 2 Verketten.Click Wait 500 - Call gMouseClick(50,60) + Call gMouseClick(60,60) Wait 500 '/// link two frames (1st frame is target frame) @@ -843,7 +904,7 @@ testcase tTextframes_45 Wait 500 Verketten.Click Wait 500 - Call gMouseClick(25,35) + Call gMouseClick(20,35) Wait 500 Call fFormatFrame("TabZusaetze") @@ -858,6 +919,9 @@ endcase testcase tTextframes_46 + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim iNoLink as Integer iNoLink = 1 @@ -868,22 +932,31 @@ testcase tTextframes_46 Call hNewDocument '/// insert a frame - Call fInsertFrame(30,30 , 30,40) + Call fInsertFrame(50,30 , 70,40) Call wTypeKeys "<ESCAPE>" Wait 500 '/// insert another frame - Call fInsertFrame(30,50 , 30,60) + Call fInsertFrame(60,50 , 80,60) + + printlog "Move the frame away from the position of the first one." + Call wTypeKeys "<RIGHT>",4 + Call wTypeKeys "<DOWN>",4 Call wTypeKeys "<ESCAPE>" Wait 500 '/// insert 3rd frame - Call fInsertFrame(40,50 , 50,60) + Call fInsertFrame(70,60 , 90,70) Wait 500 + printlog "Move the frame away from the position of the first one." + Call wTypeKeys "<RIGHT>",8 + Call wTypeKeys "<DOWN>",8 + '/// set focus to 1st frame + Call wTypeKeys "<SHIFT F4>" 'make sure object is selected. Call wTypeKeys "<TAB>" Sleep 1 @@ -893,7 +966,7 @@ testcase tTextframes_46 Sleep 1 Verketten.Click Sleep 1 - Call gMouseClick(35,55) + Call gMouseClick(45,45) Wait 500 '/// set focus to 3rd frame @@ -904,7 +977,7 @@ testcase tTextframes_46 Sleep 2 Verketten.Click Sleep 1 - Call gMouseClick(35,55) + Call gMouseClick(45,45) Wait 500 Call fFormatFrame("TabZusaetze") @@ -952,7 +1025,7 @@ testcase tTextframes_47 BereicheBearbeiten.OK '/// Insert another frame (B) out of the section - Call fInsertFrame(30,50 , 30,60) + Call fInsertFrame(50,50 , 60,60) '/// Link B->A (A is target) Call fFormatFrame("TabZusaetze") @@ -1011,7 +1084,7 @@ testcase tTextframes_48 BereicheBearbeiten.OK '/// Insert another frame (B) out of the section - Call fInsertFrame(30,50 , 30,60) + Call fInsertFrame(50,50 , 60,60) '/// Link B->A (A is target) Call fFormatFrame("TabZusaetze") diff --git a/testautomation/writer/optional/includes/textframes/w_textframes4.inc b/testautomation/writer/optional/includes/textframes/w_textframes4.inc index fa8291f984f6..ca2588432a4f 100755 --- a/testautomation/writer/optional/includes/textframes/w_textframes4.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes4.inc @@ -288,7 +288,7 @@ testcase tTextframes_55 '/// Check if the frame is in 2nd page Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "2" then @@ -333,7 +333,7 @@ testcase tTextframes_56 '/// Check if the frame is in 1st page Kontext - EditNavigator + ViewNavigator Kontext "NavigatorWriter" Sleep 1 if Seitennummer.GetText <> "1" then @@ -352,6 +352,9 @@ testcase tTextframes_57 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim iVertical as Integer Dim sVerticalBy as String @@ -430,6 +433,9 @@ testcase tTextframes_58 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim iVertical as Integer Dim sVerticalBy as String @@ -507,6 +513,9 @@ testcase tTextframes_59 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim sPositionY1 as String Dim sPositionY2 as String @@ -592,6 +601,9 @@ testcase tTextframes_60 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim sPositionY1 as String Dim sPositionY2 as String @@ -613,6 +625,10 @@ goto endsub Sleep 1 Call wTypeKeys ( "<Tab>" ) + printlog "Move the frame into the document-area." + Call wTypeKeys "<RIGHT>",10 + Call wTypeKeys "<DOWN>",7 + 'Get the pic Y position Sleep 1 Call fFormatGraphic("TabType") @@ -677,6 +693,9 @@ testcase tTextframes_61 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim iVertical as Integer Dim sVerticalBy as String @@ -754,6 +773,9 @@ testcase tTextframes_62 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim iVertical as Integer Dim sVerticalBy as String @@ -831,6 +853,9 @@ testcase tTextframes_63 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim iHorizontal as Integer Dim sHorizontalBy as String @@ -920,6 +945,9 @@ testcase tTextframes_64 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim iHorizontal as Integer Dim sHorizontalBy as String @@ -1009,6 +1037,9 @@ testcase tTextframes_65 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim iHorizontal as Integer Dim sHorizontalBy as String @@ -1087,6 +1118,9 @@ testcase tTextframes_66 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim iHorizontal as Integer Dim sHorizontalBy as String @@ -1165,6 +1199,9 @@ testcase tTextframes_67 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim iHorizontal as Integer Dim sHorizontalBy as String @@ -1254,6 +1291,9 @@ testcase tTextframes_68 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim iHorizontal as Integer Dim sHorizontalBy as String @@ -1343,6 +1383,9 @@ testcase tTextframes_69 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim iHorizontal as Integer Dim sHorizontalBy as String @@ -1421,6 +1464,9 @@ testcase tTextframes_70 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim iHorizontal as Integer Dim sHorizontalBy as String diff --git a/testautomation/writer/optional/includes/textframes/w_textframes5.inc b/testautomation/writer/optional/includes/textframes/w_textframes5.inc index ebdcd648bfdb..7bf72123e5ff 100755 --- a/testautomation/writer/optional/includes/textframes/w_textframes5.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes5.inc @@ -239,7 +239,6 @@ testcase tTextframes_75 end if TabType.Cancel - Call hCloseDocument endcase @@ -404,6 +403,9 @@ testcase tTextframes_81 QaErrorLog "#i94758# - Testcase outcommented" goto endsub + QaErrorLog "#i94758# Testcase outcommented due to unreability." + goto endsub + Dim sTestFile as String Dim iVertical as Integer Dim iVerticalTo as Integer diff --git a/testautomation/writer/optional/includes/tools/tools2.inc b/testautomation/writer/optional/includes/tools/tools2.inc index 516b57130f07..58666459ec8b 100755 --- a/testautomation/writer/optional/includes/tools/tools2.inc +++ b/testautomation/writer/optional/includes/tools/tools2.inc @@ -52,7 +52,7 @@ function fStartupNavigator(navigatorItem as String , subItemNum as Integer) Kontext "Navigator" if NOT Navigator.Exists then - EditNavigator + ViewNavigator end if Sleep 2 Kontext "NavigatorWriter" diff --git a/testautomation/writer/optional/input/import/html/html.html b/testautomation/writer/optional/input/import/html/html.html new file mode 100755 index 000000000000..77569bd90be6 --- /dev/null +++ b/testautomation/writer/optional/input/import/html/html.html @@ -0,0 +1,93 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<HTML> +<HEAD> + <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-15"> + <TITLE></TITLE> + <META NAME="GENERATOR" CONTENT="StarOffice 7 (Linux)"> + <META NAME="CREATED" CONTENT="20030724;14042643"> + <META NAME="CHANGEDBY" CONTENT="Helge Delfs"> + <META NAME="CHANGED" CONTENT="20040108;8361100"> + <STYLE> + <!-- + TH P { font-style: italic } + --> + </STYLE> +</HEAD> +<BODY LANG="en-US" DIR="LTR"> +<P STYLE="margin-bottom: 0cm"><A NAME="DDE_LINK3"></A>Text +<A HREF="http://www.sun.com/">www.sun.com</A> <B>Bold</B> <I>Italic</I> +<FONT COLOR="#0000ff">Blue</FONT> Text <B>Bold</B> <I>Italic</I> <FONT COLOR="#0000ff">Blue</FONT></P> +<P STYLE="margin-bottom: 0cm"><BR> +</P> +<P STYLE="margin-bottom: 0cm"><A NAME="DDE_LINK1"></A>Field: <SDFIELD TYPE=DATETIME SDNUM="1031;1033;MM/DD/YY">01/08/04</SDFIELD></P> +<P STYLE="margin-bottom: 0cm"><BR> +</P> +<P STYLE="margin-bottom: 0cm">Tables</P> +<TABLE WIDTH=100% BORDER=1 BORDERCOLOR="#000000" CELLPADDING=4 CELLSPACING=0> + <COL WIDTH=51*> + <COL WIDTH=51*> + <COL WIDTH=51*> + <COL WIDTH=51*> + <COL WIDTH=51*> + <THEAD> + <TR VALIGN=TOP> + <TH WIDTH=20%> + <P>Table with</P> + </TH> + <TH WIDTH=20%> + <P>colors</P> + </TH> + <TH WIDTH=20%> + <P>numbers</P> + </TH> + <TH WIDTH=20%> + <P>numbers</P> + </TH> + <TH WIDTH=20%> + <P>calculation</P> + </TH> + </TR> + </THEAD> + <TBODY> + <TR> + <TD WIDTH=20% VALIGN=TOP> + <P> </P> + </TD> + <TD WIDTH=20% VALIGN=TOP BGCOLOR="#00ff00"> + <P> </P> + </TD> + <TD WIDTH=20% VALIGN=BOTTOM SDVAL="0,5" SDNUM="1031;"> + <P ALIGN=RIGHT>0,5</P> + </TD> + <TD WIDTH=20% VALIGN=BOTTOM SDVAL="84,56" SDNUM="1031;"> + <P ALIGN=RIGHT>84,56</P> + </TD> + <TD WIDTH=20% VALIGN=BOTTOM SDVAL="85,06" SDNUM="1031;"> + <P ALIGN=RIGHT>85,06</P> + </TD> + </TR> + </TBODY> +</TABLE> +<P STYLE="margin-bottom: 0cm"><BR> +</P> +<P STYLE="margin-bottom: 0cm">Graphic linked</P> +<P STYLE="margin-bottom: 0cm"><IMG SRC="flower.gif" NAME="Graphic1" ALIGN=BOTTOM WIDTH=100 HEIGHT=75 BORDER=0></P> +<P STYLE="margin-bottom: 0cm"><BR> +</P> +<P STYLE="margin-bottom: 0cm">Button</P> +<FORM NAME="Standard" ACTION="../../../../../../../qatesttool/writer/level1/input/clipboard"> + <P STYLE="margin-bottom: 0cm"><INPUT TYPE=BUTTON NAME="PushButton1" VALUE="Button1" STYLE="width: 1.5cm; height: 0.64cm"></P> +</FORM> +<P STYLE="margin-bottom: 0cm"><BR> +</P> +<P STYLE="margin-bottom: 0cm">Floating Frame</P> +<P STYLE="margin-bottom: 0cm"><BR> +</P> +<P STYLE="margin-bottom: 0cm"><IFRAME SRC="dummy.sxw" FRAMEBORDER=YES ALIGN=LEFT WIDTH=378 HEIGHT=189></IFRAME><BR CLEAR=LEFT><BR> +</P> +<P STYLE="margin-bottom: 0cm"><BR> +</P> +<P STYLE="margin-bottom: 0cm"><BR> +</P> +</BODY> +</HTML>
\ No newline at end of file diff --git a/testautomation/writer/optional/input/import/PocketWord.psw b/testautomation/writer/optional/input/import/pocketword.psw Binary files differindex d36c95fd375f..d36c95fd375f 100755 --- a/testautomation/writer/optional/input/import/PocketWord.psw +++ b/testautomation/writer/optional/input/import/pocketword.psw diff --git a/testautomation/writer/optional/input/import/rft.rtf b/testautomation/writer/optional/input/import/rtf.rtf index b7f674cfc1d8..b7f674cfc1d8 100755 --- a/testautomation/writer/optional/input/import/rft.rtf +++ b/testautomation/writer/optional/input/import/rtf.rtf diff --git a/testautomation/writer/optional/w_chinesetranslate.bas b/testautomation/writer/optional/w_chinesetranslate.bas index af4d189832c7..5e23f44cfb83 100644 --- a/testautomation/writer/optional/w_chinesetranslate.bas +++ b/testautomation/writer/optional/w_chinesetranslate.bas @@ -39,76 +39,74 @@ sub main - Dim StartZeit - Dim bAsianLanguage as Boolean - Dim DefaultLanguage as String - - StartZeit = Now() - - use "writer\tools\includes\w_tools.inc" - use "writer\tools\includes\w_tool3.inc" - use "writer\optional\includes\tools\tools1.inc" - use "writer\optional\includes\tools\tools2.inc" - use "writer\optional\includes\chinesetranslate\w_chinesetranslate1.inc" - use "writer\optional\includes\chinesetranslate\w_chinesetranslate2.inc" - - printlog Chr(13) + "Loading of Include - Files takes: " + Wielange ( StartZeit ) - printlog Chr(13) + "******* Writer - Level 1 - Test *******" - - Call hStatusIn ( "writer", "w_chinesetranslate.bas" , "Chinese Translation" ) - - printlog Chr(13) + " - Test Chinese Translation" - + Dim StartZeit + Dim bAsianLanguage as Boolean + Dim DefaultLanguage as String + + StartZeit = Now() + + use "writer\tools\includes\w_tools.inc" + use "writer\tools\includes\w_tool3.inc" + use "writer\optional\includes\tools\tools1.inc" + use "writer\optional\includes\tools\tools2.inc" + use "writer\optional\includes\chinesetranslate\w_chinesetranslate1.inc" + use "writer\optional\includes\chinesetranslate\w_chinesetranslate2.inc" + + printlog Chr(13) + "Loading of Include - Files takes: " + Wielange ( StartZeit ) + printlog Chr(13) + "******* Writer - Level 1 - Test *******" + + Call hStatusIn ( "writer", "w_chinesetranslate.bas" , "Chinese Translation" ) + + printlog Chr(13) + " - Test Chinese Translation" + 'Enable 'Asian Language support' ON - bAsianLanguage = ActiveDeactivateAsianSupport(TRUE) - ' Set default language(asian) for document is "Simplified Chinese" - DefaultLanguage = fSetAsian(fGetLanguageName(86)) - - printlog Chr(13) + " -- Default setting -- " - - 'Don't need to run this case - tDefaultSetting_1 - 'Call tDefaultSetting_1 - Call tDefaultSetting_2 - Call tDefaultSetting_3 - - printlog Chr(13) + " -- Standard Function -- " - Call tChineseTranslate_1 - Call tChineseTranslate_2 - Call tChineseTranslate_3 - Call tChineseTranslate_4 - 'Mark this case , since we don't use 'Use Taiwan , Hongkong SAR...'s statue so far - 'Call tChineseTranslate_5 - - printlog Chr(13) + " -- Chinese Dictionary -- " - Call tChineseTranslate_6 - Call tChineseTranslate_7 - Call tChineseTranslate_8 - Call tChineseTranslate_9 - Call tChineseTranslate_10 - Call tChineseTranslate_11 - - printlog Chr(13) + " -- Undo/Redo -- " - Call tUndoRedo - - 'Set default language(asian) to default - Call fSetAsian(DefaultLanguage) - + bAsianLanguage = ActiveDeactivateAsianSupport(TRUE) + ' Set default language(asian) for document is "Simplified Chinese" + DefaultLanguage = fSetAsian(fGetLanguageName(86)) + + printlog Chr(13) + " -- Default setting -- " + + 'Don't need to run this case - tDefaultSetting_1 + Call tDefaultSetting_1 + Call tDefaultSetting_2 + Call tDefaultSetting_3 + + printlog Chr(13) + " -- Standard Function -- " + Call tChineseTranslate_1 + Call tChineseTranslate_2 + Call tChineseTranslate_3 + Call tChineseTranslate_4 + Call tChineseTranslate_5 + + printlog Chr(13) + " -- Chinese Dictionary -- " + Call tChineseTranslate_6 + Call tChineseTranslate_7 + Call tChineseTranslate_8 + Call tChineseTranslate_9 + Call tChineseTranslate_10 + Call tChineseTranslate_11 + + printlog Chr(13) + " -- Undo/Redo -- " + Call tUndoRedo + + 'Set default language(asian) to default + Call fSetAsian(DefaultLanguage) 'Set the 'Asian Language support' to default - if bAsianLanguage = FALSE then - Call ActiveDeactivateAsianSupport(FALSE) - end if - - Call hStatusOut - - Printlog Chr(13) + "End of Level 1 Test - Chinese Conversion" - Printlog "Duration: "+ WieLange ( StartZeit ) - Printlog "Date: " + Date + " Time: " + Time + if bAsianLanguage = FALSE then + Call ActiveDeactivateAsianSupport(FALSE) + end if + + Call hStatusOut + + Printlog Chr(13) + "End of Level 1 Test - Chinese Conversion" + Printlog "Duration: "+ WieLange ( StartZeit ) + Printlog "Date: " + Date + " Time: " + Time end sub sub LoadIncludeFiles - use "global\system\includes\master.inc" - use "global\system\includes\gvariabl.inc" - Call GetUseFiles - gApplication = "Writer" + use "global\system\includes\master.inc" + use "global\system\includes\gvariabl.inc" + Call GetUseFiles + gApplication = "Writer" end Sub diff --git a/testautomation/writer/required/includes/w_001a_.inc b/testautomation/writer/required/includes/w_001a_.inc index 66af1682e1e9..9b5d0bd16c01 100644 --- a/testautomation/writer/required/includes/w_001a_.inc +++ b/testautomation/writer/required/includes/w_001a_.inc @@ -229,32 +229,25 @@ testcase tFileTemplatesAddressbookSource Kontext "AddressbookSource" if AddressbookSource.Exists then Call DialogTest (AddressbookSource) - if (gPlatform <> "x86") AND (gPlatForm <> "sol") then - Administrate.Click - Sleep 2 - PrintLog " Close 'Data Source Administration' with 'Cancel'" - Kontext "DatabaseProperties" - if Not DatabaseProperties.Exists then - Kontext "AddressSourceAutopilot" - if AddressSourceAutopilot.Exists then - AddressSourceAutopilot.Cancel - end if - Kontext "AddressbookSource" - AddressbookSource.Cancel - else - PrintLog " DatabaseProperties.SetPage TabConnection" - Kontext "TabConnection" - Call DialogTest ( TabConnection ) - Kontext "DatabaseProperties" - DatabaseProperties.Close - Kontext "AddressbookSource" - PrintLog " Close dialog" - AddressbookSource.Cancel + Administrate.Click + Sleep 2 + PrintLog " Close 'Data Source Administration' with 'Cancel'" + Kontext "DatabaseProperties" + if Not DatabaseProperties.Exists then + Kontext "AddressSourceAutopilot" + if AddressSourceAutopilot.Exists then + AddressSourceAutopilot.Cancel end if + Kontext "AddressbookSource" + AddressbookSource.Cancel else - QAErrorlog "#i62423#Adress Source Autopilot crashes" - PrintLog " Close dialog" + PrintLog " DatabaseProperties.SetPage TabConnection" + Kontext "TabConnection" + Call DialogTest ( TabConnection ) + Kontext "DatabaseProperties" + DatabaseProperties.Close Kontext "AddressbookSource" + PrintLog " Close dialog" AddressbookSource.Cancel end if end if diff --git a/testautomation/writer/required/includes/w_002_.inc b/testautomation/writer/required/includes/w_002_.inc index bb83ef72e3de..f7e0970b0159 100755 --- a/testautomation/writer/required/includes/w_002_.inc +++ b/testautomation/writer/required/includes/w_002_.inc @@ -51,7 +51,7 @@ sub w_002_ Call tEditChanges Call tEditCompareDocument Call tEditFindAndReplace - Call tEditNavigator + Call tViewNavigator Call tEditAutoText Call tEditHyperlink @@ -501,7 +501,7 @@ endcase '---------------------------------------------------- -testcase tEditNavigator +testcase tViewNavigator printlog "- Edit/Navigator" Dim ToolboxOk as boolean @@ -510,7 +510,7 @@ testcase tEditNavigator if gApplication = "MASTERDOC" then Kontext "NavigatorGlobalDoc" - if Not NavigatorGlobalDoc.Exists then EditNavigator + if Not NavigatorGlobalDoc.Exists then ViewNavigator Kontext "NavigatorGlobalDoc" Call DialogTest ( NavigatorGlobalDoc ) @@ -553,7 +553,7 @@ testcase tEditNavigator end if Kontext "NavigatorWriter" - if Not NavigatorWriter.Exists then EditNavigator + if Not NavigatorWriter.Exists then ViewNavigator Kontext "NavigatorWriter" PrintLog "Open Navigator" Call DialogTest ( NavigatorWriter ) @@ -648,7 +648,7 @@ testcase tEditNavigator Navigator.Close catch Errorlog - EditNavigator + ViewNavigator endcatch PrintLog "Close active document" diff --git a/testautomation/writer/required/includes/w_006_.inc b/testautomation/writer/required/includes/w_006_.inc index 30e5c925fb04..e93921e4fe64 100755 --- a/testautomation/writer/required/includes/w_006_.inc +++ b/testautomation/writer/required/includes/w_006_.inc @@ -193,7 +193,9 @@ testcase tTableCell printlog " Select 'Cell->Unprotect" Kontext "DocumentWriter" Call wTypeKeys "<Shift F10>" + wait (500) Call hMenuFindSelect (".uno:CellMenu", true, 9, false) 'Find "CellMenu" and call the slot. + wait (500) try Call hMenuFindSelect (20519, true, 1, false) 'Find "UnProtect" and call the slot. catch diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index e08e981988be..9afd9a3d6689 100755 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -817,32 +817,28 @@ testcase tToolsMailMergeWizard Kontext "MailMergeWizard" MailMergeWizard.Cancel - - + printlog " Close active document" Call hCloseDocument - endcase ' ------------------------------------------- testcase tToolsTextInTables PrintLog "- Tools / Text <-> Tables" - - Call hNewDocument printlog " Open new document" - Call wTypeKeys ("Hallo dieser Text soll in eine Tabelle") + Call hNewDocument printlog " Insert some text and select it" + Call wTypeKeys ("Hallo dieser Text soll in eine Tabelle") Call wTypeKeys ("<Shift Home>") ToolsTextInTable printlog " Tools / Text<->Table" Kontext "TextInTabelleUmwandeln" DialogTest ( TextInTabelleUmwandeln ) - TextInTabelleUmwandeln.Cancel printlog " Close upcoming dialog" - Call hCloseDocument + TextInTabelleUmwandeln.Cancel printlog " Close active document" - + Call hCloseDocument endcase ' ------------------------------------------- @@ -862,9 +858,8 @@ testcase tToolsSort Kontext "Sortieren" Call DialogTest ( Sortieren ) Sortieren.Cancel - Call hCloseDocument printlog " Close active document" - + Call hCloseDocument endcase ' ------------------------------------------- @@ -896,14 +891,14 @@ testcase tToolsUpdate printlog "Not in WriterWeb !" goto endsub end if - Call hNewDocument printlog " Open new document" + Call hNewDocument printlog " - Update Indexes ( all, current )" printlog " Add a text to document" Call wTypeKeys ("Dieser Text ist zur Aktualisierung") - InsertIndexes printlog " Insert / Indexes" + InsertIndexes WaitSlot (2000) Kontext "Active" if Active.Exists then @@ -915,9 +910,9 @@ testcase tToolsUpdate Sleep 2 Kontext Active.Setpage TabVerzeichnisseVerzeichnis + printlog " Close upcoming Index dialog" Kontext "TabVerzeichnisseVerzeichnis" TabVerzeichnisseVerzeichnis.OK - printlog " Close upcoming Index dialog" Sleep 1 printlog " Tools / Update / All Indexes" ToolsUpdateAllIndexes @@ -946,22 +941,23 @@ testcase tToolsUpdate Warnlog "Links can't be updated!" endcatch - printlog " - Update / Reformat Pages" - printlog " Tools / Page formatting" + printlog " - Update / Reformat Pages with Tools / Page formatting" ToolsPageFormatting - printlog " - update all" - printlog " Tools / Update / Update All" + printlog " - update all with Tools / Update / Update All" ToolsUpdateUpdateAll - Call hCloseDocument - printlog " Close active document" + printlog " Close all active documents" + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase ' ------------------------------------------- testcase tToolsHangulHanjaConversion - WarnLog "#i96838# - tToolsHangulHanjaConversion outcommented due to unreability." + + WarnLog "#i96838# - tToolsHangulHanjaConversion outcommented due to unreability." exit sub Dim bAsianLanguage as Boolean @@ -1035,9 +1031,10 @@ testcase tToolsHangulHanjaConversion Call ActiveDeactivateAsianSupport(FALSE) end if - printlog " Close active document" - Call hCloseDocument - + printlog " Close all active documents" + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase ' ------------------------------------------- diff --git a/testautomation/writer/tools/includes/w_tool3.inc b/testautomation/writer/tools/includes/w_tool3.inc index aca483504537..d8bb7378804b 100755 --- a/testautomation/writer/tools/includes/w_tool3.inc +++ b/testautomation/writer/tools/includes/w_tool3.inc @@ -591,7 +591,7 @@ end function sub VerzeichnisUeberNavigator(Welches as integer) dim j as integer Kontext "Navigator" - if Navigator.NotExists then EditNavigator + if Navigator.NotExists then ViewNavigator Kontext "NavigatorWriter" if Auswahlliste.GetItemCount<11 then Inhaltsansicht.Click @@ -628,7 +628,7 @@ end sub sub sNavigatorInBrauchbarenZustand dim j as integer Kontext "NavigatorWriter" - if NavigatorWriter.NotExists then EditNavigator + if NavigatorWriter.NotExists then ViewNavigator if Auswahlliste.GetItemCount<11 then Inhaltsansicht.Click Wait 500 if Auswahlliste.GetItemCount >11 then diff --git a/testautomation/writer/tools/includes/w_tool4.inc b/testautomation/writer/tools/includes/w_tool4.inc index 6a477100c295..a493f4e3f4ce 100755 --- a/testautomation/writer/tools/includes/w_tool4.inc +++ b/testautomation/writer/tools/includes/w_tool4.inc @@ -50,7 +50,7 @@ function CountItemsInNavigatorGroup(Group as integer) as Integer Dim j as integer,SelectInNavigator as integer 'First, select the Navigator depending on the application Kontext "Navigator" - If Not Navigator.Exists then EditNavigator + If Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" 'In Navigator, close all groups and set focus to first group diff --git a/testautomation/writer/tools/includes/w_tool6.inc b/testautomation/writer/tools/includes/w_tool6.inc index 704d2a60f6e9..331286c4c1b8 100755 --- a/testautomation/writer/tools/includes/w_tool6.inc +++ b/testautomation/writer/tools/includes/w_tool6.inc @@ -590,7 +590,7 @@ function hNavigatorOpenWindows() as Integer dim j as integer, WelcherEintrag as integer ' Navigator zur├�?cksetzen Kontext "NavigatorWriter" - if NavigatorWriter.NotExists then EditNavigator + if NavigatorWriter.NotExists then ViewNavigator sleep (1) Kontext do while (Active.Exists) @@ -609,7 +609,7 @@ function hNavigatorOpenWindows() as Integer ' printlog " hnow: "+DokumentListe.GetItemCount +" "+DokumentListe.GetSelText if (DokumentListe.GetItemCount = 0) then print "waassss o ??!!?!??!?!" ' close Navigator - EditNavigator + ViewNavigator Kontext "DocumentWriter" ENDE: end function diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc index 21a94cd1f3fe..64b64a58e427 100755 --- a/testautomation/writer/tools/includes/w_tools.inc +++ b/testautomation/writer/tools/includes/w_tools.inc @@ -537,19 +537,19 @@ sub wNavigatorAuswahl(Gruppe as integer, Eintrag as integer,optional LeaveFocus Select Case Ucase(gApplication) Case "CALC" Kontext "NavigatorCalc" - if NavigatorCalc.NotExists then EditNavigator + if NavigatorCalc.NotExists then ViewNavigator wait 500 Kontext "NavigatorCalc" MinEntrys = 8 Case "WRITER", "HTMLDOKUMENT", "HTML" Kontext "NavigatorWriter" - if NavigatorWriter.NotExists then EditNavigator + if NavigatorWriter.NotExists then ViewNavigator wait 500 Kontext "NavigatorWriter" MinEntrys = 11 Case "MASTERDOC" Kontext "NavigatorGlobalDoc" - if NavigatorGlobalDoc.NotExists then EditNavigator + if NavigatorGlobalDoc.NotExists then ViewNavigator wait 500 Kontext "NavigatorGlobalDoc" if Liste.IsVisible then @@ -668,7 +668,7 @@ sub wClearDocument Sleep 3 Kontext "NavigatorWriter" - if Not NavigatorWriter.Exists then EditNavigator + if Not NavigatorWriter.Exists then ViewNavigator wait 500 Kontext "NavigatorWriter" @@ -700,7 +700,7 @@ sub wClearDocument Navigator.Close catch Errorlog - EditNavigator + ViewNavigator endcatch try |