[UI Tests] Update UI Tests

Change-Id: I5b47632839e4e7eca1f052be45d2a0a4d598ab5a
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
[Logical Model View] Use our own synced icon

Synchonization icon was not part of Kepler release and older.
Use our own synced icon to be compatible with every release.

Change-Id: Ia2a5de85bf5d6d62d5f77d6ebd2c8b366680f2d4
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Notify resources when running merge all non conflicting diffs command

Fix regression from 2b4ee2034653ec80267f87ce2e5128463716da51

Change-Id: Ia10969440fed2aa56c1758cfdf93f335e7a99425
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Adds new node types in the "Nodes" metamodel to test EEnum

Change-Id: I34886ceb588f47d0844ca174c5f2573f5ac09afa
[454579] Fix Nullpointer when element is moved out of FeatureMap

The FeatureMapChangeMerger is intended to handle manipulations of
FeatureMaps. When used to work on the Non-Feature-Map side of an
operation a NullPointerException is thrown. This patch changes the
AbstractMerger so that equivalent ReferenceChanges will be preferred in
this scenario.

The AbstractMerger is also modified to first search for the master
equivalence and only after that to check for equivalences with
conflicts. This avoids an issue where multiple equivalences with
conflicts exist and the less fitting one is chosen.

Includes 2-way and 3-way testcases.

Bug: 454579
Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com>
Change-Id: I8a264b09a7a8011121c341673638eda052afb422
[UI Tests] Update UI Test

Change-Id: I20a01737dd5b495eda0816ee9a57257a17637d8a
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Adds unit test for enum

Adds test for merging attribute with an EEnum type (both multi and
single value).

Adds test merging conflicting diff onattribute with and EEnum type (both
single and multi).

Change-Id: Ic522012a6e3d7fa6252b6adec186fc223d816ecb