Skip to content

Commit c085c86

Browse files
mgronovermgronover
committed
filters test cases only evaluable by interpreter #1108 
1 parent 66262d1 commit c085c86

File tree

3 files changed

+208
-18
lines changed

3 files changed

+208
-18
lines changed

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.JunitInterpreterTest/models/org.iets3.core.JunitInterpreterTest.mps‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<model ref="r:ad118f5d-5dd4-484b-acb7-ae0e705cb8c0(org.iets3.core.JunitInterpreterTest)">
33
<persistence version="9" />
4-
<languages>
5-
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
6-
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
7-
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
8-
</languages>
9-
<imports>
10-
<import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
11-
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
12-
<import index="4o98" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.core.platform(MPS.Core/)" />
13-
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
14-
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
15-
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
16-
<import index="av4b" ref="r:ba7faab6-2b80-43d5-8b95-0c440665312c(org.iets3.core.expr.tests.structure)" />
17-
<import index="d6jk" ref="r:52c49891-65a1-45a5-a86b-4a7aa1e6c12e(org.iets3.core.JunitInterpreterTest.plugin)" />
18-
<import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" />
19-
<import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
20-
<import index="sfqd" ref="r:63a75970-913d-4a7b-99e2-8ca72ff6f509(jetbrains.mps.baseLanguage.unitTest.execution.client)" />
21-
</imports>
4+
<languages />
5+
<imports />
226
<registry />
237
</model>
248

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.JunitInterpreterTest/models/org.iets3.core.JunitInterpreterTest.plugin.mps‎

