[Test] Migrated test models for RCPTT

Change-Id: Iaece3c5c4c3a9c4f2c442397fd8e433371283189
Signed-off-by: Ali AKAR <ali.akar82@gmail.com>

tests/plugins/org.polarsys.capella.test.rcptt/DiffMerge/DiffMergeTwoFragmentedModels.test

@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _Tz93kEMPEeiEYaQR9fY4DQ
-Runtime-Version: 2.3.0.201801290011
-Save-Time: 4/18/18 4:01 PM
+Runtime-Version: 2.3.0.201806262310
+Save-Time: 9/19/18 6:05 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -25,8 +25,8 @@ get-window "EMF Diff/Merge" | get-group "Comparison method" | get-combo | get-pr
 get-window "EMF Diff/Merge" | get-group "Comparison method" | get-button "Configure..." | click
 // Check the predefine usage
 with [get-window "Comparison Configuration" | get-group "Predefined usages" 
-    | get-button "Diff/merge between different versions of the same model"] {
-    get-property caption | equals "Diff/merge between different versions of the same model" | verify-true
+    | get-button "Capella default: different versions of the same Capella / Team for Capella model"] {
+    get-property caption | equals "Capella default: different versions of the same Capella / Team for Capella model" | verify-true
     get-property selected | equals true | verify-true
 }
 // Check the advance setting
@@ -45,37 +45,33 @@ with [get-window "Comparison Configuration" | get-group "Absolute criteria"] {
         get-property caption | equals "Property IDs" | verify-true
         get-property selected | equals true | verify-true
     }
-    with [get-button "Prefer Sirius intrinsic ID when possible."] {
-        get-property caption | equals "Prefer Sirius intrinsic ID when possible." | verify-true
-        get-property selected | equals true | verify-true
-    }
 }
 // Confirm the execution of diff/merge
 get-window "Comparison Configuration" | get-button OK | click
 get-window "EMF Diff/Merge" | get-button Finish | click
 // Check that there are differences between fragments.
 with [get-editor "Compare ('DiffMerge_Fragment_Model' - 'DiffMerge_Fragment_Model')" | get-tree] {
-    get-item -path "OA.airdfragment \\(78\\)" | get-property caption | equals "OA.airdfragment (78)" | verify-true
-    get-item -path "SA.airdfragment \\(122\\)" | get-property caption | equals "SA.airdfragment (122)" | verify-true
+    get-item -path "OA.airdfragment \\(43\\)" | get-property caption | equals "OA.airdfragment (43)" | verify-true
+    get-item -path "SA.airdfragment \\(64\\)" | get-property caption | equals "SA.airdfragment (64)" | verify-true
 }
 with [get-editor "Compare ('DiffMerge_Fragment_Model' - 'DiffMerge_Fragment_Model')" | get-tree] {
-    get-item -path "OA.airdfragment \\(78\\)/Operational Analysis \\(78\\)" | get-property caption 
-        | equals "Operational Analysis (78)" | verify-true
+    get-item -path "OA.airdfragment \\(43\\)/Operational Analysis \\(41\\)" | get-property caption 
+        | equals "Operational Analysis (41)" | verify-true
     get-item 
-        -path "OA.airdfragment \\(78\\)/Operational Analysis \\(78\\)/\\[OAIB\\] Root Operational Activity \\(78\\)" 
-        | get-property caption | equals "[OAIB] Root Operational Activity (78)" | verify-true
-    get-item -path "SA.airdfragment \\(122\\)/System Analysis \\(122\\)" | get-property caption 
-        | equals "System Analysis (122)" | verify-true
-    get-item -path "SA.airdfragment \\(122\\)/System Analysis \\(122\\)/\\[SDFB\\] Root System Function \\(122\\)" 
-        | get-property caption | equals "[SDFB] Root System Function (122)" | verify-true
+        -path "OA.airdfragment \\(43\\)/Operational Analysis \\(41\\)/\\[OAIB\\] Root Operational Activity \\(40\\)" 
+        | get-property caption | equals "[OAIB] Root Operational Activity (40)" | verify-true
+    get-item -path "SA.airdfragment \\(64\\)/System Analysis \\(63\\)" | get-property caption 
+        | equals "System Analysis (63)" | verify-true
+    get-item -path "SA.airdfragment \\(64\\)/System Analysis \\(63\\)/\\[SDFB\\] Root System Function \\(62\\)" 
+        | get-property caption | equals "[SDFB] Root System Function (62)" | verify-true
 }
 // Merge the differences
 with [get-editor "Compare ('DiffMerge_Fragment_Model' - 'DiffMerge_Fragment_Model')"] {
-    get-tree | select "SA.airdfragment (122)" "OA.airdfragment (78)"
-    get-button "Copy to the left" | click
+    get-tree | select "SA.airdfragment (64)" "OA.airdfragment (43)"
+    get-button "Transfer changes to the right" | click
 }
 get-window "Merge Operation" | get-button OK | click
