[495811] Clean the test class.

Bug: 495811
Change-Id: Ia66d5d2dccc4c04263277ebd1fe33b5abcf443b5
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>

1 files changed, 21 insertions, 65 deletions

diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mappings/ImportSpecClassesUnsetTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mappings/ImportSpecClassesUnsetTests.java
index b703476cba..f5e477bc14 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mappings/ImportSpecClassesUnsetTests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mappings/ImportSpecClassesUnsetTests.java
@@ -10,10 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.tests.unit.api.mappings;
 
-import java.util.Collection;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.ContainerMappingImportSpec;
 import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.ContainerMappingSpec;
 import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.DiagramDescriptionSpec;
@@ -35,27 +32,25 @@ import org.eclipse.sirius.diagram.description.impl.NodeMappingImpl;
 import org.eclipse.sirius.diagram.description.impl.NodeMappingImportImpl;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 
-import com.google.common.collect.Lists;
-
 import junit.framework.TestCase;
 
 /**
- * Tests for reuse mappings usage with filters
+ * Tests unsetting features on mapping/description import elements.
  * 
  * @author mporhel
  */
 public class ImportSpecClassesUnsetTests extends TestCase {
 
     public void testContainerMappingImportSpecUnset() {
-
         ContainerMappingImport cmi = DescriptionFactory.eINSTANCE.createContainerMappingImport();
 
-        assertTrue(cmi instanceof ContainerMappingImportSpec);
-        assertFalse(cmi instanceof ContainerMappingImportImpl);
+        String implemChanged = "The ContainerMappingImport implementation has changed, please update this test";
+        assertTrue(implemChanged, cmi instanceof ContainerMappingImportSpec);
+        assertFalse(implemChanged, cmi instanceof ContainerMappingImportImpl);
 
-        assertTrue(cmi instanceof ContainerMappingSpec);
-        assertTrue(cmi instanceof ContainerMappingImpl);
-        assertTrue(cmi instanceof ContainerMapping);
+        assertTrue(implemChanged, cmi instanceof ContainerMappingSpec);
+        assertTrue(implemChanged, cmi instanceof ContainerMappingImpl);
+        assertTrue(implemChanged, cmi instanceof ContainerMapping);
 
         checkFeaturesUnset(cmi);
     }
@@ -63,12 +58,13 @@ public class ImportSpecClassesUnsetTests extends TestCase {
     public void testNodeMappingImportSpecUnset() {
         NodeMappingImport nmi = DescriptionFactory.eINSTANCE.createNodeMappingImport();
 
-        assertTrue(nmi instanceof NodeMappingImportSpec);
-        assertFalse(nmi instanceof NodeMappingImportImpl);
+        String implemChanged = "The NodeMappingImport implementation has changed, please update this test";
+        assertTrue(implemChanged, nmi instanceof NodeMappingImportSpec);
+        assertFalse(implemChanged, nmi instanceof NodeMappingImportImpl);
 
-        assertTrue(nmi instanceof NodeMappingSpec);
-        assertTrue(nmi instanceof NodeMappingImpl);
-        assertTrue(nmi instanceof NodeMapping);
+        assertTrue(implemChanged, nmi instanceof NodeMappingSpec);
+        assertTrue(implemChanged, nmi instanceof NodeMappingImpl);
+        assertTrue(implemChanged, nmi instanceof NodeMapping);
 
         checkFeaturesUnset(nmi);
     }
@@ -76,66 +72,26 @@ public class ImportSpecClassesUnsetTests extends TestCase {
     public void testDiagramImportDescriptionSpecUnset() {
         DiagramImportDescription did = DescriptionFactory.eINSTANCE.createDiagramImportDescription();
 
-        assertTrue(did instanceof DiagramImportDescriptionSpec);
-        assertFalse(did instanceof DiagramImportDescriptionImpl);
+        String implemChanged = "The DiagramImportDescription implementation has changed, please update this test";
+        assertTrue(implemChanged, did instanceof DiagramImportDescriptionSpec);
+        assertFalse(implemChanged, did instanceof DiagramImportDescriptionImpl);
 
-        assertTrue(did instanceof DiagramDescriptionSpec);
-        assertTrue(did instanceof DiagramDescriptionImpl);
-        assertTrue(did instanceof DiagramDescription);
+        assertTrue(implemChanged, did instanceof DiagramDescriptionSpec);
+        assertTrue(implemChanged, did instanceof DiagramDescriptionImpl);
+        assertTrue(implemChanged, did instanceof DiagramDescription);
 
         checkFeaturesUnset(did);
     }
 
     private void checkFeaturesUnset(IdentifiedElement object) {
-        // TODO uncomment this and remove buildMessage() when corrected.
-        Collection<EStructuralFeature> exceptions = Lists.newArrayList();
-        Collection<EStructuralFeature> stackOverFlows = Lists.newArrayList();
-
         for (EStructuralFeature f : object.eClass().getEAllStructuralFeatures()) {
             if (f.isChangeable()) {
                 try {
                     object.eUnset(f);
                 } catch (Exception e) {
-                    exceptions.add(f);
-                    e.printStackTrace();
-
-                    // TODO uncomment this and remove buildMessage() when
-                    // corrected.
-                    // fail("Error occurred while unsetting feature " +
-                    // f.getName() + " on " + object + ": " + e.getMessage());
+                    fail("Error occurred while unsetting feature " + f.getName() + " on " + object + ": " + e.getMessage());
                 } catch (StackOverflowError s) {
-                    stackOverFlows.add(f);
-
-                    // TODO uncomment this and remove buildMessage() when
-                    // corrected.
-                    // fail("StackOverflowError occurred while unsetting feature
-                    // " + f.getName() + " on " + object);
-                }
-            }
-        }
-
-        // TODO Remove this and buildMessage() when corrected.
-        StringBuilder sb = new StringBuilder();
-        buildMessage(sb, "Error(s) occurred on ", object, exceptions);
-        buildMessage(sb, "StackOverFlow(s) occurred on ", object, stackOverFlows);
-        if (sb.length() != 0) {
-            fail(sb.toString());
-        }
-    }
-
-    private void buildMessage(StringBuilder sb, String message, IdentifiedElement object, Collection<EStructuralFeature> failures) {
-        if (!failures.isEmpty()) {
-            sb.append("\n").append(message).append(object.eClass().getName());
-            if (StringUtil.isEmpty(object.getName())) {
-                sb.append(" ").append(object.getName());
-            }
-            sb.append(" while unsetting ");
-            if (failures.size() == 1) {
-                sb.append(failures.iterator().next().getName());
-            } else {
-                sb.append("\n");
-                for (EStructuralFeature f : failures) {
-                    sb.append("  . ").append(f.getName()).append(", ").append("\n");
+                    fail("StackOverflowError occurred while unsetting feature" + f.getName() + " on " + object);
                 }
             }
         }