Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MPS-28915: Making GeneratorTests extensible #38

Open
wants to merge 1 commit into
base: 2018.2
Choose a base branch
from
Open

MPS-28915: Making GeneratorTests extensible #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build/mpsTesting.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
<module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
<module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
Expand Down Expand Up @@ -506,6 +507,7 @@
<library file="${artifacts.mpsBootstrapCore}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
<library file="${artifacts.mpsBootstrapCore}/languages/devkits/jetbrains.mps.devkit.templates.jar" />
<library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
<library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
<library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
<library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
<library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
Expand Down
16 changes: 12 additions & 4 deletions build/tests/mpsSModel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,16 @@
<echoxml file="${build.tmp}/default/jetbrains.mps.test.smodel.jar/META-INF/module.xml">
<module namespace="jetbrains.mps.test.smodel" type="solution" uuid="494e76b6-a751-488a-8cfa-cbf8aead39e9">
<dependencies>
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
<module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
<module ref="c8cbf416-5e11-499c-816d-60b07b47b8c1(jetbrains.mps.lang.test.generator.rt)" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
</dependencies>
<classpath>
<entry path="." />
Expand Down Expand Up @@ -398,16 +406,16 @@
<pathelement path="${basedir}/testbench/modules/generator-tests/smodel/test_gen/" />
</src>
<classpath>
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
<fileset file="${artifacts.IDEA}/lib/hamcrest-core-1.3.jar" />
Expand Down
17 changes: 11 additions & 6 deletions plugins/mps-build/solutions/mpsBuild/models/build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30131,6 +30131,11 @@
<ref role="3bR37D" node="4SM2EuqHUPF" resolve="jetbrains.mps.lang.modelapi" />
</node>
</node>
<node concept="1SiIV0" id="6LH9MCjQW0u" role="3bR37C">
<node concept="1Busua" id="6LH9MCjQW0v" role="1SiIV1">
<ref role="1Busuk" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
</node>
</node>
<node concept="1yeLz9" id="3AyJARAAkVk" role="1TViLv">
<property role="TrG5h" value="jetbrains.mps.lang.test.generator#01" />
<property role="3LESm3" value="24e429f7-0439-4d0c-a3f8-8deb1e1e2912" />
Expand Down Expand Up @@ -33078,11 +33083,11 @@
<ref role="3_I8Xa" node="1QfYSWzYzJR" resolve="vcs-platform.jar" />
</node>
<node concept="L2wRC" id="1QfYSWzZotz" role="39821P">
<ref role="L2wRA" node="4WGKd_KIwrs" resolve="jetbrains.mps.vcs.mergehints.runtime" />
<ref role="L2wRA" node="4WGKd_KIwrs" />
<node concept="3yLZsm" id="1QfYSWzZMd$" role="3yL2VB">
<property role="3yLZsk" value="../lib/vcs-core.jar" />
<node concept="398BVA" id="1QfYSWzZMd_" role="3yLZsn">
<ref role="398BVh" node="6ifcnI8$2ke" resolve="mps_home" />
<ref role="398BVh" node="6ifcnI8$2ke" />
<node concept="2Ry0Ak" id="1QfYSWzZMdA" role="iGT6I">
<property role="2Ry0Am" value="plugins" />
<node concept="2Ry0Ak" id="1QfYSWzZMdB" role="2Ry0An">
Expand All @@ -33099,11 +33104,11 @@
</node>
</node>
<node concept="L2wRC" id="1QfYSWzZooj" role="39821P">
<ref role="L2wRA" node="39HJr_hyEzS" resolve="jetbrains.mps.ide.vcs.platform" />
<ref role="L2wRA" node="39HJr_hyEzS" />
<node concept="3yLZsm" id="1QfYSWzZLWo" role="3yL2VB">
<property role="3yLZsk" value="../lib/vcs-platform.jar" />
<node concept="398BVA" id="1QfYSWzZLWp" role="3yLZsn">
<ref role="398BVh" node="6ifcnI8$2ke" resolve="mps_home" />
<ref role="398BVh" node="6ifcnI8$2ke" />
<node concept="2Ry0Ak" id="1QfYSWzZLWq" role="iGT6I">
<property role="2Ry0Am" value="plugins" />
<node concept="2Ry0Ak" id="1QfYSWzZLWr" role="2Ry0An">
Expand All @@ -33120,11 +33125,11 @@
</node>
</node>
<node concept="L2wRC" id="1QfYSWzZott" role="39821P">
<ref role="L2wRA" node="39HJr_hyAl1" resolve="jetbrains.mps.ide.vcs.core" />
<ref role="L2wRA" node="39HJr_hyAl1" />
<node concept="3yLZsm" id="1QfYSWzZMaQ" role="3yL2VB">
<property role="3yLZsk" value="../lib/vcs-core.jar" />
<node concept="398BVA" id="1QfYSWzZMaR" role="3yLZsn">
<ref role="398BVh" node="6ifcnI8$2ke" resolve="mps_home" />
<ref role="398BVh" node="6ifcnI8$2ke" />
<node concept="2Ry0Ak" id="1QfYSWzZMaS" role="iGT6I">
<property role="2Ry0Am" value="plugins" />
<node concept="2Ry0Ak" id="1QfYSWzZMaT" role="2Ry0An">
Expand Down
3 changes: 0 additions & 3 deletions plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<dependencies version="2" modelHash="bd73ubk96shdgubut9cocih3gju21il" />

