From 0251aafed886233a3137dca7e0046ce45b4a4891 Mon Sep 17 00:00:00 2001
From: Christian W. Damus
Date: Wed, 27 Jun 2018 17:12:35 -0400
Subject: Bug 536378: [RCPTT] Sequence diagram functional test regressions

- remove test cases from the "suites" folder that were redundant
  with identically-named test cases in the "tests" folder
- us CSS to select Roboto 11pt font in all tests for consistent
  (in some degree) geometry across platforms
- define ECL procedures to express assertions of the geometry of
  shapes in the diagram more concisely and with tolerances for
  platform variability (and perhaps other sources of variability)
- update test assertions to reflect current layout results on
  Mac platform with the intention that tolerances account for
  deviation in Linux build environment
- update stylesheet for labels

Note that some of the layout results as asserted now in the tests
may be functionally incorrect and so not flagged as such by tests
that should be failing. These will have to be reviewed once the
noise of test failures for reasons of invalid test construction
(e.g. asserting fractional anchors to 10 decimal places!) have been
successfully cleaned up and stabilized.

Change-Id: I0c757d3bd65ca30205a3cb1575dc61f81331a3b5
Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
---
 .../contexts/scripts/assertion_utils.ctx           | 152 +++++++++++++++
 .../contexts/scripts/init_sequence_diagram.ctx     |  27 +++
 .../contexts/scripts/preference_utils.ctx          |  62 ++++++
 .../EmptyPapyrusModel_SeqDiagCreated.ctx           |  72 ++++---
 .../rcptt.properties                               |   5 +-
 .../suites/add.suite                               |  31 +++
 .../suites/add/add000_InitTest.test                |  22 ---
 .../suites/add/add001_AddOneLifeline.test          |  47 -----
 .../suites/add/add002_AddSecondLifeline.test       |  61 ------
 .../suites/add/add003_AddOneMessageSync.test       |  84 ---------
 .../suites/add/addElements.suite                   |  20 --
 .../suites/move.suite                              |  26 +++
 .../testcases/add/add001_AddOneLifeline.test       |  17 +-
 .../testcases/add/add002_AddSecondLifeline.test    |  17 +-
 .../testcases/add/add003_AddOneMessageSync.test    |  57 ++----
 .../testcases/add/add004_AddOneMessageAsync.test   |  17 +-
 .../add/add005_AddOneCombinedFragment.test         | 129 ++++++-------
 .../testcases/add/add006_AddOneMessageCreate.test  |  63 +++----
 .../testcases/add/add007_AddOneMessageDelete.test  |  75 ++------
 .../testcases/add/add008_AddOneMessageFound.test   |  61 +++---
 .../testcases/add/add009_AddOneMessageLost.test    |  56 ++----
 .../move001_MoveMessageWithOthersMessages.test     | 210 ++++++++-------------
 .../move/move002_MoveMessageSyncOverLifeLine.test  |  61 ++----
 .../move003_MoveMessageCreateOverLifeLine.test     |  54 ++----
 .../move004_MoveMessageDeleteOverLifeLine.test     |  58 ++----
 25 files changed, 638 insertions(+), 846 deletions(-)
 create mode 100644 tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/scripts/assertion_utils.ctx
 create mode 100644 tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/scripts/init_sequence_diagram.ctx
 create mode 100644 tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/scripts/preference_utils.ctx
 create mode 100644 tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add.suite
 delete mode 100644 tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add000_InitTest.test
 delete mode 100644 tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add001_AddOneLifeline.test
 delete mode 100644 tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add002_AddSecondLifeline.test
 delete mode 100644 tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add003_AddOneMessageSync.test
 delete mode 100644 tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/addElements.suite
 create mode 100644 tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/move.suite

diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/scripts/assertion_utils.ctx b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/scripts/assertion_utils.ctx
new file mode 100644
index 00000000000..48bd1a7a14d
--- /dev/null
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/scripts/assertion_utils.ctx
@@ -0,0 +1,152 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Context-Type: org.eclipse.rcptt.ctx.ecl
+Element-Name: assertion_utils
+Element-Type: context
+Element-Version: 2.0
+Id: _0rxqwHl4Eei64tmsM6ziaQ
+Runtime-Version: 2.3.0.201806122315
+Save-Time: 6/28/18 10:04 AM
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
+Content-Type: text/plain
+Entry-Name: .description
+
+Utilities procedures for assertions about edit parts, figures, anchors, and more in the diagram editor.
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa--
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998
+Content-Type: text/ecl
+Entry-Name: .ecl.context
+
+/**
+ * Fuzzy assertion of a numeric quantity.
+ *
+ * @param value the quantity to assert
+ * @param expected the expected value of the quantity
+ * @param tolerance the tolerance within which to consider the value matched with the expected
+ * @param name optional name of the quantity being asserted
+ */
+proc "assert-value" [val value -input] [val expected] [val tolerance] [val name "value"] {
+	let [val error [minus $expected $value | abs]] {
+		if [or [lt $error $tolerance] [eq $error $tolerance] | not] {
+			assert-true -input False -message [concat $name " was " $value " but expected " $expected " ±" $tolerance]
+		}
+	}
+}
+
+/**
+ * Assert the X- and Y-fractions of a message anchor.
+ *
+ * @param id the anchor ID (terminal)
+ * @param expectedX the expected X fraction
+ * @param expectedY the expected Y fraction
+ * @param tolerance the fuzzy comparison tolerance to allow for variability in
+ *          layout on different systems/displays/etc.
+ * @param name optional name of the anchor
+ */
+proc "assert-message-anchor" [val id -input] [val expectedX] [val expectedY] [val tolerance "0.02"] [val name "anchor"] {
+	let [val trimmed [str $id | invoke substring 1 [echo $id | invoke length | int | minus 1]]] {
+		echo $trimmed | split -sep "," | to-list | get 0 | float
+			| assert-value $expectedX [float $tolerance] [concat $name " x fraction"]
+		echo $trimmed | split -sep "," | to-list | get 1 | float
+			| assert-value $expectedY [float $tolerance] [concat $name " y fraction"]
+	}
+}
+
+/**
+ * Assert the source anchor of a message.
+ *
+ * @param object the message edit-part or figure
+ * @param expectedX the expected X fraction
+ * @param expectedY the expected Y fraction
+ * @param tolerance the fuzzy comparison tolerance to allow for variability in
+ *          layout on different systems/displays/etc.
+ */
+proc "assert-message-source" [val object -input] [val expectedX] [val expectedY] [val tolerance [float "0.02"]] {
+	get-property -object $object -name "sourceAnchor.id" -raw | assert-message-anchor $expectedX $expectedY $tolerance "sourceAnchor"
+}
+
+/**
+ * Assert the target anchor of a message.
+ *
+ * @param object the message edit-part or figure
+ * @param expectedX the expected X fraction
+ * @param expectedY the expected Y fraction
+ * @param tolerance the fuzzy comparison tolerance to allow for variability in
+ *          layout on different systems/displays/etc.
+ */
+proc "assert-message-target" [val object -input] [val expectedX] [val expectedY] [val tolerance [float "0.02"]] {
+	get-property -object $object -name "targetAnchor.id" -raw | assert-message-anchor $expectedX $expectedY $tolerance "targetAnchor"
+}
+
+/**
+ * Assert the source and target anchors of a message.
+ *
+ * @param object the message edit-part or figure
+ * @param sourceX the expected source X fraction
+ * @param sourceY the expected source Y fraction
+ * @param targetX the expected target X fraction
+ * @param targetY the expected target Y fraction
+ * @param tolerance the fuzzy comparison tolerance to allow for variability in
+ *          layout on different systems/displays/etc.
+ * 
+ * @see #assert-message-anchor
+ */
+proc "assert-message-anchors" [val object -input] [val sourceX] [val sourceY] [val targetX] [val targetY] [val tolerance [float "0.02"]] {
+	with $object {
+		assert-message-source $sourceX $sourceY $tolerance
+        assert-message-target $targetX $targetY $tolerance
+    }
+}
+
+/**
+ * Assert the location of an edit-part or figure.
+ *
+ * @param object the edit-part or figure
+ * @param expectedX the expected X coördinate
+ * @param expectedY the expected Y coördinate
+ * @param tolerance the fuzzy comparison tolerance to allow for variability in
+ *          layout on different systems/displays/etc.
+ */
+proc "assert-at" [val object -input] [val expectedX] [val expectedY] [val tolerance 5] {
+	with $object {
+ 		get-property x -raw | assert-value $expectedX $tolerance "x" 
+ 		get-property y -raw | assert-value $expectedY $tolerance "y" 
+    }
+}
+
+/**
+ * Assert the size of an edit-part or figure.
+ *
+ * @param object the edit-part or figure
+ * @param expectedWidth the expected width
+ * @param expectedHeight the expected height
+ * @param tolerance the fuzzy comparison tolerance to allow for variability in
+ *          layout on different systems/displays/etc.
+ */
+proc "assert-size" [val object -input] [val expectedWidth] [val expectedHeight] [val tolerance 5] {
+	with $object {
+  		get-property width -raw | assert-value $expectedWidth $tolerance "width" 
+ 		get-property height -raw | assert-value $expectedHeight $tolerance "height" 
+    }
+}
+
+/**
+ * Assert the bounds of an edit-part or figure.
+ *
+ * @param object the edit-part or figure
+ * @param expectedX the expected X coördinate
+ * @param expectedY the expected Y coördinate
+ * @param expectedWidth the expected width
+ * @param expectedHeight the expected height
+ * @param tolerance the fuzzy comparison tolerance to allow for variability in
+ *          layout on different systems/displays/etc.
+ */
+proc "assert-bounds" [val object -input] [val expectedX] [val expectedY] [val expectedWidth] [val expectedHeight] [val tolerance 5] {
+	with $object {
+        assert-at $expectedX $expectedY $tolerance
+        assert-size $expectedWidth $expectedHeight $tolerance
+    }
+}
+
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/scripts/init_sequence_diagram.ctx b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/scripts/init_sequence_diagram.ctx
new file mode 100644
index 00000000000..f365e2f0a95
--- /dev/null
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/scripts/init_sequence_diagram.ctx
@@ -0,0 +1,27 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Context-Type: org.eclipse.rcptt.ctx.ecl
+Element-Name: init_sequence_diagram
+Element-Type: context
+Element-Version: 2.0
+Id: _cDr2gHl_Eei64tmsM6ziaQ
+Runtime-Version: 2.3.0.201806122315
+Save-Time: 6/28/18 8:45 AM
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
+Content-Type: text/plain
+Entry-Name: .description
+
+Configure basic settings for the sequence diagram.
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa--
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998
+Content-Type: text/ecl
+Entry-Name: .ecl.context
+
+/*
+ * Open the editor and the sequence diagram.
+ */
+get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
+get-view "Model Explorer" | get-tree | select "SequenceDiagramTest/NewSequenceDiagram" | double-click
+
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/scripts/preference_utils.ctx b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/scripts/preference_utils.ctx
new file mode 100644
index 00000000000..4f04e7d4860
--- /dev/null
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/scripts/preference_utils.ctx
@@ -0,0 +1,62 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Context-Type: org.eclipse.rcptt.ctx.ecl
+Element-Name: preference_utils
+Element-Type: context
+Element-Version: 2.0
+Id: _IfftoHoNEei64tmsM6ziaQ
+Runtime-Version: 2.3.0.201806122315
+Save-Time: 6/27/18 9:48 AM
+
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998
+Content-Type: text/ecl
+Entry-Name: .ecl.context
+
+/**
+ * Set automatic creation execution-specification behaviour for synchronous messages.
+ *
+ * @param option "br" for behaviour exec with reply; "ar" for action exec with reply;
+ *               "b" for behaviour exec only; "a" for action exec only;
+ *               "n" or anything else for nothing
+ */
+proc "auto-syncmsg-execspec" [val option] {
+	str $option | switch 
+			[case "br" { echo "A Behavior Execution Specification and a Reply Message" }]
+			[case "ar" { echo "An ActionExecution Specification and a Reply Message" }]
+			[case "b" { echo "A Behavior Execution Specification" }]
+			[case "a" { echo "An ActionExecution Specification" }]
+			-default { echo "Nothing" } | let [val button -input] {
+		get-preferences-menu | click
+		with [get-window Preferences] {
+		    get-tree | select "Papyrus/Diagrams/PapyrusUMLSequenceDiagram Diagram"
+		    get-group "Automatic creations" | get-button $button | click
+		    get-button Apply | click
+		    get-button "Apply and Close" | click
+		}
+	}
+}
+
+/**
+ * Set automatic creation execution-specification behaviour for asynchronous messages.
+ *
+ * @param option "b" for behaviour execution; "a" for action execution;
+ *               "n" or anything else for nothing
+ */
+proc "auto-asyncmsg-execspec" [val option] {
+	str $option | switch 
+			[case "b" { echo "A Behavior Execution Specification" }]
+			[case "a" { echo "An ActionExecution Specification" }]
+			-default { echo "Nothing" }
+	| let [val button -input] {
+		get-preferences-menu | click
+		with [get-window Preferences] {
+		    get-tree | select "Papyrus/Diagrams/PapyrusUMLSequenceDiagram Diagram"
+		    get-group "Automatic creations" | get-button $button -after [get-label "When creating an asynchronous .*"]
+		    	| click
+		    get-button Apply | click
+		    get-button "Apply and Close" | click
+		}
+	}
+}
+
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/workspaces/EmptyPapyrusModel_SeqDiagCreated.ctx b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/workspaces/EmptyPapyrusModel_SeqDiagCreated.ctx
index 58f17161b45..9013f16cbaa 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/workspaces/EmptyPapyrusModel_SeqDiagCreated.ctx
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/contexts/workspaces/EmptyPapyrusModel_SeqDiagCreated.ctx
@@ -5,8 +5,8 @@ Element-Name: EmptyPapyrusModel_SeqDiagCreated
 Element-Type: context
 Element-Version: 2.0
 Id: _KWhwYAgBEeiHkPkpSqDhSg
