[UI Tests] Upodate tests after Implementation of contextual tooltips
Change-Id: I7ffddd803d779601b8744adfe765995b284185e4
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/contexts/MergingLibrary.ctx b/plugins/org.eclipse.emf.compare.rcptt.tests/contexts/MergingLibrary.ctx
index cf9ed6a..e9110a5 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/contexts/MergingLibrary.ctx
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/contexts/MergingLibrary.ctx
@@ -1,13 +1,12 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
-Context-Type: com.xored.q7.ecl.context
+Context-Type: org.eclipse.rcptt.ctx.ecl
Element-Name: MergingLibrary
Element-Type: context
Element-Version: 2.0
Id: _SM1VQVPAEeSorJcpi4oQKA
-Q7-Runtime-Version: 1.3.13.201408151228
-Save-Time: 10/15/14 11:26 AM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/8/15 4:28 PM
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
Content-Type: text/plain
@@ -77,7 +76,7 @@
with $editor{
get-tree
|select $itemPath
- get-button "Copy Current Change From Right To Left" | click
+ get-button -after [get-button "Show consequences of merging from right to left"] -index 1 | click
}
}
@@ -89,7 +88,7 @@
with $editor{
get-tree
|select $itemPath
- get-button "Copy Current Change From Left To Right" | click
+ get-button -after [get-button "Show consequences of merging from right to left"] | click
}
}
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/egit/ts005_tc022_CMV_titles_from_egit_history.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/egit/ts005_tc022_CMV_titles_from_egit_history.test
index 95481af..cc052dd 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/egit/ts005_tc022_CMV_titles_from_egit_history.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/egit/ts005_tc022_CMV_titles_from_egit_history.test
@@ -7,7 +7,7 @@
External-Reference:
Id: _wXTuUFCAEeWzYYatGYnhhw
Runtime-Version: 2.0.0.201506120617
-Save-Time: 9/2/15 10:32 AM
+Save-Time: 9/30/15 5:58 PM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -23,7 +23,7 @@
4) Right-click and select "Compare with each other"
4) The Compare editor must show one diff : Library [eClassifiers delete] under library package.
//Asserts that the compare editor is open.
- //Assert that the labels of the ContentMergeViewer are "Remote: library/library.ecore. Commit ID: 9763e97" and "Remote: library/library.ecore. Commit ID: db84a95"
+ //Assert that the labels of the ContentMergeViewer are "Remote: library/library.ecore 9763e97 (Axel Richard)" and "Remote: library/library.ecore db84a95 (Axel Richard)"
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa--
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
Content-Type: text/ecl
@@ -37,9 +37,9 @@
}
get-tab-folder -index 1 | get-property activePage | equals "Compare library.ecore 9763e97 and db84a95" | verify-true
with [get-editor "Compare library.ecore 9763e97 and db84a95"] {
- get-label "Remote: library/library.ecore" | get-property caption
- | equals "library/library.ecore 9763e97 (Axel Richard)" | verify-true
- get-label "Remote: library/library.ecore" -after [get-label "Remote: library/library.ecore"] | get-property caption
- | equals "library/library.ecore db84a95 (Axel Richard)" | verify-true
+ get-label "(Remote: )?library/library.ecore 9763e97 \(Axel Richard\)" | get-property caption
+ | equals "(Remote: )?library/library.ecore 9763e97 \(Axel Richard\)" | verify-true
+ get-label "(Remote: )?library/library.ecore db84a95 \(Axel Richard\)" -after [get-label "(Remote: )?library/library.ecore 9763e97 \(Axel Richard\)"] | get-property caption
+ | equals "(Remote: )?library/library.ecore db84a95 \(Axel Richard\)" | verify-true
}
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/filters/ts003_tc012_not_reseting_filter_after_save.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/filters/ts003_tc012_not_reseting_filter_after_save.test
index c384aec..4d23ed3 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/filters/ts003_tc012_not_reseting_filter_after_save.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/filters/ts003_tc012_not_reseting_filter_after_save.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_jRtbsGrtEeK_JdLra2Bk5A
Element-Name: ts003_tc012_not_reseting_filter_after_save
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _nCdeAOTrEeOmt7XUo6i_ng
-Q7-Runtime-Version: 1.3.10.201312200736
-Save-Time: 5/26/14 6:08 PM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/8/15 11:55 AM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -50,7 +49,7 @@
//Merges and saves
get-window "Filters preference" | get-button No | click
with [get-editor "Compare (\'Library/extlibraryRight.ecore\' - \'Library/extlibraryLeft.ecore\' - \'Library/extlibraryRight.ecore\')"] {
- get-button "Copy Current Change From Left To Right" | click | key-type "M1+s" //save
+ get-button "Set the 'name' of this 'EAttribute' to 'length' on the right-hand side (currently 'minutes').The left-hand side will remain unchanged.The right-hand side will be modified." | click | key-type "M1+s" //save
}
set-dialog-result File
@@ -63,4 +62,5 @@
get-menu "Empty resource mappings" | get-property selection | equals true | verify-true
get-menu "Identical elements" | get-property selection | equals false | verify-true
get-menu "Cascading differences" | get-property selection | equals true | verify-true
+
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/groups/ts004_tc006_not_reseting_group_after_save.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/groups/ts004_tc006_not_reseting_group_after_save.test
index 1f15e6b..8554181 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/groups/ts004_tc006_not_reseting_group_after_save.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/groups/ts004_tc006_not_reseting_group_after_save.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_jRtbsGrtEeK_JdLra2Bk5A
Element-Name: ts004_tc006_not_reseting_group_after_save
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _hHgs4OTHEeOeIpN_wsak0A
-Q7-Runtime-Version: 1.3.10.201312200736
-Save-Time: 5/26/14 6:08 PM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/8/15 11:57 AM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -49,7 +48,7 @@
//Merges and saves
get-window "Group preference" | get-button No | click
with [get-editor "Compare (\'Library/extlibraryRight.ecore\' - \'Library/extlibraryLeft.ecore\' - \'Library/extlibraryRight.ecore\')"] {
- get-button "Copy Current Change From Left To Right" | click
+ get-button "Remove 'TitledItem' on the right-hand side.The left-hand side will remain unchanged.The right-hand side will be modified." | click
get-tree | select "> extlibrary/> Book -> CirculatingItem" | key-type "M1+s" //save
}
@@ -61,4 +60,5 @@
//Checks the root of the tree
get-editor "Compare (\'Library/extlibraryRight.ecore\' - \'Library/extlibraryLeft.ecore\' - \'Library/extlibraryRight.ecore\')"
| get-tree | get-item "> extlibrary" | get-property caption | equals "> extlibrary" | verify-true
+
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/groups/ts004_tc007_group_item_double_click.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/groups/ts004_tc007_group_item_double_click.test
index 3ab7e6f..c858927 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/groups/ts004_tc007_group_item_double_click.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/groups/ts004_tc007_group_item_double_click.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_jRtbsGrtEeK_JdLra2Bk5A
Element-Name: ts004_tc007_group_item_double_click
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _He3N0UP1EeSR35Af5c_jlw
-Q7-Runtime-Version: 1.3.14.201410230950
-Save-Time: 1/7/15 11:54 AM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/8/15 3:36 PM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -54,8 +53,8 @@
get-text-viewer | get-property text | equals length | verify-true
get-text-viewer -after [get-label "(Local: /)?Library/extlibraryRight.ecore"] -index 1 | get-property text | equals minutes
| verify-true
- get-button "Copy Current Change From Right To Left" | get-property enablement | equals true | verify-true
- get-button "Copy Current Change From Left To Right" | get-property enablement | equals true | verify-true
+ get-button "Set the 'name' of this 'EAttribute' to 'minutes' on the left-hand side (instead of 'length').The left-hand side will be modified.The right-hand side will remain unchanged." | get-property enablement | equals true | verify-true
+ get-button "Set the 'name' of this 'EAttribute' to 'length' on the right-hand side (currently 'minutes').The left-hand side will remain unchanged.The right-hand side will be modified." | get-property enablement | equals true | verify-true
get-tree | get-property "getItems().TreeItem[1].getExpanded()" | equals false | verify-true
}
@@ -88,4 +87,5 @@
get-text-viewer -after [get-label "(Local: /)?Library/extlibraryRight.ecore"] -index 1 | get-property text | equals minutes
| verify-true
}
+
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/localhistory/ts011_tc001_localhistory_workspace_compare_with.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/localhistory/ts011_tc001_localhistory_workspace_compare_with.test
index 6df14d7..7afb18f 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/localhistory/ts011_tc001_localhistory_workspace_compare_with.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/localhistory/ts011_tc001_localhistory_workspace_compare_with.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,__EnCYL8uEeO4RfFLR_NBfQ
Element-Name: ts011_tc001_localhistory_workspace_compare_with
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _EqPDkb8uEeO4RfFLR_NBfQ
-Q7-Runtime-Version: 1.3.14.201410230950
-Save-Time: 10/30/14 3:02 PM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/8/15 3:53 PM
Testcase-Type: ecl
Verifications: _LQRcEL8xEeO4RfFLR_NBfQ
@@ -52,10 +51,10 @@
-after [get-label "Model differences (6 of 6 differences are not merged — 10 differences filtered from view)"]] {
get-property "getItems().ToolItem[0].getToolTipText()" | equals "Show consequences of accepting change"
| verify-true
- get-property "getItems().ToolItem[1].getToolTipText()" | equals "Accept Change" | verify-true
- get-property "getItems().ToolItem[2].getToolTipText()" | equals "Reject Change" | verify-true
- get-property "getItems().ToolItem[3].getToolTipText()" | equals "Accept All Non-Conflicting Changes" | verify-true
- get-property "getItems().ToolItem[4].getToolTipText()" | equals "Reject All Non-Conflicting Changes" | verify-true
+ get-property "getItems().ToolItem[1].getToolTipText()" | equals "Accept the change.\nKeep the 'eType' of this 'EReference' unset on the left-hand side.\nThe left-hand side will remain unchanged." | verify-true
+ get-property "getItems().ToolItem[2].getToolTipText()" | equals "Reject the change.\nRestore the 'eType' of this 'EReference' to 'Employee -> Person' on the left-hand side.\nThe left-hand side will be modified." | verify-true
+ get-property "getItems().ToolItem[3].getToolTipText()" | equals "Accept All Non-Conflicting Changes. The left changes will be accepted and the right changes will be merged into the left-hand side" | verify-true
+ get-property "getItems().ToolItem[4].getToolTipText()" | equals "Reject All Non-Conflicting Changes. The left changes will be rejected and the right changes will not be used" | verify-true
get-property "getItems().ToolItem[5].getStyle()" | equals "[SEPARATOR]" | verify-true
get-property "getItems().ToolItem[6].getToolTipText()" | equals "Next Difference" | verify-true
get-property "getItems().ToolItem[7].getToolTipText()" | equals "Previous Difference" | verify-true
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/localhistory/ts011_tc003_localhistory_editor_compare_with.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/localhistory/ts011_tc003_localhistory_editor_compare_with.test
index 1088e17..904a5f8 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/localhistory/ts011_tc003_localhistory_editor_compare_with.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/localhistory/ts011_tc003_localhistory_editor_compare_with.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,__EnCYL8uEeO4RfFLR_NBfQ
Element-Name: ts011_tc003_localhistory_editor_compare_with
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _nWDqgb-_EeOnsqx26fWf_w
-Q7-Runtime-Version: 1.3.14.201410230950
-Save-Time: 10/30/14 3:03 PM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/8/15 3:54 PM
Testcase-Type: ecl
Verifications: _LQRcEL8xEeO4RfFLR_NBfQ
@@ -54,20 +53,5 @@
-after [get-label "Model differences (6 of 6 differences are not merged — 10 differences filtered from view)"]] {
get-property "getItems().ToolItem[0].getToolTipText()" | equals "Show consequences of accepting change"
| verify-true
- get-property "getItems().ToolItem[1].getToolTipText()" | equals "Accept Change" | verify-true
- get-property "getItems().ToolItem[2].getToolTipText()" | equals "Reject Change" | verify-true
- get-property "getItems().ToolItem[3].getToolTipText()" | equals "Accept All Non-Conflicting Changes" | verify-true
- get-property "getItems().ToolItem[4].getToolTipText()" | equals "Reject All Non-Conflicting Changes" | verify-true
- get-property "getItems().ToolItem[5].getStyle()" | equals "[SEPARATOR]" | verify-true
- get-property "getItems().ToolItem[6].getToolTipText()" | equals "Next Difference" | verify-true
- get-property "getItems().ToolItem[7].getToolTipText()" | equals "Previous Difference" | verify-true
- get-property "getItems().ToolItem[8].getStyle()" | equals "[SEPARATOR]" | verify-true
- get-property "getItems().ToolItem[9].getToolTipText()" | equals "Expand All" | verify-true
- get-property "getItems().ToolItem[10].getToolTipText()" | equals "Collapse All" | verify-true
- get-property "getItems().ToolItem[11].getStyle()" | equals "[SEPARATOR]" | verify-true
- get-property "getItems().ToolItem[12].getToolTipText()" | equals Groups | verify-true
- get-property "getItems().ToolItem[13].getToolTipText()" | equals Filters | verify-true
- get-property "getItems().ToolItem[14].getStyle()" | equals "[SEPARATOR]" | verify-true
- get-property "getItems().ToolItem[15].getToolTipText()" | equals "Save Comparison Model" | verify-true
}
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/merge/ts007_tc002_merge_reference_add.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/merge/ts007_tc002_merge_reference_add.test
index b0fff61..8c6a759 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/merge/ts007_tc002_merge_reference_add.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/merge/ts007_tc002_merge_reference_add.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_jRtbsGrtEeK_JdLra2Bk5A
Element-Name: ts007_tc002_merge_reference_add
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _Tk6zMHXkEeKwK6X4DjDh0A
-Q7-Runtime-Version: 1.3.14.201410230950
-Save-Time: 1/7/15 11:50 AM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/8/15 3:40 PM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -56,7 +55,7 @@
}
get-editor "Compare (\'Library/extlibraryLeft.ecore\' - \'Library/extlibraryRight.ecore\')"
- | get-button "Copy Current Change From Right To Left" | click
+ | get-button "Delete 'Dictionary = 4' in 'BookCategory' on the left-hand side.The left-hand side will be modified.The right-hand side will remain unchanged." | click
with [get-editor "Compare (\'Library/extlibraryLeft.ecore\' - \'Library/extlibraryRight.ecore\')"] {
with [get-tree -after [get-label "(Local: /)?Library/extlibraryRight.ecore"]] {
get-item "extlibrary/BookCategory" | get-property childCount | equals 7 | verify-true
@@ -81,7 +80,7 @@
}
get-editor "Compare (\'Library/extlibraryLeft.ecore\' - \'Library/extlibraryRight.ecore\')"
- | get-button "Copy Current Change From Left To Right" | click
+ | get-button "Add 'Dictionary = 4' in 'BookCategory' on the right-hand side.The left-hand side will remain unchanged.The right-hand side will be modified." | click
with [get-editor "Compare (\'Library/extlibraryLeft.ecore\' - \'Library/extlibraryRight.ecore\')"] {
with [get-tree -after [get-label "(Local: /)?Library/extlibraryRight.ecore"]] {
get-item "extlibrary/BookCategory" | get-property childCount | equals 7 | verify-true
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/merge/ts007_tc003_merge_reference_add_select_next_diff.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/merge/ts007_tc003_merge_reference_add_select_next_diff.test
index 5a5d6e9..069a2ed 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/merge/ts007_tc003_merge_reference_add_select_next_diff.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/merge/ts007_tc003_merge_reference_add_select_next_diff.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_jRtbsGrtEeK_JdLra2Bk5A
Element-Name: ts007_tc003_merge_reference_add_select_next_diff
Element-Type: testcase
Element-Version: 3.0
External-Reference: https://bugs.eclipse.org/bugs/show_bug.cgi?id=400691
Id: _5-gDkXXsEeKJx8j2cqlHSg
-Q7-Runtime-Version: 1.3.14.201410230950
-Save-Time: 1/7/15 11:47 AM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/8/15 3:42 PM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -62,7 +61,7 @@
}
get-editor "Compare (\'Library/extlibraryLeft.ecore\' - \'Library/extlibraryRight.ecore\')"
- | get-button "Copy Current Change From Left To Right" | click
+ | get-button "Add 'Dictionary = 4' in 'BookCategory' on the right-hand side.The left-hand side will remain unchanged.The right-hand side will be modified." | click
with [get-editor "Compare (\'Library/extlibraryLeft.ecore\' - \'Library/extlibraryRight.ecore\')"] {
get-tree | get-item "> extlibrary/> BookCategory/Manga = 3 \\[eLiterals delete\\]" | get-property selected
| equals true | verify-true
@@ -73,4 +72,5 @@
get-tree -after [get-label "(Local: /)?Library/extlibraryRight.ecore"] -index 1 | get-item "extlibrary/BookCategory/Manga = 3" | get-property selected | equals true | verify-true
}
+
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/merge/ts007_tc004_merge_required.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/merge/ts007_tc004_merge_required.test
index 2f5c7f8..07b4d36 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/merge/ts007_tc004_merge_required.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/merge/ts007_tc004_merge_required.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_jRtbsGrtEeK_JdLra2Bk5A
Element-Name: ts007_tc004_merge_required
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _puOBEHXuEeKJx8j2cqlHSg
-Q7-Runtime-Version: 1.3.14.201410230950
-Save-Time: 1/7/15 11:46 AM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/8/15 3:45 PM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -62,10 +61,11 @@
get-tree
| select "> extlibrary/> AudioVisualItem -> CirculatingItem/title : EString \\[eStructuralFeatures add\\]/EString \\[java.lang.String\\] \\[eType set\\]"
| double-click
- get-button "Copy Current Change From Left To Right" | click
+ get-button "Set the 'eType' of this 'EAttribute' to 'EString [java.lang.String]' on the right-hand side.The left-hand side will remain unchanged.The right-hand side will be modified." | click
get-tree | select "> extlibrary/> AudioVisualItem -> CirculatingItem/title : EString \\[eStructuralFeatures add\\]"
| double-click
}
+
with [get-editor "Compare (\'Library/extlibraryLeft.ecore\' - \'Library/extlibraryRight.ecore\')"] {
get-tree | get-item "> extlibrary/> AudioVisualItem -> CirculatingItem/title : EString \\[eStructuralFeatures add\\]"
| get-property selected | equals true | verify-true
@@ -96,9 +96,10 @@
get-tree
| select "> extlibrary/> AudioVisualItem -> CirculatingItem/title : EString \\[eStructuralFeatures add\\]/EString \\[java.lang.String\\] \\[eType set\\]"
| double-click
- get-button "Copy Current Change From Right To Left" | click
+ get-button "Clear the 'eType' of this 'EAttribute' on the left-hand side (currently 'EString [java.lang.String]').The left-hand side will be modified.The right-hand side will remain unchanged." | click
get-tree | select "> extlibrary/> AudioVisualItem -> CirculatingItem/title \\[eStructuralFeatures add\\]" | double-click
}
+
with [get-editor "Compare (\'Library/extlibraryLeft.ecore\' - \'Library/extlibraryRight.ecore\')"] {
with [get-tree -after [get-label "(Local: /)?Library/extlibraryRight.ecore"]] {
get-item "extlibrary/AudioVisualItem -> CirculatingItem/title" | get-property selected | equals true | verify-true
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/profile/ts013_tc002_merge_left_one_by_one.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/profile/ts013_tc002_merge_left_one_by_one.test
index 9eefd8a..8974c2e 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/profile/ts013_tc002_merge_left_one_by_one.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/profile/ts013_tc002_merge_left_one_by_one.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_r_QpAFLlEeS4zYvVAxx5Mg,_SM1VQVPAEeSorJcpi4oQKA
Element-Name: ts013_tc002_merge_left_one_by_one
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _AYD2oFPBEeSorJcpi4oQKA
-Q7-Runtime-Version: 1.3.15.201412220512
-Save-Time: 5/28/15 6:03 PM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/8/15 4:19 PM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/profile/ts013_tc003_merge_left_all.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/profile/ts013_tc003_merge_left_all.test
index 25c5eea..8f77363 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/profile/ts013_tc003_merge_left_all.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/profile/ts013_tc003_merge_left_all.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_r_QpAFLlEeS4zYvVAxx5Mg
Element-Name: ts013_tc003_merge_left_all
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _qwClUFPAEeSorJcpi4oQKA
-Q7-Runtime-Version: 1.3.15.201412220512
-Save-Time: 5/28/15 5:16 PM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/8/15 4:32 PM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -39,7 +38,7 @@
}
with [get-editor "Compare (\'SysMLModel/left/model.uml\' - \'SysMLModel/right/model.uml\')"] {
- get-button "Copy All Non-Conflicting Changes From Right To Left" | click
+ get-button "Apply all right changes on the left-hand side.*" | click
get-tree | select "<Model> SysMLmodel/<Package> Blocks"
}
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/profile/ts013_tc005_merge_right_all.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/profile/ts013_tc005_merge_right_all.test
index 3c2fa8e..4cfe035 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/profile/ts013_tc005_merge_right_all.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/profile/ts013_tc005_merge_right_all.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_r_QpAFLlEeS4zYvVAxx5Mg
Element-Name: ts013_tc005_merge_right_all
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _14VY4VRDEeSkU9qpHBB-2g
-Q7-Runtime-Version: 1.3.15.201412220512
-Save-Time: 5/28/15 5:16 PM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/8/15 4:33 PM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -39,7 +38,7 @@
}
with [get-editor "Compare (\'SysMLModel/left/model.uml\' - \'SysMLModel/right/model.uml\')"] {
- get-button "Copy All Non-Conflicting Changes From Left To Right" | click
+ get-button "Apply all left changes on the right-hand side.*" | click
get-tree | select "<Model> SysMLmodel/<Package> Blocks"
}
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/treeviewer/ts008_tc001_move_under_rac.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/treeviewer/ts008_tc001_move_under_rac.test
index 031452c..72f3d04 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/treeviewer/ts008_tc001_move_under_rac.test
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/treeviewer/ts008_tc001_move_under_rac.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_BZMegKsqEeKckft8tQOilA
Element-Name: ts008_tc001_move_under_rac
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _NdtZQKsqEeKckft8tQOilA
-Q7-Runtime-Version: 1.3.14.201410230950
-Save-Time: 1/7/15 11:44 AM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 10/8/15 3:48 PM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -80,7 +79,7 @@
//Left Side : root2 must have one child
//right side : root2 must have one child
get-editor "Compare (\'TreeViewerResourceAttachmentChange/move/left.uml\' - \'TreeViewerResourceAttachmentChange/move/right.uml\')"
- | get-button "Copy All Non-Conflicting Changes From Left To Right" | click
+ | get-button "Apply all left changes on the right-hand side. The left-hand side will remain unchanged" | click
get-editor "Compare (\'TreeViewerResourceAttachmentChange/move/left.uml\' - \'TreeViewerResourceAttachmentChange/move/right.uml\')"
| get-tree | select "<Model> root2/<Package> package3 \\[packagedElement move\\]" | double-click
@@ -121,7 +120,7 @@
//Left Side : root must have three child, root2 must have no child
//right side : root must have three child
get-editor "Compare (\'TreeViewerResourceAttachmentChange/move/left.uml\' - \'TreeViewerResourceAttachmentChange/move/right.uml\')"
- | get-button "Copy All Non-Conflicting Changes From Right To Left" | click
+ | get-button "Apply all right changes on the left-hand side. The right-hand side will remain unchanged" | click
get-editor "Compare (\'TreeViewerResourceAttachmentChange/move/left.uml\' - \'TreeViewerResourceAttachmentChange/move/right.uml\')"
| get-tree | select "<Model> root2/<Package> package3 \\[packagedElement move\\]" | double-click
with [get-editor "Compare (\'TreeViewerResourceAttachmentChange/move/left.uml\' - \'TreeViewerResourceAttachmentChange/move/right.uml\')"] {