2 changes: 2 additions & 0 deletions plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
<module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
<module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
Expand Down Expand Up @@ -506,6 +507,7 @@
<library file="${artifacts.mpsBootstrapCore}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
<library file="${artifacts.mpsBootstrapCore}/languages/devkits/jetbrains.mps.devkit.templates.jar" />
<library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
<library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
<library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
<library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
<library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
Expand Down
16 changes: 12 additions & 4 deletions plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,16 @@
<echoxml file="${build.tmp}/default/jetbrains.mps.test.smodel.jar/META-INF/module.xml">
<module namespace="jetbrains.mps.test.smodel" type="solution" uuid="494e76b6-a751-488a-8cfa-cbf8aead39e9">
<dependencies>
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
<module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
<module ref="c8cbf416-5e11-499c-816d-60b07b47b8c1(jetbrains.mps.lang.test.generator.rt)" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
</dependencies>
<classpath>
<entry path="." />
Expand Down Expand Up @@ -398,16 +406,16 @@
<pathelement path="${basedir}/testbench/modules/generator-tests/smodel/test_gen/" />
</src>
<classpath>
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
<fileset file="${artifacts.IDEA}/lib/hamcrest-core-1.3.jar" />
Expand Down
109 changes: 0 additions & 109 deletions plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,109 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<debug-info version="2">
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/141865155246494254">
<file name="mpsDataFlow.xml">
<unit id="141865155246494254" at="1,0,731,10" name="jetbrains.mps.ide.build.tests.mpsDataFlow" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2085316548396374793">
<file name="mpsImplementationStripping.xml">
<unit id="2085316548396374793" at="1,0,639,10" name="jetbrains.mps.ide.build.tests.mpsImplementationStripping" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2201735946498405745">
<file name="mpsTypesystem.xml">
<unit id="2201735946498405745" at="1,0,390,10" name="jetbrains.mps.ide.build.tests.mpsTypesystem" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2883693069523015134">
<file name="mpsConstraints.xml">
<unit id="2883693069523015134" at="1,0,493,10" name="jetbrains.mps.ide.build.tests.mpsConstraints" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3197190366568000187">
<file name="mpsBuild.xml">
<unit id="3197190366568000187" at="1,0,538,10" name="jetbrains.mps.ide.build.tests.mpsBuild" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3474133302908391407">
<file name="mpsExecution.xml">
<unit id="3474133302908391407" at="1,0,688,10" name="jetbrains.mps.ide.build.tests.mpsExecution" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3856853424911912638">
<file name="mpsEditorImageGen.xml">
<unit id="3856853424911912638" at="1,0,557,10" name="jetbrains.mps.ide.build.tests.mpsEditorImageGen" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/4074183641147971049">
<file name="mpsSModel.xml">
<unit id="4074183641147971049" at="1,0,574,10" name="jetbrains.mps.ide.build.tests.mpsSModel" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/4286050570470716727">
<file name="mpsText.xml">
<unit id="4286050570470716727" at="1,0,399,10" name="jetbrains.mps.ide.build.tests.mpsText" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5003005296035786909">
<file name="mpsEditorDiagram.xml">
<unit id="5003005296035786909" at="1,0,649,10" name="jetbrains.mps.ide.build.tests.mpsEditorDiagram" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5332690376493680136">
<file name="mpsSmartRefAttrMigration.xml">
<unit id="5332690376493680136" at="1,0,379,10" name="jetbrains.mps.ide.build.tests.mpsSmartRefAttrMigration" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5624877018229105292">
<file name="mpsEditorTransformationMenu.xml">
<unit id="5624877018229105292" at="1,0,1940,10" name="jetbrains.mps.ide.build.tests.mpsEditorTransformationMenu" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5833628797344916224">
<file name="mpsEditor.xml">
<unit id="5833628797344916224" at="1,0,1893,10" name="jetbrains.mps.ide.build.tests.mpsEditor" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5973657458022229901">
<file name="mpsPackaged.xml">
<unit id="5973657458022229901" at="1,0,497,10" name="jetbrains.mps.ide.build.tests.mpsPackaged" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6147098677962246363">
<file name="mpsHttpSupport.xml">
<unit id="6147098677962246363" at="1,0,454,10" name="jetbrains.mps.ide.build.tests.mpsHttpSupport" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/617882099353312053">
<file name="mpsGenerator.xml">
<unit id="617882099353312053" at="1,0,1571,10" name="jetbrains.mps.ide.build.tests.mpsGenerator" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/617882099353331886">
<file name="mpsJava.xml">
<unit id="617882099353331886" at="1,0,463,10" name="jetbrains.mps.ide.build.tests.mpsJava" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6238501899265293051">
<file name="mpsActions.xml">
<unit id="6238501899265293051" at="1,0,475,10" name="jetbrains.mps.ide.build.tests.mpsActions" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/7210153263370654627">
<file name="mpsBaseLanguage.xml">
<unit id="7210153263370654627" at="1,0,467,10" name="jetbrains.mps.ide.build.tests.mpsBaseLanguage" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/7438002853058266164">
<file name="mpsBehavior.xml">
<unit id="7438002853058266164" at="1,0,1138,10" name="jetbrains.mps.ide.build.tests.mpsBehavior" />
</file>
</root>
<root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/9219004022556570565">
<file name="mpsConsole.xml">
<unit id="9219004022556570565" at="1,0,457,10" name="jetbrains.mps.ide.build.tests.mpsConsole" />
</file>
</root>
</debug-info>

Loading