-Runtime-Version: 2.2.0.201706152316
-Save-Time: 2/2/18 12:44 PM
+Runtime-Version: 2.3.0.201806262310
+Save-Time: 7/26/18 3:44 PM
 
 ------=_contents/SequenceDiagramTest/.project-bd993e17-b4d3-3df7-bc2c-63e155621a11
 Content-Type: q7/binary
@@ -22,32 +22,44 @@ AAAAAAAALmNvbnRlbnRVVAUAAQAAAABQSwUGAAAAAAEAAQA/AAAAyAAAAAAA
 Content-Type: q7/binary
 Entry-Name: contents/SequenceDiagramTest/SequenceDiagramTest.notation
 
-UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAAC1VFtv2jAUfp+0/xB5
-z4s7qkpVBK26UiRoQVRAxZ6QSQ6JNcfObGeBf9+T61iAgibtLbHP+S4+l+79NhbOb9CGK9kj39wr4oD0
-VcBl2COL+eDrLbm/+/ypK5VlFmO8PmehZrGzjbnX5HXyPESSxsPzHomsTTxKsyxzVRy6Sod0OR7WITXW
-X3HgC54YKGLDeEN1Ki2PgaIkt0PrlBrC2J2Ak/kJS3Y6NZTLjWY5WoCiaZFTA6SxOJmOdx16g7xXdDF+
-IYVVHvTIKhikw/Ah7D8Bn69Hm9kPPRpNM+LYXYJipiUrpszgV4qvCNVbEUeyGAMmkB3cxMBMqiEGaReS
-W0ThWxAEn9xxun7ERaBBFgpKkqYOs4gl0Nb2ekrbUFrQzM8zV2VmwXCGow++0sXnRAUHZOElZBN0/sLW
-aIlewvidGe4/qjhh2uZv0ubMLjKYrrHuYZ6/D1XxowLBdirFO2msZlzao0pUKgPT4o8Oi9/YorWv+gBE
-UdY9cGwsb08ocSINmx5pNcUcjHUx9MvKv1GT1w8o/93HYaOUoC0X3WJmzNH+sxp3xBsTKczqwdpnONId
-5RQEpcuVn5fG8jUX3O5W1SohjvmDm++ja9ws9JyW6uGO6jjsmFNwxYFXTfEHkPzIBqhMPXMZDDEOt0iz
-UapllFfUrcJcU1W8mUKVSdCtThnjzImzPTL4OedPD+EjKoqeb6dLdu2LZdiUs3RZ/vzXhuzSdjnw8B1Q
-SwcIscAGNCgCAABfBgAAUEsBAhQAFAAICAgAAAAhALHABjQoAgAAXwYAAAgACQAAAAAAAAAAAAAAAAAA
-AC5jb250ZW50VVQFAAEAAAAAUEsFBgAAAAABAAEAPwAAAGcCAAAAAA==
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAAC1VU1z2jAQvedXeNRz
+rCRtpgkDydBAGiBQKKSTnBhhr21NbdmV5Dr8+65lGxMwSdqZnjDS7tv39kvt6+cotH6DVDwWHXJqnxAL
+hBO7XPgd8rC4Pb4g11dH7eeItx7HAyv/3Vif5dboL1QLzzsk0DppUZplmR1Hvh1Ln6JPZeIo9cIEnJAn
+CoxZwpK1TBXlwpOM+pHncuZT9KicRayZNkEPIKAPlanQPAKKKuwzWrlUEEqvQ/hLBsanAkij8KA73p3R
+c4x7Qh/G9+TqyLLaFYFWD6Eki0zyuNshS/c2Hfhdv9cHvlgNvfmTHA6nGbH0OkGG04IK4szhV4rVgBKA
+WIJFaDCBbO8mAqZSCREI/SC4RhT+DKEhglScgIeuBGEoFFE27OYBS4zGbXKzQ+QGQoNkTu65LDyLEG8E
+6YETS/M5id29aP57ok1Q+z1boSj6rpBfmOLOTRwlTOo8LbtBs3dJTFfYD37uvw1VEUAKIVvHKV4KpSXj
+QjdSiVPhqh0CwX4D1MJopWxzAqEp7hY89lxriyuxAgleh+y0xgKUttH0w9I5jyez14L+u5T9dilRd4W0
+zUSpxj7UEpfODxamMK/GbjtGQ5MU4+AWQpdOXiDNVzzker0stxSxVI2bL7hPuLTom2TK5DUS2W+cg3jm
+oFUO9CuYvGEZlLJGXLgDtMMts9k45bLKy2qXZrYqy17PY5wJkDv9MsbpC9/slNufC97v+jdIKRhdTB/Z
+Ryd89OuaFjrLf/+3Mdt0tybmFJ+GQovJ5jwA0KpO6al//K1/J2cIOOonl8vga+8CZuRFlWqXgnSOWIN9
+Bw+kSWeNmlyq1dOwO0TUqefdDdafx+qmSyxsuqBDaIO8IlF2/o6VYpp44/NKy/f16ugPUEsHCHm3i0mY
+AgAAkQcAAFBLAQIUABQACAgIAAAAIQB5t4tJmAIAAJEHAAAIAAkAAAAAAAAAAAAAAAAAAAAuY29udGVu
+dFVUBQABAAAAAFBLBQYAAAAAAQABAD8AAADXAgAAAAA=
 ------=_contents/SequenceDiagramTest/SequenceDiagramTest.notation-5061f09f-c419-35c8-b57b-48dcb0dbb522--
 ------=_contents/SequenceDiagramTest/SequenceDiagramTest.uml-104aebc9-0799-3bf7-ae07-9ba9e32dde28
 Content-Type: q7/binary
 Entry-Name: contents/SequenceDiagramTest/SequenceDiagramTest.uml
 
-UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAABlkdFugjAUhu+X7B1I
-dz0KGhNDYMZNTHC6MMXEXZlajqWxBVaq6Ntb2WbQXban33/Od+oPjlJYB1AVL/IAubaDLMhpkfKcBWiZ
-jJ/7aPDy+ODvpfBmRQrCOkruXYGO43Zdx3GRuRZ55ZligDKtSw/juq7tQjK7UAxXJVC8mkX4HjC5NwBQ
-wcsKGsjUOrhnO7aDl7MpajrzNEDr8S7h4ZC9hcCz9368Il0qVgxZOZEQoAV8740DjDhhisgEKo2MgmX5
-JaE7wiCSZaF0E6dPpSEucnG71u5VE0X/92oCTSRv3kP6i9+FNhtDVqZgG6CS6EySi6ixWU+j1/lwHoWL
-yylWXHLND5AYtLIF3yiiTraJeFo7CP9Mj2/GvzFKQwES8nunKNegCNXmq1pGtFd8fA7ZyBglm8l28aUm
-k7j+216LcZvOPr6amNMZUEsHCH6AMEJIAQAAMQIAAFBLAQIUABQACAgIAAAAIQB+gDBCSAEAADECAAAI
-AAkAAAAAAAAAAAAAAAAAAAAuY29udGVudFVUBQABAAAAAFBLBQYAAAAAAQABAD8AAACHAQAAAAA=
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAABlkVFvgjAUhd/9FaR7
+HgWNiSGgcRMTnC5MMXFPppZraWyBlSru36+QzaB7bO8959zvXn9ylcK6gKp4kQfItR1kQU6LlOcsQNtk
+/jxCk3HPP0vhrYoUhHWV3Lv19x134DqOi8y3yCvPFAOUaV16GNd1bReS2YViuCqB4t0qwo8C43snACp4
+WUErMrU+HtqO7eDtaonaZJ4GaD8/JTycstcQePY2indkQMWOISsnEgK0ga+zQYAZJ0wRmUCl0bhnWX5J
+6IkwiGRZKN266e/SCBq2uFvrRtVE0f9RjZ9x5G07pL/qB892X8jKFBwDVBKdSdJgGpb9MnpZT9dRuGle
+seKSa36BxEgrW/CDIurbNhZPewfhdnZ8N3wXJw0FSMgfgaJcgyJUmzN1cOiweP+YspnBSQ6L4+ZTLRZx
+/be5jsZtcn18wxj3fgBQSwcIawRU8EcBAAAqAgAAUEsBAhQAFAAICAgAAAAhAGsEVPBHAQAAKgIAAAgA
+CQAAAAAAAAAAAAAAAAAAAC5jb250ZW50VVQFAAEAAAAAUEsFBgAAAAABAAEAPwAAAIYBAAAAAA==
 ------=_contents/SequenceDiagramTest/SequenceDiagramTest.uml-104aebc9-0799-3bf7-ae07-9ba9e32dde28--
+------=_contents/SequenceDiagramTest/style.css-619e7aba-9f71-3c8b-aee7-2aeef3056432
+Content-Type: q7/binary
+Entry-Name: contents/SequenceDiagramTest/style.css
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAAAljLEKg0AQBWv3K159
+jaRI4/2AlYUQUl9ya27RuwVvhYSQf1dJNQwM4/ClZtJiQ8jcYdSHmnq0DrfKEQGTvA+eBUyRw8yo28qw
+xFjCRzeDVEQ2XrMUqSZPuPb/7FleyTpcrp6aRQrfJVo63NOPaAdQSwcIfh80x28AAAB7AAAAUEsBAhQA
+FAAICAgAAAAhAH4fNMdvAAAAewAAAAgACQAAAAAAAAAAAAAAAAAAAC5jb250ZW50VVQFAAEAAAAAUEsF
+BgAAAAABAAEAPwAAAK4AAAAAAA==
+------=_contents/SequenceDiagramTest/style.css-619e7aba-9f71-3c8b-aee7-2aeef3056432--
 ------=_contents/SequenceDiagramTest/SequenceDiagramTest.di-2b2fade7-8a80-3011-8ed1-78cda1f4db2d
 Content-Type: q7/binary
 Entry-Name: contents/SequenceDiagramTest/SequenceDiagramTest.di
@@ -63,12 +75,12 @@ AAAAUEsFBgAAAAABAAEAPwAAAPAAAAAAAA==
 Content-Type: q7/binary
 Entry-Name: .q7.content
 
-UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACVkl9LwzAUxd8Fv0PI
-u4n6JKV16DZQZDCoMH0aIb3r4po/S25t9+1NZ1tfBtK33OR3zuFcks5aXZFv8EFZk9E7dksJGGkLZcqM
-1ri7eaCzx+ur1PqSgayUC8C8dIhMYssa6w/BCQnJZjjNrUFokbRaJaPvfecbk0xI4n1G94gu4bxpGmZ1
-yaI5/1i9Dsg/WaN8YDr5meOR4yNHiRE60kvt8LQW7uTrsLIFVNscjgslyrkHgVBQooqMbt82++bzqXxe
-gno5rA8uPy72eUljeUJS2bUyeB7i6Lz9AomhT4h+ddwadKZe6HcISHs0wjtVwUCyXkn55fcLTqxQU2hj
-UWBc+hRNrasRT/lQ7rc5/6ue8qm/IIp+AFBLBwhQP74FFgEAAGICAABQSwECFAAUAAgICAAAACEAUD++
-BRYBAABiAgAACAAJAAAAAAAAAAAAAAAAAAAALmNvbnRlbnRVVAUAAQAAAABQSwUGAAAAAAEAAQA/AAAA
-VQEAAAAA
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACVkl1rwjAUhu/9FSH3
+S7ZdjdIqmwobQxAcuF1JSI9tZvNhcrrWf7/U2V7pxLsk5znP4bwknbS6Ij/gg7Imow/snhIw0ubKFBmt
+cXv3RCfjUWp9wUBWygVgXjpEJrFljfW74ISEZN2fptYgtEharZJB+9hp4yATkvie0RLRJZw3TcOsLliU
+88/FW49cmTW090zXfuR45PjAUWKEjvRcOzwshTv4OixsDtVmBfuZEsXUg0DIKVF5Rjfv67L5ei5e5qBe
+d8udW+1n5aqg4xEhqeyWMtid4815+w0Sw8kfbXWMDDqlF/oDAtI/MrJbVcE/IKt1RflZOuChAiZDuFA/
+ZzMWBcbEb2jJ1QWYndbsyynv9z5GwodMUn7r5xiPfgFQSwcI3zCMxh0BAAB3AgAAUEsBAhQAFAAICAgA
+AAAhAN8wjMYdAQAAdwIAAAgACQAAAAAAAAAAAAAAAAAAAC5jb250ZW50VVQFAAEAAAAAUEsFBgAAAAAB
+AAEAPwAAAFwBAAAAAA==
 ------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/rcptt.properties b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/rcptt.properties
index ba86f0fb1d7..073a079e100 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/rcptt.properties
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/rcptt.properties
@@ -1,9 +1,10 @@
 --- RCPTT project settings ---
 Format-Version: 1.0
+Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_0rxqwHl4Eei64tmsM6ziaQ,_IfftoHoNEei64tmsM6ziaQ,_KWhwYAgBEeiHkPkpSqDhSg,_cDr2gHl_Eei64tmsM6ziaQ
 Element-Name: Project Settings
 Element-Type: projectMetadata
 Element-Version: 2.0
 Id: _Qqw18Af-EeiHkPkpSqDhSg
