From 71ed5e823ecc0d4a84d9b308933052117f9ba5c9 Mon Sep 17 00:00:00 2001 From: alaskowski <alaskowski@ethz.ch> Date: Thu, 20 Jul 2023 08:49:50 +0200 Subject: [PATCH] SSDM-55: fixed some xls export tests. --- ...rt-sample-type-compatible-with-import.xlsx | Bin 5791 -> 5835 bytes ...xport-sample-type-filtered-attributes.xlsx | Bin 5777 -> 5806 bytes ...type-with-omitted-vocabulary-property.xlsx | Bin 6140 -> 6193 bytes ...ulary-property-compatible-with-import.xlsx | Bin 6299 -> 6387 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-compatible-with-import.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-compatible-with-import.xlsx index bb11b60cb05965203ae6bd2949eb089c813752e8..787d95d2941df984540b4e1c846870a57c22c9bd 100644 GIT binary patch delta 3618 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 EUwL45*8l(j delta 3566 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 X8mB9dj1vDF<Als%;wJ(9Jmh}>3-?O- diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-filtered-attributes.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-filtered-attributes.xlsx index e83f7e3c89de906322c8377b71145421d114f7dc..77c3b253844f40cb25d999dc6a662a62155c10e6 100644 GIT binary patch delta 3510 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 delta 3585 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 diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-vocabulary-property.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-vocabulary-property.xlsx index a9c031224f7a22dff8d56c4745e1d38b76016d76..80ba617cae4fe1d6d89e57c8d56f78a97adc2b2c 100644 GIT binary patch delta 3970 zcmZ8k2RIu}8&7N%#9k$$M%1hkqc$~S1+5X4s=aB|C?zPRHnI08ZLO9dr8R<@rBrIQ zXw}}MD5^f~_dVZ#+&%Z)J$LWDckjL9-rrA&T1i@@J}DV9fQpI=AOinhOUn-=J@0Wc zKv|OC1FQ!rFUH0@SCTno_QlJeFY&CpOvmX+ziBDMobn38GQBmPi;{#2)vP;X!?#qq zm`Gel8?qZmV&B-_n)TiK>eD2<zwJPP{dnxCO$Jf-9*+X-A+;jkYj3+r%_xNNn#JhE zTu9WB?BP(No&iaxn?1<3tqMzQ$1xbBA(Ac%(J;M3Hey6f-|Ztr`85&73-9_&ADg6c zfJ=?u`-Mb9J8nzP`@)?rlNM+B%0>jIQ%?*$)%D#w0Z;fi^L@CkVwWgTGJOBM-U~gk z7bot_&#gY>=JuA1H&(rskwF`N>h$I2Sxo@@>zT(T?#cW*@!XEt1jPj#@=nX`kAoYU z?o^K^xiLQ;KTDjH-YhQCAW_Io{1Uj%+7<z{n`q95BFa<Q?c>>tn`EthA{@#KqY^9} z@Csv6)lo|6T^B6rmm5JU4K#?MTC2*EjZ@E$aDmM;T+f2C@RJjl-Z{J2WF(5^Ha$vH z(jdjua<{f1?5<Luna#w_wk^29*F&zYY^|noE({Uy_S#bZ1&)<pb??>*Wz<?^gJe42 zFLM*vM?jtZ-_f6U%dW7SUKHWBOtrGBK|D#ME=jWudfAmlgx{4NUePpIDRVWy_3h*I zYsF>0*4dkZS4NbFeI%mcrV8q=h`m}#_1L<Xj{>6fJMSU-;-%j#28u^@6kiVVyiNDW zWrYgE2<^+K^W^zbweDFiE5gW$ZMj9ojDAK_oSaaiFpWqvs;^~C*?y*5HD0I17%I(R zZz|@V{UMg3i0=(yB-KHKkGA^0VqBo1a6lOrUu`7t-miFdvDtJ$Dp0{8h&!9sp)nM% zD8-$fXrNPm2}hg#3!VGR^q|GOb_E}6_`(q5L3bw2@w7DrpL;Z=GPBn>-6Jt~LR^dd zm3*TAi74l=rfS^yRCQ;3A4(kd7<N6Vla)TRb9rt1e%;w7rNIz4#yVM47SYhu`_l+# z?teCpmvdkHG&$vOE+XA#7|~GCo40FU;jd*HVtMq^iF^^@M%I?4X^g^pDhgd^@N&L2 z6w;n;3lckRQ73(gX8^P|&59(?0*>e-7ESGV7FnFy!dFxuxy~!Pd^v!0<lA$sIwRHT zxWK_b8W_!t&7aN_B#`=)RQVw30TogJzzqTb{KM(60~Df|yQT8ra~CTLgxGJ38BG@C zOx%%Ld*|dPjWcWTzR;`9qE?l>q1PIUnqw4o4X@rkCfpcSya(A&DOxB9`N^R(2E@e= zJ9xcrY4!Zt^%SV*?|X8B-;Wmg)Gv=9VICoSzhRL#31Mp+OiXKWfOdZ-q11!pHHSvs zd-{HYdtjKg5oRIDx-wDii(ZpMeWs60cp<Tude#nmjN*0emUwEc*dX^_3#gz?FpzJN zOGfO8V9H}F-49jY52TmpC2W_e%*2j}u$tYJ{=%!opKrUIWlF7Q_FQiwN1YY?%7ymg zPsO|Jy3hwJls<VK^96cZKPu;4B%D4RSvYy>bzQ-nXpjy&#+86NEo1$EQ15L$zqmBJ zY$2J}Ib^rUOfTUC3}?PDDfS5Odx8ya*--+f#I#YVI5oJ7(5&2{B|Bv3M_@h#_ULY_ zF@ns84x)C9gKmCU=8*#GSE_8wJxWWb(DsKSAGBMeo935~sC6cm<e#Y?zFJ}+yC0NL z=z1NaK()=faY-DeCf|=Z0kXf}(3+Pf$&_J%X2{2ODR~aCO}zhtQL3+&Lwpm0TuT<f z&%T&GgF-B-`3mWm(>EPau_m=#1;QZ=f?x3x*HdxeBg2#l1#+5C8n((`@&>#2S0DYf z5;@U9@KK2LMXnwD2@j#fIgzh>$>+aPQU_vSS^L^Ew(?o=6<Xn<hnD=@+B(Wtwkd+r z$~AyFPmh5RA2NDfZ9gupUgzaJFziPaSSOC7RELHLZkln<>sEMn0ZJVo3|8e=55v0g z>d1jpJ=EH$%Caq?3(beu<cmE8OFKF_Ea~HZy;A^~K|<S~^DW9U<bJ1cc3#wTLSquL zt*>BXxVXRO^JOU5AvHlp3?kD#+st>?Tsb)N`NkCO9>l&HWnl8npft2n367;q9eb(0 zhR~}`%(^T*#8BF75F+rfnaLvMZoX!>Urfn@4P7=7O6toPor$jK94m8EgRObEhQVk& z9m8NE8)JZMSQA{0d2$N`zIGVQjVYlzm<&UjcW+U|q&6ASHC1RT;nqvzHuF;&pD8a) z-^FT{)5ZmzGf+S!)YC3Le*q(9+vh&#rN7iVJs=qUDr7Ish{%5HdP41xjn#qNH-FhF zXyu*PoD|~yzffGf6`UJr__s|r1M!M(t)-ebDqeycZtT3PGg<YO#l9RE7<!B%W|y_u zy>O(35GPeS_~f<is34)n0UCrJET@gK6`!mRw7OcRR&l$G)9XfOvy*&wO>duL+a#ae zfX*j?$+!#9wL+2>O_W8c<+vG;YKckFCS#sUO?R7hADL~eT5Fz~=SaFmUAN7dp~4HQ zqQs{U+;Hvpgyp8=APJby2e=gKl7-PQ6MZ8l?P>)>_J(Dd+r)~|NR!z*ig;8&4zJr+ z*N$iD&fzPjLCu-U_@?8>2oV(;gKunOktV9OHKFaJt+j$GQ{~dO#GI!O3k}0pzBBl7 z8AmK-I!>UYShJk0rmj?yjEcsEC!rqaNal!cgu=<ob44?ipEqG1Jxo9)HggZT3C1^C zE9Q-X9@M82BTd{t(CszL9hp>`9;)W8ey*g^3*c<1<^0uF5|mkyYE%k0XL3$jCH{&q z;?VnHfBCAWc}$9nYfFH*|CSBS$KA;LlR8wwm%L@Z!ccRO_6IyB-`~ma>;r|i2oKaf zba;LEgSk#;o-F%gn8)+VcP~h78z>kwy`ga&(E6Nk^RVCVWX5*={wY)mSC*C=oma7i zGp=SX%Ti8}6O{`vU-Re<MNVFXc~$y{c~Y|_8EDflUpZo(n`dyMK5`}#6b|<Ay;>G8 zttAgmN<P~arVfpav=9>%v3)i+xO0bD%vChUFWaS;Ur5i!u8hoxD*}~07!YS{7O?;X zIAuCJiZR)eJG_pH7kXf5dB9U4rAk5A_!?p;<|IS4Ys4&?JSBT`k;m89&xW1?f8(j| z4$bc{PkOtbwS^o25aa$=n8&q%*#0C}*l}86%#<3q<<O$43QeFWsn_UEInsSh#y%OA zW+od*`6jhxZIklxSqQ7klY)xAk%Qb2+}0phkMWk_p!l-{<XuM4u}M2JBbMfV0olp4 z@0N3WJb7QSIirwzv|u2j^=-H1qJCL6S$e~UJjl@MHfi|_RNAiry%mZo3~_0=o-;fb zb72JTCm&zZ^AZRpHNPxW{WL+T8atQNIe9v`d_~vpQtFRxDY#f#!Dom)@|L7-?7bEn zvCu6vK2E+~?;^VPjPRaWhtVgooLJI;rejp`Gq06K5N$_hqf4P5xr<mY*2t_I=~f)? zXU5ECWu5sjZawKgHMB8*b*ZJN0rC)wfo<6gDT^7V3~oB+4Bm3Jb$x5HlSnqR5S;U= zm7H-?!G@)tDSE_*7^mGr2%`;+k1pNmBsJ`CzgzX8o`y9&$X-KgzN0R#T`tF%JY)X; zv|FLE=T-Ag26q&HI|<H4A9q%SkZ<O^7m#a`gK!}Xkk$JuQYXOL7;_sct6!;MHj=U1 zvvMmraJECWv6*@-AB#s3bTw-c=a@5koFC)^7pl>4u5z1TmYFPkuX~tjrLI5bTw_%R z8Z5PHoLrc6YsiAsSt(Ax_>kAAkx>w?@GYQZwyWCwb9%2w6sWb%noi=VwFnyJ-^G2l zn-o%fW-kc&Z5|xzzSw;rfDzzL`7isxQh@m}1fxz#P|F_6jZK?WRzgf8A8_h1H9tK3 zRTPms9R8RwskTjMV@%3+&Z+Hi*Q2N4W+>cm7pUUmULKjmuGbE;cEjbQF4$!x>M<g7 zOvlFB(>$Qb19J`~dC0NO7CfDj8<n1nlsZgK;6;oPl9MPRBNboLp;cGcn!;|@R)T#F zX2u+3lyQnqPmSlRKZg;A!w70eF{9pM5#Ajml-#~W9x`6s7t;^si++KEz+Uj&5y7n| zwHTwqMLhlVv*+*)3t`^34zn>x9)68%Ez(+%ap|O^{XskJ*my^){<^e6iHWG*o`|LQ zOvh^>?yusiB^FWlxjdr!Y;L%c_eq6$7h*uM<~ABg^wsz{F~wa<@E$7XqoP+a04okr z>;p8MR6Dlce-nw&yx)+(qw}(L&?)Iu)w!T<PsW}G&ia&%?;EA>0fmhtJ)~K=H)5}5 zH5u<2y+6PO`#dPae?>b%cKwUWPv5e)Y`?Vu9%y$91_A&(B!4M`{0|bswlnZ!ygMX8 zkG4)&Zge#mS~o@@IqO}gs9mq#bHQKMzuB86As~GDEEFj7MX7Loe9ZntU`?-b9iXD? zj=Ihw(BJMO@?^4M85cZ|38P8jAf(9-ms}#NFQ=dHw5C)+P+9S14VQ$(dqv&(5<D!* z{M^&j`6U{cg=p*aXXlT$7|@}`2+lQ&a)HdqE~(9LUeIEjTLquduw)c&(tO%nW=u+@ zt2YxR5%`he510C=M_XT!8d}|p^F`cc#R}ZJ)TaEVFyPCzD-x{Nlt1Z88=a2Vt>pHs zdleb0{sbfiqKDAh&$ZA@59qI^;Mrcd?q5$69wNnX66CB`{-mo3C@8DNF#rI_J%68n z=Bo#cAOC>FA*Lt)4QPHW@IPR&hDDL?95kB$mFi*-Sj2dLPyIbCvY&JPt4vT}rzkkF zHmsok0!~&gl20J)JJ3ZDq&|>@8SsB_YW_dp`Qtjwe=#^8?PG^oFQI>*^LLFh{DVdm z3;;NI+avFK`}j)Od*5{w5A^i-_Yvn(|6k~H`oEP$tO*<Bk0@Wq0AZQuD?8_n>2DMO m01p#3nGFj0eUG`TczTEPmm{8k1^*;Ezz(wsQslDy-uWLqU<9iG delta 3823 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 diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-vocabulary-property-compatible-with-import.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-vocabulary-property-compatible-with-import.xlsx index 2c2279b439f07ae3131a88f476157537acba27a0..65a768bdee1d829e034318776afab098d45ddd40 100644 GIT binary patch delta 4120 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 C1z>vs delta 4015 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 Yiiu+2_@kCwsdkud1|DJ}`d?fA2e3Us$^ZZW -- GitLab