From 8ec345fd1286ac6f48330443b8675e40beb7ea2e Mon Sep 17 00:00:00 2001 From: Arthur Daussy Date: Fri, 22 Aug 2014 12:24:32 +0200 Subject: [PATCH] Updates preferences UI tests to adapt to new content. Update the tests to adapt to new content (such as FeatureMap filter, UML Stereotyped post processors etc...). Change-Id: Iadd4e40e1f2a801c7ae28e019f6cdc666983bbf1 Signed-off-by: Arthur Daussy --- ...019_filters_preference_page_no_preferences.test | 8 ++-- ...1_filters_preference_page_reset_to_default.test | 47 ++++++++++++++++------ ...t_processors_preference_page_no_preference.test | 6 ++- ...ors_preference_page_modify_post_processors.test | 5 ++- 4 files changed, 46 insertions(+), 20 deletions(-) diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc019_filters_preference_page_no_preferences.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc019_filters_preference_page_no_preferences.test index 366a86109..51f4d566b 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc019_filters_preference_page_no_preferences.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc019_filters_preference_page_no_preferences.test @@ -8,7 +8,7 @@ Element-Version: 3.0 External-Reference: Id: _JFcTMcClEeO8eNTYV1NAnA Q7-Runtime-Version: 1.3.10.201312200736 -Save-Time: 4/10/14 4:43 PM +Save-Time: 8/22/14 12:11 PM Testcase-Type: ecl ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa @@ -31,8 +31,10 @@ with [get-window Preferences] { get-property "getItems().TableItem[0].getText()" | equals "Cascading differences" | verify-true get-property "getItems().TableItem[1].getText()" | equals "Diagram Refined elements" | verify-true get-property "getItems().TableItem[2].getText()" | equals "Empty resource mappings" | verify-true - get-property "getItems().TableItem[3].getText()" | equals "Identical elements" | verify-true - get-property "getItems().TableItem[4].getText()" | equals "Pseudo conflicts differences" | verify-true + get-property "getItems().TableItem[3].getText()" | equals "Feature map differences" | verify-true + get-property "getItems().TableItem[4].getText()" | equals "Identical elements" | verify-true + get-property "getItems().TableItem[5].getText()" | equals "Pseudo conflicts differences" | verify-true + get-property "getItems().TableItem[6].getText()" | equals "UML refined elements" | verify-true } get-group "Automatic behavior" | get-combo -after [get-label "Synchronize current filter selection:"] | get-property selection | equals prompt | verify-true diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc021_filters_preference_page_reset_to_default.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc021_filters_preference_page_reset_to_default.test index 61662b9b7..5ac7fb62b 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc021_filters_preference_page_reset_to_default.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc021_filters_preference_page_reset_to_default.test @@ -1,14 +1,14 @@ --- Q7 testcase --- Format-Version: 1.0 Q7-vendor: www.xored.com/q7 -Contexts: _LOMGYGrvEeK_JdLra2Bk5A,_6ooSEMCpEeO8eNTYV1NAnA +Contexts: _LOMGYGrvEeK_JdLra2Bk5A,_6ooSEMCpEeO8eNTYV1NAnA,_jRtbsGrtEeK_JdLra2Bk5A Element-Name: ts016_tc021_filters_preference_page_reset_to_default Element-Type: testcase Element-Version: 3.0 External-Reference: Id: _WYvVQMClEeO8eNTYV1NAnA Q7-Runtime-Version: 1.3.10.201312200736 -Save-Time: 4/10/14 4:43 PM +Save-Time: 8/22/14 12:22 PM Testcase-Type: ecl ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa @@ -26,26 +26,47 @@ Content-Type: text/ecl Entry-Name: .content get-preferences-menu | click -get-window Preferences | get-group "Automatic behavior" | get-combo - -after [get-label "Synchronize current filter selection:"] | get-property selection | equals never | verify-true -//Checks preference from context -with [get-window Preferences | get-table] { - get-property "getItems().TableItem[0].getText()" | equals "Cascading differences" | verify-true - get-property "getItems().TableItem[1].getText()" | equals "Diagram Refined elements" | verify-true - get-property "getItems().TableItem[2].getText()" | equals "Empty resource mappings" | verify-true - get-property "getItems().TableItem[3].getText()" | equals "Identical elements" | verify-true - get-property "getItems().TableItem[4].getText()" | equals "Pseudo conflicts differences" | verify-true + +with [get-window Preferences] { + with [get-table] { + get-property "getItems().TableItem[0].getText()" | equals "Cascading differences" | verify-true + get-property "getItems().TableItem[0].getChecked()" | equals false | verify-true + get-property "getItems().TableItem[1].getText()" | equals "Diagram Refined elements" | verify-true + get-property "getItems().TableItem[1].getChecked()" | equals false | verify-true + get-property "getItems().TableItem[2].getText()" | equals "Empty resource mappings" | verify-true + get-property "getItems().TableItem[2].getChecked()" | equals false | verify-true + get-property "getItems().TableItem[3].getText()" | equals "Feature map differences" | verify-true + get-property "getItems().TableItem[3].getChecked()" | equals true | verify-true + get-property "getItems().TableItem[4].getText()" | equals "Identical elements" | verify-true + get-property "getItems().TableItem[4].getChecked()" | equals false | verify-true + get-property "getItems().TableItem[5].getText()" | equals "Pseudo conflicts differences" | verify-true + get-property "getItems().TableItem[5].getChecked()" | equals false | verify-true + get-property "getItems().TableItem[6].getText()" | equals "UML refined elements" | verify-true + get-property "getItems().TableItem[6].getChecked()" | equals true | verify-true + } + get-group "Automatic behavior" | get-combo -after [get-label "Synchronize current filter selection:"] + | get-property selection | equals never | verify-true } + //Resets to default get-window Preferences | get-button "Restore Defaults" | click //Checks defaults parameters with [get-window Preferences] { with [get-table] { get-property "getItems().TableItem[0].getText()" | equals "Cascading differences" | verify-true + get-property "getItems().TableItem[0].getChecked()" | equals true | verify-true get-property "getItems().TableItem[1].getText()" | equals "Diagram Refined elements" | verify-true + get-property "getItems().TableItem[1].getChecked()" | equals true | verify-true get-property "getItems().TableItem[2].getText()" | equals "Empty resource mappings" | verify-true - get-property "getItems().TableItem[3].getText()" | equals "Identical elements" | verify-true - get-property "getItems().TableItem[4].getText()" | equals "Pseudo conflicts differences" | verify-true + get-property "getItems().TableItem[2].getChecked()" | equals true | verify-true + get-property "getItems().TableItem[3].getText()" | equals "Feature map differences" | verify-true + get-property "getItems().TableItem[3].getChecked()" | equals true | verify-true + get-property "getItems().TableItem[4].getText()" | equals "Identical elements" | verify-true + get-property "getItems().TableItem[4].getChecked()" | equals true | verify-true + get-property "getItems().TableItem[5].getText()" | equals "Pseudo conflicts differences" | verify-true + get-property "getItems().TableItem[5].getChecked()" | equals true | verify-true + get-property "getItems().TableItem[6].getText()" | equals "UML refined elements" | verify-true + get-property "getItems().TableItem[6].getChecked()" | equals true | verify-true } get-group "Automatic behavior" | get-combo -after [get-label "Synchronize current filter selection:"] | get-property selection | equals prompt | verify-true diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc025_post_processors_preference_page_no_preference.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc025_post_processors_preference_page_no_preference.test index b2bd07592..fc2fff8a2 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc025_post_processors_preference_page_no_preference.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc025_post_processors_preference_page_no_preference.test @@ -8,7 +8,7 @@ Element-Version: 3.0 External-Reference: Id: _HfAiEMC_EeO8eNTYV1NAnA Q7-Runtime-Version: 1.3.10.201312200736 -Save-Time: 6/4/14 9:28 AM +Save-Time: 8/22/14 12:14 PM Testcase-Type: ecl ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa @@ -31,9 +31,11 @@ with [get-window Preferences] { get-tree | select "EMF Compare/Post Processors" with [get-table] { get-property "getItems().TableItem[0].getText()" | equals "UML Post Processor" | verify-true - get-property "getItems().TableItem[1].getText()" | equals "Diagram Post processor" | verify-true + get-property "getItems().TableItem[1].getText()" | equals "Stereotyped element change post processor" | verify-true + get-property "getItems().TableItem[2].getText()" | equals "Diagram Post processor" | verify-true get-property "getItems().TableItem[0].getChecked()" | equals true | verify-true get-property "getItems().TableItem[1].getChecked()" | equals true | verify-true + get-property "getItems().TableItem[2].getChecked()" | equals true | verify-true } get-group Description | get-property "getChildren().Control[0].getText()" | equals "Post Processor used for UML models." | verify-true } diff --git a/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc026_post_processors_preference_page_modify_post_processors.test b/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc026_post_processors_preference_page_modify_post_processors.test index dcb2320f2..ff4aec4a7 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc026_post_processors_preference_page_modify_post_processors.test +++ b/plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc026_post_processors_preference_page_modify_post_processors.test @@ -8,7 +8,7 @@ Element-Version: 3.0 External-Reference: Id: _taYtIMC_EeO8eNTYV1NAnA Q7-Runtime-Version: 1.3.10.201312200736 -Save-Time: 4/10/14 5:02 PM +Save-Time: 8/22/14 12:14 PM Testcase-Type: ecl ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa @@ -32,7 +32,8 @@ with [get-window Preferences] { with [get-table] { get-item "UML Post Processor" | uncheck select "UML Post Processor" | get-item "Diagram Post processor" | uncheck - select "Diagram Post processor" + select "Diagram Post processor" |get-item "Stereotyped element change post processor" | uncheck + select "Stereotyped element change post processor" } get-button OK | click } -- 2.11.4.GIT