-Runtime-Version: 2.2.0.201706152316
-Save-Time: 2/5/18 1:35 PM
+Runtime-Version: 2.3.0.201806122315
+Save-Time: 6/27/18 9:35 AM
 
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add.suite b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add.suite
new file mode 100644
index 00000000000..ede8900d629
--- /dev/null
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add.suite
@@ -0,0 +1,31 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Element-Name: add
+Element-Type: testsuite
+Element-Version: 2.0
+Id: _w41w8HoCEei64tmsM6ziaQ
+Runtime-Version: 2.3.0.201806122315
+Save-Time: 6/27/18 3:07 PM
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
+Content-Type: text/plain
+Entry-Name: .description
+
+Test suite for addition of elements to the Sequence Diagram.
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa--
+------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8
+Content-Type: text/testcase
+Entry-Name: testcase-items
+
+_fnea8AgAEeiHkPkpSqDhSg	// kind: 'test' name: 'add001_AddOneLifeline' path: '../testcases/add/add001_AddOneLifeline.test'
+_V0U8gAgZEeiHkPkpSqDhSg	// kind: 'test' name: 'add002_AddSecondLifeline' path: '../testcases/add/add002_AddSecondLifeline.test'
+_tyrqsAgnEeiHkPkpSqDhSg	// kind: 'test' name: 'add003_AddOneMessageSync' path: '../testcases/add/add003_AddOneMessageSync.test'
+_NepbQAgqEeiHkPkpSqDhSg	// kind: 'test' name: 'add004_AddOneMessageAsync' path: '../testcases/add/add004_AddOneMessageAsync.test'
+_WPB6kBh3Eeilv_R0H7e8aA	// kind: 'test' name: 'add005_AddOneCombinedFragment' path: '../testcases/add/add005_AddOneCombinedFragment.test'
+_qbdN4DMhEei_49Y9iBceHC	// kind: 'test' name: 'add006_AddOneMessageCreate' path: '../testcases/add/add006_AddOneMessageCreate.test'
+_qbdN4DMhEei_49Y9iBceHB	// kind: 'test' name: 'add007_AddOneMessageDelete' path: '../testcases/add/add007_AddOneMessageDelete.test'
+_yH8scDmYEeiGhrmLGgv4BA	// kind: 'test' name: 'add008_AddOneMessageFound' path: '../testcases/add/add008_AddOneMessageFound.test'
+_rLR_0DmZEeiGhrmLGgv4BA	// kind: 'test' name: 'add009_AddOneMessageLost' path: '../testcases/add/add009_AddOneMessageLost.test'
+
+------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add000_InitTest.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add000_InitTest.test
deleted file mode 100644
index 001c14f6923..00000000000
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add000_InitTest.test
+++ /dev/null
@@ -1,22 +0,0 @@
---- RCPTT testcase ---
-Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
-Element-Name: add000_InitTest
-Element-Type: testcase
-Element-Version: 3.0
-External-Reference: 
-Id: _CM2lcApwEeiHkPkpSqDhSg
-Runtime-Version: 2.2.0.201706152316
-Save-Time: 2/23/18 9:17 AM
-Testcase-Type: ecl
-
-------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
-Content-Type: text/ecl
-Entry-Name: .content
-
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
-get-view "Model Explorer" | get-tree | select "SequenceDiagramTest/NewSequenceDiagram" | double-click
-
-
-
-------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add001_AddOneLifeline.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add001_AddOneLifeline.test
deleted file mode 100644
index 8ab6f380299..00000000000
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add001_AddOneLifeline.test
+++ /dev/null
@@ -1,47 +0,0 @@
---- RCPTT testcase ---
-Format-Version: 1.0
-Element-Name: add001_AddOneLifeline
-Element-Type: testcase
-Element-Version: 3.0
-External-Reference: 
-Id: _-wzVUApvEeiHkPkpSqDhSg
-Runtime-Version: 2.2.0.201706152316
-Save-Time: 2/5/18 1:36 PM
-Testcase-Type: ecl
-
-------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
-Content-Type: text/ecl
-Entry-Name: .content
-
-with [get-editor "SequenceDiagramTest.di"] {
-    get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
-        -className CInteractionInteractionCompartmentEditPart | mouse-move 811 16 -height 738 -width 857
-    with [get-palette | get-palette-entry Lifeline] {
-        mouse-move 35 6 button1 -height 23 -width 125
-        mouse-press 35 6 button1 -height 23 -width 125
-        mouse-release 35 6 button1 524288 -height 23 -width 125
-    }
-    with [get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
-        -className CInteractionInteractionCompartmentEditPart] {
-        mouse-move 163 56 button1 -height 738 -width 857
-        mouse-press 163 56 button1 -height 738 -width 857
-        mouse-release 163 56 button1 524288 -height 738 -width 857
-    }
-    with [get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1] {
-        with [get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part -name Lifeline1] {
-            mouse-hover 4 41 -height 700 -width 100
-            get-edit-part -name Lifeline1 | activate-direct-edit
-        }
-        mouse-move 3 53 -height 757 -width 857
-    }
-}
-get-button "Save (Ctrl+S)" | click
-
-// [ASSERT] Verify position of the new lifeline.
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
-    -name Lifeline1 | get-figure -path "0/0"] {
-    get-property x | equals 154 | verify-true
-    get-property y | equals 10 | verify-true
-}
-------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add002_AddSecondLifeline.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add002_AddSecondLifeline.test
deleted file mode 100644
index 1c85659936a..00000000000
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add002_AddSecondLifeline.test
+++ /dev/null
@@ -1,61 +0,0 @@
---- RCPTT testcase ---
-Format-Version: 1.0
-Element-Name: add002_AddSecondLifeline
-Element-Type: testcase
-Element-Version: 3.0
-External-Reference: 
-Id: _-xJTkApvEeiHkPkpSqDhSg
-Runtime-Version: 2.2.0.201706152316
-Save-Time: 2/5/18 1:35 PM
-Testcase-Type: ecl
-
-------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
-Content-Type: text/ecl
-Entry-Name: .content
-
-with [get-editor "SequenceDiagramTest.di"] {
-    with [get-palette | get-palette-entry Lifeline] {
-        mouse-move 48 10 button1 -height 23 -width 125
-        mouse-press 48 10 button1 -height 23 -width 125
-        mouse-release 48 10 button1 524288 -height 23 -width 125
-        mouse-hover 48 10 -height 23 -width 125
-        mouse-move 13 11 -height 23 -width 125
-    }
-    with [get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
-        -className CInteractionInteractionCompartmentEditPart] {
-        mouse-move 497 30 button1 -height 738 -width 857
-        mouse-press 497 30 button1 -height 738 -width 857
-        mouse-release 497 30 button1 524288 -height 738 -width 857
-    }
-    with [get-diagram -index 1] {
-        with [get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
-            -className CInteractionInteractionCompartmentEditPart] {
-            get-edit-part -name Lifeline2 | get-edit-part -name Lifeline2 | activate-direct-edit
-            mouse-hover 497 30 -height 738 -width 857
-            with [get-edit-part -name Lifeline2] {
-                mouse-move 11 12 button1 -height 700 -width 100
-                mouse-press 11 12 button1 -height 700 -width 100
-            }
-        }
-        commit-direct-edit
-        with [get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
-            -className CInteractionInteractionCompartmentEditPart | get-edit-part -name Lifeline2] {
-            mouse-release 11 12 button1 524288 -height 700 -width 100
-            mouse-move 8 15 button1 -height 700 -width 100
-            mouse-press 8 15 button1 -height 700 -width 100
-            mouse-release 8 15 button1 524288 -height 700 -width 100
-            mouse-move 10 17 -height 700 -width 100
-            get-edit-part -name Lifeline2 | activate-direct-edit
-        }
-    }
-}
-
-// [ASSERT] Verify position of the second created lifeline.
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
-    -name Lifeline2 | get-figure -path "0/0"] {
-    get-property x | equals 494 | verify-true
-    get-property y | equals 10 | verify-true
-}
-get-button "Save (Ctrl+S)" | click
-------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add003_AddOneMessageSync.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add003_AddOneMessageSync.test
deleted file mode 100644
index 1f0a28d51bc..00000000000
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/add003_AddOneMessageSync.test
+++ /dev/null
@@ -1,84 +0,0 @@
---- RCPTT testcase ---
-Format-Version: 1.0
-Element-Name: add003_AddOneMessageSync
-Element-Type: testcase
-Element-Version: 3.0
-External-Reference: 
-Id: _-xdcoApvEeiHkPkpSqDhSg
-Runtime-Version: 2.2.0.201706152316
-Save-Time: 2/5/18 1:35 PM
-Testcase-Type: ecl
-
-------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
-Content-Type: text/ecl
-Entry-Name: .content
-
-with [get-editor "SequenceDiagramTest.di"] {
-    get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | mouse-move 856 462 
-        -height 757 -width 857
-    with [get-palette] {
-        get-palette-entry "Message Reply" | mouse-move 31 2 -height 23 -width 125
-        get-palette-entry "Message Async" | mouse-move 47 2 -height 23 -width 125
-        with [get-palette-entry "Message Sync"] {
-            mouse-move 52 17 button1 -height 23 -width 125
-            mouse-press 52 17 button1 -height 23 -width 125
-            mouse-release 52 17 button1 524288 -height 23 -width 125
-        }
-    }
-    with [get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
-        -className CInteractionInteractionCompartmentEditPart] {
-        mouse-move 629 299 -height 738 -width 857
-        with [get-edit-part -name Lifeline1] {
-            mouse-move 48 213 button1 -height 700 -width 100
-            mouse-press 48 213 button1 -height 700 -width 100
-            mouse-release 48 213 button1 524288 -height 700 -width 100
-            mouse-hover 48 213 -height 700 -width 100
-        }
-        mouse-move 391 227 -height 738 -width 857
-        mouse-hover 391 227 -height 738 -width 857
-        mouse-move 497 226 -height 738 -width 857
-        with [get-edit-part -name Lifeline2] {
-            mouse-move 46 210 -height 700 -width 100
-            mouse-hover 46 210 -height 700 -width 100
-            mouse-move 46 210 button1 -height 700 -width 100
-            mouse-press 46 210 button1 -height 700 -width 100
-        }
-    }
-    with [get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
-        -className CInteractionInteractionCompartmentEditPart] {
-        with [get-edit-part -name Lifeline2] {
-            mouse-release 46 210 button1 524288 -height 700 -width 100
-            get-edit-part -name BehaviorExecutionSpecification1 | mouse-hover 6 4 -height 100 -width 20
-            get-target-connection -path 0 | get-edit-part -text Message1 | activate-direct-edit
-        }
-        mouse-move 822 152 -height 738 -width 857
-    }
-    with [get-palette] {
-        get-palette-entry " Behavior Execution Specification" | mouse-move 16 8 -height 52 -width 125
-        get-palette-entry "Action Execution Specification" | mouse-move 118 26 -height 37 -width 125
-    }
-    get-diagram -index 1 | commit-direct-edit
-}
-
-// [ASSERT] Verify position of the eletments of Message Sync.
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1] {
-    get-property x | equals 0 | verify-true
-    get-property y | equals 0 | verify-true
-    with [get-edit-part -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
-        with [get-edit-part -name Lifeline2] {
-            with [get-target-connection -path 0] {
-                get-property x | equals 197 | verify-true
-                get-property y | equals 207 | verify-true
-            }
-            with [get-edit-part -name BehaviorExecutionSpecification1] {
-                get-property x | equals 534 | verify-true
-                get-property y | equals 216 | verify-true
-            }
-        }
-        with [get-edit-part -name Lifeline1 | get-target-connection -path 0] {
-            get-property x | equals 197 | verify-true
-            get-property y | equals 321 | verify-true
-        }
-    }
-}
-------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/addElements.suite b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/addElements.suite
deleted file mode 100644
index 081b2b23061..00000000000
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/add/addElements.suite
+++ /dev/null
@@ -1,20 +0,0 @@
---- RCPTT testcase ---
-Format-Version: 1.0
-Element-Name: addElements
-Element-Type: testsuite
-Element-Version: 2.0
-Id: _813SoApvEeiHkPkpSqDhSg
-Manually-Ordered: true
-Runtime-Version: 2.2.0.201706152316
-Save-Time: 2/5/18 1:32 PM
-
-------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8
-Content-Type: text/testcase
-Entry-Name: testcase-items
-
-_CM2lcApwEeiHkPkpSqDhSg	// kind: 'test' name: 'add000_InitTest' path: 'add000_InitTest.test'
-_-wzVUApvEeiHkPkpSqDhSg	// kind: 'test' name: 'add001_AddOneLifeline' path: 'add001_AddOneLifeline.test'
-_-xJTkApvEeiHkPkpSqDhSg	// kind: 'test' name: 'add002_AddSecondLifeline' path: 'add002_AddSecondLifeline.test'
-_-xdcoApvEeiHkPkpSqDhSg	// kind: 'test' name: 'add003_AddOneMessageSync' path: 'add003_AddOneMessageSync.test'
-
-------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/move.suite b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/move.suite
new file mode 100644
index 00000000000..a7e22b3e3dc
--- /dev/null
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/suites/move.suite
@@ -0,0 +1,26 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Element-Name: move
+Element-Type: testsuite
+Element-Version: 2.0
+Id: _KyxXAHo9EeibvLF7Iqf_Gg
+Runtime-Version: 2.3.0.201806122315
+Save-Time: 6/27/18 3:07 PM
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
+Content-Type: text/plain
+Entry-Name: .description
+
+Test suite for moving of existing elements in the Sequence Diagram.
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa--
+------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8
+Content-Type: text/testcase
+Entry-Name: testcase-items
+
+_qSU0wD8OEeiwV4oloEiuHA	// kind: 'test' name: 'move004_MoveMessageDeleteOverLifeLine' path: '../testcases/move/move004_MoveMessageDeleteOverLifeLine.test'
+_8nbQsD72EeiwV4oloEiuHA	// kind: 'test' name: 'move003_MoveMessageCreateOverLifeLine' path: '../testcases/move/move003_MoveMessageCreateOverLifeLine.test'
+_BqX60DDNEeiA_5cwf7Mpvw	// kind: 'test' name: 'move001_MoveMessageWithOthersMessages' path: '../testcases/move/move001_MoveMessageWithOthersMessages.test'
+_5NBtwD7zEeiwV4oloEiuHA	// kind: 'test' name: 'move002_MoveMessageOverLifeLine' path: '../testcases/move/move002_MoveMessageSyncOverLifeLine.test'
+
+------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add001_AddOneLifeline.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add001_AddOneLifeline.test
index 4e850159cfc..557621c85ef 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add001_AddOneLifeline.test
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add001_AddOneLifeline.test
@@ -1,28 +1,21 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
 Element-Name: add001_AddOneLifeline
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _fnea8AgAEeiHkPkpSqDhSg
-Runtime-Version: 2.3.0.201803252310
-Save-Time: 3/27/18 2:02 PM
+Runtime-Version: 2.3.0.201806122315
+Save-Time: 6/27/18 9:39 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
-get-view "Model Explorer" | get-tree | select "SequenceDiagramTest/NewSequenceDiagram" | double-click
-get-preferences-menu | click
-with [get-window Preferences] {
-    get-tree | select "Papyrus/Diagrams/PapyrusUMLSequenceDiagram Diagram"
-    get-group "Automatic creations" | get-button "A Behavior Execution Specification and a Reply Message" | click
-    get-button Apply | click
-    get-button "Apply and Close" | click
-}
+/* Automatically create a behaviour execution with reply message for synchronous messages. */
+auto-syncmsg-execspec br
+
 with [get-editor "SequenceDiagramTest.di"] {
     get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
         -className CInteractionInteractionCompartmentEditPart | mouse-move 811 16 -height 738 -width 857
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add002_AddSecondLifeline.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add002_AddSecondLifeline.test
index 498a8f48c0e..7482332bec3 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add002_AddSecondLifeline.test
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add002_AddSecondLifeline.test
@@ -1,28 +1,21 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
 Element-Name: add002_AddSecondLifeline
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _V0U8gAgZEeiHkPkpSqDhSg
-Runtime-Version: 2.3.0.201803252310
-Save-Time: 3/27/18 2:02 PM
+Runtime-Version: 2.3.0.201806122315
+Save-Time: 6/27/18 9:38 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
-get-view "Model Explorer" | get-tree | select "SequenceDiagramTest/NewSequenceDiagram" | double-click
-get-preferences-menu | click
-with [get-window Preferences] {
-    get-tree | select "Papyrus/Diagrams/PapyrusUMLSequenceDiagram Diagram"
-    get-group "Automatic creations" | get-button "A Behavior Execution Specification and a Reply Message" | click
-    get-button Apply | click
-    get-button "Apply and Close" | click
-}
+/* Automatically create a behaviour execution with reply message for synchronous messages. */
+auto-syncmsg-execspec br
+
 with [get-editor "SequenceDiagramTest.di"] {
     get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
         -className CInteractionInteractionCompartmentEditPart | mouse-move 811 16 -height 738 -width 857
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add003_AddOneMessageSync.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add003_AddOneMessageSync.test
index 945f91808ce..180cb6a9d08 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add003_AddOneMessageSync.test
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add003_AddOneMessageSync.test
@@ -1,28 +1,21 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
 Element-Name: add003_AddOneMessageSync
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _tyrqsAgnEeiHkPkpSqDhSg
-Runtime-Version: 2.3.0.201803252310
-Save-Time: 3/27/18 2:54 PM
+Runtime-Version: 2.3.0.201806262310
+Save-Time: 7/25/18 5:52 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
-get-view "Model Explorer" | get-tree | select "SequenceDiagramTest/NewSequenceDiagram" | double-click
-get-preferences-menu | click
-with [get-window Preferences] {
-    get-tree | select "Papyrus/Diagrams/PapyrusUMLSequenceDiagram Diagram"
-    get-group "Automatic creations" | get-button "A Behavior Execution Specification and a Reply Message" | click
-    get-button Apply | click
-    get-button "Apply and Close" | click
-}
+/* Automatically create a behaviour execution with reply message for synchronous messages. */
+auto-syncmsg-execspec br
+
 with [get-editor "SequenceDiagramTest.di"] {
     get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
         -className CInteractionInteractionCompartmentEditPart | mouse-move 811 16 -height 738 -width 857
@@ -101,25 +94,11 @@ with [get-editor "SequenceDiagramTest.di"] {
         -className CInteractionInteractionCompartmentEditPart] {
         mouse-move 264 117 -height 738 -width 857
         with [get-edit-part -name Lifeline1] {
-            mouse-move 49 66 -height 700 -width 100
-            mouse-hover 49 66 -height 700 -width 100
             mouse-move 49 66 button1 -height 700 -width 100
             mouse-press 49 66 button1 -height 700 -width 100
             mouse-release 49 66 button1 524288 -height 700 -width 100
         }
         with [get-edit-part -name Lifeline2] {
-            mouse-move 46 66 -height 700 -width 100
-            mouse-hover 46 66 -height 700 -width 100
-            mouse-move 48 66 -height 700 -width 100
-            mouse-hover 48 66 -height 700 -width 100
-            mouse-move 51 66 -height 700 -width 100
-            mouse-hover 51 66 -height 700 -width 100
-            mouse-move 47 66 -height 700 -width 100
-            mouse-hover 47 66 -height 700 -width 100
-            mouse-move 50 66 -height 700 -width 100
-            mouse-hover 50 66 -height 700 -width 100
-            mouse-move 48 66 -height 700 -width 100
-            mouse-hover 48 66 -height 700 -width 100
             mouse-move 48 66 button1 -height 700 -width 100
             mouse-press 48 66 button1 -height 700 -width 100
         }
@@ -144,34 +123,20 @@ with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part
     mouse-move 860 553 -height 1000 -width 1892
     mouse-move 895 668 -height 1000 -width 1892
 }
+
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
     // [ASSERT] Verify position of the second created lifeline.
     with [get-edit-part -name Lifeline2] {
-        with [get-figure -path "0/0"] {
-            get-property x | equals 474 | verify-true
-            get-property y | equals 10 | verify-true
-            get-property width | equals 100 | verify-true
-            get-property height | equals 700 | verify-true
-        }
+        get-figure -path "0/0" | assert-bounds 474 10 100 700
         // [ASSERT] Verify positions of the first message anchors
-        with [get-target-connection -path 0] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.09428571428571429)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,0.09428571428571429)" | verify-true
-        }
+        get-target-connection -path 0 | assert-message-anchors "0.5" "0.1" "0.5" "0.1"
         // [ASSERT] Verify positions of the execution specification
-        with [get-edit-part -name BehaviorExecutionSpecification6] {
-            get-property x | equals 514 | verify-true
-            get-property y | equals 76 | verify-true
-            get-property width | equals 20 | verify-true
-            get-property height | equals 100 | verify-true
-        }
+        get-edit-part -name BehaviorExecutionSpecification6 | assert-bounds 514 66 20 100
     }
     // [ASSERT] Verify positions of the second message anchors
