Added several tests & GUI enhancements

diederikd · Jan 20, 2019 · 3a866a6 · 3a866a6
1 parent 1c07bad
commit 3a866a6
Show file tree

Hide file tree

Showing 29 changed files with 2,234 additions and 1,718 deletions.
diff --git a/.mps/workspace.xml b/.mps/workspace.xml
diff --git a/TEST-jetbrains.mps.testbench.junit.suites.AntModuleTestSuite-test.xml b/TEST-jetbrains.mps.testbench.junit.suites.AntModuleTestSuite-test.xml
diff --git a/build.xml b/build.xml
@@ -1384,6 +1384,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset dir="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.diagram/lib" includes="jgraphx.jar" />
         <fileset dir="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.diagram/lib" includes="org.eclipse.emf.ecore-2.15.0.jar" />
         <fileset dir="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.diagram/lib" includes="org.eclipse.emf.common-2.15.0.jar" />
@@ -1408,7 +1409,7 @@
     </javac>
   </target>
 
-  <target name="java.compile.FactSL#01" depends="java.compile.FactSL, java.compile.GeneralSL, fetchDependencies">
+  <target name="java.compile.FactSL#01" depends="java.compile.FactSL, fetchDependencies">
     <mkdir dir="${basedir}/languages/FactSL/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/FactSL#01" />
     <javac destdir="${build.tmp}/java/out/FactSL#01" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1434,7 +1435,6 @@
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <pathelement path="${build.tmp}/java/out/FactSL" />
-        <pathelement path="${build.tmp}/java/out/GeneralSL" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1525,7 +1525,7 @@
     </javac>
   </target>
 
-  <target name="java.compile.DemoWBTests" depends="fetchDependencies">
+  <target name="java.compile.DemoWBTests" depends="java.compile.ConstructionSL, java.compile.GeneralSL, fetchDependencies">
     <mkdir dir="${build.tmp}/java/out/DemoWBTests" />
     <javac destdir="${build.tmp}/java/out/DemoWBTests" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
@@ -1545,8 +1545,10 @@
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <pathelement path="${build.tmp}/java/out/ConstructionSL" />
+        <pathelement path="${build.tmp}/java/out/GeneralSL" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
         <fileset file="${artifacts.mps}/lib/hamcrest-core-1.3.jar" />
@@ -1672,9 +1674,18 @@
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.libraries.path.string" refid="mps.libraries.path" />
     <path id="mps.plugins.path">
+      <pathelement location="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection" />
+      <pathelement location="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout" />
+      <pathelement location="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.diagram" />
+      <pathelement location="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.widgets" />
+      <pathelement location="${artifacts.com.mbeddr.platform}/de.itemis.mps.tooltips" />
+      <pathelement location="${artifacts.com.mbeddr.platform}/de.slisson.mps.conditionalEditor" />
+      <pathelement location="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks" />
+      <pathelement location="${artifacts.com.mbeddr.platform}/mps-apache-commons" />
       <pathelement location="${artifacts.mps}/plugins/mps-build" />
       <pathelement location="${artifacts.mps}/plugins/mps-core/META-INF/plugin.xml/../.." />
       <pathelement location="${artifacts.mps}/plugins/mps-testing" />
+      <pathelement location="${build.layout}/plugins/DemoWB" />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.plugins.path.string" refid="mps.plugins.path" />
     <path location="${build.layout}/plugins/DemoWB/languages/DemoWB/DemoWBTests.jar" id="mps.tests.path" />
@@ -1685,6 +1696,30 @@
       <exclude name="**/*-src.jar" />
     </patternset>
     <path id="long.class.path">
+      <fileset dir="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection">
+        <patternset refid="plugin.deployed.jars" />
+      </fileset>
+      <fileset dir="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout">
+        <patternset refid="plugin.deployed.jars" />
+      </fileset>
+      <fileset dir="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.diagram">
+        <patternset refid="plugin.deployed.jars" />
+      </fileset>
+      <fileset dir="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.widgets">
+        <patternset refid="plugin.deployed.jars" />
+      </fileset>
+      <fileset dir="${artifacts.com.mbeddr.platform}/de.itemis.mps.tooltips">
+        <patternset refid="plugin.deployed.jars" />
+      </fileset>
+      <fileset dir="${artifacts.com.mbeddr.platform}/de.slisson.mps.conditionalEditor">
+        <patternset refid="plugin.deployed.jars" />
+      </fileset>
+      <fileset dir="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks">
+        <patternset refid="plugin.deployed.jars" />
+      </fileset>
+      <fileset dir="${artifacts.com.mbeddr.platform}/mps-apache-commons">
+        <patternset refid="plugin.deployed.jars" />
+      </fileset>
       <fileset dir="${artifacts.mps}/plugins/mps-build">
         <patternset refid="plugin.deployed.jars" />
       </fileset>
@@ -1694,6 +1729,9 @@
       <fileset dir="${artifacts.mps}/plugins/mps-testing">
         <patternset refid="plugin.deployed.jars" />
       </fileset>
+      <fileset dir="${build.layout}/plugins/DemoWB">
+        <patternset refid="plugin.deployed.jars" />
+      </fileset>
       <fileset dir="${artifacts.mps}/lib">
         <include name="**/*.jar" />
       </fileset>

