Skip to content

Commit e03a55d

Browse files
mgronovermgronover
committed
fixed tests for enums ordered by values #750 
1 parent 7b94c89 commit e03a55d

File tree

2 files changed

+37
-28
lines changed

2 files changed

+37
-28
lines changed

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.runtime/models/org.iets3.core.expr.datetime.runtime.mps‎

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2928,20 +2928,14 @@
29282928
<node concept="3uibUv" id="7khFtBHIhrN" role="1zkMxy">
29292929
<ref role="3uigEE" node="7khFtBHIbg6" resolve="AbstractDateRangeValue" />
29302930
</node>
2931-
<node concept="3uibUv" id="6vUyz1yQsvi" role="EKbjA">
2932-
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
2933-
<node concept="3uibUv" id="6vUyz1yQu9m" role="11_B2D">
2934-
<ref role="3uigEE" node="4voqclTstQm" resolve="DiscreteDateRangeValue" />
2935-
</node>
2936-
</node>
29372931
<node concept="3clFb_" id="6vUyz1yQv8l" role="jymVt">
29382932
<property role="TrG5h" value="compareTo" />
29392933
<node concept="3Tm1VV" id="6vUyz1yQv8m" role="1B3o_S" />
29402934
<node concept="10Oyi0" id="6vUyz1yQv8o" role="3clF45" />
29412935
<node concept="37vLTG" id="6vUyz1yQv8p" role="3clF46">
29422936
<property role="TrG5h" value="value" />
29432937
<node concept="3uibUv" id="6vUyz1yQv8r" role="1tU5fm">
2944-
<ref role="3uigEE" node="4voqclTstQm" resolve="DiscreteDateRangeValue" />
2938+
<ref role="3uigEE" node="7khFtBHIbg6" resolve="AbstractDateRangeValue" />
29452939
</node>
29462940
</node>
29472941
<node concept="3clFbS" id="6vUyz1yQv8s" role="3clF47">
@@ -2962,8 +2956,8 @@
29622956
<node concept="37vLTw" id="6vUyz1yQAYA" role="2Oq$k0">
29632957
<ref role="3cqZAo" node="6vUyz1yQv8p" resolve="value" />
29642958
</node>
2965-
<node concept="2OwXpG" id="6vUyz1yQCJ7" role="2OqNvi">
2966-
<ref role="2Oxat5" node="26CArgU3vt4" resolve="begin" />
2959+
<node concept="liA8E" id="7HSGsv4zvwb" role="2OqNvi">
2960+
<ref role="37wK5l" node="7khFtBHIiHK" resolve="begin" />
29672961
</node>
29682962
</node>
29692963
</node>
@@ -3007,7 +3001,7 @@
30073001
<ref role="3cqZAo" node="6vUyz1yQv8p" resolve="value" />
30083002
</node>
30093003
<node concept="liA8E" id="6vUyz1z0Ss3" role="2OqNvi">
3010-
<ref role="37wK5l" node="4voqclTsBpn" resolve="end" />
3004+
<ref role="37wK5l" node="7khFtBHIiHR" resolve="end" />
30113005
</node>
30123006
</node>
30133007
</node>
@@ -3227,7 +3221,7 @@
32273221
<node concept="37vLTG" id="6vUyz1ySVhx" role="3clF46">
32283222
<property role="TrG5h" value="value" />
32293223
<node concept="3uibUv" id="6vUyz1ySVhy" role="1tU5fm">
3230-
<ref role="3uigEE" node="7khFtBHHXIi" resolve="ArbitraryDateRangeValue" />
3224+
<ref role="3uigEE" node="7khFtBHIbg6" resolve="AbstractDateRangeValue" />
32313225
</node>
32323226
</node>
32333227
<node concept="3clFbS" id="6vUyz1ySVhz" role="3clF47">
@@ -3267,7 +3261,7 @@
32673261
<ref role="3cqZAo" node="6vUyz1ySVhx" resolve="value" />
32683262
</node>
32693263
<node concept="liA8E" id="6vUyz1z0vzR" role="2OqNvi">
3270-
<ref role="37wK5l" node="7khFtBHHXJ7" resolve="begin" />
3264+
<ref role="37wK5l" node="7khFtBHIiHK" resolve="begin" />
32713265
</node>
32723266
</node>
32733267
</node>
@@ -3311,7 +3305,7 @@
33113305
<ref role="3cqZAo" node="6vUyz1ySVhx" resolve="value" />
33123306
</node>
33133307
<node concept="liA8E" id="6vUyz1z0zvB" role="2OqNvi">
3314-
<ref role="37wK5l" node="7khFtBHHXJ7" resolve="begin" />
3308+
<ref role="37wK5l" node="7khFtBHIiHK" resolve="begin" />
33153309
</node>
33163310
</node>
33173311
</node>
@@ -3359,12 +3353,6 @@
33593353
<node concept="3uibUv" id="7khFtBHIeIq" role="1zkMxy">
33603354
<ref role="3uigEE" node="7khFtBHIbg6" resolve="AbstractDateRangeValue" />
33613355
</node>
3362-
<node concept="3uibUv" id="6vUyz1ySUw1" role="EKbjA">
3363-
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
3364-
<node concept="3uibUv" id="6vUyz1ySUNz" role="11_B2D">
3365-
<ref role="3uigEE" node="7khFtBHHXIi" resolve="ArbitraryDateRangeValue" />
3366-
</node>
3367-
</node>
33683356
</node>
33693357
<node concept="312cEu" id="7khFtBHIbg6">
33703358
<property role="TrG5h" value="AbstractDateRangeValue" />
@@ -4631,6 +4619,33 @@
46314619
</node>
46324620
<node concept="2tJIrI" id="7khFtBHIiHx" role="jymVt" />
46334621
<node concept="3Tm1VV" id="7khFtBHIbg7" role="1B3o_S" />
4622+
<node concept="3uibUv" id="7HSGsv4zI7F" role="EKbjA">
4623+
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
4624+
<node concept="3uibUv" id="7HSGsv4$wer" role="11_B2D">
4625+
<ref role="3uigEE" node="7khFtBHIbg6" resolve="AbstractDateRangeValue" />
4626+
</node>
4627+
</node>
4628+
<node concept="3clFb_" id="7HSGsv4zMiX" role="jymVt">
4629+
<property role="TrG5h" value="compareTo" />
4630+
<node concept="3Tm1VV" id="7HSGsv4zMiY" role="1B3o_S" />
4631+
<node concept="10Oyi0" id="7HSGsv4zMj0" role="3clF45" />
4632+
<node concept="37vLTG" id="7HSGsv4zMj1" role="3clF46">
4633+
<property role="TrG5h" value="value" />
4634+
<node concept="3uibUv" id="7HSGsv4$xfO" role="1tU5fm">
4635+
<ref role="3uigEE" node="7khFtBHIbg6" resolve="AbstractDateRangeValue" />
4636+
</node>
4637+
</node>
4638+
<node concept="3clFbS" id="7HSGsv4zMj4" role="3clF47">
4639+
<node concept="3cpWs6" id="7HSGsv4_caz" role="3cqZAp">
4640+
<node concept="3cmrfG" id="7HSGsv4_qv$" role="3cqZAk">
4641+
<property role="3cmrfH" value="0" />
4642+
</node>
4643+
</node>
4644+
</node>
4645+
<node concept="2AHcQZ" id="7HSGsv4zMj5" role="2AJF6D">
4646+
<ref role="2AI5Lk" to="wyt6:~Override" />
4647+
</node>
4648+
</node>
46344649
</node>
46354650
<node concept="312cEu" id="4O9rw8aCYPg">
46364651
<property role="TrG5h" value="EmptyDateRangeValue" />

