Skip to content

Commit

Permalink
(WIP) imlements jaxb usable classes for XML generation #1144
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgronover
mgronover committed Jan 20, 2025
1 parent 4a9d9ed commit a2b992e
Show file tree
Hide file tree
Showing 6 changed files with 8,777 additions and 3,590 deletions.
3,697 changes: 158 additions & 3,539 deletions ...er.run.configuration/models/org.iets3.core.junit.interpreter.run.configuration.plugin.mps
View file

Large diffs are not rendered by default.

8,545 changes: 8,545 additions & 0 deletions ...nsource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/xml4JUnit.mps
View file

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions ...unit.interpreter.run.configuration/org.iets3.core.junit.interpreter.run.configuration.msd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
<dependency reexport="false">33f214de-6dce-4396-83c7-640823b7c525(jetbrains.mps.baselanguage.unitTest.launcher)</dependency>
<dependency reexport="false">2c7e7a6d-a1f9-4f07-84e0-d0f5b91d380c(jetbrains.mps.baseLanguage.unitTest.platform)</dependency>
<dependency reexport="false">f647e48e-4568-4f4c-b48a-1546492c6a2e(org.jdom)</dependency>
<dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
Expand All @@ -47,7 +47,7 @@
<language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
<language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
Expand All @@ -65,8 +65,10 @@
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" />
<module reference="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" version="0" />
<module reference="68e30703-3df8-4f84-a3eb-772b21d7fc85(TempModule68e30703-3df8-4f84-a3eb-772b21d7fc85)" version="0" />
<module reference="97495013-dd3f-4cf4-b0d1-93daf53c9b77(TempModule97495013-dd3f-4cf4-b0d1-93daf53c9b77)" version="0" />
<module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
<module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
<module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
Expand Down Expand Up @@ -112,14 +114,13 @@
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
<module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
<module reference="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" version="0" />
<module reference="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" version="1" />
<module reference="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" version="4" />
<module reference="2f7e2e35-6e74-4c43-9fa5-2465d68f5996(org.iets3.core.expr.collections)" version="5" />
<module reference="9464fa06-5ab9-409b-9274-64ab29588457(org.iets3.core.expr.lambda)" version="0" />
<module reference="9464fa06-5ab9-409b-9274-64ab29588457(org.iets3.core.expr.lambda)" version="1" />
<module reference="f3eafff0-30d2-46d6-9150-f0f3b880ce27(org.iets3.core.expr.path)" version="0" />
<module reference="d441fba0-f46b-43cd-b723-dad7b65da615(org.iets3.core.expr.tests)" version="0" />
<module reference="71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)" version="2" />
<module reference="bacb5ddc-bd96-4d54-a76e-63aeb598f7fb(org.iets3.core.junit.interpreter.run.configuration)" version="0" />
<module reference="f647e48e-4568-4f4c-b48a-1546492c6a2e(org.jdom)" version="0" />
<module reference="63b449db-0918-4a4a-a891-2c430ab133e4(org.junit.junit5)" version="0" />
</dependencyVersions>
</solution>
Expand Down
47 changes: 23 additions & 24 deletions ...ensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1004,17 +1004,16 @@
<ref role="3bR37D" to="ffeo:2Oogzg3vg0R" resolve="jetbrains.mps.baseLanguage.unitTest.platform" />
</node>
</node>
<node concept="1SiIV0" id="30Z3a1Q6ZyP" role="3bR37C">
<node concept="3bR9La" id="30Z3a1Q6ZyQ" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:4Hc8TwAmyoE" resolve="jetbrains.mps.tool.builder" />
</node>
</node>
<node concept="1SiIV0" id="7Z6s7w3P36v" role="3bR37C">
<node concept="3bR9La" id="7Z6s7w3P36w" role="1SiIV1">
<ref role="3bR37D" to="ffeo:HHlBn9$wJ2" resolve="org.jdom" />
</node>
</node>
<node concept="1SiIV0" id="2AdTqXIhpqs" role="3bR37C">
<node concept="3bR9La" id="2AdTqXIhpqt" role="1SiIV1">
<ref role="3bR37D" to="90a9:3$A0JaN5bpX" resolve="MPS.ThirdParty" />
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="5wLtKNeSWz5" role="3989C9">
Expand Down Expand Up @@ -15285,6 +15284,24 @@
<node concept="2igEWh" id="wLSoj1MVqs" role="1hWBAP">
<property role="3UIfUI" value="4096" />
</node>
<node concept="1YJUtn" id="5iD3V$BSj$n" role="1hWBAP">
<property role="3MWwXZ" value="MainClass" />
<ref role="30Vec$" node="5jJR9m7XASm" resolve="org.iets3.opensource.interpreterExecutor" />
<node concept="NbPM2" id="5iD3V$BSj$B" role="1psgkv">
<node concept="3Mxwew" id="5iD3V$BSj$A" role="3MwsjC">
<property role="3MwjfP" value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5071" />
</node>
</node>
<node concept="398BVA" id="7Lttyc2W9kv" role="1YJTkC">
<ref role="398BVh" node="7OQaAJRI74_" resolve="iets3.lang.opensource" />
<node concept="2Ry0Ak" id="7Lttyc2W9rm" role="iGT6I">
<property role="2Ry0Am" value="tests" />
<node concept="2Ry0Ak" id="7Lttyc2W9yd" role="2Ry0An">
<property role="2Ry0Am" value="test.in.expr.os" />
</node>
</node>
</node>
</node>
<node concept="10PD9b" id="2U5AnekTBPu" role="10PD9s" />
<node concept="2sgV4H" id="2U5AnekTBPz" role="1l3spa">
<ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
Expand Down Expand Up @@ -15488,24 +15505,6 @@
</node>
</node>
</node>
<node concept="1YJUtn" id="5iD3V$BSj$n" role="1hWBAP">
<property role="3MWwXZ" value="MainClass" />
<ref role="30Vec$" node="5jJR9m7XASm" resolve="org.iets3.opensource.interpreterExecutor" />
<node concept="NbPM2" id="5iD3V$BSj$B" role="1psgkv">
<node concept="3Mxwew" id="5iD3V$BSj$A" role="3MwsjC">
<property role="3MwjfP" value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5071" />
</node>
</node>
<node concept="398BVA" id="7Lttyc2W9kv" role="1YJTkC">
<ref role="398BVh" node="7OQaAJRI74_" resolve="iets3.lang.opensource" />
<node concept="2Ry0Ak" id="7Lttyc2W9rm" role="iGT6I">
<property role="2Ry0Am" value="tests" />
<node concept="2Ry0Ak" id="7Lttyc2W9yd" role="2Ry0An">
<property role="2Ry0Am" value="test.in.expr.os" />
</node>
</node>
</node>
</node>
</node>
</model>

