Skip to main content
summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJeremy Aubry2018-07-23 12:54:58 +0000
committerOlivier Constant2018-08-28 08:30:45 +0000
commit32f3e510cac1a6a378408cc99baabfbd89950aab (patch)
treec9364e977aab5cf18e011ccd6d6be7637c00d466 /tests
parentc3cd576ce6237af20a9e655cc1dbd60ec491e5eb (diff)
downloadorg.eclipse.emf.diffmerge.core-32f3e510cac1a6a378408cc99baabfbd89950aab.tar.gz
org.eclipse.emf.diffmerge.core-32f3e510cac1a6a378408cc99baabfbd89950aab.tar.xz
org.eclipse.emf.diffmerge.core-32f3e510cac1a6a378408cc99baabfbd89950aab.zip
Bug 537287 - No Show Merge Impact by default and rename its description
- disable "Show merge impact" option by default - rename the impact information wizard's description - update RCPTT tests Change-Id: Id2fbf46a6f6e7795548035822a51d3c7bf106d9b Signed-off-by: Jeremy Aubry <jaubry@obeo.fr>
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/ECLS_Basics.ctx14
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_Graph.test6
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_HierarchyAddition.test6
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditions.test6
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsMandatory.test8
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsNested.test6
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_MandatoryRefChange.test8
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_MovedInAdded.test8
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAddition.test8
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAdditionOpposites.test8
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_OwnershipCycles.test6
11 files changed, 47 insertions, 37 deletions
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/ECLS_Basics.ctx b/tests/org.eclipse.emf.diffmerge.tests.ui/ECLS_Basics.ctx
index b8791974..b7cef68b 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/ECLS_Basics.ctx
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/ECLS_Basics.ctx
@@ -5,8 +5,8 @@ Element-Name: ECLS_Basics
Element-Type: context
Element-Version: 2.0
Id: _LGfR4OMCEeatZLxI8McVXQ
-Runtime-Version: 2.1.0.201606221726
-Save-Time: 2/3/17 1:17 PM
+Runtime-Version: 2.3.0.201805302312
+Save-Time: 8/28/18 10:13 AM
------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998
Content-Type: text/ecl
@@ -35,6 +35,16 @@ proc "compare-examples" {
get-window "EMF Diff/Merge" | get-button Finish | click
}
+/**
+ * Open the compare as model editor for Ex1.elements and Ex2.elements models of Example project
+ */
+proc "compare-examples-for-impact-analysis" {
+ compare-examples
+ // Activate "Show merge impact"
+ get-editor "Compare ('Ex1' - 'Ex2')" | get-button -index 9 | click
+ get-menu -path "Show merge impact" | click
+}
+
proc "check-model-validity" [val model] {
get-view "Project Explorer" | get-tree | select [format "Example/%s.elements" $model] | double-click
with [get-editor [format "%s.elements" $model] | get-tree] {
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_Graph.test b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_Graph.test
index 01430472..04136f11 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_Graph.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_Graph.test
@@ -5,8 +5,8 @@ Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _nb1u8OLjEeatZLxI8McVXQ
-Runtime-Version: 2.1.0.201606221726
-Save-Time: 1/30/17 10:09 AM
+Runtime-Version: 2.3.0.201805302312
+Save-Time: 8/28/18 10:13 AM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -22,7 +22,7 @@ Entry-Name: .content
/* Copy current test files to Example project */
copy-example "Graph"
/* Compare Example models */
-compare-examples
+compare-examples-for-impact-analysis
//get-eclipse-window | get-object | save-screenshot [substitute-variables "${workspace_loc}/rcptt-screenshots/org.eclipse.emf.diffmerge.tests.ui.cases.Graph_screenshot_02.png"]
/* Check the result of the comparison */
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_HierarchyAddition.test b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_HierarchyAddition.test
index 9d623134..d75ce549 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_HierarchyAddition.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_HierarchyAddition.test
@@ -5,8 +5,8 @@ Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _9nkA4OL8EeatZLxI8McVXQ
-Runtime-Version: 2.1.0.201606221726
-Save-Time: 1/26/17 9:02 AM
+Runtime-Version: 2.3.0.201805302312
+Save-Time: 8/28/18 10:14 AM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -22,7 +22,7 @@ Entry-Name: .content
/* Copy current test files to Example project */
copy-example "HierarchyAddition"
/* Compare Example models */
-compare-examples
+compare-examples-for-impact-analysis
/* Merge some of changes */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditions.test b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditions.test
index e82bb64e..86300ea8 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditions.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditions.test
@@ -5,8 +5,8 @@ Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _ZvRPAOOYEeaykLJOso5MtA
-Runtime-Version: 2.1.0.201606221726
-Save-Time: 1/26/17 9:02 AM
+Runtime-Version: 2.3.0.201805302312
+Save-Time: 8/28/18 10:14 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -16,7 +16,7 @@ Entry-Name: .content
/* Copy current test files to Example project */
copy-example "InterReferencedAdditions"
/* Compare Example models */
-compare-examples
+compare-examples-for-impact-analysis
/* Merge some of changes */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsMandatory.test b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsMandatory.test
index bdd8ba29..18fb947a 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsMandatory.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsMandatory.test
@@ -5,8 +5,8 @@ Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _NC530OOdEeaykLJOso5MtA
-Runtime-Version: 2.1.0.201606221726
-Save-Time: 1/26/17 9:26 AM
+Runtime-Version: 2.3.0.201805302312
+Save-Time: 8/28/18 10:24 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -16,7 +16,7 @@ Entry-Name: .content
/* Copy current test files to Example project */
copy-example "InterReferencedAdditionsMandatory"
/* Compare Example models */
-compare-examples
+compare-examples-for-impact-analysis
/* Cancel merging */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
@@ -46,6 +46,6 @@ get-editor "Compare ('Ex1' - 'Ex2')" | get-tree | get-property itemCount | equal
/* Check persistency */
check-persistency
-get-window Compare | get-property "getChildren().Control[1].getText()" | equals "There are no differences between the selected inputs." | verify-true
+//get-window Compare | get-property "getChildren().Control[1].getText()" | equals "There are no differences between the selected inputs." | verify-true
get-window Compare | get-button OK | click
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsNested.test b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsNested.test
index ca0665a6..599e0af6 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsNested.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsNested.test
@@ -5,8 +5,8 @@ Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _Dgv9YOOjEeaykLJOso5MtA
-Runtime-Version: 2.1.0.201606221726
-Save-Time: 1/26/17 11:28 AM
+Runtime-Version: 2.3.0.201805302312
+Save-Time: 8/28/18 10:14 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -16,7 +16,7 @@ Entry-Name: .content
/* Copy current test files to Example project */
copy-example "InterReferencedAdditionsNested"
/* Compare Example models */
-compare-examples
+compare-examples-for-impact-analysis
/* Cancel merging */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MandatoryRefChange.test b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MandatoryRefChange.test
index c9de54b7..45f57bd8 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MandatoryRefChange.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MandatoryRefChange.test
@@ -5,8 +5,8 @@ Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _n730oOO5EeaykLJOso5MtA
-Runtime-Version: 2.1.0.201606221726
-Save-Time: 3/23/17 4:07 PM
+Runtime-Version: 2.3.0.201805302312
+Save-Time: 8/28/18 10:24 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -16,7 +16,7 @@ Entry-Name: .content
/* Copy current test files to Example project */
copy-example "MandatoryRefChange"
/* Compare Example models */
-compare-examples
+compare-examples-for-impact-analysis
/* Merging */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
@@ -32,6 +32,6 @@ get-window "Merge Operation" | get-button OK | click
/* Check persistency */
check-persistency
-get-window Compare | get-property "getChildren().Control[1].getText()" | equals "There are no differences between the selected inputs." | verify-true
+//get-window Compare | get-property "getChildren().Control[1].getText()" | equals "There are no differences between the selected inputs." | verify-true
get-window Compare | get-button OK | click
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MovedInAdded.test b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MovedInAdded.test
index d3a8e3fe..da4fee4f 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MovedInAdded.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MovedInAdded.test
@@ -5,8 +5,8 @@ Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _9d3K4OPDEeaykLJOso5MtA
-Runtime-Version: 2.1.0.201606221726
-Save-Time: 3/23/17 3:36 PM
+Runtime-Version: 2.3.0.201805302312
+Save-Time: 8/28/18 10:24 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -16,7 +16,7 @@ Entry-Name: .content
/* Copy current test files to Example project */
copy-example "MovedInAdded"
/* Compare Example models */
-compare-examples
+compare-examples-for-impact-analysis
/* Merge changes */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
@@ -45,6 +45,6 @@ get-window "Merge Operation" | get-button OK | click
/* Check persistency */
check-persistency
-get-window Compare | get-property "getChildren().Control[1].getText()" | equals "There are no differences between the selected inputs." | verify-true
+//get-window Compare | get-property "getChildren().Control[1].getText()" | equals "There are no differences between the selected inputs." | verify-true
get-window Compare | get-button OK | click
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAddition.test b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAddition.test
index df694f27..170ce309 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAddition.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAddition.test
@@ -5,8 +5,8 @@ Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _lUzW0OPcEeaykLJOso5MtA
-Runtime-Version: 2.1.0.201606221726
-Save-Time: 1/30/17 9:27 AM
+Runtime-Version: 2.3.0.201805302312
+Save-Time: 8/28/18 10:24 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -16,7 +16,7 @@ Entry-Name: .content
/* Copy current test files to Example project */
copy-example "NestedReferencedAddition"
/* Compare Example models */
-compare-examples
+compare-examples-for-impact-analysis
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Element ROOT (3)"
@@ -25,6 +25,6 @@ with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-window "Merge Operation" | get-button OK | click
get-window "Merge Operation" | get-button OK | click
check-persistency
-get-window Compare | get-property "getChildren().Control[1].getText()" | equals "There are no differences between the selected inputs." | verify-true
+//get-window Compare | get-property "getChildren().Control[1].getText()" | equals "There are no differences between the selected inputs." | verify-true
get-window Compare | get-button OK | click
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAdditionOpposites.test b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAdditionOpposites.test
index 7c14c331..4c12ef70 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAdditionOpposites.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAdditionOpposites.test
@@ -5,8 +5,8 @@ Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _oK1IwOPcEeaykLJOso5MtA
-Runtime-Version: 2.1.0.201606221726
-Save-Time: 1/30/17 9:54 AM
+Runtime-Version: 2.3.0.201805302312
+Save-Time: 8/28/18 10:25 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -16,7 +16,7 @@ Entry-Name: .content
/* Copy current test files to Example project */
copy-example "NestedReferencedAdditionOpposites"
/* Compare Example models */
-compare-examples
+compare-examples-for-impact-analysis
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Element ROOT (3)"
@@ -25,6 +25,6 @@ with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-window "Merge Operation" | get-button OK | click
get-window "Merge Operation" | get-button OK | click
check-persistency
-get-window Compare | get-property "getChildren().Control[1].getText()" | equals "There are no differences between the selected inputs." | verify-true
+//get-window Compare | get-property "getChildren().Control[1].getText()" | equals "There are no differences between the selected inputs." | verify-true
get-window Compare | get-button OK | click
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_OwnershipCycles.test b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_OwnershipCycles.test
index fa292fc1..88a2bea8 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_OwnershipCycles.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_OwnershipCycles.test
@@ -5,8 +5,8 @@ Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _GIY1gBB7Eee03ahGL0O-5w
-Runtime-Version: 2.1.0.201606221726
-Save-Time: 3/24/17 11:51 AM
+Runtime-Version: 2.3.0.201805302312
+Save-Time: 8/28/18 10:14 AM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -22,7 +22,7 @@ Entry-Name: .content
/* Copy current test files to Example project */
copy-example "OwnershipCycles/e-CrossedSwaps"
/* Compare Example models */
-compare-examples
+compare-examples-for-impact-analysis
/* Merge an atomic move */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {

Back to the top