Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2018-10-02 12:03:54 -0400
committerOlivier Constant2018-10-02 12:03:54 -0400
commit17084c20f7195e9a2c760b6f61956a04ce80198b (patch)
treeeef59eb18da34f5d591a2662de519937cea92d74
parenta1b0662b86fd306164cbc61be4cf77ea9dc650ab (diff)
downloadorg.eclipse.emf.diffmerge.patch-17084c20f7195e9a2c760b6f61956a04ce80198b.tar.gz
org.eclipse.emf.diffmerge.patch-17084c20f7195e9a2c760b6f61956a04ce80198b.tar.xz
org.eclipse.emf.diffmerge.patch-17084c20f7195e9a2c760b6f61956a04ce80198b.zip
[rcptt] fix RCPTT tests after upstream changes
Change-Id: Ic681002af48f0022d568f1519a3134218d5b3aa3 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application filter test.test2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application test.test2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch reverse application test.test2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application filter test.test b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application filter test.test
index c9afb48..19c2411 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application filter test.test
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application filter test.test
@@ -41,7 +41,7 @@ with [get-window "Modelpatch Application"] {
}
get-tree | get-property "getTopItem().getText()" | equals "Cyber Physical System testModel6504822858552 (4)" | verify-true
get-tree | select "Cyber Physical System testModel6504822858552 (4)"
- 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 "Modelpatch Application" | get-window "Merge Operation" | get-group "Required changes" | get-tree
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application test.test b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application test.test
index c33e76f..ff89ee7 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application test.test
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application test.test
@@ -34,7 +34,7 @@ with [get-window "Modelpatch Application"] {
click
}
get-tree | select "Cyber Physical System testModel6504822858552 (10)"
- 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-button Finish | click
}
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch reverse application test.test b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch reverse application test.test
index 0ac43ff..0337c30 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch reverse application test.test
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch reverse application test.test
@@ -35,7 +35,7 @@ with [get-window "Modelpatch Application"] {
click
}
get-tree | select "Cyber Physical System testModel6504822858552 (10)"
- 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-button Finish | click
}

Back to the top