Skip to main content
summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOlivier Constant2017-03-23 14:48:29 +0000
committerOlivier Constant2017-03-23 15:28:47 +0000
commit976783dac77e51c299139dd852cd360a25e6b1c3 (patch)
treee42814aec29aba2d12db3e28a117c1a155c81e1e /tests
parent32ffd433e3ca74ad8c53298fbec81d103a8e1c97 (diff)
downloadorg.eclipse.emf.diffmerge.core-976783dac77e51c299139dd852cd360a25e6b1c3.tar.gz
org.eclipse.emf.diffmerge.core-976783dac77e51c299139dd852cd360a25e6b1c3.tar.xz
org.eclipse.emf.diffmerge.core-976783dac77e51c299139dd852cd360a25e6b1c3.zip
Bug 514127 - Improve the FeaturesViewer
Made the technical representation of features optional, improved the non-technical representation, added a mention of the type of the element, updated the UI tests accordingly. Change-Id: Icdc81a6886f0ae0147397462c88495348e352675 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_MandatoryRefChange.test20
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_MovedInAdded.test6
2 files changed, 10 insertions, 16 deletions
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 48c21500..c9de54b7 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MandatoryRefChange.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MandatoryRefChange.test
@@ -6,7 +6,7 @@ Element-Version: 3.0
External-Reference:
Id: _n730oOO5EeaykLJOso5MtA
Runtime-Version: 2.1.0.201606221726
-Save-Time: 1/26/17 4:31 PM
+Save-Time: 3/23/17 4:07 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -21,23 +21,17 @@ compare-examples
/* Merging */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Root (3)/Node C (1)"
- get-table -after [get-label Details] -index 2 | select "Edge Z (in Root)"
+ get-table -after [get-label "Details of the Node"] -index 2 | select "Edge Z (in Root)"
get-button "Delete on the right" | click
}
check-changes "Required" "Node C/Reference 'incoming': deletion of Edge Z"
-/* The original WT test fails at this point (and if I do not use try-catch, then our test will also fail */
-try -command {
- check-changes "Implied" "Edge Z/Reference 'target': addition of Node B"
- check-changes "Implied" "Edge Z/Reference 'target': deletion of Node C"
- check-changes "Implied" "Node B/Reference 'incoming': addition of Edge Z"
-} -catch {
- trace "Missing implied changes"
- take-screenshot "Missing implied changes"
-}
+check-changes "Implied" "Edge Z/Reference 'target': addition of Node B"
+check-changes "Implied" "Edge Z/Reference 'target': deletion of Node C"
+check-changes "Implied" "Node B/Reference 'incoming': addition of Edge Z"
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-button OK | click
+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 5cf88729..d3a8e3fe 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MovedInAdded.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MovedInAdded.test
@@ -6,7 +6,7 @@ Element-Version: 3.0
External-Reference:
Id: _9d3K4OPDEeaykLJOso5MtA
Runtime-Version: 2.1.0.201606221726
-Save-Time: 3/23/17 3:02 PM
+Save-Time: 3/23/17 3:36 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -34,10 +34,10 @@ get-window "Merge Operation" | get-button OK | click
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Root (1)/Element A (1)/Element B (1)"
- get-table | select "value : EInt"
+ get-table | select "Value"
}
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
- get-table -after [get-label Details] -index 1 | select 1
+ get-table -after [get-label "Details of the Element"] -index 1 | select 1
get-button "Copy to the right" | click
}
get-window "Merge Operation" | get-button OK | click

Back to the top