[481846] Fix ResourceVersionMismatchTest

* Change test to make sure the aird or vsm are migrated at the beginning
of the test.

Bug: 481846
Change-Id: I585436cf08324f5dd2ea5dd7fc3ad9c690fb5bf9
Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>

1 files changed, 21 insertions, 5 deletions

diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/ResourceVersionMismatchTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/ResourceVersionMismatchTest.java
index 156fa69c2a..8c73b0845e 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/ResourceVersionMismatchTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/ResourceVersionMismatchTest.java
@@ -210,9 +210,19 @@ public class ResourceVersionMismatchTest extends SiriusTestCase {
     }
 
     private void setupFileVersionMismatch(boolean setupInvalidVSM, boolean setupInvalidMainAird, boolean setupInvalidReferencedAird) {
-        // Session creation
+        // If the aird or vsm need to be migrated, then, at save, the migration
+        // version is set at the last one.
+        // So, to avoid that the changed version (done below) gets overridden we
+        // make sure the model does not need to be migrated.
         Session session = SessionManager.INSTANCE.getSession(sessionResourceURI, new NullProgressMonitor());
         session.open(new NullProgressMonitor());
+        session.save(new NullProgressMonitor());
+        Viewpoint viewpoint = session.getSelectedViewpoints(false).iterator().next();
+        saveVSM(viewpoint.eResource());
+        session.close(new NullProgressMonitor());
+
+        session = SessionManager.INSTANCE.getSession(sessionResourceURI, new NullProgressMonitor());
+        session.open(new NullProgressMonitor());
         TransactionalEditingDomain domain = session.getTransactionalEditingDomain();
         CommandStack commandStack = domain.getCommandStack();
 
@@ -226,10 +236,8 @@ public class ResourceVersionMismatchTest extends SiriusTestCase {
             Command changeVersionCmd = SetCommand.create(domain, group, DescriptionPackage.Literals.GROUP__VERSION, newVersion.toString());
             assertTrue(changeVersionCmd.canExecute());
             commandStack.execute(changeVersionCmd);
-            try {
-                group.eResource().save(null);
-            } catch (IOException e) {
-            }
+
+            saveVSM(group.eResource());
         }
 
         if (setupInvalidMainAird) {
@@ -256,6 +264,14 @@ public class ResourceVersionMismatchTest extends SiriusTestCase {
         session.close(new NullProgressMonitor());
     }
 
+    private void saveVSM(Resource resource) {
+        try {
+            resource.save(null);
+        } catch (IOException e) {
+            fail("The save of the viewpoint " + ODESIGN_MODEL_FILENAME + " failed.");
+        }
+    }
+
     @Override
     protected void tearDown() throws Exception {
         if (defaultUiCallback != null) {