Merge pull request #727 from modelix/fix-mps-model-adapters-test

chore(mps-model-adapters): fix `writeActionOnEdt` in `MpsAdaptersTestBase`

Author: Oleksandr Dzhychko

mps-model-adapters-plugin/src/test/kotlin/org/modelix/model/mpsadapters/ChangePropertyTest.kt

@@ -28,10 +28,11 @@ class ChangePropertyTest : MpsAdaptersTestBase("SimpleProject") {
 
         val repositoryNode: INode = MPSRepositoryAsNode(mpsProject.repository)
 
-        writeActionOnEdt {
+        runCommandOnEDT {
             val module = repositoryNode.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Repository.modules)
                 .single { it.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name) == "Solution1" }
-            val model = module.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Module.models).single()
+            val model = module.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Module.models)
+                .single { it.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name) == "Solution1.model1" }
             val rootNode = model.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Model.rootNodes).single()
             assertEquals("Class1", rootNode.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name))
             rootNode.setPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name, "MyRenamedClass")

mps-model-adapters-plugin/src/test/kotlin/org/modelix/model/mpsadapters/MpsAdaptersTestBase.kt

@@ -97,18 +97,18 @@ abstract class MpsAdaptersTestBase(val testDataName: String?) : UsefulTestCase()
         return checkNotNull(ProjectHelper.fromIdeaProject(project)) { "MPS project not loaded" }
     }
 
-    protected fun <R> writeAction(body: () -> R): R {
-        return mpsProject.modelAccess.computeWriteAction(body)
-    }
-
-    protected fun <R> writeActionOnEdt(body: () -> R): R {
-        return onEdt { writeAction { body() } }
-    }
-
-    protected fun <R> onEdt(body: () -> R): R {
+    protected fun <R> runCommandOnEDT(body: () -> R): R {
         var result: R? = null
-        ThreadUtils.runInUIThreadAndWait {
-            result = body()
+        val exception = ThreadUtils.runInUIThreadAndWait {
+            mpsProject.modelAccess.executeCommand {
+                result = body()
+            }
+        }
+        if (exception != null) {
+            throw exception
+        }
+        checkNotNull(result) {
+            "The result was null even those no exception was thrown."
         }
         return result as R
     }

mps-model-adapters-plugin/src/test/kotlin/org/modelix/model/mpsadapters/ReplaceNodeTest.kt

@@ -16,11 +16,13 @@
 
 package org.modelix.model.mpsadapters
 
+import org.junit.Ignore
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.api.ConceptReference
 import org.modelix.model.api.INode
 import org.modelix.model.api.IReplaceableNode
 
+@Ignore("Replacing a node through MPS-model-adapters is broken. See MODELIX-920")
 class ReplaceNodeTest : MpsAdaptersTestBase("SimpleProject") {
 
     fun testReplaceNode() {
@@ -30,10 +32,12 @@ class ReplaceNodeTest : MpsAdaptersTestBase("SimpleProject") {
 
         val repositoryNode: INode = MPSRepositoryAsNode(mpsProject.repository)
 
-        writeActionOnEdt {
+        runCommandOnEDT {
             val module = repositoryNode.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Repository.modules)
                 .single { it.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name) == "Solution1" }
-            val model = module.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Module.models).single()
+            val model = module.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Module.models)
+                .single { it.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name) == "Solution1.model1" }
+
             val rootNode = model.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Model.rootNodes).single() as IReplaceableNode
 
             val oldProperties = rootNode.getAllProperties().toSet()