-    with [get-edit-part -name Lifeline1 | get-target-connection -path 0] {
-        get-property "sourceAnchor.id" | equals "(0.5,0.23714285714285716)" | verify-true
-        get-property "targetAnchor.id" | equals "(0.5,0.23714285714285716)" | verify-true
-    }
+    get-edit-part -name Lifeline1 | get-target-connection -path 0
+        | assert-message-anchors "0.5" "0.24" "0.5" "0.24"
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1] {
     get-edit-part -text Interaction1 | mouse-move 488 8 -height 757 -width 857
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add004_AddOneMessageAsync.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add004_AddOneMessageAsync.test
index 3c76d903cf7..582dc796564 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add004_AddOneMessageAsync.test
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add004_AddOneMessageAsync.test
@@ -1,28 +1,21 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
 Element-Name: add004_AddOneMessageAsync
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _NepbQAgqEeiHkPkpSqDhSg
-Runtime-Version: 2.3.0.201803252310
-Save-Time: 3/27/18 3:04 PM
+Runtime-Version: 2.3.0.201806122315
+Save-Time: 6/27/18 9:38 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
-get-view "Model Explorer" | get-tree | select "SequenceDiagramTest/NewSequenceDiagram" | double-click
-get-preferences-menu | click
-with [get-window Preferences] {
-    get-tree | select "Papyrus/Diagrams/PapyrusUMLSequenceDiagram Diagram"
-    get-group "Automatic creations" | get-button "A Behavior Execution Specification and a Reply Message" | click
-    get-button Apply | click
-    get-button "Apply and Close" | click
-}
+/* Automatically create a behaviour execution with reply message for synchronous messages. */
+auto-syncmsg-execspec br
+
 with [get-editor "SequenceDiagramTest.di"] {
     get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
         -className CInteractionInteractionCompartmentEditPart | mouse-move 811 16 -height 738 -width 857
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add005_AddOneCombinedFragment.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add005_AddOneCombinedFragment.test
index b68f1d00c1c..6050eeaac60 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add005_AddOneCombinedFragment.test
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add005_AddOneCombinedFragment.test
@@ -1,13 +1,12 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
 Element-Name: add005_AddOneCombinedFragment
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _WPB6kBh3Eeilv_R0H7e8aA
-Runtime-Version: 2.3.0.201803252310
-Save-Time: 3/27/18 3:22 PM
+Runtime-Version: 2.3.0.201806262310
+Save-Time: 7/26/18 1:51 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -20,63 +19,69 @@ Add combined fragment element
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
-get-view "Model Explorer" | get-tree | select "SequenceDiagramTest/NewSequenceDiagram" | double-click
-get-preferences-menu | click
-with [get-window Preferences] {
-    get-tree | select "Papyrus/Diagrams/PapyrusUMLSequenceDiagram Diagram"
-    get-group "Automatic creations" | get-button "A Behavior Execution Specification and a Reply Message" | click
-    get-button Apply | click
-    get-button "Apply and Close" | click
-}
+/* Automatically create a behaviour execution with reply message for synchronous messages. */
+auto-syncmsg-execspec br
+
+// Create First Lifeline (Lifeline1)
 with [get-editor "SequenceDiagramTest.di"] {
-    get-diagram -index 1 | get-edit-part -name Interaction1 | mouse-move 909 120 -height 1000 -width 915
+    get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
+        -className CInteractionInteractionCompartmentEditPart | mouse-move 811 16 -height 738 -width 857
     with [get-palette | get-palette-entry Lifeline] {
-        mouse-move 33 15 button1 -height 23 -width 125
-        mouse-press 33 15 button1 -height 23 -width 125
-        mouse-release 33 15 button1 524288 -height 23 -width 125
+        mouse-move 35 6 button1 -height 23 -width 125
+        mouse-press 35 6 button1 -height 23 -width 125
+        mouse-release 35 6 button1 524288 -height 23 -width 125
     }
     with [get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
         -className CInteractionInteractionCompartmentEditPart] {
-        mouse-move 68 67 button1 -height 738 -width 857
-        mouse-press 68 67 button1 -height 738 -width 857
-        mouse-release 68 67 button1 524288 -height 738 -width 857
+        mouse-move 163 56 button1 -height 738 -width 857
+        mouse-press 163 56 button1 -height 738 -width 857
+        mouse-release 163 56 button1 524288 -height 738 -width 857
     }
-    with [get-diagram -index 1 | get-edit-part -name Interaction1] {
-        get-edit-part -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart 
-            | get-edit-part -name Lifeline1 | mouse-hover 9 52 -height 700 -width 100
-        mouse-move 873 99 -height 1000 -width 915
-        get-edit-part -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart 
-            | get-edit-part -name Lifeline1 | get-edit-part -name Lifeline1 | activate-direct-edit
+    with [get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1] {
+        with [get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part -name Lifeline1] {
+            mouse-hover 4 41 -height 700 -width 100
+            get-edit-part -name Lifeline1 | activate-direct-edit
+        }
+        mouse-move 3 53 -height 757 -width 857
     }
-    get-palette | get-palette-entry Lifeline | mouse-move 38 10 -height 23 -width 125
-    get-diagram -index 1 | commit-direct-edit
+}
+
+with [get-editor "SequenceDiagramTest.di"] {
     with [get-palette | get-palette-entry Lifeline] {
-        mouse-move 38 10 button1 -height 23 -width 125
-        mouse-press 38 10 button1 -height 23 -width 125
-        mouse-release 38 10 button1 524288 -height 23 -width 125
+        mouse-move 48 10 button1 -height 23 -width 125
+        mouse-press 48 10 button1 -height 23 -width 125
+        mouse-release 48 10 button1 524288 -height 23 -width 125
+        mouse-hover 48 10 -height 23 -width 125
+        mouse-move 13 11 -height 23 -width 125
     }
     with [get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
         -className CInteractionInteractionCompartmentEditPart] {
-        mouse-move 421 31 button1 -height 738 -width 857
-        mouse-press 421 31 button1 -height 738 -width 857
-        mouse-release 421 31 button1 524288 -height 738 -width 857
+        mouse-move 497 30 button1 -height 738 -width 857
+        mouse-press 497 30 button1 -height 738 -width 857
+        mouse-release 497 30 button1 524288 -height 738 -width 857
     }
-    with [get-diagram -index 1 | get-edit-part -name Interaction1] {
-        with [get-edit-part -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart 
-            | get-edit-part -name Lifeline2] {
+    with [get-diagram -index 1] {
+        with [get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
+            -className CInteractionInteractionCompartmentEditPart] {
+            get-edit-part -name Lifeline2 | get-edit-part -name Lifeline2 | activate-direct-edit
+            mouse-hover 497 30 -height 738 -width 857
+            with [get-edit-part -name Lifeline2] {
+                mouse-move 11 12 button1 -height 700 -width 100
+                mouse-press 11 12 button1 -height 700 -width 100
+            }
+        }
+        commit-direct-edit
+        with [get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
+            -className CInteractionInteractionCompartmentEditPart | get-edit-part -name Lifeline2] {
+            mouse-release 11 12 button1 524288 -height 700 -width 100
+            mouse-move 8 15 button1 -height 700 -width 100
+            mouse-press 8 15 button1 -height 700 -width 100
+            mouse-release 8 15 button1 524288 -height 700 -width 100
+            mouse-move 10 17 -height 700 -width 100
             get-edit-part -name Lifeline2 | activate-direct-edit
-            mouse-hover 2 16 -height 700 -width 100
         }
-        mouse-move 913 214 -height 1000 -width 915
     }
-    with [get-palette] {
-        get-palette-entry InteractionUse | mouse-move 36 22 -height 23 -width 125
-        get-palette-entry "Combined Fragment" | mouse-move 64 18 -height 37 -width 125
-    }
-    get-diagram -index 1 | commit-direct-edit
 }
-
 with [get-editor "SequenceDiagramTest.di"] {
     with [get-palette] {
         get-palette-entry "Interaction Operand" | mouse-move 55 0 -height 23 -width 146
@@ -90,36 +95,20 @@ with [get-editor "SequenceDiagramTest.di"] {
     with [get-diagram -index 1] {
         with [get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
             -className CInteractionInteractionCompartmentEditPart] {
-            mouse-move 40 159 button1 -height 738 -width 857
-            mouse-press 40 159 button1 -height 738 -width 857
-            mouse-move 40 160 -mask 524288 -height 738 -width 857
-        }
-        mouse-drag 47 164 -mask 524288 -height 1000 -width 915
-        with [get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
-            -className CInteractionInteractionCompartmentEditPart | get-edit-part -name Lifeline2] {
-            mouse-drag 98 370 button1 524288 -height 700 -width 100
-            mouse-release 98 370 button1 524288 -height 700 -width 100
-        }
-    }
-    with [get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
-        -className CInteractionInteractionCompartmentEditPart] {
-        with [get-edit-part -name Lifeline2] {
-            mouse-press 98 370 button1 -height 700 -width 100
-            mouse-move 98 371 -mask 524288 -height 700 -width 100
-            mouse-drag 97 371 button1 524288 -height 700 -width 100
-            mouse-release 97 371 button1 524288 -height 700 -width 100
+            mouse-move 40 160 button1 -height 738 -width 857
+            mouse-press 40 160 button1 -height 738 -width 857
+             mouse-drag 620 400 button1 524288 -height 700 -width 100
+            mouse-release 620 400 button1 524288 -height 700 -width 100
         }
     }
     get-diagram -index 1 | commit-direct-edit
 }
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
-    -name CombinedFragment3] {
-    get-property x | equals 34 | verify-true
-    get-property y | equals 156 | verify-true
-    get-property width | equals 481 | verify-true
-    get-property height | equals 221 | verify-true
-}
+// Verify the bounds of the new combined fragment
+get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
+    	-text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
+    	-name CombinedFragment3
+    | assert-bounds 34 147  580  240
+
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1] {
     with [get-edit-part -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
         get-edit-part -name Lifeline2 | mouse-move 66 216 -height 700 -width 100
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add006_AddOneMessageCreate.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add006_AddOneMessageCreate.test
index efff844218a..f880f3e78f2 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add006_AddOneMessageCreate.test
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add006_AddOneMessageCreate.test
@@ -1,13 +1,12 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
 Element-Name: add006_AddOneMessageCreate
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _qbdN4DMhEei_49Y9iBceHC
-Runtime-Version: 2.3.0.201803252310
-Save-Time: 4/6/18 3:07 PM
+Runtime-Version: 2.3.0.201806262310
+Save-Time: 7/26/18 1:55 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -20,15 +19,9 @@ Add a MessageCreate when some messages are always on the lifelines. The availabl
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
-get-view "Model Explorer" | get-tree | select "SequenceDiagramTest/NewSequenceDiagram" | double-click
-get-preferences-menu | click
-with [get-window Preferences] {
-    get-tree | select "Papyrus/Diagrams/PapyrusUMLSequenceDiagram Diagram"
-    get-group "Automatic creations" | get-button Nothing | click
-    get-button Apply | click
-    get-button "Apply and Close" | click
-}
+/* Automatically create nothing additional for synchronous messages. */
+auto-syncmsg-execspec n
+
 with [get-editor "SequenceDiagramTest.di"] {
     with [get-diagram -index 1 | get-edit-part -name Interaction1] {
         mouse-move 750 792 -height 1000 -width 1892
@@ -227,30 +220,24 @@ with [get-editor "SequenceDiagramTest.di"] {
 }
 get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | mouse-move 1255 110 
     -height 1000 -width 1892
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
-    -name Lifeline2 | get-figure -path "0/0"] {
-    get-property x | equals 434 | verify-true
-    get-property y | equals 87 | verify-true
-    get-property width | equals 100 | verify-true
-    get-property height | equals 622 | verify-true
-}
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
-    -name Lifeline2 | get-target-connection -path 0] {
-    get-property "sourceAnchor.id" | equals "(0.5,0.20857142857142857)" | verify-true
-    get-property "targetAnchor.id" | equals "(0.5,0.11093247588424439)" | verify-true
-}
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
-    -name Lifeline2 | get-target-connection -path 1] {
-    get-property "sourceAnchor.id" | equals "(0.5,0.29428571428571426)" | verify-true
-    get-property "targetAnchor.id" | equals "(0.5,0.20739549839228294)" | verify-true
-}
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
-    -name Lifeline2 | get-target-connection -path 2] {
-    get-property "sourceAnchor.id" | equals "(0.5,0.38)" | verify-true
-    get-property "targetAnchor.id" | equals "(0.5,0.30385852090032156)" | verify-true
-}
+get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
+	    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
+    	-name Lifeline2 | get-figure -path "0/0"
+    | assert-bounds 434 74 100 640
+
+get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
+	    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
+    	-name Lifeline2 | get-target-connection -path 0
+    | assert-message-anchors "0.5"  "0.21" "0.5" "0.11"
+
+get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
+	    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
+	    -name Lifeline2 | get-target-connection -path 1
+	| assert-message-anchors "0.5"  "0.3" "0.5" "0.21"
+
+get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
+	    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
+	    -name Lifeline2 | get-target-connection -path 2
+    | assert-message-anchors "0.5"  "0.38" "0.5" "0.33"
+
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add007_AddOneMessageDelete.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add007_AddOneMessageDelete.test
index cfbce568cf5..2bd9cc3056c 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add007_AddOneMessageDelete.test
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add007_AddOneMessageDelete.test
@@ -1,13 +1,12 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
 Element-Name: add007_AddOneMessageDelete
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _qbdN4DMhEei_49Y9iBceHB
-Runtime-Version: 2.3.0.201803252310
-Save-Time: 4/6/18 3:10 PM
+Runtime-Version: 2.3.0.201806262310
+Save-Time: 7/26/18 2:12 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -20,15 +19,9 @@ Add a MessageDelete when some messages are always on the lifelines. The availabl
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
-get-view "Model Explorer" | get-tree | select "SequenceDiagramTest/NewSequenceDiagram" | double-click
-get-preferences-menu | click
-with [get-window Preferences] {
-    get-tree | select "Papyrus/Diagrams/PapyrusUMLSequenceDiagram Diagram"
-    get-group "Automatic creations" | get-button Nothing | click
-    get-button Apply | click
-    get-button "Apply and Close" | click
-}
+/* Automatically create nothing additional for synchronous messages. */
+auto-syncmsg-execspec n
+
 with [get-editor "SequenceDiagramTest.di"] {
     with [get-diagram -index 1 | get-edit-part -name Interaction1] {
         mouse-move 750 792 -height 1000 -width 1892
@@ -198,65 +191,29 @@ with [get-editor "SequenceDiagramTest.di"] {
         mouse-move 859 450 -height 1000 -width 1892
         with [get-edit-part -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
             with [get-edit-part -name Lifeline1] {
-                mouse-move 50 356 button1 -height 700 -width 100
-                mouse-press 50 356 button1 -height 700 -width 100
-                mouse-release 50 356 button1 524288 -height 700 -width 100
+                mouse-move 50 340 button1 -height 700 -width 100
+                mouse-press 50 340 button1 -height 700 -width 100
+                mouse-release 50 340 button1 -height 700 -width 100
             }
             mouse-move 436 363 -height 738 -width 857
             with [get-edit-part -name Lifeline2] {
-                mouse-move 47 364 button1 -height 700 -width 100
-                mouse-press 47 364 button1 -height 700 -width 100
+                mouse-move 47 340 button1 -height 700 -width 100
+                mouse-press 47 340 button1 -height 700 -width 100
+                mouse-release 47 340 button1 -height 700 -width 100
             }
         }
     }
     with [get-diagram -index 1] {
-        with [get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
-            -className CInteractionInteractionCompartmentEditPart] {
-            with [get-edit-part -name Lifeline2] {
-                mouse-release 47 364 button1 524288 -height 700 -width 100
-                with [get-target-connection -path 3] {
-                    get-handle PapyrusConnectionEndpointHandle -index 1 | mouse-hover 0 1 -height 7 -width 7
-                    get-edit-part -text Message12 | activate-direct-edit
-                }
-            }
-            mouse-move 483 432 button1 -height 738 -width 857
-            mouse-press 483 432 button1 -height 738 -width 857
-        }
         commit-direct-edit
-        with [get-edit-part -name Interaction1] {
-            with [get-edit-part -text Interaction1 | get-edit-part 
-                -className CInteractionInteractionCompartmentEditPart] {
-                mouse-release 483 432 button1 524288 -height 738 -width 857
-                mouse-hover 483 432 -height 738 -width 857
-            }
-            mouse-move 906 329 -height 1000 -width 1892
-        }
     }
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
     -name Lifeline2] {
-    with [get-figure -path "0/0"] {
-        get-property x | equals 434 | verify-true
-        get-property y | equals 10 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 366 | verify-true
-    }
-    with [get-target-connection -path 0] {
-        get-property "sourceAnchor.id" | equals "(0.5,0.20857142857142857)" | verify-true
-        get-property "targetAnchor.id" | equals "(0.5,0.3989071038251366)" | verify-true
-    }
-    with [get-target-connection -path 1] {
-        get-property "sourceAnchor.id" | equals "(0.5,0.29428571428571426)" | verify-true
-        get-property "targetAnchor.id" | equals "(0.5,0.5628415300546448)" | verify-true
-    }
-    with [get-target-connection -path 2] {
-        get-property "sourceAnchor.id" | equals "(0.5,0.38)" | verify-true
-        get-property "targetAnchor.id" | equals "(0.5,0.726775956284153)" | verify-true
-    }
-    with [get-target-connection -path 3] {
-        get-property "sourceAnchor.id" | equals "(0.5,0.5228571428571429)" | verify-true
-        get-property "targetAnchor.id" | equals "(0.5,1.0000000000000002)" | verify-true
-    }
+    get-figure -path "0/0" | assert-bounds 434 10 100 317
+    get-target-connection -path 0 | assert-message-anchors "0.5" "0.21" "0.5" "0.43"
+    get-target-connection -path 1 | assert-message-anchors "0.5" "0.3" "0.5" "0.62"
+    get-target-connection -path 2 | assert-message-anchors "0.5" "0.38" "0.5" "0.87"
+    get-target-connection -path 3 | assert-message-anchors "0.5" "0.5" "0.5" "1.0"
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add008_AddOneMessageFound.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add008_AddOneMessageFound.test
index beafa408056..ebe52c98581 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add008_AddOneMessageFound.test
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add008_AddOneMessageFound.test
@@ -1,25 +1,18 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
 Element-Name: add008_AddOneMessageFound
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _yH8scDmYEeiGhrmLGgv4BA
-Runtime-Version: 2.3.0.201803252310
-Save-Time: 4/6/18 2:54 PM
+Runtime-Version: 2.3.0.201806262310
+Save-Time: 7/26/18 3:24 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
-with [get-view "Model Explorer" | get-tree] {
-    get-item -path "SequenceDiagramTest/NewSequenceDiagram" | click
-    select "SequenceDiagramTest/NewSequenceDiagram" | double-click
-    get-item -path "SequenceDiagramTest/NewSequenceDiagram" | click
-}
 with [get-editor "SequenceDiagramTest.di"] {
     get-diagram -index 1 | get-edit-part -name Interaction1 | mouse-move 1881 169 -height 1000 -width 1892
     with [get-palette] {
@@ -48,7 +41,8 @@ with [get-editor "SequenceDiagramTest.di"] {
     }
     with [get-palette] {
         get-palette-entry "Interaction Operand" | mouse-move 43 31 -height 37 -width 125
-        get-palette-entry Continuation | mouse-move 43 12 -height 23 -width 125
+        // FIXME There is no Continuation tool in the palette
+        //get-palette-entry Continuation | mouse-move 43 12 -height 23 -width 125
         get-palette-entry StateInvariant | mouse-move 43 14 -height 23 -width 125
         get-palette-entry Comment | mouse-move 47 15 -height 23 -width 125
         get-palette-entry Constraint | mouse-move 52 22 -height 23 -width 125
@@ -117,13 +111,10 @@ with [get-editor "SequenceDiagramTest.di"] {
 get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | mouse-move 604 232 
     -height 738 -width 857
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -text Interaction1] {
-    get-property x | equals 1 | verify-true
-    get-property y | equals 3 | verify-true
-    get-property width | equals 857 | verify-true
-    get-property height | equals 15 | verify-true
-}
+get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
+	    -text Interaction1 | get-edit-part -text Interaction1
+    | assert-bounds 1  3 857 24
+
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1] {
     with [get-edit-part -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
         mouse-move 211 85 -height 738 -width 857
@@ -138,29 +129,19 @@ with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part
     }
     mouse-move 922 409 -height 1000 -width 1892
 }
+get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
+    	-text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-figure -path "1/0"
+    | assert-bounds 6 33 847 728
+
+get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
+    	-text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
+    	-name Lifeline1 | get-figure -path "0/0"
+    | assert-bounds 334 10 100 700
+
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-figure -path "1/0"] {
-    get-property x | equals 6 | verify-true
-    get-property y | equals 24 | verify-true
-    get-property width | equals 847 | verify-true
-    get-property height | equals 728 | verify-true
-}
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
-    -name Lifeline1 | get-figure -path "0/0"] {
-    get-property x | equals 334 | verify-true
-    get-property y | equals 10 | verify-true
-    get-property width | equals 100 | verify-true
-    get-property height | equals 700 | verify-true
-}
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
-    -name Lifeline1 | get-target-connection -path 0] {
-    get-property x | equals 82 | verify-true
-    get-property y | equals 67 | verify-true
-    get-property width | equals 322 | verify-true
-    get-property height | equals 53 | verify-true
-    get-property "sourceAnchor.id" | equals "(100.0,100.0)" | verify-true
-    get-property "targetAnchor.id" | equals "(0.5,0.09428571428571429)" | verify-true
+	    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
+	    -name Lifeline1 | get-target-connection -path 0] {
+    assert-message-source "100.0" "120.0" "2.0"
+    assert-message-target "0.5" "0.11"
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add009_AddOneMessageLost.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add009_AddOneMessageLost.test
index eb1f40250dc..36620b1fdd2 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add009_AddOneMessageLost.test
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/add/add009_AddOneMessageLost.test
@@ -1,25 +1,18 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
 Element-Name: add009_AddOneMessageLost
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _rLR_0DmZEeiGhrmLGgv4BA
-Runtime-Version: 2.3.0.201803252310
-Save-Time: 4/6/18 2:56 PM
+Runtime-Version: 2.3.0.201806262310
+Save-Time: 7/26/18 3:27 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
-with [get-view "Model Explorer" | get-tree] {
-    get-item -path "SequenceDiagramTest/NewSequenceDiagram" | click
-    select "SequenceDiagramTest/NewSequenceDiagram" | double-click
-    get-item -path "SequenceDiagramTest/NewSequenceDiagram" | click
-}
 with [get-editor "SequenceDiagramTest.di"] {
     get-diagram -index 1 | get-edit-part -name Interaction1 | mouse-move 1887 90 -height 1000 -width 1892
     with [get-palette | get-palette-entry Lifeline] {
@@ -102,35 +95,22 @@ with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part
         | get-edit-part -name Lifeline1 | mouse-move 19 516 -height 700 -width 100
     mouse-move 921 359 -height 1000 -width 1892
 }
+get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
+    	-text Interaction1
+    | assert-bounds 0 0 857 757
+
+get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
+	    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-figure -path "1/0"
+    | assert-bounds 6 33 847 728
+
+get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
+    	-text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
+    	-name Lifeline1 | get-figure -path "0/0"
+    | assert-bounds 174 10 100 700
+
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1] {
-    get-property x | equals 0 | verify-true
-    get-property y | equals 0 | verify-true
-    get-property width | equals 857 | verify-true
-    get-property height | equals 757 | verify-true
-}
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-figure -path "1/0"] {
-    get-property x | equals 6 | verify-true
-    get-property y | equals 24 | verify-true
-    get-property width | equals 847 | verify-true
-    get-property height | equals 728 | verify-true
-}
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
-    -name Lifeline1 | get-figure -path "0/0"] {
-    get-property x | equals 174 | verify-true
-    get-property y | equals 10 | verify-true
-    get-property width | equals 100 | verify-true
-    get-property height | equals 700 | verify-true
-}
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-target-connection -path 0] {
-    get-property x | equals 217 | verify-true
-    get-property y | equals 87 | verify-true
-    get-property width | equals 320 | verify-true
-    get-property height | equals 53 | verify-true
-    get-property "sourceAnchor.id" | equals "(0.5,0.12285714285714286)" | verify-true
-    get-property "targetAnchor.id" | equals "(560.0,120.0)" | verify-true
+	    -text Interaction1 | get-target-connection -path 0] {
+    assert-message-source "0.5" "0.12"
+    assert-message-target "560" "140.0" "2.0"
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move001_MoveMessageWithOthersMessages.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move001_MoveMessageWithOthersMessages.test
index e0be106f7d2..57fcecb7c88 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move001_MoveMessageWithOthersMessages.test
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move001_MoveMessageWithOthersMessages.test
@@ -1,13 +1,12 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
 Element-Name: move001_MoveMessageWithOthersMessages
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _BqX60DDNEeiA_5cwf7Mpvw
-Runtime-Version: 2.3.0.201803252310
-Save-Time: 4/6/18 3:39 PM
+Runtime-Version: 2.3.0.201806262310
+Save-Time: 7/26/18 4:21 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -20,16 +19,8 @@ Move message on life lines
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
-get-view "Model Explorer" | get-tree | select "SequenceDiagramTest/NewSequenceDiagram" | double-click
-get-preferences-menu | click
-with [get-window Preferences] {
-    get-tree | select "Papyrus/Diagrams/PapyrusUMLSequenceDiagram Diagram"
-    with [get-group "Automatic creations"] {
-        get-button Nothing | click
-    }
-    get-button "Apply and Close" | click
-}
+/* Automatically create nothing additional for synchronous messages. */
+auto-syncmsg-execspec n
 
 with [get-editor "SequenceDiagramTest.di"] {
     get-diagram -index 1 | get-edit-part -name Interaction1 | mouse-move 1861 127 -height 1000 -width 1892
@@ -137,9 +128,6 @@ with [get-editor "SequenceDiagramTest.di"] {
         -className CInteractionInteractionCompartmentEditPart] {
         mouse-move 604 397 -height 738 -width 857
         with [get-edit-part -name Lifeline1] {
-            mouse-move 48 52 -height 700 -width 100
-            mouse-hover 48 52 -height 700 -width 100
-            mouse-move 50 53 -height 700 -width 100
             mouse-hover 50 53 -height 700 -width 100
             mouse-move 50 53 button1 -height 700 -width 100
             mouse-press 50 53 button1 -height 700 -width 100
@@ -147,12 +135,10 @@ with [get-editor "SequenceDiagramTest.di"] {
         }
         mouse-move 278 66 -height 738 -width 857
         with [get-edit-part -name Lifeline2] {
-            mouse-move 46 47 -height 700 -width 100
-            mouse-hover 46 47 -height 700 -width 100
-            mouse-move 49 47 -height 700 -width 100
-            mouse-hover 49 47 -height 700 -width 100
-            mouse-move 49 47 button1 -height 700 -width 100
-            mouse-press 49 47 button1 -height 700 -width 100
+            mouse-hover 50 53 -height 700 -width 100
+            mouse-move 50 53 button1 -height 700 -width 100
+            mouse-press 50 53 button1 -height 700 -width 100
+            mouse-release 50 53 button1 -height 700 -width 100
         }
     }
     with [get-diagram -index 1] {
@@ -220,19 +206,19 @@ with [get-editor "SequenceDiagramTest.di"] {
     with [get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part -text Interaction1 | get-edit-part 
         -className CInteractionInteractionCompartmentEditPart] {
         with [get-edit-part -name Lifeline2] {
-            mouse-move 52 207 button1 -height 700 -width 100
-            mouse-press 52 207 button1 -height 700 -width 100
-            mouse-release 52 207 button1 524288 -height 700 -width 100
+            mouse-move 50 130 button1 -height 700 -width 100
+            mouse-press 50 130 button1 -height 700 -width 100
+            mouse-release 50 130 button1 524288 -height 700 -width 100
         }
-        with [get-edit-part -name Lifeline3] {
-            mouse-move 45 108 button1 -height 602 -width 100
-            mouse-press 45 108 button1 -height 602 -width 100
+  		with [get-edit-part -name Lifeline3] {
+            mouse-move 43 100 button1 524288 -height 700 -width 100
+            mouse-press 43 100 button1 524288 -height 700 -width 100
+            mouse-release 43 100 button1 524288 -height 700 -width 100
         }
     }
     with [get-diagram -index 1 | get-edit-part -name Interaction1] {
         with [get-edit-part -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart 
             | get-edit-part -name Lifeline3] {
-            mouse-release 45 108 button1 524288 -height 602 -width 100
             with [get-target-connection -path 1] {
                 get-edit-part -text Message11 | activate-direct-edit
                 get-figure -path 4 | mouse-move 12 6 -height 13 -width 17
@@ -240,6 +226,18 @@ with [get-editor "SequenceDiagramTest.di"] {
         }
         mouse-move 1887 567 -height 1000 -width 1892
     }
+    
+    
+//    with [get-diagram -index 1 | get-edit-part -name Interaction1] {
+//        with [get-edit-part -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart 
+//            | get-edit-part -name Lifeline3] {
+//            with [get-target-connection -path 1] {
+//                get-edit-part -text Message11 | activate-direct-edit
+//                get-figure -path 4 | mouse-move 12 6 -height 13 -width 17
+//            }
+//        }
+//        mouse-move 1887 567 -height 1000 -width 1892
+//    }
     get-palette | get-palette-entry "Message Create" | mouse-move 41 6 -height 23 -width 125
     get-diagram -index 1 | commit-direct-edit
     with [get-palette | get-palette-entry "Message Create"] {
@@ -255,14 +253,15 @@ with [get-editor "SequenceDiagramTest.di"] {
             mouse-release 51 328 button1 524288 -height 700 -width 100
         }
         with [get-edit-part -name Lifeline4] {
-            mouse-move 44 324 button1 -height 700 -width 100
-            mouse-press 44 324 button1 -height 700 -width 100
+            mouse-move 44 328 button1 -height 700 -width 100
+            mouse-press 44 328 button1 -height 700 -width 100
+            mouse-release 44 328 button1 524288 -height 700 -width 100
         }
     }
     with [get-diagram -index 1 | get-edit-part -name Interaction1] {
         with [get-edit-part -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart 
             | get-edit-part -name Lifeline4] {
-            mouse-release 44 324 button1 524288 -height 700 -width 100
+            
             get-target-connection -path 0 | get-edit-part -text Message14 | activate-direct-edit
         }
         mouse-move 1887 524 -height 1000 -width 1892
@@ -354,42 +353,27 @@ get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name
     -height 1000 -width 1892
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
-    with [get-edit-part -name Lifeline3 | get-figure -path "0/0"] {
-        get-property x | equals 494 | verify-true
-        get-property y | equals 107 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 109 | verify-true
-    }
-    with [get-edit-part -name Lifeline4 | get-figure -path "0/0"] {
-        get-property x | equals 734 | verify-true
-        get-property y | equals 327 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 382 | verify-true
-    }
+    get-edit-part -name Lifeline3 | get-figure -path "0/0"
+        | assert-bounds 494 74 100 73
+    
+    get-edit-part -name Lifeline4 | get-figure -path "0/0"
+        | assert-bounds 734 333 100 380
+    
     with [get-edit-part -name Lifeline3] {
-        with [get-target-connection -path 0] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.15142857142857144)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,0.08256880733944963)" | verify-true
-        }
-        with [get-target-connection -path 1] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.29428571428571426)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,1.0)" | verify-true
-        }
+        get-target-connection -path 0
+            | assert-message-anchors "0.5" "0.15" "0.5" "0.17"
+        get-target-connection -path 1
+            | assert-message-anchors "0.5" "0.19" "0.5" "1.0"
     }
     with [get-edit-part -name Lifeline4] {
-        with [get-target-connection -path 0] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.4657142857142857)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,0.023560209424083767)" | verify-true
-        }
-        with [get-target-connection -path 1] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.58)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,0.23298429319371727)" | verify-true
-        }
-    }
-    with [get-edit-part -name Lifeline2 | get-target-connection -path 1] {
-        get-property "sourceAnchor.id" | equals "(0.5,0.4424083769633508)" | verify-true
-        get-property "targetAnchor.id" | equals "(0.5,0.6942857142857143)" | verify-true
-    }
+        get-target-connection -path 0
+            | assert-message-anchors "0.5" "0.48" "0.5" "0.02"
+        get-target-connection -path 1
+            | assert-message-anchors "0.5" "0.58" "0.5" "0.23"
+    }
+    get-edit-part -name Lifeline2
+    	| get-target-connection -path 1
+        	| assert-message-anchors "0.5" "0.44" "0.5" "0.69"
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1] {
     with [get-edit-part -name Interaction1] {
@@ -420,42 +404,24 @@ with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1] {
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
-    with [get-edit-part -name Lifeline3 | get-figure -path "0/0"] {
-        get-property x | equals 494 | verify-true
-        get-property y | equals 227 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 109 | verify-true
-    }
-    with [get-edit-part -name Lifeline4 | get-figure -path "0/0"] {
-        get-property x | equals 734 | verify-true
-        get-property y | equals 447 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 286 | verify-true
-    }
+    get-edit-part -name Lifeline3 | get-figure -path "0/0"
+        | assert-bounds 494 194 100 73
+    get-edit-part -name Lifeline4 | get-figure -path "0/0"
+        | assert-bounds 734 453 100 270
     with [get-edit-part -name Lifeline3] {
-        with [get-target-connection -path 0] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.32285714285714284)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,0.08256880733944955)" | verify-true
-        }
-        with [get-target-connection -path 1] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.4657142857142857)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,1.0)" | verify-true
-        }
+        get-target-connection -path 0
+            | assert-message-anchors "0.5" "0.32" "0.5" "0.17"
+        get-target-connection -path 1
+            | assert-message-anchors "0.5" "0.36" "0.5" "1.0"
     }
     with [get-edit-part -name Lifeline4] {
-        with [get-target-connection -path 0] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.6371428571428571)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,0.03146853146853147)" | verify-true
-        }
-        with [get-target-connection -path 1] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.7514285714285714)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,0.3111888111888112)" | verify-true
-        }
-    }
-    with [get-edit-part -name Lifeline2 | get-target-connection -path 1] {
-        get-property "sourceAnchor.id" | equals "(0.5,0.5909090909090909)" | verify-true
-        get-property "targetAnchor.id" | equals "(0.5,0.8657142857142858)" | verify-true
+        get-target-connection -path 0
+            | assert-message-anchors "0.5" "0.64" "0.5" "0.03"
+        get-target-connection -path 1
+            | assert-message-anchors "0.5" "0.76" "0.5" "0.34"
     }
