Skip to main content
summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOlivier Constant2018-09-13 20:05:29 +0000
committerOlivier Constant2018-09-14 07:16:54 +0000
commit53dcacabc39ba1f3ccbe4d2b8707db4d0c8774dc (patch)
tree4857818285f77ea23784042e7620ebfea03b4560 /tests
parentea2b4807c3ca1c7091861bc7acf398c14895cfd4 (diff)
downloadorg.eclipse.emf.diffmerge.core-53dcacabc39ba1f3ccbe4d2b8707db4d0c8774dc.tar.gz
org.eclipse.emf.diffmerge.core-53dcacabc39ba1f3ccbe4d2b8707db4d0c8774dc.tar.xz
org.eclipse.emf.diffmerge.core-53dcacabc39ba1f3ccbe4d2b8707db4d0c8774dc.zip
Merge ComparisonViewer and DirectedComparisonViewer
Change-Id: I914e26e4c6f17ef10bfc5d78689c11cdde766c3e Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_HierarchyAddition.test2
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsMandatory.test2
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_MovedInAdded.test4
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAddition.test2
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAdditionOpposites.test2
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_OwnershipCycles.test2
6 files changed, 7 insertions, 7 deletions
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 d75ce549..983601b0 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_HierarchyAddition.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_HierarchyAddition.test
@@ -39,7 +39,7 @@ with [get-window "Merge Operation"] {
}
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Root (5)/Element B (4)/Element G (2)/Element H"
- get-button "Copy to the right" | click
+ get-button "Transfer changes to the right" | click
}
with [get-window "Merge Operation"] {
get-group "Implied changes" | get-tree | select "Element G/Addition into Element B (via 'manyContent')"
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 18fb947a..703296ae 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsMandatory.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsMandatory.test
@@ -34,7 +34,7 @@ get-editor "Compare ('Ex1' - 'Ex2')" | get-tree | get-property itemCount | equal
/* Merge some of changes */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Root (5)/Referencing Node RN4"
- get-button "Copy to the right" | click
+ get-button "Transfer changes to the right" | click
}
check-changes "Required" "Referencing Node RN4/Addition into Root \\(via 'content'\\)"
check-changes "Implied" "Node N1/Addition into Root \\(via 'content'\\)"
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 da4fee4f..ea9e0a30 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MovedInAdded.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MovedInAdded.test
@@ -21,7 +21,7 @@ compare-examples-for-impact-analysis
/* Merge changes */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Root (3)/Element A (2)"
- get-button "Copy to the right" | click
+ get-button "Transfer changes to the right" | click
}
with [get-window "Merge Operation"] {
get-button "Include differences in children" | uncheck
@@ -38,7 +38,7 @@ with [get-editor "Compare ('Ex1' - 'Ex2')"] {
}
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-table -after [get-label "Details of the Element"] -index 1 | select 1
- get-button "Copy to the right" | click
+ get-button "Transfer changes to the right" | click
}
get-window "Merge Operation" | get-button OK | click
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 170ce309..34939705 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAddition.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAddition.test
@@ -20,7 +20,7 @@ compare-examples-for-impact-analysis
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Element ROOT (3)"
- get-button "Copy to the right" | click
+ get-button "Transfer changes to the right" | click
}
get-window "Merge Operation" | get-button OK | click
get-window "Merge Operation" | get-button OK | click
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 4c12ef70..a99ec924 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAdditionOpposites.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_NestedReferencedAdditionOpposites.test
@@ -20,7 +20,7 @@ compare-examples-for-impact-analysis
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Element ROOT (3)"
- get-button "Copy to the right" | click
+ get-button "Transfer changes to the right" | click
}
get-window "Merge Operation" | get-button OK | click
get-window "Merge Operation" | get-button OK | click
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 88a2bea8..a9cb52be 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_OwnershipCycles.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_OwnershipCycles.test
@@ -31,7 +31,7 @@ with [get-editor "Compare ('Ex1' - 'Ex2')"] {
}
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-table -after [get-label "Details of the Element"] -index 2 | select "Element 8 (via Many Content)"
- get-button "Copy to the left" | click
+ get-button "Transfer changes to the left" | click
}
with [get-window "Merge Operation"] {
get-group "Implied changes" | get-tree | select "Element 3"

Back to the top