Skip to main content
summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOlivier Constant2018-09-24 10:05:42 +0000
committerOlivier Constant2018-09-24 11:56:14 +0000
commita8f82e25c772fa5558945bfde20d2ce86b753b23 (patch)
tree0d3041cf0a180cabc67a3c9e201fb9e6fe297112 /tests
parent6235ff1f7b84b66be2371c2b060f83a97133daa3 (diff)
downloadorg.eclipse.emf.diffmerge.core-a8f82e25c772fa5558945bfde20d2ce86b753b23.tar.gz
org.eclipse.emf.diffmerge.core-a8f82e25c772fa5558945bfde20d2ce86b753b23.tar.xz
org.eclipse.emf.diffmerge.core-a8f82e25c772fa5558945bfde20d2ce86b753b23.zip
Updated tool labels
Change-Id: I69be367c54e0b1d929f91d8a6962b78e517362a8 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.test4
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditions.test2
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsMandatory.test4
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsNested.test2
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/TC_MandatoryRefChange.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
9 files changed, 12 insertions, 12 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 983601b0..bbd863e8 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_HierarchyAddition.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_HierarchyAddition.test
@@ -27,7 +27,7 @@ compare-examples-for-impact-analysis
/* Merge some of changes */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Root (8)/Element B (7)/Element D (2)"
- get-button "Delete on the left" | click
+ get-button "Apply deletion on the left" | click
}
with [get-window "Merge Operation"] {
get-button "Include differences in children" | uncheck
@@ -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 "Transfer changes to the right" | click
+ get-button "Apply 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_InterReferencedAdditions.test b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditions.test
index 86300ea8..9bf42a00 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditions.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditions.test
@@ -21,7 +21,7 @@ compare-examples-for-impact-analysis
/* Merge some of changes */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Root (3)/Element E2"
- get-button "Delete on the left" | click
+ get-button "Apply deletion on the left" | click
}
with [get-window "Merge Operation"] {
get-button OK | click
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 703296ae..3d6ce8ee 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsMandatory.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsMandatory.test
@@ -21,7 +21,7 @@ compare-examples-for-impact-analysis
/* Cancel merging */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Root (5)/Node N1"
- get-button "Delete on the left" | click
+ get-button "Apply deletion on the left" | click
}
check-changes "Required" "Node N1/Deletion"
check-changes "Implied" "Referencing Node RN1/Deletion"
@@ -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 "Transfer changes to the right" | click
+ get-button "Apply 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_InterReferencedAdditionsNested.test b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsNested.test
index 599e0af6..bd2826bc 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsNested.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_InterReferencedAdditionsNested.test
@@ -21,7 +21,7 @@ compare-examples-for-impact-analysis
/* Cancel merging */
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Root (4)/Element E4 (1)/Element E2"
- get-button "Delete on the left" | click
+ get-button "Apply deletion on the left" | click
}
check-changes "Required" "Element E2/Deletion"
check-changes "Implied" "Element E1/Reference 'singleRef': deletion of Element E2"
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 45f57bd8..395c4716 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MandatoryRefChange.test
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/TC_MandatoryRefChange.test
@@ -22,7 +22,7 @@ compare-examples-for-impact-analysis
with [get-editor "Compare ('Ex1' - 'Ex2')"] {
get-tree | select "Root (3)/Node C (1)"
get-table -after [get-label "Details of the Node"] -index 2 | select "Edge Z (in Root)"
- get-button "Delete on the right" | click
+ get-button "Apply deletion on the right" | click
}
check-changes "Required" "Node C/Reference 'incoming': deletion of Edge Z"
check-changes "Implied" "Edge Z/Reference 'target': addition of Node B"
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 ea9e0a30..a3e9948f 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 "Transfer changes to the right" | click
+ get-button "Apply 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 "Transfer changes to the right" | click
+ get-button "Apply 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 34939705..7d4c9a0a 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 "Transfer changes to the right" | click
+ get-button "Apply 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 a99ec924..57928f1e 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 "Transfer changes to the right" | click
+ get-button "Apply 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 a9cb52be..be746f7c 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 "Transfer changes to the left" | click
+ get-button "Apply changes to the left" | click
}
with [get-window "Merge Operation"] {
get-group "Implied changes" | get-tree | select "Element 3"

Back to the top