diff options
| author | Nicolas FAUVERGUE | 2016-11-30 09:15:36 +0000 |
|---|---|---|
| committer | Nicolas FAUVERGUE | 2016-12-01 08:42:25 +0000 |
| commit | 4037a189c90f8bb8685dc1af23047673e16fbde0 (patch) | |
| tree | 4975305e1c9a58aaaa2b146eb31fb223bfb7a56c /tests/junit/plugins/junit | |
| parent | 6391b10bc090c6e9cc4227cbbf96c5ea0edc2036 (diff) | |
| download | org.eclipse.papyrus-4037a189c90f8bb8685dc1af23047673e16fbde0.tar.gz org.eclipse.papyrus-4037a189c90f8bb8685dc1af23047673e16fbde0.tar.xz org.eclipse.papyrus-4037a189c90f8bb8685dc1af23047673e16fbde0.zip | |
Bug 496905: [Diagram][ModelExplorer][Table][Dialog] Papyrus must
integrate the internationalization feature provided by UML.
https://bugs.eclipse.org/bugs/show_bug.cgi?id=496905
Fix JUnit tests problem with master rebase.
Change-Id: I9406b6c002c07b01514fa03f43594f6eb05cb411
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@all4tec.net>
Diffstat (limited to 'tests/junit/plugins/junit')
| -rw-r--r-- | tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java index 9aec593c5d7..f2d977d579c 100644 --- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java +++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java @@ -60,7 +60,6 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet; import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel; -import org.eclipse.papyrus.infra.internationalization.utils.PropertiesFilesUtils; import org.eclipse.papyrus.infra.tools.util.TypeUtils; import org.eclipse.papyrus.junit.utils.JUnitUtils; import org.eclipse.papyrus.uml.tools.model.UmlModel; @@ -446,7 +445,6 @@ public abstract class AbstractModelFixture<T extends EditingDomain> extends Test result.put(basePath.addFileExtension(DiModel.DI_FILE_EXTENSION), true); result.put(basePath.addFileExtension(UmlModel.UML_FILE_EXTENSION), true); result.put(basePath.addFileExtension(NotationModel.NOTATION_FILE_EXTENSION), true); - result.put(basePath.addFileExtension(PropertiesFilesUtils.PROPERTIES_FILE_EXTENSION), true); } return result; @@ -492,7 +490,7 @@ public abstract class AbstractModelFixture<T extends EditingDomain> extends Test if (result == null) { String extension = modelURI.fileExtension(); - if (DiModel.DI_FILE_EXTENSION.equals(extension) || UmlModel.UML_FILE_EXTENSION.equals(extension) || NotationModel.NOTATION_FILE_EXTENSION.equals(extension) || PropertiesFilesUtils.PROPERTIES_FILE_EXTENSION.equals(extension)) { + if (DiModel.DI_FILE_EXTENSION.equals(extension) || UmlModel.UML_FILE_EXTENSION.equals(extension) || NotationModel.NOTATION_FILE_EXTENSION.equals(extension)) { // Default load behaviour result = resourceSet.createResource(modelURI); } else { |