Skip to content

Commit 29119be

Browse files
dbinkeledbinkele
committed
Fix tests (#1360)
1 parent ac522ee commit 29119be

File tree

3 files changed

+148
-52
lines changed

3 files changed

+148
-52
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps‎

Lines changed: 63 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,69 +1400,86 @@
14001400
</node>
14011401
</node>
14021402
<node concept="3clFbS" id="5d7fNZ69S4i" role="3clF47">
1403-
<node concept="3cpWs8" id="5d7fNZ6auoX" role="3cqZAp">
1404-
<node concept="3cpWsn" id="5d7fNZ6auoY" role="3cpWs9">
1405-
<property role="TrG5h" value="prioDiff" />
1406-
<node concept="10Oyi0" id="5d7fNZ6au21" role="1tU5fm" />
1407-
<node concept="3cpWsd" id="5d7fNZ6auoZ" role="33vP2m">
1408-
<node concept="2OqwBi" id="5d7fNZ6aup0" role="3uHU7w">
1409-
<node concept="2OqwBi" id="5d7fNZ6aup1" role="2Oq$k0">
1410-
<node concept="37vLTw" id="5d7fNZ6aup2" role="2Oq$k0">
1411-
<ref role="3cqZAo" node="5d7fNZ69S4f" resolve="other" />
1412-
</node>
1413-
<node concept="2OwXpG" id="5d7fNZ6aup3" role="2OqNvi">
1403+
<node concept="3clFbF" id="3hhKUUE_YOZ" role="3cqZAp">
1404+
<node concept="3K4zz7" id="3hhKUUEAWkW" role="3clFbG">
1405+
<node concept="3cmrfG" id="3hhKUUEAWkX" role="3K4E3e">
1406+
<property role="3cmrfH" value="-1" />
1407+
</node>
1408+
<node concept="3eOVzh" id="3hhKUUEAWkY" role="3K4Cdx">
1409+
<node concept="2OqwBi" id="3hhKUUEAWkZ" role="3uHU7B">
1410+
<node concept="2OqwBi" id="3hhKUUEAWl0" role="2Oq$k0">
1411+
<node concept="Xjq3P" id="3hhKUUEAWl1" role="2Oq$k0" />
1412+
<node concept="2OwXpG" id="3hhKUUEAWl2" role="2OqNvi">
14141413
<ref role="2Oxat5" node="5d7fNZ69LhD" resolve="stf" />
14151414
</node>
14161415
</node>
1417-
<node concept="liA8E" id="5d7fNZ6aup4" role="2OqNvi">
1416+
<node concept="liA8E" id="3hhKUUEAWl3" role="2OqNvi">
14181417
<ref role="37wK5l" node="4KEERJNKlms" resolve="priority" />
14191418
</node>
14201419
</node>
1421-
<node concept="2OqwBi" id="5d7fNZ6aup5" role="3uHU7B">
1422-
<node concept="2OqwBi" id="5d7fNZ6aup6" role="2Oq$k0">
1423-
<node concept="Xjq3P" id="5d7fNZ6aup7" role="2Oq$k0" />
1424-
<node concept="2OwXpG" id="5d7fNZ6aup8" role="2OqNvi">
1420+
<node concept="2OqwBi" id="3hhKUUEAWl4" role="3uHU7w">
1421+
<node concept="2OqwBi" id="3hhKUUEAWl5" role="2Oq$k0">
1422+
<node concept="37vLTw" id="3hhKUUEAWl6" role="2Oq$k0">
1423+
<ref role="3cqZAo" node="5d7fNZ69S4f" resolve="other" />
1424+
</node>
1425+
<node concept="2OwXpG" id="3hhKUUEAWl7" role="2OqNvi">
14251426
<ref role="2Oxat5" node="5d7fNZ69LhD" resolve="stf" />
14261427
</node>
14271428
</node>
1428-
<node concept="liA8E" id="5d7fNZ6aup9" role="2OqNvi">
1429+
<node concept="liA8E" id="3hhKUUEAWl8" role="2OqNvi">
14291430
<ref role="37wK5l" node="4KEERJNKlms" resolve="priority" />
14301431
</node>
14311432
</node>
14321433
</node>
1433-
</node>
1434-
</node>
1435-
<node concept="3clFbF" id="75lF9T6tot5" role="3cqZAp">
1436-
<node concept="3K4zz7" id="75lF9T6tz79" role="3clFbG">
1437-
<node concept="37vLTw" id="75lF9T6tBfu" role="3K4E3e">
1438-
<ref role="3cqZAo" node="5d7fNZ6auoY" resolve="prioDiff" />
1439-
</node>
1440-
<node concept="3y3z36" id="75lF9T6tsVV" role="3K4Cdx">
1441-
<node concept="3cmrfG" id="75lF9T6tw69" role="3uHU7w">
1442-
<property role="3cmrfH" value="0" />
1443-
</node>
1444-
<node concept="37vLTw" id="75lF9T6tot3" role="3uHU7B">
1445-
<ref role="3cqZAo" node="5d7fNZ6auoY" resolve="prioDiff" />
1446-
</node>
1447-
</node>
1448-
<node concept="2OqwBi" id="75lF9T6mXHi" role="3K4GZi">
1449-
<node concept="37vLTw" id="75lF9T6tF5f" role="2Oq$k0">
1450-
<ref role="3cqZAo" node="4aAsKjbH0_9" resolve="conceptsComp" />
1434+
<node concept="3K4zz7" id="3hhKUUEAWl9" role="3K4GZi">
1435+
<node concept="3cmrfG" id="3hhKUUEAWla" role="3K4E3e">
1436+
<property role="3cmrfH" value="1" />
14511437
</node>
1452-
<node concept="liA8E" id="75lF9T6n2Ik" role="2OqNvi">
1453-
<ref role="37wK5l" to="33ny:~Comparator.compare(java.lang.Object,java.lang.Object)" resolve="compare" />
1454-
<node concept="2OqwBi" id="75lF9T6nc41" role="37wK5m">
1455-
<node concept="Xjq3P" id="75lF9T6n5Vs" role="2Oq$k0" />
1456-
<node concept="2OwXpG" id="75lF9T6neDH" role="2OqNvi">
1457-
<ref role="2Oxat5" node="5d7fNZ69Pkn" resolve="concept" />
1438+
<node concept="3eOSWO" id="3hhKUUEAWlb" role="3K4Cdx">
1439+
<node concept="2OqwBi" id="3hhKUUEAWlc" role="3uHU7B">
1440+
<node concept="2OqwBi" id="3hhKUUEAWld" role="2Oq$k0">
1441+
<node concept="Xjq3P" id="3hhKUUEAWle" role="2Oq$k0" />
1442+
<node concept="2OwXpG" id="3hhKUUEAWlf" role="2OqNvi">
1443+
<ref role="2Oxat5" node="5d7fNZ69LhD" resolve="stf" />
1444+
</node>
1445+
</node>
1446+
<node concept="liA8E" id="3hhKUUEAWlg" role="2OqNvi">
1447+
<ref role="37wK5l" node="4KEERJNKlms" resolve="priority" />
14581448
</node>
14591449
</node>
1460-
<node concept="2OqwBi" id="75lF9T6nq68" role="37wK5m">
1461-
<node concept="37vLTw" id="75lF9T6nmSg" role="2Oq$k0">
1462-
<ref role="3cqZAo" node="5d7fNZ69S4f" resolve="other" />
1450+
<node concept="2OqwBi" id="3hhKUUEAWlh" role="3uHU7w">
1451+
<node concept="2OqwBi" id="3hhKUUEAWli" role="2Oq$k0">
1452+
<node concept="37vLTw" id="3hhKUUEAWlj" role="2Oq$k0">
1453+
<ref role="3cqZAo" node="5d7fNZ69S4f" resolve="other" />
1454+
</node>
1455+
<node concept="2OwXpG" id="3hhKUUEAWlk" role="2OqNvi">
1456+
<ref role="2Oxat5" node="5d7fNZ69LhD" resolve="stf" />
1457+
</node>
1458+
</node>
1459+
<node concept="liA8E" id="3hhKUUEAWll" role="2OqNvi">
1460+
<ref role="37wK5l" node="4KEERJNKlms" resolve="priority" />
14631461
</node>
1464-
<node concept="2OwXpG" id="75lF9T6nvyy" role="2OqNvi">
1465-
<ref role="2Oxat5" node="5d7fNZ69Pkn" resolve="concept" />
1462+
</node>
1463+
</node>
1464+
<node concept="2OqwBi" id="3hhKUUEAWlm" role="3K4GZi">
1465+
<node concept="37vLTw" id="3hhKUUEAWln" role="2Oq$k0">
1466+
<ref role="3cqZAo" node="4aAsKjbH0_9" resolve="conceptsComp" />
1467+
</node>
1468+
<node concept="liA8E" id="3hhKUUEAWlo" role="2OqNvi">
1469+
<ref role="37wK5l" to="33ny:~Comparator.compare(java.lang.Object,java.lang.Object)" resolve="compare" />
1470+
<node concept="2OqwBi" id="3hhKUUEAWlp" role="37wK5m">
1471+
<node concept="Xjq3P" id="3hhKUUEAWlq" role="2Oq$k0" />
1472+
<node concept="2OwXpG" id="3hhKUUEAWlr" role="2OqNvi">
1473+
<ref role="2Oxat5" node="5d7fNZ69Pkn" resolve="concept" />
1474+
</node>
1475+
</node>
1476+
<node concept="2OqwBi" id="3hhKUUEAWls" role="37wK5m">
1477+
<node concept="37vLTw" id="3hhKUUEAWlt" role="2Oq$k0">
1478+
<ref role="3cqZAo" node="5d7fNZ69S4f" resolve="other" />
1479+
</node>
1480+
<node concept="2OwXpG" id="3hhKUUEAWlu" role="2OqNvi">
1481+
<ref role="2Oxat5" node="5d7fNZ69Pkn" resolve="concept" />
1482+
</node>
14661483
</node>
14671484
</node>
14681485
</node>

‎code/languages/org.iets3.opensource/languages/test.org.iets3.analysis.base.solvable/models/test.org.iets3.analysis.base.solvable.plugin.mps‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,8 @@
214214
<node concept="3Tm1VV" id="1mChDufikj6" role="1B3o_S" />
215215
<node concept="3clFbS" id="1mChDufikjf" role="3clF47">
216216
<node concept="3clFbF" id="1mChDufivX4" role="3cqZAp">
217-
<node concept="10M0yZ" id="1mChDufix0r" role="3clFbG">
218-
<ref role="3cqZAo" to="wyt6:~Integer.MIN_VALUE" resolve="MIN_VALUE" />
219-
<ref role="1PxDUh" to="wyt6:~Integer" resolve="Integer" />
217+
<node concept="3cmrfG" id="3hhKUUE_$MX" role="3clFbG">
218+
<property role="3cmrfH" value="-999999998" />
220219
</node>
221220
</node>
222221
</node>
@@ -299,9 +298,8 @@
299298
<node concept="3Tm1VV" id="1mChDufiBBH" role="1B3o_S" />
300299
<node concept="3clFbS" id="1mChDufiBBQ" role="3clF47">
301300
<node concept="3clFbF" id="1mChDufiIaB" role="3cqZAp">
302-
<node concept="10M0yZ" id="1mChDufiIaC" role="3clFbG">
303-
<ref role="3cqZAo" to="wyt6:~Integer.MIN_VALUE" resolve="MIN_VALUE" />
304-
<ref role="1PxDUh" to="wyt6:~Integer" resolve="Integer" />
301+
<node concept="3cmrfG" id="3hhKUUE_wCS" role="3clFbG">
302+
<property role="3cmrfH" value="-999999998" />
305303
</node>
306304
</node>
307305
</node>

‎code/languages/org.iets3.opensource/tests/test.org.iets3.analysis.base/models/[email protected]‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
5555
<property id="1068580320021" name="value" index="3cmrfH" />
5656
</concept>
57+
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
5758
<concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
5859
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
5960
</concept>
@@ -63,6 +64,10 @@
6364
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
6465
<child id="1068499141038" name="actualArgument" index="37wK5m" />
6566
</concept>
67+
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
68+
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
69+
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
70+
</concept>
6671
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
6772
<child id="8356039341262087992" name="line" index="1aUNEU" />
6873
</concept>
@@ -87,15 +92,25 @@
8792
<concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
8893
<child id="1171981057159" name="condition" index="3vwVQn" />
8994
</concept>
95+
<concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
96+
<child id="1172073511101" name="message" index="3_1BAH" />
97+
</concept>
98+
<concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ngI" index="3_9gw8">
99+
<child id="1172075534298" name="message" index="3_9lra" />
100+
</concept>
90101
</language>
91102
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
92103
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
93104
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
94105
</concept>
106+
<concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
95107
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
96108
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
97109
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
98110
</concept>
111+
<concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
112+
<reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
113+
</concept>
99114
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
100115
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
101116
</concept>
@@ -154,6 +169,11 @@
154169
<node concept="37vLTw" id="4aAsKjbTWE0" role="2Hmdds">
155170
<ref role="3cqZAo" node="4aAsKjbTWA7" resolve="task" />
156171
</node>
172+
<node concept="3_1$Yv" id="r27GJjCF67" role="3_9lra">
173+
<node concept="Xl_RD" id="r27GJjCFgC" role="3_1BAH">
174+
<property role="Xl_RC" value="Task must not be null" />
175+
</node>
176+
</node>
157177
</node>
158178
<node concept="3vwNmj" id="4aAsKjbU5HC" role="3cqZAp">
159179
<node concept="2OqwBi" id="4aAsKjbU5Pz" role="3vwVQn">
@@ -166,6 +186,29 @@
166186
</node>
167187
</node>
168188
</node>
189+
<node concept="3_1$Yv" id="r27GJjCFzq" role="3_9lra">
190+
<node concept="3cpWs3" id="r27GJjCK4Z" role="3_1BAH">
191+
<node concept="2OqwBi" id="r27GJjCKCC" role="3uHU7w">
192+
<node concept="37vLTw" id="r27GJjCKwO" role="2Oq$k0">
193+
<ref role="3cqZAo" node="4aAsKjbTWA7" resolve="task" />
194+
</node>
195+
<node concept="2yIwOk" id="r27GJjCLcO" role="2OqNvi" />
196+
</node>
197+
<node concept="3cpWs3" id="r27GJjCJh_" role="3uHU7B">
198+
<node concept="3cpWs3" id="r27GJjCIcS" role="3uHU7B">
199+
<node concept="Xl_RD" id="r27GJjCFJ3" role="3uHU7B">
200+
<property role="Xl_RC" value="Task is not " />
201+
</node>
202+
<node concept="35c_gC" id="r27GJjCIee" role="3uHU7w">
203+
<ref role="35c_gD" to="6w03:7wEqFvbO3UV" resolve="DummySolverTask" />
204+
</node>
205+
</node>
206+
<node concept="Xl_RD" id="r27GJjCJj5" role="3uHU7w">
207+
<property role="Xl_RC" value=" but " />
208+
</node>
209+
</node>
210+
</node>
211+
</node>
169212
</node>
170213
<node concept="3SKdUt" id="2qZCmtwodS7" role="3cqZAp">
171214
<node concept="1PaTwC" id="2qZCmtwodS8" role="1aUNEU">
@@ -325,6 +368,11 @@
325368
<node concept="3cmrfG" id="7_IBAC_PA$1" role="3tpDZB">
326369
<property role="3cmrfH" value="0" />
327370
</node>
371+
<node concept="3_1$Yv" id="r27GJjCLeG" role="3_9lra">
372+
<node concept="Xl_RD" id="r27GJjCLEK" role="3_1BAH">
373+
<property role="Xl_RC" value="Sleep time wrong" />
374+
</node>
375+
</node>
328376
</node>
329377
</node>
330378
</node>
@@ -357,6 +405,11 @@
357405
<node concept="37vLTw" id="7Vgw$ZVF8hn" role="2Hmdds">
358406
<ref role="3cqZAo" node="7Vgw$ZVF8ai" resolve="task" />
359407
</node>
408+
<node concept="3_1$Yv" id="r27GJjCN0Y" role="3_9lra">
409+
<node concept="Xl_RD" id="r27GJjCNbu" role="3_1BAH">
410+
<property role="Xl_RC" value="Task must not be null" />
411+
</node>
412+
</node>
360413
</node>
361414
<node concept="3vwNmj" id="7Vgw$ZVF8ho" role="3cqZAp">
362415
<node concept="2OqwBi" id="7Vgw$ZVF8hp" role="3vwVQn">
@@ -369,6 +422,29 @@
369422
</node>
370423
</node>
371424
</node>
425+
<node concept="3_1$Yv" id="r27GJjCNcH" role="3_9lra">
426+
<node concept="3cpWs3" id="r27GJjCNnd" role="3_1BAH">
427+
<node concept="2OqwBi" id="r27GJjCNne" role="3uHU7w">
428+
<node concept="37vLTw" id="r27GJjCNnf" role="2Oq$k0">
429+
<ref role="3cqZAo" node="7Vgw$ZVF8ai" resolve="task" />
430+
</node>
431+
<node concept="2yIwOk" id="r27GJjCNng" role="2OqNvi" />
432+
</node>
433+
<node concept="3cpWs3" id="r27GJjCNnh" role="3uHU7B">
434+
<node concept="3cpWs3" id="r27GJjCNni" role="3uHU7B">
435+
<node concept="Xl_RD" id="r27GJjCNnj" role="3uHU7B">
436+
<property role="Xl_RC" value="Task is not " />
437+
</node>
438+
<node concept="35c_gC" id="r27GJjCNnk" role="3uHU7w">
439+
<ref role="35c_gD" to="6w03:7wEqFvbO3UV" resolve="DummySolverTask" />
440+
</node>
441+
</node>
442+
<node concept="Xl_RD" id="r27GJjCNnl" role="3uHU7w">
443+
<property role="Xl_RC" value=" but " />
444+
</node>
445+
</node>
446+
</node>
447+
</node>
372448
</node>
373449
<node concept="3SKdUt" id="7Vgw$ZVF8ht" role="3cqZAp">
374450
<node concept="1PaTwC" id="4pFv3cYfC6J" role="1aUNEU">
@@ -428,6 +504,11 @@
428504
<node concept="3cmrfG" id="7Vgw$ZVF8hX" role="3tpDZB">
429505
<property role="3cmrfH" value="1234" />
430506
</node>
507+
<node concept="3_1$Yv" id="r27GJjCP9x" role="3_9lra">
508+
<node concept="Xl_RD" id="r27GJjCP$s" role="3_1BAH">
509+
<property role="Xl_RC" value="Sleep time wrong" />
510+
</node>
511+
</node>
431512
</node>
432513
<node concept="3clFbH" id="7Vgw$ZVF8gs" role="3cqZAp" />
433514
</node>

0 commit comments

Comments
 (0)