diff options
Diffstat (limited to 'testautomation/graphics/optional/includes/global')
4 files changed, 43 insertions, 41 deletions
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 |