Bug 509908: [Internationalization][Tests] Internationalization JUnit

tests failed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=509908

Manage the internationalization tests with Papyrus Model Fixture instead
of AbstractEditorTest

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

18 files changed, 219 insertions, 215 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 10f6bc297f8..4609033d990 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
@@ -7,25 +7,30 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
  *   
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.internationalization.tests.tests;
 
 import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.infra.internationalization.tests.Activator;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
 import org.eclipse.papyrus.views.modelexplorer.DecoratingLabelProviderWTooltips;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Rule;
 
 /**
  * This allows to define the abstract class for the internationalization tests.
  */
 @SuppressWarnings({ "nls", "restriction" })
-public abstract class AbstractInternationalizationTest extends AbstractEditorTest {
+public abstract class AbstractInternationalizationTest extends AbstractPapyrusTest {
+
+	/** The papyrus fixture for the project. */
+	@Rule
+	public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
 
 	/** The label provider. */
 	protected DecoratingLabelProviderWTooltips labelProvider;
@@ -51,14 +56,14 @@ public abstract class AbstractInternationalizationTest extends AbstractEditorTes
 	 */
 	@Before
 	public void initTest() throws Exception {
-		initModel("testLabels", "internationalizationModel", Activator.getDefault().getBundle());
 
-		labelProvider = (DecoratingLabelProviderWTooltips) getModelExplorerView().getCommonViewer().getLabelProvider();
-		
-		for(Object object : getPageManager().allPages()){
-			if(object instanceof Table){
+		labelProvider = (DecoratingLabelProviderWTooltips) fixture.getModelExplorerView().getCommonViewer()
+				.getLabelProvider();
+
+		for (Object object : fixture.getPageManager().allPages()) {
+			if (object instanceof Table) {
 				table = (Table) object;
-			}else if(object instanceof Diagram){
+			} else if (object instanceof Diagram) {
 				diagram = (Diagram) object;
 			}
 		}
@@ -74,7 +79,8 @@ public abstract class AbstractInternationalizationTest extends AbstractEditorTes
 		Assert.assertEquals("The diagram label is not the expected one.", "Diagram ClassDiagram",
 				labelProvider.getText(diagram));
 
-		Assert.assertEquals("The table 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));
 	}
 
 	/**
@@ -101,16 +107,7 @@ public abstract class AbstractInternationalizationTest extends AbstractEditorTes
 		Assert.assertEquals("The diagram label is not the expected one.", "Diagram MyClassDiagram",
 				labelProvider.getText(diagram));
 
-		Assert.assertEquals("The table label is not the expected one.", "Table MyGenericTable", labelProvider.getText(table));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest#getSourcePath()
-	 */
-	@Override
-	protected String getSourcePath() {
-		return "resources/";
+		Assert.assertEquals("The table label is not the expected one.", "Table MyGenericTable",
+				labelProvider.getText(table));
 	}
 }
diff --git a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/AllTests.java b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/AllTests.java
index 613333283c2..5352566760c 100644
--- a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/AllTests.java
+++ b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/AllTests.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
  *   
  *****************************************************************************/
 
diff --git a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/InternationalizationChangePreferencesTest.java b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/InternationalizationChangePreferencesTest.java
index 26e976de715..3dc812b8131 100644
--- a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/InternationalizationChangePreferencesTest.java
+++ b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/InternationalizationChangePreferencesTest.java
@@ -7,19 +7,21 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
  *   
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.internationalization.tests.tests;
 
 import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
 import org.junit.Test;
 
 /**
  * This allows to test the internationalization preferences modification.
  */
 @SuppressWarnings("nls")
+@PluginResource({"resources/internationalizationModel.di", "resources/internationalizationModel_en_US.properties", "resources/internationalizationModel_fr_FR.properties"})
 public class InternationalizationChangePreferencesTest extends AbstractInternationalizationTest {
 
 	/**
@@ -38,10 +40,10 @@ public class InternationalizationChangePreferencesTest extends AbstractInternati
 	@Test
 	public void testUseInternationalizationModification() throws Exception {
 		checkFrenchLabels();
-		
+
 		InternationalizationPreferencesUtils.setInternationalizationPreference(diagram, false);
 		checkNoLabels();
-		
+
 		InternationalizationPreferencesUtils.setInternationalizationPreference(diagram, true);
 		checkFrenchLabels();
 	}
@@ -55,10 +57,10 @@ public class InternationalizationChangePreferencesTest extends AbstractInternati
 	@Test
 	public void testLanguageModification() throws Exception {
 		checkFrenchLabels();
-		
+
 		InternationalizationPreferencesUtils.setLanguagePreference(diagram, "en_US");
 		checkEnglishLabels();
-		
+
 		InternationalizationPreferencesUtils.setLanguagePreference(diagram, "es_ES");
 		checkNoLabels();
 	}
diff --git a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/InternationalizationLabelProviderTest.java b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/InternationalizationLabelProviderTest.java
index b1f9a97ddaa..adfd0e97cdb 100644
--- a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/InternationalizationLabelProviderTest.java
+++ b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/src/org/eclipse/papyrus/infra/internationalization/tests/tests/InternationalizationLabelProviderTest.java
@@ -7,12 +7,13 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
  *   
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.internationalization.tests.tests;
 
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
 import org.junit.Test;
 
 /**
@@ -20,6 +21,7 @@ import org.junit.Test;
  * internationalization.
  */
 @SuppressWarnings("nls")
+@PluginResource({"resources/internationalizationModel.di", "resources/internationalizationModel_en_US.properties", "resources/internationalizationModel_fr_FR.properties"})
 public class InternationalizationLabelProviderTest extends AbstractInternationalizationTest {
 
 	/**
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java
index 183d071d5bb..8e700650af9 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java
@@ -430,9 +430,11 @@ public class PapyrusEditorFixture extends AbstractModelFixture<TransactionalEdit
 		List<IMultiDiagramEditor> result = Lists.newArrayList();
 
 		for (Resource resource : initModelResources(description)) {
-			IFile papyrusModel = getProject().getFile(resource.getURI().trimFileExtension().appendFileExtension(DiModel.DI_FILE_EXTENSION));
-			modelFiles.put(description, papyrusModel);
-			result.add(open(papyrusModel));
+			if(resource.getURI().fileExtension().equals(UmlModel.UML_FILE_EXTENSION)){
+				IFile papyrusModel = getProject().getFile(resource.getURI().trimFileExtension().appendFileExtension(DiModel.DI_FILE_EXTENSION));
+				modelFiles.put(description, papyrusModel);
+				result.add(open(papyrusModel));
+			}
 		}
 
 		return result;
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 2aa532bb679..666a70248c9 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
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
  *   
  *****************************************************************************/
 
@@ -21,19 +21,16 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.GetRelTypesForSREOnSourceOperation;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 import org.eclipse.papyrus.infra.services.controlmode.ControlModeManager;
 import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
-import org.eclipse.papyrus.uml.internationalization.controlmode.tests.Activator;
 import org.eclipse.papyrus.uml.internationalization.tests.tests.AbstractUMLInternationalizationTest;
 import org.eclipse.papyrus.uml.tools.model.UmlModel;
 import org.eclipse.uml2.uml.Element;
 import org.junit.Assert;
-import org.osgi.framework.Bundle;
 
 /**
  * The abstract class for the internationalization control mode tests.
@@ -63,7 +60,7 @@ public abstract class AbstractInternationalizationControlModeTest extends Abstra
 	public void initTest() throws Exception {
 		super.initTest();
 
-		for (Object object : getPageManager().allPages()) {
+		for (Object object : fixture.getPageManager().allPages()) {
 			if (object instanceof Table) {
 				table = (Table) object;
 			} else if (object instanceof Diagram) {
@@ -75,16 +72,6 @@ public abstract class AbstractInternationalizationControlModeTest extends Abstra
 	/**
 	 * {@inheritDoc}
 	 * 
-	 * @see org.eclipse.papyrus.uml.internationalization.tests.tests.AbstractUMLInternationalizationTest#initTestModel()
-	 */
-	@Override
-	protected void initTestModel() throws Exception {
-		initModel("testLabels", "internationalizationModel", getBundle());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
 	 * @see org.eclipse.papyrus.uml.internationalization.tests.tests.AbstractUMLInternationalizationTest#checkNoLabels()
 	 */
 	@Override
@@ -94,7 +81,8 @@ public abstract class AbstractInternationalizationControlModeTest extends Abstra
 		Assert.assertEquals("The root element 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 class label is not the expected one.", "Table GenericTable0",
+				labelProvider.getText(table));
 	}
 
 	/**
@@ -125,27 +113,8 @@ public abstract class AbstractInternationalizationControlModeTest extends Abstra
 		Assert.assertEquals("The root element 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));
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.papyrus.uml.internationalization.tests.tests.AbstractUMLInternationalizationTest#getSourcePath()
-	 */
-	@Override
-	protected String getSourcePath() {
-		return "resources/controlmode";
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest#getBundle()
-	 */
-	@Override
-	protected Bundle getBundle() {
-		return Activator.getDefault().getBundle();
+		Assert.assertEquals("The class label is not the expected one.", "Table MyGenericTable",
+				labelProvider.getText(table));
 	}
 
 	/**
@@ -165,8 +134,7 @@ public abstract class AbstractInternationalizationControlModeTest extends Abstra
 		final ICommand control = ControlModeManager.getInstance().getControlCommand(request);
 
 		execute(control);
-		assertThat("Cannot undo control command", getTransactionalEditingDomain().getCommandStack().canUndo(),
-				is(true));
+		assertThat("Cannot undo control command", fixture.getEditingDomain().getCommandStack().canUndo(), is(true));
 
 		return request.getTargetResource(UmlModel.UML_FILE_EXTENSION);
 	}
@@ -193,7 +161,7 @@ public abstract class AbstractInternationalizationControlModeTest extends Abstra
 
 		try {
 			final URI fragmentURI = objectToControl.eResource().getURI().trimSegments(1).appendSegment(fragmentName);
-			result = new ControlModeRequest(getTransactionalEditingDomain(), objectToControl, fragmentURI);
+			result = new ControlModeRequest(fixture.getEditingDomain(), objectToControl, fragmentURI);
 		} catch (Exception e) {
 			e.printStackTrace();
 			fail("Failed to create ControlModeRequest: " + e.getLocalizedMessage());
@@ -215,8 +183,7 @@ public abstract class AbstractInternationalizationControlModeTest extends Abstra
 		final ICommand uncontrol = ControlModeManager.getInstance().getUncontrolCommand(request(element));
 
 		execute(uncontrol);
-		assertThat("Cannot undo control command", getTransactionalEditingDomain().getCommandStack().canUndo(),
-				is(true));
+		assertThat("Cannot undo control command", fixture.getEditingDomain().getCommandStack().canUndo(), is(true));
 	}
 
 	/**
@@ -229,12 +196,7 @@ public abstract class AbstractInternationalizationControlModeTest extends Abstra
 	private ControlModeRequest request(final EObject objectToUncontrol) {
 		ControlModeRequest result = null;
 
-		try {
-			result = new ControlModeRequest(getTransactionalEditingDomain(), objectToUncontrol);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Failed to create ControlModeRequest: " + e.getLocalizedMessage());
-		}
+		result = new ControlModeRequest(fixture.getEditingDomain(), objectToUncontrol);
 
 		return result;
 	}
@@ -246,36 +208,21 @@ public abstract class AbstractInternationalizationControlModeTest extends Abstra
 	 *            The GMF command to execute.
 	 */
 	protected void execute(final ICommand command) {
-		try {
-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(command));
-		} catch (ServiceException e) {
-			e.printStackTrace();
-			fail("Failed to execute GMF command: " + e.getLocalizedMessage());
-		}
+		fixture.getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(command));
 	}
 
 	/**
 	 * This allows to undo the last command done.
 	 */
 	protected void undo() {
-		try {
-			getTransactionalEditingDomain().getCommandStack().undo();
-		} catch (ServiceException e) {
-			e.printStackTrace();
-			fail("Failed to undo command: " + e.getLocalizedMessage());
-		}
+		fixture.getEditingDomain().getCommandStack().undo();
 	}
 
 	/**
 	 * This allows to redo the last command undoable.
 	 */
 	protected void redo() {
-		try {
-			getTransactionalEditingDomain().getCommandStack().redo();
-		} catch (ServiceException e) {
-			e.printStackTrace();
-			fail("Failed to redo command: " + e.getLocalizedMessage());
-		}
+		fixture.getEditingDomain().getCommandStack().redo();
 	}
 
 }
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/AllTests.java b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/AllTests.java
index 12457d20056..ba4e0f3c923 100644
--- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/AllTests.java
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/AllTests.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
  *   
  *****************************************************************************/
 
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/InternationalizationControlModeTest.java b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/InternationalizationControlModeTest.java
index bf87e1282e5..348f4fa16e2 100644
--- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/InternationalizationControlModeTest.java
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/InternationalizationControlModeTest.java
@@ -7,20 +7,21 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
  *   
  *****************************************************************************/
 
 package org.eclipse.papyrus.uml.internationalization.controlmode.tests.tests;
 
 import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
-import org.eclipse.papyrus.junit.framework.classification.InvalidTest;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
 import org.junit.Test;
 
 /**
  * This allows to test the internationalization during the control mode.
  */
 @SuppressWarnings("nls")
+@PluginResource({"resources/controlmode/internationalizationModel.di", "resources/controlmode/internationalizationModel_en_US.properties", "resources/controlmode/internationalizationModel_fr_FR.properties"})
 public class InternationalizationControlModeTest extends AbstractInternationalizationControlModeTest {
 
 	/**
@@ -31,22 +32,11 @@ public class InternationalizationControlModeTest extends AbstractInternationaliz
 	}
 
 	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.papyrus.uml.internationalization.tests.tests.AbstractUMLInternationalizationTest#getSourcePath()
-	 */
-	@Override
-	protected String getSourcePath() {
-		return "resources/controlmode/";
-	}
-
-	/**
 	 * This allows to test the control of the class object.
 	 * 
 	 * @throws Exception
 	 *             The caught exception.
 	 */
-	@InvalidTest
 	@Test
 	public void testControlClass() throws Exception {
 		checkFrenchLabels();
@@ -60,51 +50,51 @@ public class InternationalizationControlModeTest extends AbstractInternationaliz
 		redo();
 		checkFrenchLabels();
 	}
-	
+
 	/**
-	 * This allows to test the control of the class object with the language modification preference.
+	 * This allows to test the control of the class object with the language
+	 * modification preference.
 	 * 
 	 * @throws Exception
 	 *             The caught exception.
 	 */
-	@InvalidTest
 	@Test
-	public void testControlWithLanguageModificationTest() throws Exception{
+	public void testControlWithLanguageModificationTest() throws Exception {
 		checkFrenchLabels();
-		
+
 		control(modelClass, "Class1");
 		checkFrenchLabels();
-		
+
 		InternationalizationPreferencesUtils.setLanguagePreference(modelClass, "en_US");
 		checkEnglishLabels();
-		
+
 		undo();
 		checkEnglishLabels();
-		
+
 		redo();
 		checkEnglishLabels();
 	}
 
 	/**
-	 * This allows to test the control of the class object with the use internationalization preference.
+	 * This allows to test the control of the class object with the use
+	 * internationalization preference.
 	 * 
 	 * @throws Exception
 	 *             The caught exception.
 	 */
-	@InvalidTest
 	@Test
-	public void testControlWithUseInternationalizationModificationTest() throws Exception{
+	public void testControlWithUseInternationalizationModificationTest() throws Exception {
 		checkFrenchLabels();
-		
+
 		control(modelClass, "Class1");
 		checkFrenchLabels();
-		
+
 		InternationalizationPreferencesUtils.setInternationalizationPreference(modelClass, false);
 		checkNoLabels();
-		
+
 		undo();
 		checkNoLabels();
-		
+
 		redo();
 		checkNoLabels();
 	}
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/InternationalizationUncontrolModeTest.java b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/InternationalizationUncontrolModeTest.java
index 102f6927a90..b5683e197a6 100644
--- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/InternationalizationUncontrolModeTest.java
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/src/org/eclipse/papyrus/uml/internationalization/controlmode/tests/tests/InternationalizationUncontrolModeTest.java
@@ -7,20 +7,21 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
  *   
  *****************************************************************************/
 
 package org.eclipse.papyrus.uml.internationalization.controlmode.tests.tests;
 
 import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
-import org.eclipse.papyrus.junit.framework.classification.InvalidTest;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
 import org.junit.Test;
 
 /**
  * This allows to test the internationalization during the uncontrol mode.
  */
 @SuppressWarnings("nls")
+@PluginResource({"resources/controlmode/internationalizationModel.di", "resources/controlmode/internationalizationModel_en_US.properties", "resources/controlmode/internationalizationModel_fr_FR.properties"})
 public class InternationalizationUncontrolModeTest extends AbstractInternationalizationControlModeTest {
 
 	/**
@@ -38,19 +39,9 @@ public class InternationalizationUncontrolModeTest extends AbstractInternational
 	@Override
 	public void initTest() throws Exception {
 		super.initTest();
-		
+
 		control(modelClass, "Class1");
 	}
-	
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.papyrus.uml.internationalization.tests.tests.AbstractUMLInternationalizationTest#getSourcePath()
-	 */
-	@Override
-	protected String getSourcePath() {
-		return "resources/controlmode/";
-	}
 
 	/**
 	 * This allows to test the uncontrol of the class object.
@@ -58,7 +49,6 @@ public class InternationalizationUncontrolModeTest extends AbstractInternational
 	 * @throws Exception
 	 *             The caught exception.
 	 */
-	@InvalidTest
 	@Test
 	public void testUncontrolClass() throws Exception {
 		checkFrenchLabels();
@@ -74,47 +64,47 @@ public class InternationalizationUncontrolModeTest extends AbstractInternational
 	}
 
 	/**
-	 * This allows to test the uncontrol of the class object with the language modification preference.
+	 * This allows to test the uncontrol of the class object with the language
+	 * modification preference.
 	 * 
 	 * @throws Exception
 	 *             The caught exception.
 	 */
-	@InvalidTest
 	@Test
-	public void testUncontrolWithLanguageModificationTest() throws Exception{
+	public void testUncontrolWithLanguageModificationTest() throws Exception {
 		checkFrenchLabels();
-		
+
 		InternationalizationPreferencesUtils.setLanguagePreference(model, "en_US");
 		uncontrol(modelClass);
 		checkEnglishLabels();
-		
+
 		undo();
 		checkEnglishLabels();
-		
+
 		redo();
 		checkEnglishLabels();
 	}
-	
+
 	/**
-	 * This allows to test the uncontrol of the class object with the use internationalization preference.
+	 * This allows to test the uncontrol of the class object with the use
+	 * internationalization preference.
 	 * 
 	 * @throws Exception
 	 *             The caught exception.
 	 */
-	@InvalidTest
 	@Test
-	public void testUncontrolWithUseInternationalizationModificationTest() throws Exception{
+	public void testUncontrolWithUseInternationalizationModificationTest() throws Exception {
 		checkFrenchLabels();
-		
+
 		InternationalizationPreferencesUtils.setInternationalizationPreference(modelClass, false);
 		uncontrol(modelClass);
 		checkNoLabels();
-		
+
 		undo();
 		checkNoLabels();
-		
+
 		redo();
 		checkNoLabels();
 	}
-	
+
 }
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel.di b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel.notation b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel.notation
new file mode 100644
index 00000000000..c98e9846262
--- /dev/null
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel.notation
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider">
+  <nattable:Table xmi:id="_yqOrMKHCEeaOZo-nqA3kVA" name="GenericTable0" currentRowAxisProvider="_yqPSQaHCEeaOZo-nqA3kVA" currentColumnAxisProvider="_yqPSQKHCEeaOZo-nqA3kVA">
+    <context href="internationalizationChangeLanguageModel.uml#_auoNsKHCEeaOZo-nqA3kVA"/>
+    <owner href="internationalizationChangeLanguageModel.uml#_auoNsKHCEeaOZo-nqA3kVA"/>
+    <prototype href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/genericTable.configuration#_Uz8agHDuEeWh-MssWmCB_A"/>
+    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_yqPSQKHCEeaOZo-nqA3kVA" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider"/>
+    <rowAxisProvidersHistory xsi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_yqPSQaHCEeaOZo-nqA3kVA" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider"/>
+  </nattable:Table>
+  <notation:Diagram xmi:id="_z2Uq4KHCEeaOZo-nqA3kVA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <styles xsi:type="notation:StringValueStyle" xmi:id="_z2Uq4aHCEeaOZo-nqA3kVA" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_z2Uq4qHCEeaOZo-nqA3kVA"/>
+    <styles xsi:type="style:PapyrusViewStyle" xmi:id="_z2Uq46HCEeaOZo-nqA3kVA">
+      <owner href="internationalizationChangeLanguageModel.uml#_auoNsKHCEeaOZo-nqA3kVA"/>
+    </styles>
+    <element href="internationalizationChangeLanguageModel.uml#_auoNsKHCEeaOZo-nqA3kVA"/>
+  </notation:Diagram>
+  <ecore:EAnnotation xmi:id="_L3K_UKHEEeaOZo-nqA3kVA" source="Internationalization">
+    <details xmi:id="_L3K_UaHEEeaOZo-nqA3kVA" key="use" value="true"/>
+    <details xmi:id="_L3K_UqHEEeaOZo-nqA3kVA" key="language" value="fr_FR"/>
+  </ecore:EAnnotation>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel.uml b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel.uml
new file mode 100644
index 00000000000..fd50538e34f
--- /dev/null
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel.uml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_auoNsKHCEeaOZo-nqA3kVA" name="RootElement">
+  <packagedElement xmi:type="uml:Class" xmi:id="_q44woKHUEeaOZo-nqA3kVA" name="Class1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_s0HuQKHUEeaOZo-nqA3kVA" name="Attribute1"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_rpqtUKHUEeaOZo-nqA3kVA" name="Operation1">
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_sLwtwKHUEeaOZo-nqA3kVA" name="Parameter1"/>
+    </ownedOperation>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_t4LzUKHUEeaOZo-nqA3kVA" name="Package1">
+    <packagedElement xmi:type="uml:Interface" xmi:id="_xti7UKHUEeaOZo-nqA3kVA" name="Interface1">
+      <nestedClassifier xmi:type="uml:Enumeration" xmi:id="_zoN4QKHUEeaOZo-nqA3kVA" name="Enumeration1"/>
+    </packagedElement>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel_en_US.properties b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel_en_US.properties
new file mode 100644
index 00000000000..9921693610a
--- /dev/null
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel_en_US.properties
@@ -0,0 +1,11 @@
+#Thu Nov 03 15:50:58 CET 2016
+_label_RootElement__Package1__Interface1=MyInterface
+_label_RootElement__Class1__Operation1=MyOperation
+_label_RootElement__Package1__Interface1__Enumeration1=MyEnumeration
+_label_RootElement__Package1=MyPackage
+_labelTable_RootElement_label_GenericTable0=MyGenericTable
+_label_RootElement__Class1__Attribute1=MyAttribute
+_label_RootElement__Class1=MyFirstClass
+_label_RootElement__Class1__Operation1__Parameter1=MyParameter
+_label_RootElement=MyRootElement
+_labelDiagram_RootElement_label_ClassDiagram=MyClassDiagram
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel_fr_FR.properties b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel_fr_FR.properties
new file mode 100644
index 00000000000..e0caea2abe0
--- /dev/null
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/resources/internationalizationChangeLanguageModel_fr_FR.properties
@@ -0,0 +1,11 @@
+#Thu Nov 03 15:50:58 CET 2016
+_label_RootElement__Package1__Interface1=MonInterface
+_label_RootElement__Class1__Operation1=MonOperation
+_label_RootElement__Package1__Interface1__Enumeration1=MonEnumeration
+_label_RootElement__Package1=MonPackage
+_labelTable_RootElement_label_GenericTable0=MaTableGenerique
+_label_RootElement__Class1__Attribute1=MonAttribut
+_label_RootElement__Class1=MaPremiereClasse
+_label_RootElement__Class1__Operation1__Parameter1=MonParametre
+_label_RootElement=MonElementRoot
+_labelDiagram_RootElement_label_ClassDiagram=MonDiagrammeDeClasse
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/AbstractUMLInternationalizationTest.java b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/AbstractUMLInternationalizationTest.java
index 41e0ee4a2a7..3bd664f367f 100644
--- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/AbstractUMLInternationalizationTest.java
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/AbstractUMLInternationalizationTest.java
@@ -7,14 +7,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
  *   
  *****************************************************************************/
 
 package org.eclipse.papyrus.uml.internationalization.tests.tests;
 
-import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
-import org.eclipse.papyrus.uml.internationalization.tests.Activator;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
 import org.eclipse.papyrus.views.modelexplorer.DecoratingLabelProviderWTooltips;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Enumeration;
@@ -25,14 +25,18 @@ import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.Property;
 import org.junit.Assert;
 import org.junit.Before;
-import org.osgi.framework.Bundle;
+import org.junit.Rule;
 
 /**
  * This allows to define the abstract class for the UML internationalization
  * tests.
  */
-@SuppressWarnings("nls")
-public abstract class AbstractUMLInternationalizationTest extends AbstractEditorTest {
+@SuppressWarnings({ "nls", "restriction" })
+public abstract class AbstractUMLInternationalizationTest extends AbstractPapyrusTest {
+
+	/** The papyrus fixture for the project. */
+	@Rule
+	public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
 
 	/** The class name. */
 	private static final String CLASS_NAME = "Class1";
@@ -97,12 +101,14 @@ public abstract class AbstractUMLInternationalizationTest extends AbstractEditor
 	 */
 	@Before
 	public void initTest() throws Exception {
-		initTestModel();
+		
+		fixture.flushDisplayEvents();
 
-		model = getRootUMLModel();
+		model = fixture.getModel();
 		Assert.assertNotNull("The model cannot be null", model);
 
-		labelProvider = (DecoratingLabelProviderWTooltips) getModelExplorerView().getCommonViewer().getLabelProvider();
+		labelProvider = (DecoratingLabelProviderWTooltips) fixture.getModelExplorerView().getCommonViewer()
+				.getLabelProvider();
 
 		modelClass = (Class) model.getOwnedMember(CLASS_NAME);
 		Assert.assertNotNull("The class cannot be null", modelClass);
@@ -134,16 +140,6 @@ public abstract class AbstractUMLInternationalizationTest extends AbstractEditor
 	}
 
 	/**
-	 * This allows to initialize the test model.
-	 * 
-	 * @throws Exception
-	 *             The caught exception.
-	 */
-	protected void initTestModel() throws Exception {
-		initModel("testLabels", "internationalizationModel", getBundle());
-	}
-
-	/**
 	 * This allows to test the labels when the internationalization is not used.
 	 * 
 	 * @throws Exception
@@ -241,23 +237,4 @@ public abstract class AbstractUMLInternationalizationTest extends AbstractEditor
 				labelProvider.getText(modelEnumeration));
 	}
 
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest#getBundle()
-	 */
-	@Override
-	protected Bundle getBundle() {
-		return Activator.getDefault().getBundle();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest#getSourcePath()
-	 */
-	@Override
-	protected String getSourcePath() {
-		return "resources/";
-	}
 }
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/AllTests.java b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/AllTests.java
index 979818990d4..20f7dd06dec 100644
--- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/AllTests.java
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/AllTests.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
  *   
  *****************************************************************************/
 
@@ -19,7 +19,8 @@ import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(ClassificationSuite.class)
 @SuiteClasses({  
-	UMLInternationalizationChangePreferencesTest.class
+	UMLInternationalizationChangePreferencesTest.class,
+	UMLInternationalizationChangeLanguageTest.class
 })
 public class AllTests {
 	
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/UMLInternationalizationChangeLanguageTest.java b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/UMLInternationalizationChangeLanguageTest.java
new file mode 100644
index 00000000000..a58665c5911
--- /dev/null
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/UMLInternationalizationChangeLanguageTest.java
@@ -0,0 +1,50 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.internationalization.tests.tests;
+
+import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.junit.Test;
+
+/**
+ * This allows to test the internationalization preferences modification.
+ */
+@SuppressWarnings("nls")
+@PluginResource({"resources/internationalizationChangeLanguageModel.di", "resources/internationalizationChangeLanguageModel_en_US.properties", "resources/internationalizationChangeLanguageModel_fr_FR.properties"})
+public class UMLInternationalizationChangeLanguageTest extends AbstractUMLInternationalizationTest {
+
+	/**
+	 * Constructor.
+	 */
+	public UMLInternationalizationChangeLanguageTest() {
+		super();
+	}
+
+	/**
+	 * This allows to test the language preference modification.
+	 * 
+	 * @throws Exception
+	 *             The caught exception.
+	 */
+	@Test
+	public void testLanguageModification() throws Exception {
+		checkFrenchLabels();
+
+		InternationalizationPreferencesUtils.setLanguagePreference(model, "en_US");
+		checkEnglishLabels();
+
+		InternationalizationPreferencesUtils.setLanguagePreference(model, "es_ES");
+		checkNoLabels();
+	}
+}
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/UMLInternationalizationChangePreferencesTest.java b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/UMLInternationalizationChangePreferencesTest.java
index 5a2fddfbab2..bef3aa53847 100644
--- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/UMLInternationalizationChangePreferencesTest.java
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/UMLInternationalizationChangePreferencesTest.java
@@ -7,19 +7,21 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
  *   
  *****************************************************************************/
 
 package org.eclipse.papyrus.uml.internationalization.tests.tests;
 
 import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
 import org.junit.Test;
 
 /**
  * This allows to test the internationalization preferences modification.
  */
 @SuppressWarnings("nls")
+@PluginResource({ "resources/internationalizationModel.di", "resources/internationalizationModel_en_US.properties", "resources/internationalizationModel_fr_FR.properties"})
 public class UMLInternationalizationChangePreferencesTest extends AbstractUMLInternationalizationTest {
 
 	/**
@@ -38,28 +40,11 @@ public class UMLInternationalizationChangePreferencesTest extends AbstractUMLInt
 	@Test
 	public void testUseInternationalizationModification() throws Exception {
 		checkFrenchLabels();
-		
+
 		InternationalizationPreferencesUtils.setInternationalizationPreference(model, false);
 		checkNoLabels();
-		
-		InternationalizationPreferencesUtils.setInternationalizationPreference(model, true);
-		checkFrenchLabels();
-	}
 
-	/**
-	 * This allows to test the language preference modification.
-	 * 
-	 * @throws Exception
-	 *             The caught exception.
-	 */
-	@Test
-	public void testLanguageModification() throws Exception {
+		InternationalizationPreferencesUtils.setInternationalizationPreference(model, true);
 		checkFrenchLabels();
-		
-		InternationalizationPreferencesUtils.setLanguagePreference(model, "en_US");
-		checkEnglishLabels();
-		
-		InternationalizationPreferencesUtils.setLanguagePreference(model, "es_ES");
-		checkNoLabels();
 	}
 }