plugins/org.eclipse.emf.compare.rcptt.tests/tests/papyrus/ts017_tc001.2_merge_resource_location_test.test

--- RCPTT testcase ---
Format-Version: 1.0
Contexts: _SapwEL4pEeOsAoUpt_cnqw,_LOMGYGrvEeK_JdLra2Bk5A,_UWjgsG3JEeWIusgcIwVxMw,_d_GLMHDdEeWhSZQCADl_Kg
Element-Name: ts017_tc001.2_merge_resource_location_test
Element-Type: testcase
Element-Version: 3.0
External-Reference: 
Id: _Mvr6IG3CEeWIusgcIwVxMw
Runtime-Version: 2.0.0.201506120617
Save-Time: 3/21/16 4:45 PM
Testcase-Type: ecl

------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
Content-Type: text/plain
Entry-Name: .description

This test must validate the hability to merge a ResourceLocationChange. 
- The initial state of the repository is a model with a resource controlled (the original model contains a diagram and the controlled resource contains only uml elements)
- On a second commit, the files containing the controlled resources are renammed (di, uml and notation files)
- On another commit based on the first one, a new uml element is added in the controlled resource. This new element is displayed in the diagram located in the original model

TEST STEPS
	1) Checkout the branch branch3
	2) Select the project, right-click and merge with branch2
	// Assert that the result contains the new uml element
	// Assert that the result fragment has been renamed
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa--
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
Content-Type: text/ecl
Entry-Name: .content

with [get-view "Project Explorer" | get-tree] {
    select "papyrus[ ]+\\[emf-compare-papyrus-egit branch1\\]" | get-menu "Team/Switch To/branch3" | click
    select "papyrus[ ]+\\[emf-compare-papyrus-egit branch3\\]" | get-menu "Team/Merge..." | click
}
with [get-window "Merge 'branch3'"] {
    get-tree | select "Local/branch2 ca917fa Commit 2"
    get-button "Merge" | click
}

try -command {
get-window "Merge Result" | get-editbox -after [get-label "Result"] | get-property text | equals Merged | verify-true
get-window "Merge Result" | get-button OK | click
} -catch {wait 500} -times 30

get-view "Project Explorer" | get-tree | get-item "papyrus[ ]+\\[emf-compare-papyrus-egit branch3\\]" 
    | get-property childCount | equals 2 | verify-true
with [get-view "Project Explorer" | get-tree] {
    get-item "papyrus[ ]+\\[emf-compare-papyrus-egit branch3\\]/control" | get-property caption | equals control 
        | verify-true
    get-item "papyrus[ ]+\\[emf-compare-papyrus-egit branch3\\]/model" | get-property caption | equals model | verify-true
}
get-view "Project Explorer" | get-tree | select "papyrus[ ]+\\[emf-compare-papyrus-egit branch3\\]/model" | double-click

with [get-view "Model Explorer" | get-tree] {
    get-item "RootElement/Diagram ClassDiagram" | click
    get-item "RootElement/Diagram ClassDiagram" | click
    select "RootElement/Diagram ClassDiagram" | double-click
}
get-view "Model Explorer" | get-tree | get-item "RootElement/Package1" | get-property "image.decorations[0].path" 
    | equals "org.eclipse.emf.edit/icons/full/ovr16/ControlledObject.gif" | verify-true
with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name RootElement | get-edit-part -name Package1] {
    get-edit-part -className PackagePackageableElementCompartmentEditPart | get-edit-part -name Package2 
        | get-edit-part -text Package2 | get-property text | equals Package2 | verify-true
    get-edit-part -text Package1 | get-property text | equals Package1 | verify-true
}
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--