Skip to content

Commit

Permalink
mpsbasics, safety: fix the doc2word tests (#121)
Browse files Browse the repository at this point in the history 
* mpsbasics, safety: fix the doc2word tests

* mpsbasics.docx4j: improved error reporting in case of tests failures

* mpsbasics.docx4j: enhance comparator for generated DOCX4j documents with the possibility to ignore certain lines

---------

Co-authored-by: ratiud <[email protected]>
  • Loading branch information
@danielratiu @ratiud
danielratiu and ratiud authored Dec 10, 2024
1 parent 08c3274 commit cc32904
Show file tree
Hide file tree
Showing 9 changed files with 526 additions and 408 deletions.
67 changes: 0 additions & 67 deletions ....formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2609,68 +2609,6 @@
</node>
<node concept="2G$12M" id="2MrvZqtGQDM" role="3989C9">
<property role="TrG5h" value="com.mpsbasics.testutils" />
<node concept="1E1JtA" id="2MrvZqtDgLZ" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="com.mpsbasics.docx4j.diffx.lib" />
<property role="3LESm3" value="1cb48442-05da-4cad-b5c5-e31ddd69e322" />
<node concept="398BVA" id="2MrvZqtDh3X" role="3LF7KH">
<ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
<node concept="2Ry0Ak" id="2MrvZqtDhmt" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="2MrvZqtDhCW" role="2Ry0An">
<property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib" />
<node concept="2Ry0Ak" id="2MrvZqtDhV1" role="2Ry0An">
<property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib.msd" />
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="2MrvZqtDib6" role="3bR37C">
<node concept="3bR9La" id="2MrvZqtDib7" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="2MrvZqtDib8" role="3bR37C">
<node concept="3bR9La" id="2MrvZqtDib9" role="1SiIV1">
<ref role="3bR37D" node="6hyv0iVPlFI" resolve="com.mpsbasics.docx4j.lib" />
</node>
</node>
<node concept="1SiIV0" id="2MrvZqtDibn" role="3bR37C">
<node concept="1BurEX" id="2MrvZqtDibo" role="1SiIV1">
<node concept="398BVA" id="2MrvZqtDiba" role="1BurEY">
<ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
<node concept="2Ry0Ak" id="2MrvZqtDibb" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="2MrvZqtDibc" role="2Ry0An">
<property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib" />
<node concept="2Ry0Ak" id="2MrvZqtDibd" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="2MrvZqtDibe" role="2Ry0An">
<property role="2Ry0Am" value="docx4j-diffx-11.4.9.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3rtmxn" id="4euqtkrusDM" role="3bR31x">
<node concept="3LXTmp" id="4euqtkrusDN" role="3rtmxm">
<node concept="3qWCbU" id="4euqtkrusDO" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="4euqtkrusDP" role="3LXTmr">
<ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
<node concept="2Ry0Ak" id="4euqtkrusDQ" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="4euqtkrusDR" role="2Ry0An">
<property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtA" id="2MrvZqtDizQ" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="com.mpsbasics.docx4j.testutils" />
Expand Down Expand Up @@ -2735,11 +2673,6 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="2MrvZqtDjUM" role="3bR37C">
<node concept="3bR9La" id="2MrvZqtDjUN" role="1SiIV1">
<ref role="3bR37D" node="2MrvZqtDgLZ" resolve="com.mpsbasics.docx4j.diffx.lib" />
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="6hyv0iVPlEc" role="3989C9">
Expand Down
67 changes: 0 additions & 67 deletions ...safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2861,68 +2861,6 @@
</node>
<node concept="2G$12M" id="2MrvZqtDw3j" role="3989C9">
<property role="TrG5h" value="com.mpsbasics.testutils" />
<node concept="1E1JtA" id="2MrvZqtDgLZ" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="com.mpsbasics.docx4j.diffx.lib" />
<property role="3LESm3" value="1cb48442-05da-4cad-b5c5-e31ddd69e322" />
<node concept="398BVA" id="2MrvZqtDh3X" role="3LF7KH">
<ref role="398BVh" node="7he_lUum_$u" resolve="mpsbasics.code" />
<node concept="2Ry0Ak" id="2MrvZqtDhmt" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="2MrvZqtDhCW" role="2Ry0An">
<property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib" />
<node concept="2Ry0Ak" id="2MrvZqtDhV1" role="2Ry0An">
<property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib.msd" />
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="2MrvZqtDib6" role="3bR37C">
<node concept="3bR9La" id="2MrvZqtDib7" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="2MrvZqtDib8" role="3bR37C">
<node concept="3bR9La" id="2MrvZqtDib9" role="1SiIV1">
<ref role="3bR37D" node="7he_lUumABC" resolve="com.mpsbasics.docx4j.lib" />
</node>
</node>
<node concept="1SiIV0" id="2MrvZqtDibn" role="3bR37C">
<node concept="1BurEX" id="2MrvZqtDibo" role="1SiIV1">
<node concept="398BVA" id="2MrvZqtDiba" role="1BurEY">
<ref role="398BVh" node="7he_lUum_$u" resolve="mpsbasics.code" />
<node concept="2Ry0Ak" id="2MrvZqtDibb" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="2MrvZqtDibc" role="2Ry0An">
<property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib" />
<node concept="2Ry0Ak" id="2MrvZqtDibd" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="2MrvZqtDibe" role="2Ry0An">
<property role="2Ry0Am" value="docx4j-diffx-11.4.9.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3rtmxn" id="4euqtkrusL0" role="3bR31x">
<node concept="3LXTmp" id="4euqtkrusL1" role="3rtmxm">
<node concept="3qWCbU" id="4euqtkrusL2" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="4euqtkrusL3" role="3LXTmr">
<ref role="398BVh" node="7he_lUum_$u" resolve="mpsbasics.code" />
<node concept="2Ry0Ak" id="4euqtkrusL4" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="4euqtkrusL5" role="2Ry0An">
<property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtA" id="2MrvZqtDizQ" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="com.mpsbasics.docx4j.testutils" />
Expand Down Expand Up @@ -2987,11 +2925,6 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="2MrvZqtDjUM" role="3bR37C">
<node concept="3bR9La" id="2MrvZqtDjUN" role="1SiIV1">
<ref role="3bR37D" node="2MrvZqtDgLZ" resolve="com.mpsbasics.docx4j.diffx.lib" />
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="1k6eCQnESS5" role="3989C9">
Expand Down
97 changes: 97 additions & 0 deletions ...ety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,14 @@
<child id="1163668922816" name="ifTrue" index="3K4E3e" />
<child id="1163668934364" name="ifFalse" index="3K4GZi" />
</concept>
<concept id="1221737317277" name="jetbrains.mps.baseLanguage.structure.StaticInitializer" flags="lg" index="1Pe0a1">
<child id="1221737317278" name="statementList" index="1Pe0a2" />
</concept>
<concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
<child id="8356039341262087992" name="line" index="1aUNEU" />
</concept>
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
</language>
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
Expand Down Expand Up @@ -246,6 +250,14 @@
<concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
<child id="1204796294226" name="closure" index="23t8la" />
</concept>
<concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
<child id="540871147943773366" name="argument" index="25WWJ7" />
</concept>
<concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
<child id="1226511765987" name="elementType" index="2hN53Y" />
</concept>
<concept id="1226516258405" name="jetbrains.mps.baseLanguage.collections.structure.HashSetCreator" flags="nn" index="2i4dXS" />
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
<concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
</language>
Expand Down Expand Up @@ -301,6 +313,10 @@
<ref role="3cqZAo" node="4ziKDEnefnp" resolve="newFile" />
</node>
<node concept="1jxXqW" id="4ziKDEnetE_" role="37wK5m" />
<node concept="10M0yZ" id="3egY5wRsiK_" role="37wK5m">
<ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
<ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -350,6 +366,10 @@
<ref role="3cqZAo" node="4ziKDEneKbr" resolve="newFile" />
</node>
<node concept="1jxXqW" id="4ziKDEneKbA" role="37wK5m" />
<node concept="10M0yZ" id="3egY5wRsj2U" role="37wK5m">
<ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
<ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -399,6 +419,10 @@
<ref role="3cqZAo" node="4ziKDEneKo_" resolve="newFile" />
</node>
<node concept="1jxXqW" id="4ziKDEneKoK" role="37wK5m" />
<node concept="10M0yZ" id="3egY5wRsjig" role="37wK5m">
<ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
<ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -448,6 +472,10 @@
<ref role="3cqZAo" node="4ziKDEnfS3L" resolve="newFile" />
</node>
<node concept="1jxXqW" id="4ziKDEnfS3W" role="37wK5m" />
<node concept="10M0yZ" id="3egY5wRsjsV" role="37wK5m">
<ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
<ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -497,6 +525,10 @@
<ref role="3cqZAo" node="2321JT9jM6C" resolve="newFile" />
</node>
<node concept="1jxXqW" id="2321JT9jM6N" role="37wK5m" />
<node concept="10M0yZ" id="3egY5wRsjI8" role="37wK5m">
<ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
<ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -634,6 +666,10 @@
<ref role="3cqZAo" node="2321JT9mejN" resolve="newFile" />
</node>
<node concept="1jxXqW" id="2321JT9mejY" role="37wK5m" />
<node concept="10M0yZ" id="3egY5wRsk6A" role="37wK5m">
<ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
<ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -683,6 +719,10 @@
<ref role="3cqZAo" node="3n9jAIZJvrh" resolve="newFile" />
</node>
<node concept="1jxXqW" id="3n9jAIZJvrs" role="37wK5m" />
<node concept="10M0yZ" id="3egY5wRskpk" role="37wK5m">
<ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
<ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -1209,6 +1249,9 @@
<node concept="37vLTw" id="4ziKDEnkSoA" role="37wK5m">
<ref role="3cqZAo" node="4ziKDEnkQ9N" resolve="witnessFile" />
</node>
<node concept="37vLTw" id="3egY5wRqEv2" role="37wK5m">
<ref role="3cqZAo" node="3egY5wRqwZw" resolve="prefixesOfLinesToIgnore" />
</node>
</node>
</node>
</node>
Expand All @@ -1225,6 +1268,12 @@
<ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
</node>
</node>
<node concept="37vLTG" id="3egY5wRqwZw" role="3clF46">
<property role="TrG5h" value="prefixesOfLinesToIgnore" />
<node concept="2hMVRd" id="3egY5wRqAdx" role="1tU5fm">
<node concept="17QB3L" id="3egY5wRqAdz" role="2hN53Y" />
</node>
</node>
</node>
</node>
<node concept="312cEu" id="4ziKDEneaC3">
Expand Down Expand Up @@ -1514,10 +1563,58 @@
<ref role="3cqZAo" node="7YjSMFlzo6o" resolve="newFile" />
</node>
<node concept="1jxXqW" id="7YjSMFlzo6z" role="37wK5m" />
<node concept="10M0yZ" id="3egY5wRskHm" role="37wK5m">
<ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
<ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="312cEu" id="3egY5wRs8fu">
<property role="3GE5qa" value="utils" />
<property role="TrG5h" value="Utils" />
<node concept="2tJIrI" id="3egY5wRs8JA" role="jymVt" />
<node concept="Wx3nA" id="3egY5wRsaTL" role="jymVt">
<property role="TrG5h" value="PREFIXES_OF_LINES_TO_IGNORE" />
<node concept="3Tm1VV" id="3egY5wRs8Wp" role="1B3o_S" />
<node concept="2hMVRd" id="3egY5wRs99w" role="1tU5fm">
<node concept="17QB3L" id="3egY5wRsaqv" role="2hN53Y" />
</node>
<node concept="2ShNRf" id="3egY5wRsb1f" role="33vP2m">
<node concept="2i4dXS" id="3egY5wRsbBo" role="2ShVmc" />
</node>
</node>
<node concept="1Pe0a1" id="3egY5wRscD6" role="jymVt">
<node concept="3clFbS" id="3egY5wRscD8" role="1Pe0a2">
<node concept="3clFbF" id="3egY5wRscQs" role="3cqZAp">
<node concept="2OqwBi" id="3egY5wRsdMd" role="3clFbG">
<node concept="37vLTw" id="3egY5wRscQr" role="2Oq$k0">
<ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
</node>
<node concept="TSZUe" id="3egY5wRsh2Q" role="2OqNvi">
<node concept="Xl_RD" id="3egY5wRsh4H" role="25WWJ7">
<property role="Xl_RC" value="&lt;wp:extent cx=" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="3egY5wRshf4" role="3cqZAp">
<node concept="2OqwBi" id="3egY5wRshf5" role="3clFbG">
<node concept="37vLTw" id="3egY5wRshf6" role="2Oq$k0">
<ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
</node>
<node concept="TSZUe" id="3egY5wRshf7" role="2OqNvi">
<node concept="Xl_RD" id="3egY5wRshf8" role="25WWJ7">
<property role="Xl_RC" value="&lt;a:ext cx=" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="3egY5wRs8fv" role="1B3o_S" />
</node>
</model>

Binary file modified ...ormal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_100_node_references.docx
View file
Binary file not shown.
Binary file modified ...safety/tests/test.com.fasten.safety.doc2word/test_witness/_110_argument_over_hazards.docx
View file
Binary file not shown.
1 change: 0 additions & 1 deletion code/languages/com.mpsbasics/.mps/modules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<modulePath path="$PROJECT_DIR$/languages/com.mpsbasics.pdfexporter/com.mpsbasics.pdfexporter.mpl" folder="pdfbox" />
<modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.build/com.mpsbasics.build.msd" folder="" />
<modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.core/com.mpsbasics.docx4j.core.msd" folder="docx4j" />
<modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd" folder="docx4j" />
<modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd" folder="docx4j" />
<modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.sandbox/com.mpsbasics.docx4j.sandbox.msd" folder="docx4j" />
<modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd" folder="docx4j" />
Expand Down
30 changes: 0 additions & 30 deletions ...com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd
View file

This file was deleted.

Loading

0 comments on commit cc32904

Please sign in to comment.