[411485] Fix the CMV display for moves beteen two containers
Add rcptt tests
Bug: 411485
Change-Id: Ic2fbc38ab5d7ccf36d827fe68fb42ecd41ad650f
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/contexts/treeviewer/ts008_tc005_WorkspaceContext.ctx b/plugins/org.eclipse.emf.compare.rcptt.tests/contexts/treeviewer/ts008_tc005_WorkspaceContext.ctx
new file mode 100644
index 0000000..ccb34f9
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/contexts/treeviewer/ts008_tc005_WorkspaceContext.ctx
@@ -0,0 +1,99 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Context-Type: org.eclipse.rcptt.ctx.workspace
+Element-Name: ts008_tc005_WorkspaceContext
+Element-Type: context
+Element-Version: 2.0
+Id: _NQgrUE_eEeWqpPs2GegP7A
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 8/31/15 2:46 PM
+
+------=_contents/Library/extlibraryLeft.ecore-fadd95a1-c0c5-377d-b36f-54bc8effac00
+Content-Type: q7/binary
+Entry-Name: contents/Library/extlibraryLeft.ecore
+
+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
+AAAA
+------=_contents/Library/extlibraryLeft.ecore-fadd95a1-c0c5-377d-b36f-54bc8effac00--
+------=_contents/Library/.project-23e3d8b7-f7d2-371a-9d56-237a570cf079
+Content-Type: q7/binary
+Entry-Name: contents/Library/.project
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACzsa/IzVEoSy0qzszP
+s1Uy1DNQUkjNS85PycxLt1UKDXHTtVCyt+Plsikoys9KTS5xSS1OLsosKAGqBopy2uQl5qba+WQmFSUW
+Vdrog3kg4eT83NzUvBI7G30YCyQKNaMYzNFH4SWVZuakBBekJkPkULl5iSWlRalQbQgO3AhURwEAUEsH
+CJrDZ7qCAAAA0wAAAFBLAQIUABQACAgIAAAAIQCaw2e6ggAAANMAAAAIAAkAAAAAAAAAAAAAAAAAAAAu
+Y29udGVudFVUBQABAAAAAFBLBQYAAAAAAQABAD8AAADBAAAAAAA=
+------=_contents/Library/.project-23e3d8b7-f7d2-371a-9d56-237a570cf079--
+------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf
+Content-Type: q7/binary
+Entry-Name: .q7.content
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACVkVFLwzAUhd/7K0Le
+TepAHKXtEBkiTJmCzLdSs9ss2iYxudr67023pQ9DGL7d5Hz3nBOSL4auJd/gvDK6oJcspQS0MFulZUG/
+sLmY00WZ5MZJBqJV1gNzwiIygQPrjfvwthaQbeJ0azTCgGToVDbZzkbbEKR9Fu4LukO0Ged93zPTSRbM
++evDfUTOZE3rkRnX9xwPHJ84SnTdBRp9ms4rFGl6VZ3WpERtC1o9Pkn3sqxgCZtPu/azO5Dr6xtaJoTk
+YiQ1jnM4WWfeQaA/eq/Um6vdDz2oQW9UC1FkR5jyP+UQ3x7WV9BgeLFxcBZ9VnJ3wuY8ltr35VPhnP/3
+18rkF1BLBwhgYjSHAQEAABACAABQSwECFAAUAAgICAAAACEAYGI0hwEBAAAQAgAACAAJAAAAAAAAAAAA
+AAAAAAAALmNvbnRlbnRVVAUAAQAAAABQSwUGAAAAAAEAAQA/AAAAQAEAAAAA
+------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf--
+------=_contents/Library/extlibraryRight.ecore-aecaea00-fcdc-3f5a-83bf-4530568280c1
+Content-Type: q7/binary
+Entry-Name: contents/Library/extlibraryRight.ecore
+
+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
+------=_contents/Library/extlibraryRight.ecore-aecaea00-fcdc-3f5a-83bf-4530568280c1--
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/resources/treeviewer/ts008_tc005.zip b/plugins/org.eclipse.emf.compare.rcptt.tests/resources/treeviewer/ts008_tc005.zip
new file mode 100644
index 0000000..2498ad1
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/resources/treeviewer/ts008_tc005.zip
Binary files differ
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/treeviewer/ts008_tc005_move_with_different_containers.test b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/treeviewer/ts008_tc005_move_with_different_containers.test
new file mode 100644
index 0000000..6de6625
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/treeviewer/ts008_tc005_move_with_different_containers.test
@@ -0,0 +1,67 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_NQgrUE_eEeWqpPs2GegP7A
+Element-Name: ts008_tc005_move_with_different_containers
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference: https://bugs.eclipse.org/bugs/show_bug.cgi?id=411485
+Id: _gpiK8E_dEeWqpPs2GegP7A
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 8/31/15 4:31 PM
+Testcase-Type: ecl
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
+Content-Type: text/plain
+Entry-Name: .description
+
+This test must validate the expend behaviour when a resource is copied from a container to another.
+TEST STEPS
+ 1) Select the 2 uml models extlibraryLeft.uml and extlibraryRight.uml in the folder named "Library" and run a 2-way comparison
+ 2) In the SMV, Double-click on the "title : EString [eStructuralFeature move]" inside container Book difference.
+ //asserts that the left and the right part of the CMV have the container Book expended
+ //asserts that the left and the right part of the CMV have the container Library expended
+ 3) In the SMV, Double-click on the fullName : eString [eStructuralFeature add] inside container Person difference.
+ //asserts that the left and the right part of the CMV have the container Person expended
+ //asserts that the left and the right part of the CMV have the container Book expended
+ //asserts that the left and the right part of the CMV have the container Library expended
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa--
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+with [get-view "Package Explorer" | get-tree] {
+ select "Library/extlibraryLeft.ecore" | key-type "M2+ARROW_DOWN"
+ select "Library/extlibraryLeft.ecore" "Library/extlibraryRight.ecore"
+ get-menu "Compare With/Each Other" | click
+}
+get-editor "Compare ('Library/extlibraryLeft.ecore' - 'Library/extlibraryRight.ecore')" | get-tree
+ | select "> extlibrary/> Book -> CirculatingItem/title : EString [eStructuralFeatures add]" | double-click
+with [get-editor "Compare ('Library/extlibraryLeft.ecore' - 'Library/extlibraryRight.ecore')"] {
+ get-tree -after [get-label "Local: /Library/extlibraryRight.ecore"] | get-item "extlibrary/Book -> CirculatingItem"
+ | get-property "getExpanded()" | equals true | verify-true
+ get-tree -after [get-label "Local: /Library/extlibraryRight.ecore"] -index 1
+ | get-item "extlibrary/Book -> CirculatingItem, TitledItem" | get-property "getExpanded()" | equals true
+ | verify-true
+ get-tree -after [get-label "Local: /Library/extlibraryRight.ecore"] | get-item "extlibrary/Library -> Addressable"
+ | get-property "getExpanded()" | equals true | verify-true
+ get-tree -after [get-label "Local: /Library/extlibraryRight.ecore"] -index 1
+ | get-item "extlibrary/Library -> Addressable" | get-property "getExpanded()" | equals true | verify-true
+}
+get-editor "Compare ('Library/extlibraryLeft.ecore' - 'Library/extlibraryRight.ecore')" | get-tree
+ | select "> extlibrary/> Person -> Addressable/fullName : EString [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/Book -> CirculatingItem" | get-property "getExpanded()" | equals false | verify-true
+ get-item "extlibrary/Library -> Addressable" | get-property "getExpanded()" | equals false | verify-true
+ }
+ with [get-tree -after [get-label "Local: /Library/extlibraryRight.ecore"] -index 1] {
+ get-item "extlibrary/Book -> CirculatingItem, TitledItem" | get-property "getExpanded()" | equals false
+ | verify-true
+ get-item "extlibrary/Library -> Addressable" | get-property "getExpanded()" | equals false | verify-true
+ }
+ get-tree -after [get-label "Local: /Library/extlibraryRight.ecore"] | get-item "extlibrary/Person -> Addressable"
+ | get-property "getExpanded()" | equals true | verify-true
+ get-tree -after [get-label "Local: /Library/extlibraryRight.ecore"] -index 1
+ | get-item "extlibrary/Person -> Addressable" | get-property "getExpanded()" | equals true | verify-true
+}
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/ts008_treeviewer.suite b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/ts008_treeviewer.suite
index 2472387..fd30131 100644
--- a/plugins/org.eclipse.emf.compare.rcptt.tests/tests/ts008_treeviewer.suite
+++ b/plugins/org.eclipse.emf.compare.rcptt.tests/tests/ts008_treeviewer.suite
@@ -1,12 +1,11 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Element-Name: ts008_treeviewer
Element-Type: testsuite
Element-Version: 2.0
Id: _5zaY4aspEeKckft8tQOilA
-Q7-Runtime-Version: 1.3.14.201410230950
-Save-Time: 2/18/15 9:52 AM
+Runtime-Version: 2.0.0.201506120617
+Save-Time: 8/31/15 2:54 PM
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
Content-Type: text/plain
@@ -18,9 +17,10 @@
Content-Type: text/testcase
Entry-Name: testcase-items
-_NdtZQKsqEeKckft8tQOilA //
-_-cdv4N13EeKlP8eyY8UqWw //
-_KYn4gN17EeKlP8eyY8UqWw //
-_XgOJcN2SEeKlP8eyY8UqWw //
+_NdtZQKsqEeKckft8tQOilA // kind: 'test' name: 'ts008_tc001_move_under_rac' path: 'treeviewer/ts008_tc001_move_under_rac.test'
+_-cdv4N13EeKlP8eyY8UqWw // kind: 'test' name: 'ts008_tc002_rac' path: 'treeviewer/ts008_tc002_rac.test'
+_KYn4gN17EeKlP8eyY8UqWw // kind: 'test' name: 'ts008_tc003_rac_left_fragment' path: 'treeviewer/ts008_tc003_rac_left_fragment.test'
+_XgOJcN2SEeKlP8eyY8UqWw // kind: 'test' name: 'ts008_tc004_rac_right_fragment' path: 'treeviewer/ts008_tc004_rac_right_fragment.test'
+_gpiK8E_dEeWqpPs2GegP7A // kind: 'test' name: 'ts008_tc005_move_with_different_containers' path: 'treeviewer/ts008_tc005_move_with_different_containers.test'
------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--
