use SoftAssertions for models comparison

atlanmod · Jun 9, 2017 · ad765f3 · ad765f3
1 parent e10afb2
commit ad765f3
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/neoemf-tests/src/test/java/fr/inria/atlanmod/neoemf/tests/io/AbstractIOTest.java b/neoemf-tests/src/test/java/fr/inria/atlanmod/neoemf/tests/io/AbstractIOTest.java
@@ -19,6 +19,7 @@
 import fr.inria.atlanmod.neoemf.tests.AbstractBackendTest;
 import fr.inria.atlanmod.neoemf.util.emf.compare.LazyMatchEngineFactory;
 
+import org.assertj.core.api.SoftAssertions;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
@@ -99,8 +100,12 @@ protected void assertNotifierAreEqual(Notifier actual, Notifier expected) {
                 .build()
                 .compare(scope);
 
-        assertThat(comparison.getConflicts()).hasSize(0);
-        assertThat(comparison.getDifferences()).hasSize(0);
+        SoftAssertions softly = new SoftAssertions();
+        {
+            softly.assertThat(comparison.getConflicts()).isEmpty();
+            softly.assertThat(comparison.getDifferences()).isEmpty();
+        }
+        softly.assertAll();
     }
 
     /**
@@ -159,7 +164,7 @@ protected void assertReferenceHas(EObject obj, String name, int index, String re
                 EAttribute attribute = checkNotNull(EAttribute.class.cast(eObjectReference.eClass().getEStructuralFeature("name")));
                 assertThat(eObjectReference.eGet(attribute)).isEqualTo(attribute.getDefaultValue());
             }
-            catch (NullPointerException ignored) {
+            catch (NullPointerException expected) {
                 // It's not a problem if this happens
             }
         }