Skip to content

Commit

Permalink
(WIP) fixes JUnit XML report (no <testsuites> anymore) #1144
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgronover
mgronover committed Jan 13, 2025
1 parent 77c7d28 commit 4921711
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 91 deletions.
6 changes: 3 additions & 3 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,9 @@ task execTestsByInterpreter(type: TestLanguages, dependsOn: buildLanguages) {
ant.taskdef(name: 'junitInterpreterReport',
classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
classpath: configurations.junitAnt.asPath)
ant.junitInterpreterReport(toDir: "$buildDir") {
fileset(dir: "$buildDir", includes: '**/TEST-InterpreterTestSuites.xml')
report(format: 'frames', todir: "$buildDir/junitInterpreterReport")
ant.junitInterpreterReport(toDir: "$buildDir", tofile: "AggregatedInterpreterTests.xml") {
fileset(dir: "$buildDir", includes: '**/InterpreterTest*.xml', excludes: 'tmp/**')
report(format: 'frames', todir: "$buildDir/junitInterpreterReport" )
}
ant.echo("JUnit Interpreter report placed into $buildDir/junitInterpreterReport/index.html")
}
Expand Down
2 changes: 1 addition & 1 deletion ...er.run.configuration/models/org.iets3.core.junit.interpreter.run.configuration.plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4195,7 +4195,7 @@
<node concept="3clFbF" id="6Bg9Ew1ZzeA" role="3cqZAp">
<node concept="2OqwBi" id="63re9eQYCZi" role="3clFbG">
<node concept="37vLTw" id="63re9eQYCZj" role="2Oq$k0">
<ref role="3cqZAo" node="3hBC0mRNSRj" resolve="reporterFactory" />
<ref role="3cqZAo" node="3hBC0mRNSRj" resolve="reporter" />
</node>
<node concept="liA8E" id="63re9eQYCZk" role="2OqNvi">
<ref role="37wK5l" to="707k:6Bg9Ew1Yx_S" resolve="testSuiteStarted" />
Expand Down
145 changes: 65 additions & 80 deletions ...nsource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/xml4JUnit.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
<use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
<use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
</languages>
<imports>
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
Expand All @@ -17,7 +16,6 @@
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
<import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
<import index="zf81" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.net(JDK/)" />
<import index="884n" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.ibm.icu.text(MPS.ThirdParty/)" />
<import index="25x5" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.text(JDK/)" />
</imports>
<registry>
Expand Down Expand Up @@ -196,6 +194,13 @@
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
<concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
<property id="709746936026609031" name="linkId" index="3V$3ak" />
<property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
</concept>
<concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
<child id="3078666699043039389" name="commentedNode" index="8Wnug" />
</concept>
</language>
<language id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp">
<concept id="1175161300324" name="jetbrains.mps.baseLanguage.regexp.structure.LineEndRegexp" flags="ng" index="2t4AhP" />
Expand Down Expand Up @@ -7534,7 +7539,7 @@
</node>
<node concept="3Tm6S6" id="2doG_VG7LY5" role="1B3o_S" />
<node concept="Xl_RD" id="2doG_VG7LY6" role="33vP2m">
<property role="Xl_RC" value="yyyy-MM-dd'T'HH:mm:ss" />
<property role="Xl_RC" value="YYYY-MM-DD'T'hh:mm:ss" />
</node>
</node>
<node concept="312cEg" id="2doG_VG7LZ$" role="jymVt">
Expand All @@ -7546,11 +7551,15 @@
</node>
<node concept="2tJIrI" id="4YUGyHBGj23" role="jymVt" />
<node concept="2tJIrI" id="4YUGyHBGddt" role="jymVt" />
<node concept="312cEg" id="5ZZgOa8N$6s" role="jymVt">
<property role="TrG5h" value="root" />
<node concept="3Tm6S6" id="5ZZgOa8NzI1" role="1B3o_S" />
<node concept="3uibUv" id="5ZZgOa8NzVH" role="1tU5fm">
<ref role="3uigEE" node="5ZZgOa8J6rd" resolve="Testsuites" />
<node concept="1X3_iC" id="6mKf5uiCw5_" role="lGtFl">
<property role="3V$3am" value="member" />
<property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107461130800/5375687026011219971" />
<node concept="312cEg" id="5ZZgOa8N$6s" role="8Wnug">
<property role="TrG5h" value="root" />
<node concept="3Tm6S6" id="5ZZgOa8NzI1" role="1B3o_S" />
<node concept="3uibUv" id="5ZZgOa8NzVH" role="1tU5fm">
<ref role="3uigEE" node="5ZZgOa8J6rd" resolve="Testsuites" />
</node>
</node>
</node>
<node concept="312cEg" id="5ZZgOa8N$Ue" role="jymVt">
Expand All @@ -7571,21 +7580,7 @@
<node concept="3clFbW" id="5ZZgOa8NzgO" role="jymVt">
<node concept="3cqZAl" id="5ZZgOa8NzgQ" role="3clF45" />
<node concept="3Tm1VV" id="5ZZgOa8NzgR" role="1B3o_S" />
<node concept="3clFbS" id="5ZZgOa8NzgS" role="3clF47">
<node concept="3clFbF" id="5ZZgOa8NAeg" role="3cqZAp">
<node concept="37vLTI" id="5ZZgOa8NAxn" role="3clFbG">
<node concept="2ShNRf" id="5ZZgOa8NAzW" role="37vLTx">
<node concept="HV5vD" id="5ZZgOa8NCaI" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="HV5vE" node="5ZZgOa8J6rd" resolve="Testsuites" />
</node>
</node>
<node concept="37vLTw" id="5ZZgOa8NAef" role="37vLTJ">
<ref role="3cqZAo" node="5ZZgOa8N$6s" resolve="root" />
</node>
</node>
</node>
</node>
<node concept="3clFbS" id="5ZZgOa8NzgS" role="3clF47" />
</node>
<node concept="3Tm1VV" id="5ZZgOa8NuRp" role="1B3o_S" />
<node concept="3uibUv" id="5ZZgOa8NuSd" role="EKbjA">
Expand Down Expand Up @@ -7644,32 +7639,6 @@
</node>
</node>
</node>
<node concept="3clFbF" id="6A$Q$veHHdc" role="3cqZAp">
<node concept="2OqwBi" id="6A$Q$veHHOZ" role="3clFbG">
<node concept="37vLTw" id="6A$Q$veHHda" role="2Oq$k0">
<ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
</node>
<node concept="liA8E" id="6A$Q$veHIvb" role="2OqNvi">
<ref role="37wK5l" node="5ZZgOa8J6hN" resolve="setErrors" />
<node concept="Xl_RD" id="6A$Q$veI747" role="37wK5m">
<property role="Xl_RC" value="0" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="6A$Q$veHIWz" role="3cqZAp">
<node concept="2OqwBi" id="6A$Q$veHIW$" role="3clFbG">
<node concept="37vLTw" id="6A$Q$veHIW_" role="2Oq$k0">
<ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
</node>
<node concept="liA8E" id="6A$Q$veHIWA" role="2OqNvi">
<ref role="37wK5l" node="5ZZgOa8J6hv" resolve="setFailures" />
<node concept="Xl_RD" id="6A$Q$veI8ng" role="37wK5m">
<property role="Xl_RC" value="0" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="4YUGyHBFgLn" role="3cqZAp">
<node concept="2OqwBi" id="4YUGyHBFhHh" role="3clFbG">
<node concept="37vLTw" id="4YUGyHBFgLl" role="2Oq$k0">
Expand Down Expand Up @@ -7716,22 +7685,8 @@
</node>
<node concept="liA8E" id="4YUGyHBFBCP" role="2OqNvi">
<ref role="37wK5l" node="5ZZgOa8J6jF" resolve="setId" />
<node concept="2YIFZM" id="4YUGyHBHVlq" role="37wK5m">
<ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="2OqwBi" id="4YUGyHBHPXO" role="37wK5m">
<node concept="2OqwBi" id="4YUGyHBHNB9" role="2Oq$k0">
<node concept="37vLTw" id="4YUGyHBHN09" role="2Oq$k0">
<ref role="3cqZAo" node="5ZZgOa8N$6s" resolve="root" />
</node>
<node concept="liA8E" id="4YUGyHBHOzx" role="2OqNvi">
<ref role="37wK5l" node="5ZZgOa8J6sa" resolve="getTestsuite" />
</node>
</node>
<node concept="liA8E" id="4YUGyHBHSeQ" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
<node concept="Xl_RD" id="6mKf5uiCyrQ" role="37wK5m">
<property role="Xl_RC" value="0" />
</node>
</node>
</node>
Expand Down Expand Up @@ -7870,20 +7825,24 @@
</node>
</node>
</node>
<node concept="3clFbF" id="5ZZgOa8NGBF" role="3cqZAp">
<node concept="2OqwBi" id="5ZZgOa8NIy2" role="3clFbG">
<node concept="2OqwBi" id="5ZZgOa8NGL6" role="2Oq$k0">
<node concept="37vLTw" id="5ZZgOa8NGBD" role="2Oq$k0">
<ref role="3cqZAo" node="5ZZgOa8N$6s" resolve="root" />
</node>
<node concept="liA8E" id="5ZZgOa8NHh7" role="2OqNvi">
<ref role="37wK5l" node="5ZZgOa8J6sa" resolve="getTestsuite" />
<node concept="1X3_iC" id="6mKf5uiCzml" role="lGtFl">
<property role="3V$3am" value="statement" />
<property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
<node concept="3clFbF" id="5ZZgOa8NGBF" role="8Wnug">
<node concept="2OqwBi" id="5ZZgOa8NIy2" role="3clFbG">
<node concept="2OqwBi" id="5ZZgOa8NGL6" role="2Oq$k0">
<node concept="37vLTw" id="5ZZgOa8NGBD" role="2Oq$k0">
<ref role="3cqZAo" node="5ZZgOa8N$6s" resolve="root" />
</node>
<node concept="liA8E" id="5ZZgOa8NHh7" role="2OqNvi">
<ref role="37wK5l" node="5ZZgOa8J6sa" resolve="getTestsuite" />
</node>
</node>
</node>
<node concept="liA8E" id="5ZZgOa8NMMt" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="37vLTw" id="5ZZgOa8NNc4" role="37wK5m">
<ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
<node concept="liA8E" id="5ZZgOa8NMMt" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="37vLTw" id="5ZZgOa8NNc4" role="37wK5m">
<ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -7956,6 +7915,32 @@
</node>
</node>
</node>
<node concept="3clFbF" id="6A$Q$veHHdc" role="3cqZAp">
<node concept="2OqwBi" id="6A$Q$veHHOZ" role="3clFbG">
<node concept="37vLTw" id="6A$Q$veHHda" role="2Oq$k0">
<ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
</node>
<node concept="liA8E" id="6A$Q$veHIvb" role="2OqNvi">
<ref role="37wK5l" node="5ZZgOa8J6hN" resolve="setErrors" />
<node concept="Xl_RD" id="6A$Q$veI747" role="37wK5m">
<property role="Xl_RC" value="0" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="6A$Q$veHIWz" role="3cqZAp">
<node concept="2OqwBi" id="6A$Q$veHIW$" role="3clFbG">
<node concept="37vLTw" id="6A$Q$veHIW_" role="2Oq$k0">
<ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
</node>
<node concept="liA8E" id="6A$Q$veHIWA" role="2OqNvi">
<ref role="37wK5l" node="5ZZgOa8J6hv" resolve="setFailures" />
<node concept="Xl_RD" id="6A$Q$veI8ng" role="37wK5m">
<property role="Xl_RC" value="0" />
</node>
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="5ZZgOa8NuTW" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" />
Expand Down Expand Up @@ -8273,8 +8258,8 @@
</node>
<node concept="liA8E" id="5ZZgOa8OiVk" role="2OqNvi">
<ref role="37wK5l" to="eaz0:~Marshaller.marshal(java.lang.Object,java.io.File)" resolve="marshal" />
<node concept="37vLTw" id="5ZZgOa8Ojq8" role="37wK5m">
<ref role="3cqZAo" node="5ZZgOa8N$6s" resolve="root" />
<node concept="37vLTw" id="6mKf5uiAO_c" role="37wK5m">
<ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
</node>
<node concept="37vLTw" id="5ZZgOa8OkVK" role="37wK5m">
<ref role="3cqZAo" node="5ZZgOa8NuVb" resolve="file" />
Expand Down
7 changes: 1 addition & 6 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,11 +1004,6 @@
<ref role="3bR37D" to="ffeo:2Oogzg3vg0R" resolve="jetbrains.mps.baseLanguage.unitTest.platform" />
</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" />
Expand Down Expand Up @@ -15289,7 +15284,7 @@
<ref role="30Vec$" node="5jJR9m7XASm" resolve="org.iets3.opensource.interpreterExecutor" />
<node concept="NbPM2" id="5iD3V$BSj$B" role="1psgkv">
<node concept="3Mxwew" id="yHjyt5yb1m" role="3MwsjC">
<property role="3MwjfP" value="-Xss2048k -Xmx4096m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5071" />
<property role="3MwjfP" value="-Xss2048k -Xmx4096m " />
</node>
</node>
<node concept="398BVA" id="7Lttyc2W9kv" role="1YJTkC">
Expand Down
2 changes: 1 addition & 1 deletion ....iets3.opensource.interpreterExecutor/models/org.iets3.opensource.interpreterExecutor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
<node concept="17QB3L" id="3PMiOKDWLJX" role="1tU5fm" />
<node concept="3Tm6S6" id="3PMiOKDWJuL" role="1B3o_S" />
<node concept="Xl_RD" id="3PMiOKDWNJV" role="33vP2m">
<property role="Xl_RC" value="/home/mgronover/Projects/Datev/iets3.opensource/build/TEST-InterpreterTestSuites.xml" />
<property role="Xl_RC" value="/home/mgronover/Projects/Datev/iets3.opensource/build/InterpreterTestSuites.xml" />
</node>
</node>
<node concept="2tJIrI" id="7Z6s7w42B7N" role="jymVt" />
Expand Down

0 comments on commit 4921711

Please sign in to comment.