Skip to content

Commit a6342b3

Browse files
mfsoliveiramfsoliveira
authored
Merge pull request #1417 from IETS3/refactor/MoveVariabilityBaseTestsFromCoreIntoOs
Move tests from core into os
2 parents ffd10ab + 9a779f1 commit a6342b3

File tree

25 files changed

+31602
-0
lines changed

25 files changed

+31602
-0
lines changed

‎code/languages/org.iets3.opensource/.mps/modules.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,11 @@
176176
<modulePath path="$PROJECT_DIR$/tests/test.in.expr.os/test.in.expr.os.msd" folder="expr.tests" />
177177
<modulePath path="$PROJECT_DIR$/tests/test.node.expr.os/test.node.expr.os.msd" folder="expr.tests" />
178178
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.analysis.base/test.org.iets3.analysis.base.msd" folder="analysis.tests" />
179+
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.common.base/test.org.iets3.common.base.msd" folder="variability.tests" />
179180
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.core.comments/test.org.iets3.core.comments.msd" folder="core" />
180181
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.protocol.transport/test.org.iets3.protocol.transport.msd" folder="comp.protocols" />
182+
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.variability.configuration.base/test.org.iets3.variability.configuration.base.msd" folder="variability.tests" />
183+
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.variability.featuremodel.base/test.org.iets3.variability.featuremodel.base.msd" folder="variability.tests" />
181184
<modulePath path="$PROJECT_DIR$/tests/test.ts.components.core/test.ts.components.core.msd" folder="comp.tests" />
182185
<modulePath path="$PROJECT_DIR$/tests/test.ts.components.hardware/test.ts.components.hardware.msd" folder="comp.tests" />
183186
<modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os.comma/test.ts.expr.os.comma.msd" folder="expr.tests" />

‎code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps‎

