Bug 509278: [Internationalization] Diagram and Table labels in Model

Explorer must be managed by custom facet
https://bugs.eclipse.org/bugs/show_bug.cgi?id=509278

- Modify the path to get the correct one for the 'GetDiagramLabel' call
- Modify some JUnit test messages

Change-Id: I137eeb7676bd15f13f71303376c94c77d2176a6e
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>

2 files changed, 8 insertions, 8 deletions

diff --git a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/AbstractInternationalizationTest.java b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/AbstractInternationalizationTest.java
index 42ac0c71055..10f6bc297f8 100644
--- a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/AbstractInternationalizationTest.java
+++ b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/AbstractInternationalizationTest.java
@@ -71,10 +71,10 @@ public abstract class AbstractInternationalizationTest extends AbstractEditorTes
 	 *             The caught exception.
 	 */
 	public void checkNoLabels() throws Exception {
-		Assert.assertEquals("The root element label is not the expected one.", "Diagram ClassDiagram",
+		Assert.assertEquals("The diagram label is not the expected one.", "Diagram ClassDiagram",
 				labelProvider.getText(diagram));
 
-		Assert.assertEquals("The class label is not the expected one.", "Table GenericTable0", labelProvider.getText(table));
+		Assert.assertEquals("The table label is not the expected one.", "Table GenericTable0", labelProvider.getText(table));
 	}
 
 	/**
@@ -84,10 +84,10 @@ public abstract class AbstractInternationalizationTest extends AbstractEditorTes
 	 *             The caught exception.
 	 */
 	public void checkFrenchLabels() throws Exception {
-		Assert.assertEquals("The root element label is not the expected one.", "Diagram MonDiagrammeDeClasse",
+		Assert.assertEquals("The diagram label is not the expected one.", "Diagram MonDiagrammeDeClasse",
 				labelProvider.getText(diagram));
 
-		Assert.assertEquals("The class label is not the expected one.", "Table MaTableGenerique",
+		Assert.assertEquals("The table label is not the expected one.", "Table MaTableGenerique",
 				labelProvider.getText(table));
 	}
 
@@ -98,10 +98,10 @@ public abstract class AbstractInternationalizationTest extends AbstractEditorTes
 	 *             The caught exception.
 	 */
 	public void checkEnglishLabels() throws Exception {
-		Assert.assertEquals("The root element label is not the expected one.", "Diagram MyClassDiagram",
+		Assert.assertEquals("The diagram label is not the expected one.", "Diagram MyClassDiagram",
 				labelProvider.getText(diagram));
 
-		Assert.assertEquals("The class label is not the expected one.", "Table MyGenericTable", labelProvider.getText(table));
+		Assert.assertEquals("The table label is not the expected one.", "Table MyGenericTable", labelProvider.getText(table));
 	}
 
 	/**
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/AbstractInternationalizationControlModeTest.java b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/AbstractInternationalizationControlModeTest.java
index 1fd24420d44..2aa532bb679 100644
--- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/AbstractInternationalizationControlModeTest.java
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/AbstractInternationalizationControlModeTest.java
@@ -106,10 +106,10 @@ public abstract class AbstractInternationalizationControlModeTest extends Abstra
 	public void checkFrenchLabels() throws Exception {
 		super.checkFrenchLabels();
 
-		Assert.assertEquals("The root element label is not the expected one.", "Diagram MonDiagrammeDeClasse",
+		Assert.assertEquals("The diagram label is not the expected one.", "Diagram MonDiagrammeDeClasse",
 				labelProvider.getText(diagram));
 
-		Assert.assertEquals("The class label is not the expected one.", "Table MaTableGenerique",
+		Assert.assertEquals("The table label is not the expected one.", "Table MaTableGenerique",
 				labelProvider.getText(table));
 	}