diff --git a/tests/GuiTests/RcpttProjects/RedGuiTests/DebugPerspective/DebugActions/OpeningDebugPerspective.test b/tests/GuiTests/RcpttProjects/RedGuiTests/DebugPerspective/DebugActions/OpeningDebugPerspective.test index 96ce212ef..068de7a24 100644 --- a/tests/GuiTests/RcpttProjects/RedGuiTests/DebugPerspective/DebugActions/OpeningDebugPerspective.test +++ b/tests/GuiTests/RcpttProjects/RedGuiTests/DebugPerspective/DebugActions/OpeningDebugPerspective.test @@ -7,7 +7,7 @@ Element-Version: 3.0 External-Reference: Id: _g1Ox4HmQEeWIf_WwvRtf3w Runtime-Version: 2.5.0.202001211718 -Save-Time: 3/24/20 4:47 PM +Save-Time: 7/9/20 3:34 PM Tags: Debug Testcase-Type: ecl @@ -35,25 +35,14 @@ exec-with-options -disableJobWaiting -command { | click wait 3000 try -times 5 -delay 1000 -command{ - //check Debug window - if [$is_eclipse_photon | equals True]{ - get-window "Confirm Perspective Switch" - | get-label "This kind of launch is configured to open the Debug perspective when it suspends.*" - | get-property caption - | equals "This kind of launch is configured to open the Debug perspective when it suspends.\n\n" - + "This Debug perspective is designed to support application debugging. \s?It incorporates views for displaying the debug stack, variables and breakpoint management.\n\n" - + "Do you want to switch to this perspective now\?" | verify-true - - }-else{ - with [get-window "Confirm Perspective Switch"] { - get-label "This kind of launch is configured to open the Debug perspective when it suspends.*" - | get-property caption - | equals "This kind of launch is configured to open the Debug perspective when it suspends.\n\n" - + "This Debug perspective is designed to support application debugging. It incorporates views for displaying the debug stack, variables and breakpoint management.\n\n" - + "Do you want to open this perspective now?" | verify-true - get-button "Remember my decision" | get-property selected | equals false | verify-true - } - } + with [get-window "Confirm Perspective Switch"] { + get-label "This kind of launch is configured to open the Debug perspective when it suspends.*" + | get-property caption + | equals "This kind of launch is configured to open the Debug perspective when it suspends.\n\n" + + "This Debug perspective supports application debugging by providing views for displaying the debug stack, variables and breakpoints.\n\n" + + "Do you want to switch to this perspective now?" | verify-true + get-button "Remember my decision" | get-property selected | equals false | verify-true + } } //set to No - Robot perspective will stay (Project explorer exists) get-window "Confirm Perspective Switch" | get-button No | click @@ -77,23 +66,13 @@ exec-with-options -disableJobWaiting -command { wait 3000 try -times 5 -delay 1000 -command{ - if [$is_eclipse_photon | equals True]{ - get-window "Confirm Perspective Switch" - | get-label "This kind of launch is configured to open the Debug perspective when it suspends.*" - | get-property caption - | equals "This kind of launch is configured to open the Debug perspective when it suspends.\n\n" - + "This Debug perspective is designed to support application debugging. \s?It incorporates views for displaying the debug stack, variables and breakpoint management.\n\n" - + "Do you want to switch to this perspective now\?" | verify-true - - }-else{ - with [get-window "Confirm Perspective Switch"] { - get-label "This kind of launch is configured to open the Debug perspective when it suspends.This Debug perspective is designed to support application debugging. It incorporates views for displaying the debug stack, variables and breakpoint management.Do you want to open this perspective now?" - | get-property caption - | equals "This kind of launch is configured to open the Debug perspective when it suspends.\n\n" - + "This Debug perspective is designed to support application debugging. It incorporates views for displaying the debug stack, variables and breakpoint management.\n\n" - + "Do you want to open this perspective now?" | verify-true - get-button "Remember my decision" | get-property selected | equals false | verify-true - } + with [get-window "Confirm Perspective Switch"] { + get-label "This kind of launch is configured to open the Debug perspective when it suspends.*" + | get-property caption + | equals "This kind of launch is configured to open the Debug perspective when it suspends.\n\n" + + "This Debug perspective supports application debugging by providing views for displaying the debug stack, variables and breakpoints.\n\n" + + "Do you want to switch to this perspective now?" | verify-true + } get-window "Confirm Perspective Switch" | get-button "(Yes|Switch)" | click } diff --git a/tests/GuiTests/RcpttProjects/RedGuiTests/DebugPerspective/DebugScriptConfiguration/PrepereScriptConfig.ctx b/tests/GuiTests/RcpttProjects/RedGuiTests/DebugPerspective/DebugScriptConfiguration/PrepereScriptConfig.ctx index 95404dbbf..8b07bdd6a 100644 --- a/tests/GuiTests/RcpttProjects/RedGuiTests/DebugPerspective/DebugScriptConfiguration/PrepereScriptConfig.ctx +++ b/tests/GuiTests/RcpttProjects/RedGuiTests/DebugPerspective/DebugScriptConfiguration/PrepereScriptConfig.ctx @@ -5,8 +5,8 @@ Element-Name: PrepereScriptConfig Element-Type: context Element-Version: 2.0 Id: _YLsq8BVSEeeZSZgUeG7ZOA -Runtime-Version: 2.2.0.201706152316 -Save-Time: 3/29/18 5:49 PM +Runtime-Version: 2.5.0.202001211718 +Save-Time: 7/9/20 3:27 PM ------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998 Content-Type: text/ecl @@ -35,7 +35,7 @@ proc "prepere-run-config"{ //got Listener tab end set port to the same as in BAT get-tab-folder | get-tab-item Listener | click - get-group "Test Runner Agent" | get-button "Use remote agent connection (custom server parameters)" | click + get-group "Test Runner Agent" | get-button "customized" | click get-button Apply | click get-button Close | click }