Lines changed: 251 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,6 +1208,101 @@
12081208
</node>
12091209
<node concept="2G$12M" id="7B3y$vlfXUD" role="3989C9">
12101210
<property role="TrG5h" value="org.iets3.variability.os" />
1211+
<node concept="1E1JtA" id="7tVUji9Mfda" role="2G$12L">
1212+
<property role="BnDLt" value="true" />
1213+
<property role="TrG5h" value="test.org.iets3.common.base" />
1214+
<property role="3LESm3" value="c1fcd3e0-0603-4035-834f-14c6337eec24" />
1215+
<node concept="398BVA" id="7tVUji9MfeQ" role="3LF7KH">
1216+
<ref role="398BVh" node="5wLtKNeTaqD" resolve="iets3.lang.opensource" />
1217+
<node concept="2Ry0Ak" id="7tVUji9MffH" role="iGT6I">
1218+
<property role="2Ry0Am" value="tests" />
1219+
<node concept="2Ry0Ak" id="7tVUji9Mfj0" role="2Ry0An">
1220+
<property role="2Ry0Am" value="test.org.iets3.common.base" />
1221+
<node concept="2Ry0Ak" id="7tVUji9MfkF" role="2Ry0An">
1222+
<property role="2Ry0Am" value="test.org.iets3.common.base.msd" />
1223+
</node>
1224+
</node>
1225+
</node>
1226+
</node>
1227+
<node concept="1SiIV0" id="7tVUji9MflQ" role="3bR37C">
1228+
<node concept="3bR9La" id="7tVUji9MflR" role="1SiIV1">
1229+
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
1230+
</node>
1231+
</node>
1232+
<node concept="1SiIV0" id="7tVUji9MflS" role="3bR37C">
1233+
<node concept="3bR9La" id="7tVUji9MflT" role="1SiIV1">
1234+
<ref role="3bR37D" node="49WTic8jAaa" resolve="org.iets3.analysis.base" />
1235+
</node>
1236+
</node>
1237+
<node concept="1SiIV0" id="7tVUji9MflU" role="3bR37C">
1238+
<node concept="3bR9La" id="7tVUji9MflV" role="1SiIV1">
1239+
<ref role="3bR37D" to="90a9:77YfcvOLBqQ" resolve="de.itemis.mps.comparator" />
1240+
</node>
1241+
</node>
1242+
<node concept="1SiIV0" id="7tVUji9MflW" role="3bR37C">
1243+
<node concept="3bR9La" id="7tVUji9MflX" role="1SiIV1">
1244+
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
1245+
</node>
1246+
</node>
1247+
<node concept="1SiIV0" id="7tVUji9MflY" role="3bR37C">
1248+
<node concept="3bR9La" id="7tVUji9MflZ" role="1SiIV1">
1249+
<ref role="3bR37D" node="7yHH$DDpB4c" resolve="org.iets3.variability.configuration.base" />
1250+
</node>
1251+
</node>
1252+
<node concept="1SiIV0" id="7tVUji9Mfm0" role="3bR37C">
1253+
<node concept="3bR9La" id="7tVUji9Mfm1" role="1SiIV1">
1254+
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
1255+
</node>
1256+
</node>
1257+
<node concept="1SiIV0" id="7tVUji9Mfm2" role="3bR37C">
1258+
<node concept="3bR9La" id="7tVUji9Mfm3" role="1SiIV1">
1259+
<ref role="3bR37D" node="7yHH$DDpBOh" resolve="org.iets3.variability.featuremodel.base" />
1260+
</node>
1261+
</node>
1262+
<node concept="1SiIV0" id="7tVUji9Mfm4" role="3bR37C">
1263+
<node concept="3bR9La" id="7tVUji9Mfm5" role="1SiIV1">
1264+
<ref role="3bR37D" node="5wLtKNeSRRB" resolve="org.iets3.core.base" />
1265+
</node>
1266+
</node>
1267+
<node concept="1BupzO" id="7tVUji9Mfmh" role="3bR31x">
1268+
<property role="3ZfqAx" value="models" />
1269+
<property role="1Hdu6h" value="true" />
1270+
<property role="1HemKv" value="true" />
1271+
<node concept="3LXTmp" id="7tVUji9Mfmi" role="1HemKq">
1272+
<node concept="398BVA" id="7tVUji9Mfm6" role="3LXTmr">
1273+
<ref role="398BVh" node="5wLtKNeTaqD" resolve="iets3.lang.opensource" />
1274+
<node concept="2Ry0Ak" id="7tVUji9Mfm7" role="iGT6I">
1275+
<property role="2Ry0Am" value="tests" />
1276+
<node concept="2Ry0Ak" id="7tVUji9Mfm8" role="2Ry0An">
1277+
<property role="2Ry0Am" value="test.org.iets3.common.base" />
1278+
<node concept="2Ry0Ak" id="7tVUji9Mfm9" role="2Ry0An">
1279+
<property role="2Ry0Am" value="models" />
1280+
</node>
1281+
</node>
1282+
</node>
1283+
</node>
1284+
<node concept="3qWCbU" id="7tVUji9Mfmj" role="3LXTna">
1285+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
1286+
</node>
1287+
</node>
1288+
</node>
1289+
<node concept="3rtmxn" id="5YDe1LrT3Bv" role="3bR31x">
1290+
<node concept="3LXTmp" id="5YDe1LrT3Bw" role="3rtmxm">
1291+
<node concept="3qWCbU" id="5YDe1LrT3Bx" role="3LXTna">
1292+
<property role="3qWCbO" value="icons/**, resources/**" />
1293+
</node>
1294+
<node concept="398BVA" id="5YDe1LrT3By" role="3LXTmr">
1295+
<ref role="398BVh" node="5wLtKNeTaqD" resolve="iets3.lang.opensource" />
1296+
<node concept="2Ry0Ak" id="5YDe1LrT3Bz" role="iGT6I">
1297+
<property role="2Ry0Am" value="tests" />
1298+
<node concept="2Ry0Ak" id="5YDe1LrT3B$" role="2Ry0An">
1299+
<property role="2Ry0Am" value="test.org.iets3.common.base" />
1300+
</node>
1301+
</node>
1302+
</node>
1303+
</node>
1304+
</node>
1305+
</node>
12111306
<node concept="1E1JtD" id="7yHH$DDpyJJ" role="2G$12L">
12121307
<property role="BnDLt" value="true" />
12131308
<property role="TrG5h" value="org.iets3.variability.artifacts.base" />
@@ -15884,6 +15979,12 @@
1588415979
<node concept="L2wRC" id="4dUR79iwSox" role="39821P">
1588515980
<ref role="L2wRA" node="4dUR79iwSjX" resolve="test.org.iets3.protocol.transport" />
1588615981
</node>
15982+
<node concept="L2wRC" id="7fniE1Ut5xi" role="39821P">
15983+
<ref role="L2wRA" node="7tVUji9MfMb" resolve="test.org.iets3.variability.configuration.base" />
15984+
</node>
15985+
<node concept="L2wRC" id="7fniE1Ut5xl" role="39821P">
15986+
<ref role="L2wRA" node="7tVUji9MfSt" resolve="test.org.iets3.variability.featuremodel.base" />
15987+
</node>
1588715988
<node concept="L2wRC" id="48ZWgAGrvuG" role="39821P">
1588815989
<ref role="L2wRA" node="48ZWgAGrsP1" resolve="test.ts.components.core" />
1588915990
</node>
@@ -17054,6 +17155,156 @@
1705417155
</node>
1705517156
</node>
1705617157
</node>
17158+
<node concept="1E1JtA" id="7tVUji9MfMb" role="3989C9">
17159+
<property role="BnDLt" value="true" />
17160+
<property role="TrG5h" value="test.org.iets3.variability.configuration.base" />
17161+
<property role="3LESm3" value="69c0c18f-9200-46ca-96d1-e564692dce0c" />
17162+
<node concept="398BVA" id="7tVUji9MfMe" role="3LF7KH">
17163+
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
17164+
<node concept="2Ry0Ak" id="7tVUji9MfMh" role="iGT6I">
17165+
<property role="2Ry0Am" value="tests" />
17166+
<node concept="2Ry0Ak" id="7tVUji9MfMk" role="2Ry0An">
17167+
<property role="2Ry0Am" value="test.org.iets3.variability.configuration.base" />
17168+
<node concept="2Ry0Ak" id="7tVUji9MfMn" role="2Ry0An">
17169+
<property role="2Ry0Am" value="test.org.iets3.variability.configuration.base.msd" />
17170+
</node>
17171+
</node>
17172+
</node>
17173+
</node>
17174+
<node concept="1SiIV0" id="7tVUji9MfQS" role="3bR37C">
17175+
<node concept="3bR9La" id="7tVUji9MfQT" role="1SiIV1">
17176+
<ref role="3bR37D" node="7yHH$DDpB4c" resolve="org.iets3.variability.configuration.base" />
17177+
</node>
17178+
</node>
17179+
<node concept="1SiIV0" id="7tVUji9MfQU" role="3bR37C">
17180+
<node concept="3bR9La" id="7tVUji9MfQV" role="1SiIV1">
17181+
<ref role="3bR37D" to="90a9:77YfcvOLBqQ" resolve="de.itemis.mps.comparator" />
17182+
</node>
17183+
</node>
17184+
<node concept="1SiIV0" id="7tVUji9MfQW" role="3bR37C">
17185+
<node concept="3bR9La" id="7tVUji9MfQX" role="1SiIV1">
17186+
<ref role="3bR37D" node="5wLtKNeSRQd" resolve="org.iets3.core.expr.simpleTypes" />
17187+
</node>
17188+
</node>
17189+
<node concept="1SiIV0" id="7tVUji9MfQY" role="3bR37C">
17190+
<node concept="3bR9La" id="7tVUji9MfQZ" role="1SiIV1">
17191+
<ref role="3bR37D" node="7tVUji9Mfda" resolve="test.org.iets3.common.base" />
17192+
</node>
17193+
</node>
17194+
<node concept="1BupzO" id="7tVUji9MfRi" role="3bR31x">
17195+
<property role="3ZfqAx" value="models" />
17196+
<property role="1Hdu6h" value="true" />
17197+
<property role="1HemKv" value="true" />
17198+
<node concept="3LXTmp" id="7tVUji9MfRj" role="1HemKq">
17199+
<node concept="398BVA" id="7tVUji9MfR0" role="3LXTmr">
17200+
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
17201+
<node concept="2Ry0Ak" id="7tVUji9MfR1" role="iGT6I">
17202+
<property role="2Ry0Am" value="tests" />
17203+
<node concept="2Ry0Ak" id="7tVUji9MfR2" role="2Ry0An">
17204+
<property role="2Ry0Am" value="test.org.iets3.variability.configuration.base" />
17205+
<node concept="2Ry0Ak" id="7tVUji9MfR3" role="2Ry0An">
17206+
<property role="2Ry0Am" value="models" />
17207+
</node>
17208+
</node>
17209+
</node>
17210+
</node>
17211+
<node concept="3qWCbU" id="7tVUji9MfRk" role="3LXTna">
17212+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
17213+
</node>
17214+
</node>
17215+
</node>
17216+
<node concept="3rtmxn" id="5YDe1LrT3BA" role="3bR31x">
17217+
<node concept="3LXTmp" id="5YDe1LrT3BB" role="3rtmxm">
17218+
<node concept="3qWCbU" id="5YDe1LrT3BC" role="3LXTna">
17219+
<property role="3qWCbO" value="icons/**, resources/**" />
17220+
</node>
17221+
<node concept="398BVA" id="5YDe1LrT3BD" role="3LXTmr">
17222+
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
17223+
<node concept="2Ry0Ak" id="5YDe1LrT3BE" role="iGT6I">
17224+
<property role="2Ry0Am" value="tests" />
17225+
<node concept="2Ry0Ak" id="5YDe1LrT3BF" role="2Ry0An">
17226+
<property role="2Ry0Am" value="test.org.iets3.variability.configuration.base" />
17227+
</node>
17228+
</node>
17229+
</node>
17230+
</node>
17231+
</node>
17232+
</node>
17233+
<node concept="1E1JtA" id="7tVUji9MfSt" role="3989C9">
17234+
<property role="BnDLt" value="true" />
17235+
<property role="TrG5h" value="test.org.iets3.variability.featuremodel.base" />
17236+
<property role="3LESm3" value="d09d86d3-0476-4f57-a9bf-aab3e36e3aee" />
17237+
<node concept="398BVA" id="7tVUji9MfSu" role="3LF7KH">
17238+
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
17239+
<node concept="2Ry0Ak" id="7tVUji9MfSv" role="iGT6I">
17240+
<property role="2Ry0Am" value="tests" />
17241+
<node concept="2Ry0Ak" id="7tVUji9MfSw" role="2Ry0An">
17242+
<property role="2Ry0Am" value="test.org.iets3.variability.featuremodel.base" />
17243+
<node concept="2Ry0Ak" id="7tVUji9MfSL" role="2Ry0An">
17244+
<property role="2Ry0Am" value="test.org.iets3.variability.featuremodel.base.msd" />
17245+
</node>
17246+
</node>
17247+
</node>
17248+
</node>
17249+
<node concept="1SiIV0" id="7tVUji9MfSy" role="3bR37C">
17250+
<node concept="3bR9La" id="7tVUji9MfSz" role="1SiIV1">
17251+
<ref role="3bR37D" node="7yHH$DDpB4c" resolve="org.iets3.variability.configuration.base" />
17252+
</node>
17253+
</node>
17254+
<node concept="1SiIV0" id="7tVUji9MfSC" role="3bR37C">
17255+
<node concept="3bR9La" id="7tVUji9MfSD" role="1SiIV1">
17256+
<ref role="3bR37D" node="7tVUji9Mfda" resolve="test.org.iets3.common.base" />
17257+
</node>
17258+
</node>
17259+
<node concept="1BupzO" id="7tVUji9MfSE" role="3bR31x">
17260+
<property role="3ZfqAx" value="models" />
17261+
<property role="1Hdu6h" value="true" />
17262+
<property role="1HemKv" value="true" />
17263+
<node concept="3LXTmp" id="7tVUji9MfXU" role="1HemKq">
17264+
<node concept="398BVA" id="7tVUji9MfXC" role="3LXTmr">
17265+
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
17266+
<node concept="2Ry0Ak" id="7tVUji9MfXD" role="iGT6I">
17267+
<property role="2Ry0Am" value="tests" />
17268+
<node concept="2Ry0Ak" id="7tVUji9MfXE" role="2Ry0An">
17269+
<property role="2Ry0Am" value="test.org.iets3.variability.featuremodel.base" />
17270+
<node concept="2Ry0Ak" id="7tVUji9MfXF" role="2Ry0An">
17271+
<property role="2Ry0Am" value="models" />
17272+
</node>
17273+
</node>
17274+
</node>
17275+
</node>
17276+
<node concept="3qWCbU" id="7tVUji9MfXV" role="3LXTna">
17277+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
17278+
</node>
17279+
</node>
17280+
</node>
17281+
<node concept="1SiIV0" id="7tVUji9MfX$" role="3bR37C">
17282+
<node concept="3bR9La" id="7tVUji9MfX_" role="1SiIV1">
17283+
<ref role="3bR37D" to="ffeo:1TaHNgiIbJ$" resolve="jetbrains.mps.ide.editor" />
17284+
</node>
17285+
</node>
17286+
<node concept="1SiIV0" id="7tVUji9MfXA" role="3bR37C">
17287+
<node concept="3bR9La" id="7tVUji9MfXB" role="1SiIV1">
17288+
<ref role="3bR37D" node="7yHH$DDpBOh" resolve="org.iets3.variability.featuremodel.base" />
17289+
</node>
17290+
</node>
17291+
<node concept="3rtmxn" id="5YDe1LrT3BH" role="3bR31x">
17292+
<node concept="3LXTmp" id="5YDe1LrT3BI" role="3rtmxm">
17293+
<node concept="3qWCbU" id="5YDe1LrT3BJ" role="3LXTna">
17294+
<property role="3qWCbO" value="icons/**, resources/**" />
17295+
</node>
17296+
<node concept="398BVA" id="5YDe1LrT3BK" role="3LXTmr">
17297+
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
17298+
<node concept="2Ry0Ak" id="5YDe1LrT3BL" role="iGT6I">
17299+
<property role="2Ry0Am" value="tests" />
17300+
<node concept="2Ry0Ak" id="5YDe1LrT3BM" role="2Ry0An">
17301+
<property role="2Ry0Am" value="test.org.iets3.variability.featuremodel.base" />
17302+
</node>
17303+
</node>
17304+
</node>
17305+
</node>
17306+
</node>
17307+
</node>
1705717308
<node concept="1E1JtA" id="48ZWgAGrsP1" role="3989C9">
1705817309
<property role="BnDLt" value="true" />
1705917310
<property role="TrG5h" value="test.ts.components.core" />

0 commit comments

Comments
 (0)