Lines changed: 205 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,9 @@
560560
</concept>
561561
<concept id="1883223317721008713" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVariable" flags="ng" index="JncvC" />
562562
<concept id="6995935425733782641" name="jetbrains.mps.lang.smodel.structure.Model_GetModule" flags="nn" index="13u695" />
563+
<concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
564+
<reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
565+
</concept>
563566
<concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
564567
<concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
565568
<reference id="1154546997487" name="concept" index="3gnhBz" />
@@ -648,6 +651,7 @@
648651
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
649652
<concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
650653
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
654+
<concept id="3055999550620853964" name="jetbrains.mps.baseLanguage.collections.structure.RemoveWhereOperation" flags="nn" index="1aUR6E" />
651655
<concept id="1201872418428" name="jetbrains.mps.baseLanguage.collections.structure.GetKeysOperation" flags="nn" index="3lbrtF" />
652656
<concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
653657
<child id="1197683466920" name="keyType" index="3rvQeY" />
@@ -1199,6 +1203,54 @@
11991203
</node>
12001204
</node>
12011205
</node>
1206+
<node concept="3SKdUt" id="4gBl0l5WpHc" role="3cqZAp">
1207+
<node concept="1PaTwC" id="4gBl0l5WpHd" role="1aUNEU">
1208+
<node concept="3oM_SD" id="4gBl0l5Wqv2" role="1PaTwD">
1209+
<property role="3oM_SC" value="exclude" />
1210+
</node>
1211+
<node concept="3oM_SD" id="4gBl0l5WqvB" role="1PaTwD">
1212+
<property role="3oM_SC" value="node" />
1213+
</node>
1214+
<node concept="3oM_SD" id="4gBl0l5Wqwn" role="1PaTwD">
1215+
<property role="3oM_SC" value="of" />
1216+
</node>
1217+
<node concept="3oM_SD" id="4gBl0l5WqwE" role="1PaTwD">
1218+
<property role="3oM_SC" value="concepts" />
1219+
</node>
1220+
<node concept="3oM_SD" id="4gBl0l5WqxA" role="1PaTwD">
1221+
<property role="3oM_SC" value="not" />
1222+
</node>
1223+
<node concept="3oM_SD" id="4gBl0l5Wqy0" role="1PaTwD">
1224+
<property role="3oM_SC" value="evaluable" />
1225+
</node>
1226+
<node concept="3oM_SD" id="4gBl0l5WqDw" role="1PaTwD">
1227+
<property role="3oM_SC" value="by" />
1228+
</node>
1229+
<node concept="3oM_SD" id="4gBl0l5WqDR" role="1PaTwD">
1230+
<property role="3oM_SC" value="interpreter" />
1231+
</node>
1232+
</node>
1233+
</node>
1234+
<node concept="3clFbF" id="4gBl0l5MN1j" role="3cqZAp">
1235+
<node concept="2YIFZM" id="4gBl0l5LiN2" role="3clFbG">
1236+
<ref role="37wK5l" node="4gBl0l5Jnve" resolve="filterByConcecpt" />
1237+
<ref role="1Pybhc" node="4gBl0l5JlYI" resolve="WrapperFilter" />
1238+
<node concept="2OqwBi" id="4gBl0l5LiN3" role="37wK5m">
1239+
<node concept="37vLTw" id="4gBl0l5LiN4" role="2Oq$k0">
1240+
<ref role="3cqZAo" node="1I6I6y47u0U" resolve="mpsProject" />
1241+
</node>
1242+
<node concept="liA8E" id="4gBl0l5LiN5" role="2OqNvi">
1243+
<ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
1244+
</node>
1245+
</node>
1246+
<node concept="37vLTw" id="4gBl0l5LiN6" role="37wK5m">
1247+
<ref role="3cqZAo" node="5gyVhZ1884o" resolve="testNodes" />
1248+
</node>
1249+
<node concept="35c_gC" id="4gBl0l5LiN7" role="37wK5m">
1250+
<ref role="35c_gD" to="av4b:59WscmUTdO4" resolve="ITestItemContainer" />
1251+
</node>
1252+
</node>
1253+
</node>
12021254
<node concept="3clFbH" id="1ZP_ZHYUXKW" role="3cqZAp" />
12031255
<node concept="3cpWs8" id="1b7CZFPSX9i" role="3cqZAp">
12041256
<node concept="3cpWsn" id="1b7CZFPSX9j" role="3cpWs9">
@@ -11267,6 +11319,7 @@
1126711319
<ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
1126811320
</node>
1126911321
</node>
11322+
<node concept="2tJIrI" id="4gBl0l5H3mI" role="jymVt" />
1127011323
<node concept="QsSxf" id="5gyVhZ1bmql" role="Qtgdg">
1127111324
<property role="TrG5h" value="PROJECT" />
1127211325
<ref role="37wK5l" node="5gyVhZ1bml9" resolve="JUnitRunTypes" />
@@ -13612,5 +13665,157 @@
1361213665
</node>
1361313666
</node>
1361413667
</node>
13668+
<node concept="312cEu" id="4gBl0l5JlYI">
13669+
<property role="TrG5h" value="WrapperFilter" />
13670+
<node concept="2tJIrI" id="4gBl0l5JlZi" role="jymVt" />
13671+
<node concept="2YIFZL" id="4gBl0l5Jnve" role="jymVt">
13672+
<property role="TrG5h" value="filterByConcecpt" />
13673+
<node concept="3clFbS" id="4gBl0l5Jnvh" role="3clF47">
13674+
<node concept="3clFbF" id="4gBl0l5JrP$" role="3cqZAp">
13675+
<node concept="2OqwBi" id="4gBl0l5JsuG" role="3clFbG">
13676+
<node concept="2OqwBi" id="4gBl0l5JrY9" role="2Oq$k0">
13677+
<node concept="37vLTw" id="4gBl0l5JrPy" role="2Oq$k0">
13678+
<ref role="3cqZAo" node="4gBl0l5JquZ" resolve="repo" />
13679+
</node>
13680+
<node concept="liA8E" id="4gBl0l5JskR" role="2OqNvi">
13681+
<ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
13682+
</node>
13683+
</node>
13684+
<node concept="liA8E" id="4gBl0l5JsQc" role="2OqNvi">
13685+
<ref role="37wK5l" to="lui2:~ModelAccess.runReadAction(java.lang.Runnable)" resolve="runReadAction" />
13686+
<node concept="1bVj0M" id="4gBl0l5JyDR" role="37wK5m">
13687+
<node concept="3clFbS" id="4gBl0l5JyDS" role="1bW5cS">
13688+
<node concept="3clFbF" id="4gBl0l5JyHk" role="3cqZAp">
13689+
<node concept="1rXfSq" id="4gBl0l5Jtno" role="3clFbG">
13690+
<ref role="37wK5l" node="4gBl0l5JoUF" resolve="dofilterByConcecpt" />
13691+
<node concept="37vLTw" id="4gBl0l5K6gk" role="37wK5m">
13692+
<ref role="3cqZAo" node="4gBl0l5JquZ" resolve="repo" />
13693+
</node>
13694+
<node concept="37vLTw" id="4gBl0l5Ju7T" role="37wK5m">
13695+
<ref role="3cqZAo" node="4gBl0l5JnQb" resolve="given" />
13696+
</node>
13697+
<node concept="37vLTw" id="4gBl0l5JuOv" role="37wK5m">
13698+
<ref role="3cqZAo" node="4gBl0l5Jopx" resolve="givenConcept" />
13699+
</node>
13700+
</node>
13701+
</node>
13702+
</node>
13703+
</node>
13704+
</node>
13705+
</node>
13706+
</node>
13707+
</node>
13708+
<node concept="37vLTG" id="4gBl0l5JquZ" role="3clF46">
13709+
<property role="TrG5h" value="repo" />
13710+
<node concept="3uibUv" id="4gBl0l5JqQl" role="1tU5fm">
13711+
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
13712+
</node>
13713+
</node>
13714+
<node concept="37vLTG" id="4gBl0l5JnQb" role="3clF46">
13715+
<property role="TrG5h" value="given" />
13716+
<node concept="_YKpA" id="4gBl0l5JnQ9" role="1tU5fm">
13717+
<node concept="3uibUv" id="4gBl0l5Joos" role="_ZDj9">
13718+
<ref role="3uigEE" to="sfqd:56tRMpP_ej7" resolve="ITestNodeWrapper" />
13719+
</node>
13720+
</node>
13721+
</node>
13722+
<node concept="37vLTG" id="4gBl0l5Jopx" role="3clF46">
13723+
<property role="TrG5h" value="givenConcept" />
13724+
<node concept="3bZ5Sz" id="4gBl0l5JoQb" role="1tU5fm" />
13725+
</node>
13726+
<node concept="3Tm1VV" id="4gBl0l5JoU3" role="1B3o_S" />
13727+
<node concept="3cqZAl" id="4gBl0l5PlEm" role="3clF45" />
13728+
</node>
13729+
<node concept="2tJIrI" id="4gBl0l5JoXM" role="jymVt" />
13730+
<node concept="2YIFZL" id="4gBl0l5JoUF" role="jymVt">
13731+
<property role="TrG5h" value="dofilterByConcecpt" />
13732+
<node concept="3clFbS" id="4gBl0l5JoUG" role="3clF47">
13733+
<node concept="3clFbF" id="4gBl0l5MeGp" role="3cqZAp">
13734+
<node concept="2OqwBi" id="4gBl0l5Kajc" role="3clFbG">
13735+
<node concept="37vLTw" id="4gBl0l5Kajd" role="2Oq$k0">
13736+
<ref role="3cqZAo" node="4gBl0l5JoUK" resolve="given" />
13737+
</node>
13738+
<node concept="1aUR6E" id="4gBl0l5KD$s" role="2OqNvi">
13739+
<node concept="1bVj0M" id="4gBl0l5KD$u" role="23t8la">
13740+
<node concept="3clFbS" id="4gBl0l5KD$v" role="1bW5cS">
13741+
<node concept="3clFbF" id="4gBl0l5KD$w" role="3cqZAp">
13742+
<node concept="3fqX7Q" id="4gBl0l5KE98" role="3clFbG">
13743+
<node concept="2OqwBi" id="4gBl0l5KE9a" role="3fr31v">
13744+
<node concept="2OqwBi" id="4gBl0l5KE9b" role="2Oq$k0">
13745+
<node concept="2OqwBi" id="4gBl0l5KE9c" role="2Oq$k0">
13746+
<node concept="37vLTw" id="4gBl0l5KE9d" role="2Oq$k0">
13747+
<ref role="3cqZAo" node="4gBl0l5KD$E" resolve="it" />
13748+
</node>
13749+
<node concept="liA8E" id="4gBl0l5KE9e" role="2OqNvi">
13750+
<ref role="37wK5l" to="sfqd:56tRMpP_ejc" resolve="getNodePointer" />
13751+
</node>
13752+
</node>
13753+
<node concept="liA8E" id="4gBl0l5KE9f" role="2OqNvi">
13754+
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
13755+
<node concept="37vLTw" id="4gBl0l5KE9g" role="37wK5m">
13756+
<ref role="3cqZAo" node="4gBl0l5JAtr" resolve="repo" />
13757+
</node>
13758+
</node>
13759+
</node>
13760+
<node concept="liA8E" id="4gBl0l5KE9h" role="2OqNvi">
13761+
<ref role="37wK5l" to="mhbf:~SNode.isInstanceOfConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isInstanceOfConcept" />
13762+
<node concept="37vLTw" id="4gBl0l5KE9i" role="37wK5m">
13763+
<ref role="3cqZAo" node="4gBl0l5JoUN" resolve="givenConcept" />
13764+
</node>
13765+
</node>
13766+
</node>
13767+
</node>
13768+
</node>
13769+
</node>
13770+
<node concept="Rh6nW" id="4gBl0l5KD$E" role="1bW2Oz">
13771+
<property role="TrG5h" value="it" />
13772+
<node concept="2jxLKc" id="4gBl0l5KD$F" role="1tU5fm" />
13773+
</node>
13774+
</node>
13775+
</node>
13776+
</node>
13777+
</node>
13778+
<node concept="3clFbF" id="4gBl0l5KODC" role="3cqZAp">
13779+
<node concept="37vLTw" id="4gBl0l5KODA" role="3clFbG">
13780+
<ref role="3cqZAo" node="4gBl0l5JoUK" resolve="given" />
13781+
</node>
13782+
</node>
13783+
</node>
13784+
<node concept="_YKpA" id="4gBl0l5K3FP" role="3clF45">
13785+
<node concept="3uibUv" id="4gBl0l5K5ae" role="_ZDj9">
13786+
<ref role="3uigEE" to="sfqd:56tRMpP_ej7" resolve="ITestNodeWrapper" />
13787+
</node>
13788+
</node>
13789+
<node concept="37vLTG" id="4gBl0l5JAtr" role="3clF46">
13790+
<property role="TrG5h" value="repo" />
13791+
<node concept="3uibUv" id="4gBl0l5JCGi" role="1tU5fm">
13792+
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
13793+
</node>
13794+
</node>
13795+
<node concept="37vLTG" id="4gBl0l5JoUK" role="3clF46">
13796+
<property role="TrG5h" value="given" />
13797+
<node concept="_YKpA" id="4gBl0l5JoUL" role="1tU5fm">
13798+
<node concept="3uibUv" id="4gBl0l5JoUM" role="_ZDj9">
13799+
<ref role="3uigEE" to="sfqd:56tRMpP_ej7" resolve="ITestNodeWrapper" />
13800+
</node>
13801+
</node>
13802+
</node>
13803+
<node concept="37vLTG" id="4gBl0l5JoUN" role="3clF46">
13804+
<property role="TrG5h" value="givenConcept" />
13805+
<node concept="3bZ5Sz" id="4gBl0l5JoUO" role="1tU5fm" />
13806+
</node>
13807+
<node concept="3Tm6S6" id="4gBl0l5Jp1c" role="1B3o_S" />
13808+
<node concept="P$JXv" id="4gBl0l5Ws7P" role="lGtFl">
13809+
<node concept="TZ5HA" id="4gBl0l5Ws7Q" role="TZ5H$">
13810+
<node concept="1dT_AC" id="4gBl0l5Ws7R" role="1dT_Ay">
13811+
<property role="1dT_AB" value="Currently we assume that all methods in test cases are of concepts 'givenConcept'" />
13812+
</node>
13813+
</node>
13814+
</node>
13815+
</node>
13816+
<node concept="2tJIrI" id="4gBl0l5JoSU" role="jymVt" />
13817+
<node concept="2tJIrI" id="4gBl0l5JoTu" role="jymVt" />
13818+
<node concept="3Tm1VV" id="4gBl0l5JlYJ" role="1B3o_S" />
13819+
</node>
1361513820
</model>
1361613821

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.JunitInterpreterTest/org.iets3.core.JunitInterpreterTest.msd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<dependency reexport="false">d441fba0-f46b-43cd-b723-dad7b65da615(org.iets3.core.expr.tests)</dependency>
2828
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
2929
<dependency reexport="false">86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)</dependency>
30+
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
3031
</dependencies>
3132
<languageVersions>
3233
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />

0 commit comments

Comments
 (0)