469825: [UML-RT] Inconsistent default naming of UML-RT Protocol and its

internal elements
https://bugs.eclipse.org/bugs/show_bug.cgi?id=469825
- Change protocolAdvice to change name of all dependents.
- Tests are working but not all Papyrus components rely on service edit
for editon. See for example Bug 464625: [All Diagrams] Direct edition
should rely on service edit to manipulate values

Change-Id: Ia884c27bc9a62f392b572b63728f7db430049e4c


Change-Id: Ia884c27bc9a62f392b572b63728f7db430049e4c

2 files changed, 9 insertions, 11 deletions

diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/edition/ProtocolEditionTests.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/edition/ProtocolEditionTests.java
index d28305887..d327d6d9c 100644
--- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/edition/ProtocolEditionTests.java
+++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/edition/ProtocolEditionTests.java
@@ -11,7 +11,6 @@
  *****************************************************************************/
 package org.eclipse.papyrusrt.umlrt.core.tests.edition;
 
-import org.eclipse.papyrus.junit.framework.classification.FailingTest;
 import org.eclipse.uml2.uml.UMLPackage;
 import org.junit.Test;
 
@@ -24,7 +23,6 @@ public class ProtocolEditionTests extends AbstractEditionElementTest {
 
 	public static final Object NEW_NAME = "newName";
 
-	@FailingTest
 	@Test
 	public void testRenameProtocol() throws Exception {
 		runEditionTest(protocol, UMLPackage.eINSTANCE.getNamedElement_Name(), NEW_NAME, true, ProtocolRenameValidation.class);
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/edition/ProtocolRenameValidation.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/edition/ProtocolRenameValidation.java
index 084b48bc3..33d8b48ce 100644
--- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/edition/ProtocolRenameValidation.java
+++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/edition/ProtocolRenameValidation.java
@@ -34,9 +34,9 @@ public class ProtocolRenameValidation implements IValidationRule {
 		Assert.assertNotNull(protocolContainer);
 		Interface messageSetIn = ProtocolUtils.getMessageSetIn(protocol);
 		Assert.assertNotNull(messageSetIn);
-		Interface messageSetOut = ProtocolUtils.getMessageSetIn(protocol);
+		Interface messageSetOut = ProtocolUtils.getMessageSetOut(protocol);
 		Assert.assertNotNull(messageSetOut);
-		Interface messageSetInOut = ProtocolUtils.getMessageSetIn(protocol);
+		Interface messageSetInOut = ProtocolUtils.getMessageSetInOut(protocol);
 		Assert.assertNotNull(messageSetInOut);
 
 		Assert.assertEquals("Wrong name for Protocol after Protocol renaming", ProtocolEditionTests.NEW_NAME, protocol.getName());
@@ -58,16 +58,16 @@ public class ProtocolRenameValidation implements IValidationRule {
 		Assert.assertNotNull(protocolContainer);
 		Interface messageSetIn = ProtocolUtils.getMessageSetIn(protocol);
 		Assert.assertNotNull(messageSetIn);
-		Interface messageSetOut = ProtocolUtils.getMessageSetIn(protocol);
+		Interface messageSetOut = ProtocolUtils.getMessageSetOut(protocol);
 		Assert.assertNotNull(messageSetOut);
-		Interface messageSetInOut = ProtocolUtils.getMessageSetIn(protocol);
+		Interface messageSetInOut = ProtocolUtils.getMessageSetInOut(protocol);
 		Assert.assertNotNull(messageSetInOut);
 
-		Assert.assertEquals("Wrong name for Protocol after Protocol renaming", ProtocolEditionTests.OLD_NAME, protocol.getName());
-		Assert.assertEquals("Wrong name for Protocol container after Protocol renaming", ProtocolEditionTests.OLD_NAME, protocolContainer.getName());
-		Assert.assertEquals("Wrong name for MessageSet IN after Protocol renaming", ProtocolEditionTests.OLD_NAME, messageSetIn.getName());
-		Assert.assertEquals("Wrong name for MessageSet OUT after Protocol renaming", ProtocolEditionTests.OLD_NAME + "~", messageSetOut.getName());
-		Assert.assertEquals("Wrong name for MessageSet INOUT after Protocol renaming", ProtocolEditionTests.OLD_NAME + "IO", messageSetInOut.getName());
+		Assert.assertEquals("Wrong name for Protocol after Protocol renaming Undo", ProtocolEditionTests.OLD_NAME, protocol.getName());
+		Assert.assertEquals("Wrong name for Protocol container after Protocol renaming Undo", ProtocolEditionTests.OLD_NAME, protocolContainer.getName());
+		Assert.assertEquals("Wrong name for MessageSet IN after Protocol renaming Undo", ProtocolEditionTests.OLD_NAME, messageSetIn.getName());
+		Assert.assertEquals("Wrong name for MessageSet OUT after Protocol renaming Undo", ProtocolEditionTests.OLD_NAME + "~", messageSetOut.getName());
+		Assert.assertEquals("Wrong name for MessageSet INOUT after Protocol renaming Undo", ProtocolEditionTests.OLD_NAME + "IO", messageSetInOut.getName());
 	}
 
 }