+    get-edit-part -name Lifeline2 | get-target-connection -path 1
+        | assert-message-anchors "0.5" "0.64" "0.5" "0.88"
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1] {
     with [get-edit-part -name Interaction1] {
@@ -489,22 +455,12 @@ with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1] {
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
-    with [get-edit-part -name Lifeline3 | get-figure -path "0/0"] {
-        get-property x | equals 494 | verify-true
-        get-property y | equals 367 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 109 | verify-true
-    }
-    with [get-edit-part -name Lifeline4 | get-figure -path "0/0"] {
-        get-property x | equals 734 | verify-true
-        get-property y | equals 587 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 193 | verify-true
-    }
-    with [get-edit-part -name Lifeline3 | get-target-connection -path 0] {
-        get-property "sourceAnchor.id" | equals "(0.5,0.4906166219839142)" | verify-true
-        get-property "targetAnchor.id" | equals "(0.5,0.08256880733944955)" | verify-true
-    }
+    get-edit-part -name Lifeline3 | get-figure -path "0/0"
+        | assert-bounds 494 314 100 73
+    get-edit-part -name Lifeline4 | get-figure -path "0/0"
+       | assert-bounds 734 573 100 206
+    get-edit-part -name Lifeline3 | get-target-connection -path 0
+        | assert-message-anchors "0.5" "0.45" "0.5" "0.17"
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1] {
     with [get-edit-part -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
@@ -520,23 +476,17 @@ with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
-    with [get-edit-part -name Lifeline3 | get-target-connection -path 1] {
-        get-property "sourceAnchor.id" | equals "(0.5,0.6246648793565683)" | verify-true
-        get-property "targetAnchor.id" | equals "(0.5,1.0)" | verify-true
-    }
+    get-edit-part -name Lifeline3 | get-target-connection -path 1
+        | assert-message-anchors "0.5" "0.51" "0.5" "1.0"
     with [get-edit-part -name Lifeline4] {
-        with [get-target-connection -path 0] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.7855227882037533)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,0.046632124352331605)" | verify-true
-        }
-        with [get-target-connection -path 1] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.8927613941018767)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,0.46113989637305697)" | verify-true
-        }
-    }
-    with [get-edit-part -name Lifeline2 | get-target-connection -path 1] {
-        get-property "sourceAnchor.id" | equals "(0.5,0.8756476683937824)" | verify-true
-        get-property "targetAnchor.id" | equals "(0.5,1.0)" | verify-true
-    }
+        get-target-connection -path 0
+            | assert-message-anchors "0.5" "0.78" "0.5" "0.06"
+        get-target-connection -path 1
+            | assert-message-anchors "0.5" "0.89" "0.5" "0.45"
+    }
+    get-edit-part -name Lifeline2
+    	| get-target-connection -path 1
+        	| assert-message-anchors "0.5" "0.83" "0.5" "1.0"
 }