59 changes: 44 additions & 15 deletions ....iets3.opensource.interpreterExecutor/models/org.iets3.opensource.interpreterExecutor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
<import index="4o98" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.core.platform(MPS.Core/)" />
<import index="sfqd" ref="r:63a75970-913d-4a7b-99e2-8ca72ff6f509(jetbrains.mps.baseLanguage.unitTest.execution.client)" />
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
<import index="mmaq" ref="f647e48e-4568-4f4c-b48a-1546492c6a2e/java:org.jdom(org.jdom/)" />
<import index="rzt1" ref="r:128708be-e37c-484b-b372-892904c802d9(jetbrains.mps.tool.builder.unittest)" />
<import index="se19" ref="f647e48e-4568-4f4c-b48a-1546492c6a2e/java:org.jdom.output(org.jdom/)" />
<import index="707k" ref="r:3b363c34-a1ec-4ae6-92cc-95c0273ad0c2(xml4JUnit)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
</imports>
<registry>
Expand Down Expand Up @@ -89,9 +87,7 @@
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
<child id="1068581517665" name="statement" index="3cqZAp" />
</concept>
<concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
<property id="1068580123138" name="value" index="3clFbU" />
</concept>
<concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
<property id="1068580320021" name="value" index="3cmrfH" />
</concept>
Expand Down Expand Up @@ -556,14 +552,11 @@
<node concept="3cpWsn" id="6Bg9Ew20FmV" role="3cpWs9">
<property role="TrG5h" value="reporter" />
<node concept="3uibUv" id="6Bg9Ew20Bys" role="1tU5fm">
<ref role="3uigEE" to="d6jk:7Z6s7w3Pe1o" resolve="InterpreterXMLTestReporter" />
<ref role="3uigEE" to="707k:5ZZgOa8NuRo" resolve="InterpreterTestReporter" />
</node>
<node concept="2ShNRf" id="6Bg9Ew20FmW" role="33vP2m">
<node concept="1pGfFk" id="6Bg9Ew20FmX" role="2ShVmc">
<ref role="37wK5l" to="d6jk:2doG_VG7M0C" resolve="InterpreterXMLTestReporter" />
<node concept="Xl_RD" id="VT_taQoykn" role="37wK5m">
<property role="Xl_RC" value="Interpreter Tests" />
</node>
<ref role="37wK5l" to="707k:5ZZgOa8NzgO" resolve="InterpreterTestReporter" />
</node>
</node>
</node>
Expand All @@ -587,9 +580,7 @@
</node>
<node concept="ANE8D" id="4giJe8qrJck" role="2OqNvi" />
</node>
<node concept="3clFbT" id="4giJe8qrJcl" role="37wK5m">
<property role="3clFbU" value="true" />
</node>
<node concept="3clFbT" id="4giJe8qrJcl" role="37wK5m" />
<node concept="37vLTw" id="7Z6s7w45dN5" role="37wK5m">
<ref role="3cqZAo" node="6Bg9Ew20FmV" resolve="reporter" />
</node>
Expand Down Expand Up @@ -617,13 +608,27 @@
</node>
</node>
</node>
<node concept="3clFbF" id="7OLH2_zDM5g" role="3cqZAp">
<node concept="2OqwBi" id="7OLH2_zDOha" role="3clFbG">
<node concept="10M0yZ" id="7OLH2_zDMQQ" role="2Oq$k0">
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
</node>
<node concept="liA8E" id="7OLH2_zDQnF" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="Xl_RD" id="7OLH2_zDTpt" role="37wK5m">
<property role="Xl_RC" value="Test execution done. Writing XML Test Report now." />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="4MenVKna5Nk" role="3cqZAp">
<node concept="2OqwBi" id="4MenVKnab2c" role="3clFbG">
<node concept="37vLTw" id="4MenVKna5Ni" role="2Oq$k0">
<ref role="3cqZAo" node="6Bg9Ew20FmV" resolve="reporter" />
</node>
<node concept="liA8E" id="4MenVKnacXA" role="2OqNvi">
<ref role="37wK5l" to="d6jk:63re9eR752H" resolve="writeToFile" />
<ref role="37wK5l" to="707k:5ZZgOa8NuV7" resolve="writeToFile" />
<node concept="2ShNRf" id="3hBC0mRPfUe" role="37wK5m">
<node concept="1pGfFk" id="3hBC0mRPfUf" role="2ShVmc">
<property role="373rjd" value="true" />
Expand All @@ -636,6 +641,30 @@
</node>
</node>
</node>
<node concept="3clFbF" id="7OLH2_zEhmi" role="3cqZAp">
<node concept="2OqwBi" id="7OLH2_zEhmj" role="3clFbG">
<node concept="10M0yZ" id="7OLH2_zEhmk" role="2Oq$k0">
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
</node>
<node concept="liA8E" id="7OLH2_zEhml" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="7OLH2_zEzUu" role="37wK5m">
<node concept="Xl_RD" id="7OLH2_zEzUJ" role="3uHU7w">
<property role="Xl_RC" value="'" />
</node>
<node concept="3cpWs3" id="7OLH2_zEwfp" role="3uHU7B">
<node concept="Xl_RD" id="7OLH2_zEhmm" role="3uHU7B">
<property role="Xl_RC" value="XML Test Report was written to: '" />
</node>
<node concept="37vLTw" id="7OLH2_zEx0v" role="3uHU7w">
<ref role="3cqZAo" node="7Z6s7w42Qyk" resolve="myReportsFile" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="7OQaAJRI3cV" role="1B3o_S" />
<node concept="3cqZAl" id="7OQaAJRI72q" role="3clF45" />
Expand Down
6 changes: 0 additions & 6 deletions ...ons/org.iets3.opensource.interpreterExecutor/org.iets3.opensource.interpreterExecutor.msd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
<dependency reexport="false">bacb5ddc-bd96-4d54-a76e-63aeb598f7fb(org.iets3.core.junit.interpreter.run.configuration)</dependency>
<dependency reexport="false">f618e99a-2641-465c-bb54-31fe76f9e285(jetbrains.mps.baseLanguage.unitTest.execution)</dependency>
<dependency reexport="false">f647e48e-4568-4f4c-b48a-1546492c6a2e(org.jdom)</dependency>
<dependency reexport="false">e6368d5c-b931-4d4d-9941-07b7da7d2e2d(jetbrains.mps.tool.builder)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
Expand Down Expand Up @@ -74,9 +72,6 @@
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
<module reference="20351dc3-a2df-46f5-b667-fc9adab1f1c9(jetbrains.mps.make)" version="0" />
<module reference="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
<module reference="e6368d5c-b931-4d4d-9941-07b7da7d2e2d(jetbrains.mps.tool.builder)" version="0" />
<module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
<module reference="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" version="0" />
<module reference="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" version="4" />
Expand All @@ -87,7 +82,6 @@
<module reference="71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)" version="2" />
<module reference="bacb5ddc-bd96-4d54-a76e-63aeb598f7fb(org.iets3.core.junit.interpreter.run.configuration)" version="0" />
<module reference="26c41006-651b-45a4-aced-69694c3d5234(org.iets3.opensource.interpreterExecutor)" version="0" />
<module reference="f647e48e-4568-4f4c-b48a-1546492c6a2e(org.jdom)" version="0" />
<module reference="63b449db-0918-4a4a-a891-2c430ab133e4(org.junit.junit5)" version="0" />
</dependencyVersions>
</solution>
Expand Down

0 comments on commit a2b992e

Please sign in to comment.