‎code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,11 @@
44
<languages>
55
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
66
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
7-
<use id="289fb12b-7f53-4ef7-bc2e-1ed2c6a7c998" name="org.iets3.core.expr.datetime" version="0" />
8-
<use id="4621d3e3-b8a3-4bbe-b7ac-234b6e2d1d68" name="org.iets3.core.expr.temporal" version="0" />
9-
<devkit ref="ec967770-4707-442f-baaf-a8b7bb554717(org.iets3.core.expr.genall.core.devkit)" />
107
<devkit ref="c4e521ab-b605-4ef9-a7c3-68075da058f0(org.iets3.core.expr.core.devkit)" />
8+
<devkit ref="33eb240b-05aa-417a-b719-386d26df80b8(org.iets3.core.expr.genall.advanced.devkit)" />
9+
<devkit ref="ce1cf8e2-ad23-4a29-b20d-ca13a97e194f(org.iets3.core.expr.advanced.devkit)" />
1110
</languages>
12-
<imports>
13-
<import index="6xve" ref="r:55f7f54b-9ace-4846-b63e-350652706af1(test.in.expr.os.datetime@tests)" />
14-
<import index="mi3w" ref="r:9ec53fca-e669-4a18-ba8b-6c9f4f1cb361(org.iets3.core.expr.datetime.structure)" />
15-
<import index="p5zi" ref="r:8fb8c021-a1ab-41a1-a284-a1a372e0faad(org.iets3.core.expr.datetime.typesystem)" />
16-
<import index="l462" ref="r:d6904536-4de8-40ba-b54e-09fcdfe1b62a(org.iets3.core.expr.temporal.structure)" />
17-
</imports>
11+
<imports />
1812
<registry>
1913
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
2014
<concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">

0 commit comments

Comments
 (0)