+
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move002_MoveMessageSyncOverLifeLine.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move002_MoveMessageSyncOverLifeLine.test
index da7413e9e77..5d8bc5ab9fa 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move002_MoveMessageSyncOverLifeLine.test
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move002_MoveMessageSyncOverLifeLine.test
@@ -1,25 +1,18 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
 Element-Name: move002_MoveMessageOverLifeLine
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _5NBtwD7zEeiwV4oloEiuHA
-Runtime-Version: 2.3.0.201803252310
-Save-Time: 4/13/18 10:43 AM
+Runtime-Version: 2.3.0.201806262310
+Save-Time: 7/26/18 4:32 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
-with [get-view "Model Explorer" | get-tree] {
-    get-item -path "SequenceDiagramTest/NewSequenceDiagram" | click
-    select "SequenceDiagramTest/NewSequenceDiagram" | double-click
-    get-item -path "SequenceDiagramTest/NewSequenceDiagram" | click
-}
 with [get-editor "SequenceDiagramTest.di"] {
     get-diagram -index 1 | get-edit-part -name Interaction1 | mouse-move 1859 8 -height 1000 -width 1892
     with [get-palette | get-palette-entry Lifeline] {
@@ -120,8 +113,9 @@ with [get-editor "SequenceDiagramTest.di"] {
             mouse-release 52 68 button1 524288 -height 700 -width 100
         }
         with [get-edit-part -name Lifeline2] {
-            mouse-move 36 65 button1 -height 700 -width 100
-            mouse-press 36 65 button1 -height 700 -width 100
+            mouse-move 50 80 button1 -height 700 -width 100
+            mouse-press 50 80 button1 -height 700 -width 100
+            mouse-release 50 80 button1 -height 700 -width 100
         }
     }
     with [get-diagram -index 1] {
@@ -148,23 +142,13 @@ with [get-editor "SequenceDiagramTest.di"] {
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
-    with [get-edit-part -name Lifeline1 | get-figure -path "0/0"] {
-        get-property x | equals 174 | verify-true
-        get-property y | equals 10 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 700 | verify-true
-    }
+    get-edit-part -name Lifeline1 | get-figure -path "0/0"
+        | assert-bounds 174 10 100 700
     with [get-edit-part -name Lifeline2] {
-        with [get-figure -path "0/0"] {
-            get-property x | equals 534 | verify-true
-            get-property y | equals 10 | verify-true
-            get-property width | equals 100 | verify-true
-            get-property height | equals 700 | verify-true
-        }
-        with [get-target-connection -path 0] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.09428571428571429)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,0.09428571428571429)" | verify-true
-        }
+        get-figure -path "0/0"
+            | assert-bounds 534 10 100 700
+        get-target-connection -path 0
+            | assert-message-anchors "0.5" "0.1" "0.5" "0.1"
     }
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1] {
@@ -189,21 +173,12 @@ with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
-    with [get-edit-part -name Lifeline2 | get-figure -path "0/0"] {
-        get-property x | equals 534 | verify-true
-        get-property y | equals 10 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 846 | verify-true
-    }
-    with [get-edit-part -name Lifeline1 | get-figure -path "0/0"] {
-        get-property x | equals 174 | verify-true
-        get-property y | equals 10 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 846 | verify-true
-    }
-    with [get-edit-part -name Lifeline2 | get-target-connection -path 0] {
-        get-property "sourceAnchor.id" | equals "(0.5,1.0)" | verify-true
-        get-property "targetAnchor.id" | equals "(0.5,1.0)" | verify-true
-    }
+    get-edit-part -name Lifeline2 | get-figure -path "0/0"
+        | assert-bounds 534 10 100 837
+    get-edit-part -name Lifeline1 | get-figure -path "0/0"
+        | assert-bounds 174 10 100 837
+    get-edit-part -name Lifeline2 | get-target-connection -path 0
+        | assert-message-anchors "0.5" "1.0" "0.5" "1.0"
 }