diff --git a/languages/ConstructionSL/models/typesystem.mps b/languages/ConstructionSL/models/typesystem.mps
@@ -227,7 +227,7 @@
         <node concept="3clFbS" id="4vyZ9NOpE7l" role="3clFbx">
           <node concept="2MkqsV" id="4vyZ9NOpE7m" role="3cqZAp">
             <node concept="Xl_RD" id="4vyZ9NOpE7n" role="2MkJ7o">
-              <property role="Xl_RC" value="transactionkind should have at least one initiator" />
+              <property role="Xl_RC" value="initiator of transactionkind should have at least one value" />
             </node>
             <node concept="1YBJjd" id="4vyZ9NOpE7o" role="2OEOjV">
               <ref role="1YBMHb" node="1VmqrBbUp4m" resolve="transactionKind" />
@@ -253,7 +253,7 @@
         <node concept="3clFbS" id="4vyZ9NOpPAS" role="3clFbx">
           <node concept="2MkqsV" id="4vyZ9NOpPAT" role="3cqZAp">
             <node concept="Xl_RD" id="4vyZ9NOpPAU" role="2MkJ7o">
-              <property role="Xl_RC" value="transactionkind should have one executor" />
+              <property role="Xl_RC" value="executor transactionkind should have one value" />
             </node>
             <node concept="1YBJjd" id="4vyZ9NOpPAV" role="2OEOjV">
               <ref role="1YBMHb" node="1VmqrBbUp4m" resolve="transactionKind" />
@@ -278,15 +278,15 @@
       <node concept="3clFbJ" id="4h5c_cX8psy" role="3cqZAp">
         <node concept="3clFbS" id="4h5c_cX8psz" role="3clFbx">
           <node concept="2MkqsV" id="4h5c_cX8ps$" role="3cqZAp">
-            <node concept="Xl_RD" id="4h5c_cX8ps_" role="2MkJ7o">
-              <property role="Xl_RC" value="transactionkind should have one executor" />
-            </node>
             <node concept="1YBJjd" id="4h5c_cX8psA" role="2OEOjV">
               <ref role="1YBMHb" node="1VmqrBbUp4m" resolve="transactionKind" />
             </node>
             <node concept="2OE7Q9" id="4h5c_cX8psB" role="2OEWyd">
               <ref role="2OEe5H" to="pgdh:6cLLlCqqh6f" resolve="executorConcept" />
             </node>
+            <node concept="Xl_RD" id="4h5c_cXileh" role="2MkJ7o">
+              <property role="Xl_RC" value="executor transactionkind should have one value" />
+            </node>
           </node>
         </node>
         <node concept="2OqwBi" id="4h5c_cX8psC" role="3clFbw">

diff --git a/languages/DemoSL/models/behavior.mps b/languages/DemoSL/models/behavior.mps
@@ -137,6 +137,7 @@
       <concept id="1138676077309" name="jetbrains.mps.lang.smodel.structure.EnumMemberReference" flags="nn" index="uoxfO">
         <reference id="1138676095763" name="enumMember" index="uo_Cq" />
       </concept>
+      <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -3610,5 +3611,24 @@
       </node>
     </node>
   </node>
+  <node concept="13h7C7" id="4h5c_cXh9gT">
+    <property role="3GE5qa" value="Construction Model" />
+    <ref role="13h7C2" to="ar0b:1VmqrBbw57R" resolve="ConstructionModel" />
+    <node concept="13hLZK" id="4h5c_cXh9gU" role="13h7CW">
+      <node concept="3clFbS" id="4h5c_cXh9gV" role="2VODD2">
+        <node concept="3clFbF" id="4h5c_cXh9h5" role="3cqZAp">
+          <node concept="2OqwBi" id="4h5c_cXh9Vn" role="3clFbG">
+            <node concept="2OqwBi" id="4h5c_cXh9oX" role="2Oq$k0">
+              <node concept="13iPFW" id="4h5c_cXh9h4" role="2Oq$k0" />
+              <node concept="3TrEf2" id="4h5c_cXh9Dw" role="2OqNvi">
+                <ref role="3Tt5mk" to="ar0b:1VmqrBbw582" resolve="scopeOfInterest" />
+              </node>
+            </node>
+            <node concept="zfrQC" id="4h5c_cXhanc" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/languages/FactSL/FactSL.mpl b/languages/FactSL/FactSL.mpl
@@ -36,7 +36,6 @@
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
         <module reference="6836a913-df90-4e79-9a37-cb334bb02ea5(FactSL)" version="0" />
         <module reference="85e3b344-de62-4f30-8fb5-90764157555f(FactSL#01)" version="0" />
-        <module reference="aa59ea5e-1883-437f-95c0-4dc082aa848c(GeneralSL)" version="0" />
         <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
@@ -48,8 +47,14 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">61f0ccba-8ded-47ee-b024-8f1c223c70ef(DemoSL)</dependency>
+    <dependency reexport="false">d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)</dependency>
+    <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
+    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+    <dependency reexport="false">6836a913-df90-4e79-9a37-cb334bb02ea5(FactSL)</dependency>
+    <dependency reexport="false">aa59ea5e-1883-437f-95c0-4dc082aa848c(GeneralSL)</dependency>
   </dependencies>
   <languageVersions>
+    <language slang="l:aa59ea5e-1883-437f-95c0-4dc082aa848c:GeneralSL" version="0" />
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
@@ -84,11 +89,11 @@
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
   </dependencyVersions>
-  <extendedLanguages>
-    <extendedLanguage>aa59ea5e-1883-437f-95c0-4dc082aa848c(GeneralSL)</extendedLanguage>
-  </extendedLanguages>
+  <extendedLanguages />
 </language>