Bug 509908: [Internationalization][Tests] Internationalization JUnit

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

- Remove the UMLInternationalizationLabelProviderTest because it is
already done with UMLInternationalizationChangePreferenceTest
- Change the internationalization control/uncontrol tests with
InvalidTest

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

4 files changed, 9 insertions, 44 deletions

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 def0b5c195d..bf87e1282e5 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
@@ -14,6 +14,7 @@
 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.junit.Test;
 
 /**
@@ -45,6 +46,7 @@ public class InternationalizationControlModeTest extends AbstractInternationaliz
 	 * @throws Exception
 	 *             The caught exception.
 	 */
+	@InvalidTest
 	@Test
 	public void testControlClass() throws Exception {
 		checkFrenchLabels();
@@ -65,6 +67,7 @@ public class InternationalizationControlModeTest extends AbstractInternationaliz
 	 * @throws Exception
 	 *             The caught exception.
 	 */
+	@InvalidTest
 	@Test
 	public void testControlWithLanguageModificationTest() throws Exception{
 		checkFrenchLabels();
@@ -88,6 +91,7 @@ public class InternationalizationControlModeTest extends AbstractInternationaliz
 	 * @throws Exception
 	 *             The caught exception.
 	 */
+	@InvalidTest
 	@Test
 	public void testControlWithUseInternationalizationModificationTest() throws Exception{
 		checkFrenchLabels();
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 722e95de345..102f6927a90 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
@@ -14,6 +14,7 @@
 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.junit.Test;
 
 /**
@@ -57,6 +58,7 @@ public class InternationalizationUncontrolModeTest extends AbstractInternational
 	 * @throws Exception
 	 *             The caught exception.
 	 */
+	@InvalidTest
 	@Test
 	public void testUncontrolClass() throws Exception {
 		checkFrenchLabels();
@@ -77,6 +79,7 @@ public class InternationalizationUncontrolModeTest extends AbstractInternational
 	 * @throws Exception
 	 *             The caught exception.
 	 */
+	@InvalidTest
 	@Test
 	public void testUncontrolWithLanguageModificationTest() throws Exception{
 		checkFrenchLabels();
@@ -98,6 +101,7 @@ public class InternationalizationUncontrolModeTest extends AbstractInternational
 	 * @throws Exception
 	 *             The caught exception.
 	 */
+	@InvalidTest
 	@Test
 	public void testUncontrolWithUseInternationalizationModificationTest() throws Exception{
 		checkFrenchLabels();
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 3c5fd84f3e0..979818990d4 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
@@ -18,8 +18,7 @@ import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(ClassificationSuite.class)
-@SuiteClasses({ 
-	UMLInternationalizationLabelProviderTest.class,
+@SuiteClasses({  
 	UMLInternationalizationChangePreferencesTest.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/UMLInternationalizationLabelProviderTest.java b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/UMLInternationalizationLabelProviderTest.java
deleted file mode 100644
index 63a6552d101..00000000000
--- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/src/org/eclipse/papyrus/uml/internationalization/tests/tests/UMLInternationalizationLabelProviderTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * 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 (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.internationalization.tests.tests;
-
-import org.junit.Test;
-
-/**
- * This allows to test the labels of different objects and test the
- * internationalization.
- */
-@SuppressWarnings("nls")
-public class UMLInternationalizationLabelProviderTest extends AbstractUMLInternationalizationTest {
-
-	/**
-	 * Constructor.
-	 */
-	public UMLInternationalizationLabelProviderTest() {
-		super();
-	}
-
-	/**
-	 * This allows to test the labels of different objects.
-	 * 
-	 * @throws Exception
-	 *             The caught exception.
-	 */
-	@Test
-	public void testLabels() throws Exception {
-		checkFrenchLabels();
-	}
-}