-get-window "Merge Operation" | get-button OK | click
+
 get-editor "Compare ('DiffMerge_Fragment_Model' - 'DiffMerge_Fragment_Model')" | get-tree | key-type "M1+s"
 // Verify that after merging, there is not any difference
 get-editor "Compare ('DiffMerge_Fragment_Model' - 'DiffMerge_Fragment_Model')" | get-tree 

tests/plugins/org.polarsys.capella.test.rcptt/DiffMerge/DiffMergeTwoImportedModels.test

@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _bgBLEEJQEeiEYaQR9fY4DQ
-Runtime-Version: 2.3.0.201801290011
-Save-Time: 4/17/18 5:25 PM
+Runtime-Version: 2.3.0.201806262310
+Save-Time: 9/19/18 6:29 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -27,7 +27,7 @@ get-window "EMF Diff/Merge" | get-group "Comparison method" | get-button "Config
 // The criterions are "Technical IDs", "Property IDs"
 // The fine grained criterion is "Prefer Sirius intrinsic ID when possible."
 get-window "Comparison Configuration" | get-group "Predefined usages" 
-    | get-button "Diff/merge between different versions of the same model" | get-property selected | equals true 
+    | get-button "Capella default: different versions of the same Capella / Team for Capella model" | get-property selected | equals true 
     | verify-true
 with [get-window "Comparison Configuration"] {
     get-button "Show advanced settings >>" | click
@@ -36,65 +36,62 @@ with [get-window "Comparison Configuration"] {
 with [get-window "Comparison Configuration" | get-group "Absolute criteria"] {
     get-button "Technical IDs" | get-property selected | equals true | verify-true
     get-button "Property IDs" | get-property selected | equals true | verify-true
-    get-button "Prefer Sirius intrinsic ID when possible." | get-property selected | equals true | verify-true
 }
 
 // Execute the diff/merge command
 get-window "Comparison Configuration" | get-button OK | click
 get-window "EMF Diff/Merge" | get-button Finish | click
 
-// Verify that the 2 models have 564 differences in terms of diagram contents
-get-editor "Compare ('TestModel' - 'TestModel')" | get-tree | get-item -path "TestModel.aird \\(564\\)" 
-    | get-property "getText()" | equals "TestModel.aird (564)" | verify-true
+// Verify that the 2 models have 293 differences in terms of diagram contents
+get-editor "Compare ('TestModel' - 'TestModel')" | get-tree | get-item -path "TestModel.aird \\(293\\)" 
+    | get-property "getText()" | equals "TestModel.aird (293)" | verify-true
 
 with [get-editor "Compare ('TestModel' - 'TestModel')" | get-tree] {
-// Verify that the 2 models have 222 differences in terms of diagram contents at the OA level
-    get-item -path "TestModel.aird \\(564\\)/Operational Analysis \\(222\\)" | get-property "getText()" 
-        | equals "Operational Analysis (222)" | verify-true
-// Verify that the 2 models have 222 differences in the diagram OABD
+// Verify that the 2 models have 113 differences in terms of diagram contents at the OA level
+    get-item -path "TestModel.aird \\(293\\)/Operational Analysis \\(113\\)" | get-property "getText()" 
+        | equals "Operational Analysis (113)" | verify-true
+// Verify that the 2 models have 112 differences in the diagram OABD
     get-item 
-        -path "TestModel.aird \\(564\\)/Operational Analysis \\(222\\)/\\[OABD\\] Root Operational Activity \\(222\\)" 
-        | get-property "getText()" | equals "[OABD] Root Operational Activity (222)" | verify-true
-// Verify that the 2 models have 342 differences in terms of diagram contents at the SA level
-    get-item -path "TestModel.aird \\(564\\)/System Analysis \\(342\\)" | get-property "getText()" 
-        | equals "System Analysis (342)" | verify-true
-// Verify that the 2 models have 342 differences in the diagram SDFB
-    get-item -path "TestModel.aird \\(564\\)/System Analysis \\(342\\)/\\[SDFB\\] Root System Function \\(342\\)" 
-        | get-property "getText()" | equals "[SDFB] Root System Function (342)" | verify-true
+        -path "TestModel.aird \\(293\\)/Operational Analysis \\(113\\)/\\[OABD\\] Root Operational Activity \\(112\\)" 
+        | get-property "getText()" | equals "[OABD] Root Operational Activity (112)" | verify-true
+// Verify that the 2 models have 173 differences in terms of diagram contents at the SA level
+    get-item -path "TestModel.aird \\(293\\)/System Analysis \\(173\\)" | get-property "getText()" 
+        | equals "System Analysis (173)" | verify-true
+// Verify that the 2 models have 172 differences in the diagram SDFB
+    get-item -path "TestModel.aird \\(293\\)/System Analysis \\(173\\)/\\[SDFB\\] Root System Function \\(172\\)" 
+        | get-property "getText()" | equals "[SDFB] Root System Function (172)" | verify-true
 }
 
 // Deactivate the filter that hides differences in terms of diagram contents.
 get-editor "Compare ('TestModel' - 'TestModel')" | get-button -index 9 | click
-get-menu -path "Show diagram contents" | click
+
 with [get-editor "Compare ('TestModel' - 'TestModel')" | get-tree] {
-// Verify that the 2 models have 222 differences in the diagram OABD
+// Verify that the 2 models have 111 differences in the diagram OABD
     get-item 
-        -path "TestModel.aird \\(564\\)/Operational Analysis \\(222\\)/\\[OABD\\] Root Operational Activity \\(222\\)/Representation: \\[OABD\\] Root Operational Activity \\(222\\)" 
-        | get-property "getText()" | equals "Representation: [OABD] Root Operational Activity (222)" | verify-true
+        -path "TestModel.aird \\(293\\)/Operational Analysis \\(113\\)/\\[OABD\\] Root Operational Activity \\(112\\)/Representation: \\[OABD\\] Root Operational Activity \\(111\\)" 
+        | get-property "getText()" | equals "Representation: [OABD] Root Operational Activity (111)" | verify-true
 // Verify that the 2 models have 86 differences related to "Annotation Entry GMF_DIAGRAMS" in the OABD diagram
     get-item 
-        -path "TestModel.aird \\(564\\)/Operational Analysis \\(222\\)/\\[OABD\\] Root Operational Activity \\(222\\)/Representation: \\[OABD\\] Root Operational Activity \\(222\\)/Annotation Entry GMF_DIAGRAMS \\(86\\)" 
+        -path "TestModel.aird \\(293\\)/Operational Analysis \\(113\\)/\\[OABD\\] Root Operational Activity \\(112\\)/Representation: \\[OABD\\] Root Operational Activity \\(111\\)/Annotation Entry GMF_DIAGRAMS \\(86\\)" 
         | get-property "getText()" | equals "Annotation Entry GMF_DIAGRAMS (86)" | verify-true
-// Verify that the 2 models have 342 differences in the diagram SDFB
+// Verify that the 2 models have 171 differences in the diagram SDFB
     get-item 
-        -path "TestModel.aird \\(564\\)/System Analysis \\(342\\)/\\[SDFB\\] Root System Function \\(342\\)/Representation: \\[SDFB\\] Root System Function \\(342\\)" 
-        | get-property "getText()" | equals "Representation: [SDFB] Root System Function (342)" | verify-true
+        -path "TestModel.aird \\(293\\)/System Analysis \\(173\\)/\\[SDFB\\] Root System Function \\(172\\)/Representation: \\[SDFB\\] Root System Function \\(171\\)" 
+        | get-property "getText()" | equals "Representation: [SDFB] Root System Function (171)" | verify-true
 // Verify that the 2 models have 128 differences related to "Annotation Entry GMF_DIAGRAMS" in the SDFB diagram
     get-item 
-        -path "TestModel.aird \\(564\\)/System Analysis \\(342\\)/\\[SDFB\\] Root System Function \\(342\\)/Representation: \\[SDFB\\] Root System Function \\(342\\)/Annotation Entry GMF_DIAGRAMS \\(128\\)" 
+        -path "TestModel.aird \\(293\\)/System Analysis \\(173\\)/\\[SDFB\\] Root System Function \\(172\\)/Representation: \\[SDFB\\] Root System Function \\(171\\)/Annotation Entry GMF_DIAGRAMS \\(128\\)" 
         | get-property "getText()" | equals "Annotation Entry GMF_DIAGRAMS (128)" | verify-true
 }
 // Activate again the filter that hides differences in terms of diagram contents.
 get-editor "Compare ('TestModel' - 'TestModel')" | get-button -index 9 | click
-get-menu -path "Show diagram contents" | click
 
 // Merge the 2 models from right to left
 with [get-editor "Compare ('TestModel' - 'TestModel')"] {
-    get-tree | select "TestModel.aird (564)"
-    get-button "Copy to the left" | click
+    get-tree | select "TestModel.aird (293)"
+    get-button "Transfer changes to the right" | click
 }
 get-window "Merge Operation" | get-button OK | click
-get-window "Merge Operation" | get-button OK | click
 // Save the results of merge operation
 get-button "Save (M1+S)" | click
 // Verify that we have now 0 difference between 2 models.
@@ -110,6 +107,7 @@ with [get-view "Capella Project Explorer" | get-tree] {
 }
 // Verify that we have now 0 difference between 2 models.
 get-window "EMF Diff/Merge" | get-button Finish | click
+get-window "EMF Diff/Merge" | get-button OK | click
 get-editor "Compare ('TestModel' - 'TestModel')" | get-tree | get-property "getChildren().length" | equals 0 
     | verify-true
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--

tests/plugins/org.polarsys.capella.test.rcptt/models/IFEWithPropertyValue/In-Flight Entertainment System/In-Flight Entertainment System.afm

@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--Capella_Version_1.3.0-->
-<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0">
-  <viewpointReferences xsi:type="metadata:ViewpointReference" id="_jSorMHhPEeeakfW4Dd3vlQ"
-      vpId="org.polarsys.capella.core.viewpoint" version="1.3.0"/>
+<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0">
+  <viewpointReferences id="_jSorMHhPEeeakfW4Dd3vlQ" vpId="org.polarsys.capella.core.viewpoint" version="1.3.0"/>
 </metadata:Metadata>