+
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move003_MoveMessageCreateOverLifeLine.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move003_MoveMessageCreateOverLifeLine.test
index a2bbe4a0a76..53878d997fc 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move003_MoveMessageCreateOverLifeLine.test
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move003_MoveMessageCreateOverLifeLine.test
@@ -1,20 +1,18 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
 Element-Name: move003_MoveMessageCreateOverLifeLine
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _8nbQsD72EeiwV4oloEiuHA
-Runtime-Version: 2.3.0.201803252310
-Save-Time: 4/13/18 1:33 PM
+Runtime-Version: 2.3.0.201806262310
+Save-Time: 7/26/18 4:31 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
 get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | mouse-move 67 724 
     -height 738 -width 857
@@ -109,30 +107,20 @@ with [get-editor "SequenceDiagramTest.di"] {
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
-    with [get-edit-part -name Lifeline1 | get-figure -path "0/0"] {
-        get-property x | equals 134 | verify-true
-        get-property y | equals 10 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 700 | verify-true
-    }
-    with [get-edit-part -name Lifeline2 | get-figure -path "0/0"] {
-        get-property x | equals 434 | verify-true
-        get-property y | equals 147 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 562 | verify-true
-    }
+    get-edit-part -name Lifeline1 | get-figure -path "0/0"
+        | assert-bounds 134 10 100 700
+    get-edit-part -name Lifeline2 | get-figure -path "0/0"
+        | assert-bounds 434 153 100 560
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1] {
     get-edit-part -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart 
         | mouse-move 384 165 -height 738 -width 857
     mouse-move 1217 188 -mask ALT -height 1000 -width 1892
 }
-with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
-    -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
-    -name Lifeline2 | get-target-connection -path 0] {
-    get-property "sourceAnchor.id" | equals "(0.5,0.20857142857142857)" | verify-true
-    get-property "targetAnchor.id" | equals "(0.5,0.016014234875444844)" | verify-true
-}
+get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
+    	-text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart | get-edit-part 
+    	-name Lifeline2 | get-target-connection -path 0
+    | assert-message-anchors "0.5" "0.21" "0.5" "0.01"
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1] {
     mouse-move 871 175 -height 1000 -width 1892
     with [get-edit-part -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
@@ -160,23 +148,13 @@ with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
-    with [get-edit-part -name Lifeline1 | get-figure -path "0/0"] {
-        get-property x | equals 134 | verify-true
-        get-property y | equals 10 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 837 | verify-true
-    }
+    get-edit-part -name Lifeline1 | get-figure -path "0/0"
+        | assert-bounds 134 10 100 824
     with [get-edit-part -name Lifeline2] {
-        with [get-figure -path "0/0"] {
-            get-property x | equals 434 | verify-true
-            get-property y | equals 747 | verify-true
-            get-property width | equals 100 | verify-true
-            get-property height | equals 100 | verify-true
-        }
-        with [get-target-connection -path 0] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.8912783751493429)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,0.09)" | verify-true
-        }
+        get-figure -path "0/0"
+            | assert-bounds 434 734 100 100
+        get-target-connection -path 0
+            | assert-message-anchors "0.5" "0.89" "0.5" "0.13"
     }
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move004_MoveMessageDeleteOverLifeLine.test b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move004_MoveMessageDeleteOverLifeLine.test
index a5e5ab51486..197933becc4 100644
--- a/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move004_MoveMessageDeleteOverLifeLine.test
+++ b/tests/functional/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.functional.tests/testcases/move/move004_MoveMessageDeleteOverLifeLine.test
@@ -1,25 +1,18 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _NHXLMAf_EeiHkPkpSqDhSg,_KWhwYAgBEeiHkPkpSqDhSg
 Element-Name: move004_MoveMessageDeleteOverLifeLine
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _qSU0wD8OEeiwV4oloEiuHA
-Runtime-Version: 2.3.0.201803252310
-Save-Time: 4/13/18 1:35 PM
+Runtime-Version: 2.3.0.201806262310
+Save-Time: 7/26/18 4:25 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "SequenceDiagramTest/SequenceDiagramTest" | double-click
-with [get-view "Model Explorer" | get-tree] {
-    get-item -path "SequenceDiagramTest/NewSequenceDiagram" | click
-    select "SequenceDiagramTest/NewSequenceDiagram" | double-click
-    get-item -path "SequenceDiagramTest/NewSequenceDiagram" | click
-}
 with [get-editor "SequenceDiagramTest.di"] {
     get-diagram -index 1 | get-edit-part -name Interaction1 | mouse-move 1883 287 -height 1000 -width 1892
     with [get-palette] {
@@ -116,24 +109,11 @@ with [get-editor "SequenceDiagramTest.di"] {
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
-    with [get-edit-part -name Lifeline1 | get-figure -path "0/0"] {
-        get-property x | equals 114 | verify-true
-        get-property y | equals 10 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 700 | verify-true
-    }
-    with [get-edit-part -name Lifeline2] {
-        with [get-figure -path "0/0"] {
-            get-property x | equals 434 | verify-true
-            get-property y | equals 10 | verify-true
-            get-property width | equals 100 | verify-true
-            get-property height | equals 406 | verify-true
-        }
-        with [get-target-connection -path 0] {
-            get-property "sourceAnchor.id" | equals "(0.5,0.58)" | verify-true
-            get-property "targetAnchor.id" | equals "(0.5,1.0)" | verify-true
-        }
-    }
+    get-edit-part -name Lifeline1 | get-figure -path "0/0"
+        | assert-bounds 114 10 100 700
+    get-edit-part -name Lifeline2
+        | get-target-connection -path 0
+            | assert-message-anchors "0.5" "0.58" "0.5" "1.0"
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1] {
     mouse-move 919 271 -height 1000 -width 1892
@@ -158,21 +138,15 @@ with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part
 }
 with [get-editor "SequenceDiagramTest.di" | get-diagram -index 1 | get-edit-part -name Interaction1 | get-edit-part 
     -text Interaction1 | get-edit-part -className CInteractionInteractionCompartmentEditPart] {
-    with [get-edit-part -name Lifeline2 | get-figure -path "0/0"] {
-        get-property x | equals 434 | verify-true
-        get-property y | equals 10 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 766 | verify-true
-    }
-    with [get-edit-part -name Lifeline1] {
-        get-property x | equals 114 | verify-true
-        get-property y | equals 10 | verify-true
-        get-property width | equals 100 | verify-true
-        get-property height | equals 766 | verify-true
-    }
-    with [get-edit-part -name Lifeline2 | get-target-connection -path 0] {
-        get-property "sourceAnchor.id" | equals "(0.5,1.0)" | verify-true
-        get-property "targetAnchor.id" | equals "(0.5,1.0)" | verify-true
+    get-edit-part -name Lifeline2 | get-figure -path "0/0"
+        | assert-bounds 434 10 100 757
+    get-edit-part -name Lifeline1
+        | assert-bounds 114 10 100 757
+    with [get-edit-part -name Lifeline2] {
+        get-figure -path "0/0"
+            | assert-bounds 434 10 100 757
+    	get-target-connection -path 0
+        	| assert-message-anchors "0.5" "1.0" "0.5" "1.0"
     }
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
-- 
cgit v1.2.3