From bcd949f406dad6cda759eb5d452b936f67a8998c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20M=C3=B6ller?= Date: Wed, 4 Oct 2023 20:08:50 +0200 Subject: [PATCH] test: update compliance tool test-files This commit applies the following changes to all test-files: - The id_short of direct children of a `SubmodelElementList` is removed - `SubmodelElementList.order_relevant` is set to true for all `SubmodelElementList`s --- .../files/test_demo_full_example.json | 10 ++-------- .../files/test_demo_full_example.xml | 10 ++-------- .../files/test_demo_full_example_json.aasx | Bin 17915 -> 17891 bytes ...est_demo_full_example_wrong_attribute.json | 10 ++-------- ...test_demo_full_example_wrong_attribute.xml | 10 ++-------- .../files/test_demo_full_example_xml.aasx | Bin 18061 -> 18028 bytes ...demo_full_example_xml_wrong_attribute.aasx | Bin 18059 -> 18027 bytes 7 files changed, 8 insertions(+), 32 deletions(-) diff --git a/test/compliance_tool/files/test_demo_full_example.json b/test/compliance_tool/files/test_demo_full_example.json index 3c2a65bc3..e222c0948 100644 --- a/test/compliance_tool/files/test_demo_full_example.json +++ b/test/compliance_tool/files/test_demo_full_example.json @@ -1424,7 +1424,6 @@ }, "value": [ { - "idShort": "ExampleProperty", "displayName": [ { "language": "en-US", @@ -1595,7 +1594,6 @@ ] }, { - "idShort": "ExampleProperty2", "displayName": [ { "language": "en-US", @@ -1792,7 +1790,6 @@ "modelType": "SubmodelElementList", "value": [ { - "idShort": "ExampleSubmodelCollection", "modelType": "SubmodelElementCollection", "value": [ { @@ -1834,7 +1831,6 @@ ] }, { - "idShort": "ExampleSubmodelCollection2", "modelType": "SubmodelElementCollection" } ] @@ -2795,7 +2791,7 @@ } ] }, - "orderRelevant": false, + "orderRelevant": true, "category": "PARAMETER", "description": [ { @@ -2820,7 +2816,6 @@ "kind": "Template", "value": [ { - "idShort": "ExampleSubmodelCollection", "category": "PARAMETER", "description": [ { @@ -3033,7 +3028,6 @@ ] }, { - "idShort": "ExampleSubmodelCollection2", "category": "PARAMETER", "description": [ { @@ -3071,7 +3065,7 @@ } ] }, - "orderRelevant": false, + "orderRelevant": true, "category": "PARAMETER", "description": [ { diff --git a/test/compliance_tool/files/test_demo_full_example.xml b/test/compliance_tool/files/test_demo_full_example.xml index e5fc6d966..25bf5e990 100644 --- a/test/compliance_tool/files/test_demo_full_example.xml +++ b/test/compliance_tool/files/test_demo_full_example.xml @@ -1219,7 +1219,6 @@ CONSTANT - ExampleProperty en-US @@ -1380,7 +1379,6 @@ CONSTANT - ExampleProperty2 en-US @@ -1663,7 +1661,6 @@ ExampleSubmodelList - ExampleSubmodelCollection Instance @@ -1702,7 +1699,6 @@ - ExampleSubmodelCollection2 Instance @@ -2671,11 +2667,10 @@ - false + true PARAMETER - ExampleSubmodelCollection en-US @@ -2877,7 +2872,6 @@ PARAMETER - ExampleSubmodelCollection2 en-US @@ -2934,7 +2928,7 @@ - false + true ExternalReference diff --git a/test/compliance_tool/files/test_demo_full_example_json.aasx b/test/compliance_tool/files/test_demo_full_example_json.aasx index 85a0e5c7a437b21ccf5b94adb07eb6973d70068b..5aadbd09978324756f762becc314aadd46825e31 100644 GIT binary patch delta 6488 zcmY+J=vf(rfha@ z&Q6*dXb5jkoyjfdoyaX=EcDt)`1G(~dKP|NT=<4auSjiJ4akSfF@@(yA$|wSwLZlM z6)B>&b~2B8^*jA@WQ;~Rqq*~?P?!eJXW@R%Kzfcz3Ok@@g0w%s=oFQcupA!{k&ZBi zkYmtxJdrO|mz`BbOAn@rlop&v{i=k&^sj1RgW|-I*T{*hhbCoyBq|NO?gvQR$g4}h zZ^q4pcIF7@ZB7^$8Z%-$viO_b@B11k{Tcut+Sygj6^Afjc_-~uE0?de*KU!M{2=!( zvT7Bo+tkVYyZ|w66wVELT-zXiu3z_AaQ1t_d1YYg7~33JJ6*@P_|*+6Q@nx8VFqi4 z{b8WMttKn7=PK=gGT7p5kF}vQ{8ljsqhKV2w43Mh8Ev-yMPariI>tekpE8~#O*yq) zIX{(FvfmBvxA^oVknZS2)e~UT}gxAFeXF;c0{h{Z6mEe8}At|2(l~uF1 z-)&O1mwyX6H?g%U_j}v)+R=<1AGbz@b@hDmvG7z7TMcwb)bGaY_a{H6i^B-8K~8iM z(9em4jcc`Qsat+K_O`+-#TJ)2b1vFP5gJ}S(s844Y@zU6h3-ShENu8d0o!E!j(7yK zV(Nw1yys*%mQj`E>u8*8!oB0xz9ajpZy*)VwX|T8jQYcIT2Og-V#U?!c#Po;J%2D; zcQ*s{y5;X~Kx!?OH~-t8+C*yEVqw+U_TbO=_D-u(QR8D#@);Hz$S3MvQefEbKu0ikTLP1fAIk$TRvpVMKTZT(pn zKb~M*M`rmAIhIFIBCC~n4O%rgbLptHL*o_c<{N2M5(4QQCA=v)hW`*Ri2d~a21SG< zE7+1PRUaHs>7c0{o^pGi6nc>QyhMW{rPnUJ^@uwTo~}`Biri%dxdM@Ryrm=vJB{}{ zu61f1)b+=Y%7?S(9_!&UGl?1!>h2z)?(krLHOyt^zS6vET6Qf1_3oFVk`ti9P z+!wE_1&Eu&Z*BgQ3t8#?2MN)t@58dWDk8ZXA3w&33I4=vj+L4DtGKE`L-x&3qY8wG zdOG>5#WYWdfhOiHWNM1mXQ%cGV7r6!KDXNVolkV+giJuc=T!iw%A@N@C@Z(Apb0SB zcNvXN-nc*>lm3Rs+b?^-faa9+qN&W%enOzf%>0ELWlY&@Rq0gV-H?57Zg?E9SQscX ztD9EMbk07KCfXlh-pwGD+NZm&_mC;xU8?l~&HW1CUod&pLr5E;1VJUVb%*EU&`m?| zbzO-Qj?_LzEQ{rm1TwL2lLX}l$;flT(!h z0yxK1rQzFppJt^C_KE??6?12QBDWz0S&u%kUCnxY4u9}A%4RW7bgZ7R)mEq*g$zsL zma9bVo?eTa1{dHM+?~_few^{-R2Hk=D?N>UP3z(rG!^ww$J=dFEL~6>c1j?sEzWl1 z17M#irNd>I_Hf#Z?eROn{dW2u=^EU&_A{k<=sF^U(E<6W{b{ojWoe#y2LMrMcUnig z!7ZQR*H1M!?D4}<=_~>CkB=L)Qtqi28cMxanN5<@O;TH54nJt<^6W;m!;qZNWz0tq z;Y*=}2Ih(`@KxjX{bWmIGhVt?;rWb-sgOHYr1DAHxp1l^-Zb?FTHACU6|gS4@)Le= z*QWGYbbt+uwE?HHEe>1l@Cb4shx3fAL)T@Dpk6X#JXC``*IQUu80cz%o<_O`ewBpV z^*_-+p5*Jd;r%ia45th_CZt=iRPLGQz|g| z+_CAR@yEkw!LVZH7punk7Jq%NjX0qvYlV~+gM$v>{->R}M^U~UQ7VK_l37t^d)(Qq zy$#Ob9;C3@>72Hr@q>s;=Fr99KqrLl7ky5is~tKPSia`>J5~f%4(upGp!hi!nrZ^ZBZwNgAmuOY{H4LM=f1;bfhd?^ zr5l%9`HRZ|4@`;o2Mo!c&UiS3ZzupF7N^a62>xRk*)eFfbB*TR-Kb>rMS32{jqxRd zEUas8w&6mMi|*X(l{?$vns_P96xOLzWlrlXxz={v;+4D)a9yOt`WYT+Dn!a$we-b_rv z>hvQBZDLPHXtZ%X=R`|v0GDtM1R#P#KLTmoX-8*g*5vB@l!Q3X%dppoP~Xqml<*Gy zf>Oxu_mb>`9rD+6lZu*dzMsp}pxHw1x0S!_+1mQxKgZxdznq+Not&?iGzsMByk>v+ zz)f>*41|+>C@6J*-Pud2Hw=6{NjlqR7q%GUa608bL|wNpqw-wHRHU2$J?k@Lyb)yU z+2N^`;=-LSTsL8`RKfN~iipQq9#@J!U4uiut%+;t(*r!7aS)BpJ{`rIU6x6^GUeG{6RpeYyJrJ$Rl+xI+uoixT#YTweQ|Jf|PDfCpoAfGUa zxwhr-E&y&uI-ECK=e0m8PdWyAu1$ml1j=g>sH%meCtW?$H^09Ck=2hdbiP-N>C=@W z1|{%h#GAPAI+;0;B#@_)eaFlm|AL@&Tt+8qP20%Z*q6F{=;%3ILU-g;*371ROq%wo zGNDn?DF&wQ3${0Uv)+*U1&`hD+jZ$q1#pzxLen_=<+Ce^@j&=4rtCy23y29~n@`g@ zuV<{ioJ0G3|!4(_uq5hMoOj$U>FD9LQz8?*3tg9#kTbX(6Dl~s*Z@jtS8dIN<97Xjk(?W(mM zbHr*4W}3Ei<(w*I1UY5u;5S`!CT}bC3;I_=cz6ec^UD#OBAwjz`FSN$l9TX2Z4Isw<=c{4w4ko9^#ho)bYxKs1 zNDp~c*o3{C^nCXSwX8NvuJ-axSdB68U*q@#$=Uz(P-?`eK3_5{xyDXtHf%AgR2RlXCr;!D#`<5DO1`$`Bw z(t1n?dRzLC8UibHRS=Zkz+D{S(e}TN&#KTnMlE`1M5INS{Z#+uj)6 zNIu;tF0C)_oQ7SbR${m*xS0gmIcdzKrFHbTX%1v{m3_#Q=|?lam*Pq>)~G!3+2SE* z0UBlHD&x$+8L3+oe~PxTo3z+hg|QJ<&nl@IEN9ite0N~3sq2rJzAM3Zel??2`9tgz*-kp8bsXyu0&oK#!JK?g}OY>)8RpBAX0e&{c(H zTPH+dPnTRW5Rv7UB9U1`55>cR$lVc~4s;l9N4UWF7v)ILa4FxC{iKtapt&}W!ps&G zR*z7R4CZ}rcA9a(p8>|C(}w}}x87icj3;KdeX1wqZU^Meq93j+)u#%+ftdD5wjk(< zHtaKDl&@UNLENgPniqP?OR~ihz!(B+(`a-JathCs8cG_O5Ty!2wX{z}%b=9O2+XfB zZbOiyc#mgW;r{i51%rBwy$}bQ-mE*OOmcCVI@bzr=wS-If*RbrN-F4j_Nqi|Sv(uR zTDta?NnR3vGCsvyj&iX|uaD*ZY%aCw_SYlz-JSG~kgJ0Q{6~8U)i6bu*nS9jbmjOu z(sZ{=yu$ia%XgqS>Pn6~aoA6eI7>lFP8D?!u+F@TYsMHa*N4Ge57^|#HL@<1ij?pw zes@w~{=*}$^tp|82cLME#Zh(S_g2YOAG(0jmGBqo7<>e!HK^BfuQ)s@TfJbqb_xTF z#KA(K-I*eG?;sL=FLu}Yjt|m<{_I0T=D&Ut5{DVGEp*ZTn{c&h0w0_#e5P>y4OxaK zmb#Ef-OT^H?C#Y`p$eO<-esYMHAY8p^rxonUek%$vlp4C<&umK9#a8dQ{X0us-O4K+*u%afE+2f=K@KJ(NDkcO zfL-U^W%rI@RN=!?EpbDr2dP~?ePR`ieLwt^`FD(Q#ox+e1=R$Gc&-kM7i2*)^MG{- z5<&Vlt9wsoMvuabe^>o}QC2#p9spQ1uE?^}!Pbj9)@3|XPHyBvWU)Rh2n^$Cej}9( z)F_p^VHu}o1}`#sk%M`PeiOUFV)huDIW0CA^f2ktdGW__mtXY!FMbXPN|+^`9314Qrm{s9%l)Xo$!k&S;2E zUO?E3tkIWPQMqHMaZyDX*(p>K5=w(@Rkl3Bvn`uVuX zP8mY$F*jj#9HKombPBlkyF+pbn(eYR4wNW0S59_f zPEkHZh4o_ht{uxS^mgUtI6z5FR!K|P)3K4$Ypt3`d)JU>S;io-t>K^*1WqzMJ#cot*3#j{s6e*X z`c4w{0#OiA7z#2MKJp~k)#lsn`L@K$#9jHbVG>tiP0psqK24iGaxvH0vRHp9c`2`^ zi!~058k%pXN<7P8)OWpqOm2$-Q2Sz35vqpA<;0knhoHWQp$-Wg(Nt+gXVLx>{kisK zL~~QCOApBjIaNH^2^sG-s7FNQ!5Z)#;;sEe4#a+|kQ|fQf(WDM(2WerM)YgdiULPW6 zJK=}(X7<1pN~x0l=9W(-8z3O{^%YqljX<$+B=wU`K0^8El;z;Y+p#4_vk8zR=2Eka zG&{=-)V_L>VrENSeU+HTe|`yt`Qq9Hap;^@d?dYHA+Ykw-ZJ7c_paZwNN~0@5Wn40 zMdh{S<030xtV-Zo-RTr{jeZk!O$~CPqp~UEQoainmH*Iib1P0aIsJyUV^h|OToe`9 z)MbVNY+4a5o3C4xYjx+UXeJXj*=cCjz?A6vH@%^kaVf|d+g7wT?=)R=<=8Za9ZBBl z>(OiDp{%GF;zaI>#~UyutndUjHpn=|NaH(p@s}(j;p^Kiu8Q|3_d==`X9{I}8Cx0cVE4v9#pUFh;W%oasYCO$sU@ABd)81}o+cA+kA5I#{ z!DGQr!v{mI>G!mZJDSbN_p|~40qyWdR1s?;n#R@tpQf~SsgRItR85lHPrYWBjrwJ5>$&v0=O!4@JA+4d7V}U#yJ1)kJQ!Vv(oF_n2Q1wFpc78n|JOB~!e28qXKUZ^X5b}aa+nNm{q zuF887rUayS+SEs1lmln$e$?q+PeGqj<3^`#*qKTRJGr!R^%7vi+F*Y-Fh|@$xbQ+R z1r@)4GbWOgOx_&Q_(rV%`3aCNlD}35WmG^dDUmZ<_B|sdCIC_3+gs`v1!uIy4CX?e z~@byRJTUQyD)e%~Es0_U3& zWa&k^cl$Ih`*t!yHiV{7JWv0gzJu%=9!B^DpxPO#a(~>dgz1a3LsEcsv4}e{ONtm1 z1EH;SF@$Aj7Yz(;=z7|6j#?B_2Tu(LIMoJyQVL5S@)63p*GI%{Sptl?sVD)Hl9b&f`NjdQ!X4o4)xrMi=T&=o5d9C4~Qe-43r^lMCwR zmO?q4d-VQQ_1fCwER%3X|I!Cln4DB7w0I#u>B(Yw@$0pcya;=B=RVX7%#B9G=W$@i z^XGz~VPa&AcVFfw6@ONa;?lhT_FtDu5)z?+SeGsr4+2+7EFS6IEfN7GE*d?Fsv%W) o+zYTc|Nbv({iMV=BG&)kN?_$+#<%~wi@@f=lqf9{2>;yw0Gh6g$p8QV delta 6470 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 diff --git a/test/compliance_tool/files/test_demo_full_example_wrong_attribute.json b/test/compliance_tool/files/test_demo_full_example_wrong_attribute.json index 0bd00b497..5a2e23771 100644 --- a/test/compliance_tool/files/test_demo_full_example_wrong_attribute.json +++ b/test/compliance_tool/files/test_demo_full_example_wrong_attribute.json @@ -1424,7 +1424,6 @@ }, "value": [ { - "idShort": "ExampleProperty", "displayName": [ { "language": "en-US", @@ -1595,7 +1594,6 @@ ] }, { - "idShort": "ExampleProperty2", "displayName": [ { "language": "en-US", @@ -1792,7 +1790,6 @@ "modelType": "SubmodelElementList", "value": [ { - "idShort": "ExampleSubmodelCollection", "modelType": "SubmodelElementCollection", "value": [ { @@ -1834,7 +1831,6 @@ ] }, { - "idShort": "ExampleSubmodelCollection2", "modelType": "SubmodelElementCollection" } ] @@ -2795,7 +2791,7 @@ } ] }, - "orderRelevant": false, + "orderRelevant": true, "category": "PARAMETER", "description": [ { @@ -2820,7 +2816,6 @@ "kind": "Template", "value": [ { - "idShort": "ExampleSubmodelCollection", "category": "PARAMETER", "description": [ { @@ -3033,7 +3028,6 @@ ] }, { - "idShort": "ExampleSubmodelCollection2", "category": "PARAMETER", "description": [ { @@ -3071,7 +3065,7 @@ } ] }, - "orderRelevant": false, + "orderRelevant": true, "category": "PARAMETER", "description": [ { diff --git a/test/compliance_tool/files/test_demo_full_example_wrong_attribute.xml b/test/compliance_tool/files/test_demo_full_example_wrong_attribute.xml index ab3c230e8..7c298293c 100644 --- a/test/compliance_tool/files/test_demo_full_example_wrong_attribute.xml +++ b/test/compliance_tool/files/test_demo_full_example_wrong_attribute.xml @@ -1219,7 +1219,6 @@ CONSTANT - ExampleProperty en-US @@ -1380,7 +1379,6 @@ CONSTANT - ExampleProperty2 en-US @@ -1663,7 +1661,6 @@ ExampleSubmodelList - ExampleSubmodelCollection Instance @@ -1702,7 +1699,6 @@ - ExampleSubmodelCollection2 Instance @@ -2671,11 +2667,10 @@ - false + true PARAMETER - ExampleSubmodelCollection en-US @@ -2877,7 +2872,6 @@ PARAMETER - ExampleSubmodelCollection2 en-US @@ -2934,7 +2928,7 @@ - false + true ExternalReference diff --git a/test/compliance_tool/files/test_demo_full_example_xml.aasx b/test/compliance_tool/files/test_demo_full_example_xml.aasx index 4d1a1289a273a1b5dcfb4ef747d5cc94ab42115d..da79139b5d4353154c2bec0a5075a02b2ed034f6 100644 GIT binary patch delta 3889 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 delta 3951 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 diff --git a/test/compliance_tool/files/test_demo_full_example_xml_wrong_attribute.aasx b/test/compliance_tool/files/test_demo_full_example_xml_wrong_attribute.aasx index 394ed8323c8bdabe593b59cc6fb4d97539e293d6..05666218742d1f255a1b5d711bd4dde5460538f6 100644 GIT binary patch delta 3880 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 delta 3970 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 Ufhfg4@j1u9fREBukL2(A5BbPx{Qv*}