From a7588eccf96e6b829686ae858ab1ce2e544d4e68 Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Thu, 20 Jul 2023 10:21:50 +0200
Subject: [PATCH] SSDM-55: fixed more tests related to property creation and
 xls export.

---
 .../AbstractXLSEntityTypeExportHelper.java    |   3 +-
 .../server/task/MaterialsMigration.java       |   1 +
 ...rt-sample-type-compatible-with-import.xlsx | Bin 5835 -> 5834 bytes
 ...red-attributes-compatible-with-import.xlsx | Bin 5817 -> 5847 bytes
 ...xport-sample-type-filtered-attributes.xlsx | Bin 5806 -> 5810 bytes
 ...sample-type-with-bare-sample-property.xlsx | Bin 6066 -> 6087 bytes
 ...e-type-with-chained-sample-properties.xlsx | Bin 6746 -> 6812 bytes
 ...le-type-with-cyclic-sample-properties.xlsx | Bin 6806 -> 6848 bytes
 ...ple-type-with-omitted-sample-property.xlsx | Bin 6068 -> 6091 bytes
 ...ulary-property-compatible-with-import.xlsx | Bin 6098 -> 6125 bytes
 ...type-with-omitted-vocabulary-property.xlsx | Bin 6193 -> 6196 bytes
 ...port-sample-type-with-sample-property.xlsx | Bin 6384 -> 6433 bytes
 .../export/resources/export-sample-type.xlsx  | Bin 5943 -> 5968 bytes
 .../systemtest/asapi/v3/AbstractTest.java     |   9 ++++++
 .../asapi/v3/CreatePropertyTypeTest.java      |  26 ++++++++++--------
 .../asapi/v3/DeletePropertyTypesTest.java     |   2 +-
 .../asapi/v3/EvaluatePluginTest.java          |   3 +-
 .../asapi/v3/UpdateEntityTypeTest.java        |   3 ++
 .../asapi/v3/UpdatePropertyTypesTest.java     |   4 ++-
 19 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java
index 36e3d3d5a7f..e3120bfe082 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java
@@ -197,7 +197,8 @@ public abstract class AbstractXLSEntityTypeExportHelper<ENTITY_TYPE extends IEnt
                     String.valueOf(vocabulary != null ? vocabulary.getCode() : ""),
                     propertyType.getDescription(),
                     mapToJSON(propertyType.getMetaData()),
-                    plugin != null ? (plugin.getName() != null ? plugin.getName() + ".py" : "") : "" };
+                    plugin != null ? (plugin.getName() != null ? plugin.getName() + ".py" : "") : "",
+                    String.valueOf(propertyType.isMultiValue()) };
             warnings.addAll(addRow(rowNumber++, false, exportableKind, permId,
                     compatibleWithImport ? values : Arrays.copyOfRange(values, 1, values.length)));
         }
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialsMigration.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialsMigration.java
index 26a9dd5bf1e..0ffda7d680a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialsMigration.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialsMigration.java
@@ -348,6 +348,7 @@ public class MaterialsMigration implements IMaintenanceTask {
                         if (oldPropertyType.getMaterialType() != null) {
                             propertyTypeCreation.setSampleTypeId(new EntityTypePermId(PREFIX + oldPropertyType.getMaterialType().getCode(), EntityKind.SAMPLE));
                         }
+                        propertyTypeCreation.setMultiValue(false);
                         createPropertyTypes.put(PREFIX + oldPropertyType.getCode(), propertyTypeCreation);
 
                         v3.createPropertyTypes(sessionToken, List.of(propertyTypeCreation));
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 787d95d2941df984540b4e1c846870a57c22c9bd..82befed856dd6f11cc9859fcb62fe270203e7447 100644
GIT binary patch
delta 1919
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
ZwEuYo3Igp<)lZf~D?wpJaI%8X{{XY=Oy2+i

delta 1897
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
Jj)4oW{}+4?VgdjF

diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-filtered-attributes-compatible-with-import.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-filtered-attributes-compatible-with-import.xlsx
index 7f2025c69b7787d259638e04009d6a114bbbafd1..a29aeff40240f59b3aabcea1ebf191ca6da73a11 100644
GIT binary patch
delta 3322
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
b9{_fcErbvM8b$1lvdPK9NA?~6b&G!i{3PaC

delta 3318
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
JQuy-r{{g7X^7#M&

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 77c3b253844f40cb25d999dc6a662a62155c10e6..354bde744e24a50f37adde0bf81b5aaa97ba0924 100644
GIT binary patch
delta 1524
zcmZ3dyGfTPz?+#xgn@&DgW;RQMjlm0rf&|LjTz0DKy)^<Br}kn+{PBjc5?mwX(`f^
z@3NWITR(eu{igh6+tl?o$095oCVX5e%{?)`QjR}qj?%q_mgf@G7wNb%$=y8m*z&MO
zNc*KDuS<6;>$|EHn;sVZ&BNZSB=jI!Dkpdjr|+SHCYF}-$&)@$daL_KB>uz&xgg!g
zD_bj8muuP8CwyG0k}&16M+ws`v4uAy<Ep0j+FX8M+*rS~V{hJPeTO;DMcI=CKCVkD
zNf&ng*K8^1$&z+IlcTgV;E>^)ry0%jH~yHpy7r?}eZ#^#-_nHFTiDEQVNscqS}xJI
z?49}ltf${qTonJQRh-YxZa-dP-_Ed|^O5R&BRvUDdC#_kS~s>C{B!+oZnBeIb-~tG
z(*F}CtT8dz)Twx+-d(1%D`>%2W4{80f(ZNXTSPf6D(n2Oo2=w;l3AFml)~|#Z_}lH
z%^l10)V}&OOnP?dD6gN;%;m3Hgm$z1yLh0~PQ!OT^OOd!y6w@`|AJ-B*9M(;|KhjZ
zYg$tHy*AUO>o2KP?%w33#l14W@5x!sMFp}f*JQ6<T*LM?z4pq(|Eub|*06=I{<tu0
z((ZkFtBu2BnV;$%VNk4_7;waB%ef2RkN-Pb5#h<&y7PEY*$ug}C&$=BmY9f|E{J;L
zzUMHfOn~Fn+y_q2UzjS*@O6k-_s_dicuH~PktUNHMUI!1Ok$VKXi+>DbysV?X4T}#
z15GJa2aoR767g8qS+)3FK<1Lz*Y&HrS!Vf4+_m;`+?p<%`gF~*2En#A`H3z^(^NSs
zz3VsaUtnK-p)7cMbE)}jzddt%1pX<k(AsqG;)%NQ2wQEP{aoIP>vCPzckb9I_*d=G
zH8-AF9j$IZHl>}~utrkq)0gvF{_(CC*R$H0JlQCy>?|j3X!gYNW$H!qr!W8a+ca;k
zKV@uj)7I?Kp$W&`Vx&H8sd#CoSgtFeJgJiVNX8Ra?jtXrR7)pK(24fwNvqFjlwgg|
zJh6aJa%+7Y&-tj23$L!)ck%3XU4hNd%#Q34(p7PbzH@WJyo+L=#X2sEbqfXETl4$!
z7VpnznlmG0uPzAOcQNv``KHOnzrNpUi+H+OG3{r4l*gG*TU(N1wgD~tb5COCQ)}Pd
zIgJw6-yd8OD;v5r@WRJPZmVs@hWqN*<#vQ#xIE$Z#)T(hyVDnQKhqUxE=#<0Z~n5_
zS?O|7=OpfKvznE-xbEM_@Wc1R4=lT0y!Tt?`nb2f7U?R&{yS$)ohy-MJR_ff^POh~
z$7hO3Xsiw|J5_&z{Va=DUIN4MHQ$={ANHAW;NFKXA-`ld@-iOpob_$j+(N_uqS+Gt
zSGYtXf*CcZ`)`y|dMeCgEWYpl+pq3><H{M*mAqVkPYd@wbX(@xdYR4XpBS4DtCqOu
zUJDj3veXsrzgqFcYSN=l&G(9T)AbF{%~SBcFkjFk=<h3o(&AGr_0BA6yGxszuIESo
z&{kU{wQKH#g|}*?56mfd4*vO>b-HraHG!{Y>KFDHZ3#Ntth&JR;M3g;!cy0<6gUaF
zE~rp@*7C7=^{GE1ZRNY2{m-hI@O;hT;|+>F9AunTymg&*^YK^P=ijUk@Mh-_`NraY
zfQ5m<UWkDKQBHwMrVefia7nd@M*v(>ZQ<Ji=I05RgXqc21+RgW)e9{JbJax5L89>@
z)*xz*h$Zhghc97p<0n57u>?uTipnrHOtuo$lm|(FdULk!0wV)M92*0J2m>;hHMvPt
z8LX!5#nrdfKs6tj7#IYRl`yQCd_+_s7G%!n1%f%hfpT+z>I6{Kqyf1p`N;uA`31%L
zi3J6E6}dS9-i%BlK>Hvi@|UoO*BBb619g1_Vqp~B^CvrsDJg(#cx1huKLu#|6;^aL
T<wBGDg+wRM5EEdN0s8>}L)nj)

delta 1375
zcmV-l1)%z}Ev_vLP)h>@6aWYa2mrJ-u?!^v0<<-=GXXXN0<<-=YXcbr0<<-gh6Ygv
z<kxRYvK^D%1~z{IbNB1)kIA00R~}<593aT})QyG6uRM<jF-{Th&>Uy56H%5T0gr6s
z@tk24szYhw^}5}Wmm-q6n&FClhJ!{C3GgiqwkghpCSf>10>bAp$$8247JiB^WM~hm
zmhsd=ywy7upFgnpQW7xAX(T!UO^eX%EHAywMxJT#nZSQi#9p`g7a-0dxiv|MIH(xi
z*+h~5U`|95f!TK&LR})1a147n+Tdp_e&%XlywD$DD7U@Y#48TZCLsX{W!W8uqpADN
zzgqb{2~mi@3EuPC+Tk(X&mq8Vf_TZNj0;A>N0MQ%3brkbf6@I7P3}PnXs!CjKNut{
z4UBAJ2=RXrN1~z>X#I>690(lN&pmBL0#2R}>6#`LL5L%?O@s^q+)-BAcM$Q^&7__Q
zP|{qwxWP#x^K_j+Vwb=_8o16orRj5k5>UzSc5Bans^g|r>iLKcbgN`3cI9nYQ~D}R
zlD8|Xq_U9u=1AV0A_~_*VBKLI&1zVG)<+%wud06t>{SJm#PxMqnz?EjsCA(PsPKz~
zB9?J=hQ2@cFUG@4C#cFjmYT!%up>9#p&X^DC;-(;KjIxu;DCy#ZUYxOL9Y?PYyzrs
z^<V0npq$GJ7No(J3z`<8=^Di(3~|=#R{2cPo6G_hB-0Bn4ysC^w<hY1I$9&`THjkF
z&}@Ig=-y!psy*u{D`zzYj4(9(h$JdDD?!Lx`jgEC&Dn#Vo4OpVyIFVQ?PP@T2SHVl
z^^QjNyTj^PVfj^93UO^CdQHTQjp#QKw>DzXL@YGImo-y{WzEo#r+-#?`YMWkE%2cs
zkBt}^^4N&6A<s!Ki@qsO|9|8eoK>E|$?ku#5f_F$HsaEdr^QRR3At;57?I3dAVwoE
zS|COz-`fy_WZ6PuH2Xsf#3=YmLk4xosQvR|c-D#!tycAoZoY1Tm^HT{=9Oq6G1}tJ
zhV+cKn72TTwpf&q@@Czird^t69!$gPs0NMljm}!Wk)52;zt=XzDxVE8%hy6;mal&$
z6yvhZTOj85#>gz+Y1(BA#JGMBChh8|Dvg4U&sxy2os04Pb8SPcf}V!ljtxcbT09$F
zFmHhvv<s8={xt2<JoC_U#^|=y(F_~)^N+t8{=Nb>y`Jl}PkZ%hZ^StxnRv?8pzOpj
zn89%SG01H`hB(s#(`5C^P8oTpnLvNZ4NTvd)n4#-m<bZt8=f9XzazFG;5bpEUbizY
zhQDGBvyobX0&6ND<?<<36Qq2CVdld3yS@IX*Xs`8Ohl<@-}0(4c$>rUm1Fiy-eGXK
zgzl&fdTKl_r={Yt8joB@Qamx`J*4~WCC1qkWC{8+0!gZ$9HwqgnP7;(Shs&pQ1JRK
z3xCB#R1>!oGE^IG0~qpdXexiZ;Br3A8lv9j1e#ZdR;u}73207m`7WqcnJWRDkVFwE
zo{2eO{KHjcehS08-A7N&CNvE7U=9sZTf<T_YIC)&JA=pSho9MhP)i30S19+ByaWIM
zJQ4r^P)h>@6aWYa2mrJ-^j5Qu3l;$av^BG)3=jeWv^BH14!8jVv^BGG5H|q=v^A5f
z5!M2<HM4^fr2zu8HIph7Hv+UZlVcP+0<<-gpcFX`v^DfrS19+ByaWIMJd@@WIRdmb
zlOYux0eq7_6)6I=HIr!-908V-h7}_Mv^A5f6&wMmlgJey0<<-g>J=OTVv`3J9|E*B
hlPDG(0h^OW79s+)HIr!;907Bah889U7!&{i005?Wc(MQh

diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-bare-sample-property.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-bare-sample-property.xlsx
index 196100d372c72de0cb03170905c97004cf46805e..dd5fd41dc1b71553da993e97bc343835a441b3a5 100644
GIT binary patch
delta 3747
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
Axc~qF

delta 3740
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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-chained-sample-properties.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-chained-sample-properties.xlsx
index 56d8359974934e87053beee3b962f312a8d32cc0..93758b0a7ecd653548f80b8fc399c4834a87ad69 100644
GIT binary patch
delta 4552
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
M4>b!0#&2)_16Jrp9RL6T

delta 4521
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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-cyclic-sample-properties.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-cyclic-sample-properties.xlsx
index 3de0cb40e840ca239231956fd7f1b3991e4d6d54..291e272047ace1047d8a8c2ecc8e37f10b2b6d67 100644
GIT binary patch
delta 4571
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
Je&vrU{|6i{IWzzO

delta 4512
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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-sample-property.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-sample-property.xlsx
index ad06fbca77c7983d92652dfd4ac9da75d49d1d20..5fbde3b3819af5c9cf30be6d50a8b5fc705c0e6f 100644
GIT binary patch
delta 3818
zcmZ8kc{mhY7auzrg=UN;`)<gRox+fPXRO(ZVUX-g!;IY|TgIM{eN7mYC2OL2$-YYw
zMT03ze8{K1=lkBb@BVSlz4!S&_de&Gd(SyPyd*)A!PJ0)5(J>7r3JKT>@_e5kWrlL
zCRs8$@?R62H-!XdXEBd&U>Z3t%PTTo+CZb=$4u`e^M;e53mv>zuJ_a%bV1a>iJ7}_
z=Wy5kcvf#htw81i`c5umkHhTZUG>P9!r{G|5XY2wm19PM3x3>YJq`30`Q58M?dW3j
zL`l9R@F-L0O0RC!;iw<8WG_&#op0dQ3?)paG|(*GnArf6bkZNm8f2HO{mupJtN3M?
zjzcCBU}E^f-$g}%40W{P<<ohQQhu?DB$xRv=gtF>!0n*ztS8H7d9*>Y%3UX}J1JJI
z@xo4$h%9gvYOTBKr^A+1aP#W1HBaJ2HWfqWm>@(a`yNFP<cXJjQ8VygLlTF{mGaF=
zUBZ=V>hX6lkc$b)#B4Klpna=_){qVJ9UvpWY%_vBCCzZpc{bE`w<WnOD+^YjdmAiH
z?QIFX(E`>teqKc=X)ZJ>fJ+1xU;ud>!b|9ep~?HXWV41&jSp?}W5>h&T8iX=|B^Pp
zU~prSN~)c^tih3V>$3)j(C+cW5D~L^?;!d}V(|iolYZlC$KwhrMFq0LB2!;2$vY5g
ztPtyZdFo31yX2S~ucOAJ1nKw#;C#V`jAfJ)3IR#TdF_#VfxBGgd%XhRc6y3`2+0}6
zwCiQNQ*|n^Za3L;Ag$E>3@4sSX*5dX<1ghJ3<bjU2H70_RdFyE6E~D8f@^PVkx2`d
zZqJFC2RbVfjt~U%{%b-DPPCwc>VT(d$;C=bx}a3NG~|)5nwQOt;3I*P`vUO-_0ux1
zl^E3HLXuCFhOme1cBH`ao^<o%IOE}<puBIlSgJj)ipdpHFKCv-akd(Wt!6l`YG~5c
zQ${W~XfSXdJ};^=tlzL<nP^m_?|soRHwj~*`f8ys{Nt5nVjU`_kUFFaLU;YqaSP|B
zL1Pe?@IqJW;lh1JG30ce914%<v}@Wba9?jWoT6H&Nq4rF8Io_k_sV7L;Om2yjRyy3
zp3`-eh|DFjYB8HkVcYs?qUaFO*&?sAGhx{0CO5g*<B{t7BbBwz^*LwUj#*P?f8}C2
z4WTDD3%YEs?M(SYrMP)skRBhgVp+5}OlaY;3+Vw6UolqAfHOoZrAIwwBzJP5Ql&Nd
z{x+3SY5$@@z+aAZ6JfL#o?czC3+<Oe;>#-D@FZNx;5k@Lh|6hvet6%TL}O||Lp$W1
zv*<+u07MG`0DpW++$l8_;}Gyz5friP)I)N-LkbxP7MAu~R9*_4-Uvo4gBZ0htJkJ&
z33Z|C1-f}=^Aeu@cuirg^J6t1%J6D8Rc&QZ@pcwdp15KAi~>V`=%nxv+69er#N^~@
z516f#V1+_mUVZ%Q<i*KdbTLtmUV5EcQMWOU&A;Hijn#UbqPA@+rd%;9GqRD@FVqbM
zHDJ?zwFuJ5n%GILV|~<b$>n1M;g+SvCOB+z-p==3i~UIJr>jP<mj`~2K74X=1bk97
z$ycbK_{>i9bgnPHD<?DwA^YKa>Oh$1u$cRFt(7}5NKagwxSxgwyb%TcfbsP%yQZxB
zUwwjc(^lt8nS*R%Vy==U$^gAY=T|w`m(5>}6mD2cfe6$7K5LJ&0}26gu;7@F&Mxog
z73>$77#|$sK3G_V$v37IOs9R|h1q^IVdrN3#;q6K^LCC`;irZPl>Kfbok!hfuM?{X
z6qrQR)cwXp(-Al{M!2XmyE<FHjZ!AjMibw!K-e=chF>YdX!hT{z?jn5i;hi#AovcG
zx&@7HV!<hVW);X#@?*M_)P(YH#>kFcQ%do<Q}o(t$V-RT3pcpOIIip3eTVz8JBmbr
zg+8`QTBgHk(G~*6#szUmp66T*Z?#Pwr7JtN4_Y$>X8Oc#R^EWD)VfVX&MQH>`$ATB
zO<kus<_`KX1;*Nf7DWVV`e~Q2$;<RRJi0D#1&b2D>V)?*d8diO?=r$NJ*H#^FZ(m;
z5R^)UDLw%jHEPLB(SwS~V7#dwLORnnw*QBpIihG(P0wJRQbt>3SgQoIwez5;RZQ%p
zcO6*!#tq}c$?GJkvnU!{YRzud)-%QMqs^s`gDVizr>zh^&QJ)YrWb*R1zi0uzrlc3
zx@TN4oU35JYQ!54j<wLK&BJPNev~f(e#N3Ho-S9W*g*R$qgiK|E*bTgrpzj~DYv=Q
z09WIcV;*jv_#-U`^~&<Agpy%~P;BnG`m6f8=jUDtsEQ_@#RiI9s=tjF3LTV&Q{Am&
zz_i3*ctZ}m@IOhnzqaz=UpX|Z;|GH5dF(#FZ&k-nJDiK)P>(2&)8|N-ET>vC4?g8+
zk$fy?K@98Am(M@d&+TyLn#?Xt7_-|q)*$wn*rBJ$R@Zap_p6p8BsRWeJJD->eLCzW
zxuBYBb{u4C;T9eN9~dUbYx*i|7wKbYl2p!>f%1HmeXIH&#Y`*^zl!G!v3B#1fC~+i
z?|J!;Yh+$z4LO%tfwBr;S+K!v3fZ0B!b|X6N2g3=6Ck;&9Z3UMc3wP}cH?9Bp0i+|
zy*<AV83ISNaVZU*CG#{5RLrWk7wsS<T)jeiJf}|_C-!rKMoR=aFsG<us$z$Gj|q+~
zP22aeCVe%u=Bb;v<f`FEYWXthqzcQCsw75!X=jypW(S|y5`E@A?rv$Yg;mh$j9n1E
z(iEU2-Lu;7b=Ag`Z;z_sdQ|tLeEc2?7k-eg7LfN=*!e@8zsSo_`Za(~N3u7{b0NZA
zDmecq;{j#H_XEM2d<=}!od2dMLgjmk8^3#|(!+dXa7p4xbG}hdyzjSu*TBMp^v{gK
zCZ>X<ceEf;VKn`<vZQNTiUM4`JNxqAx)NfuDJ1*cD`o7z`-18`#I+N0SuY97nJ;B@
zzm_nE&Z^q0<}r((;b1|Dnau*-Bt1sJDxK5itS6e8>%z-jYDxttPo;`i_3O7sc{1HY
zEx9sZhCic@nepFlJNcbG&E^L)KvV!gJNW;yXOj~U^1G+Og)s<Yj8Y#<F?Rm2wy~<G
zJDT-r#Xc{lTc`suQ@WNF6w?`E;m@n?HWIq(ah7nCDI(Je;{9PKn+fS~TAr9RPb&xs
zS1$04Z?w!z+mGH!tQezkABe6kGGm5>tM_sDU5b*<dTEMeIdQ%F8C4)^G8@fSbFoZC
zNo*-PsIcw8u!0FA768NFT^$y}q3Wr4m7s9Rt>|UUN^SOvbt+*Y^$5a6tsUEw*{{Hv
zk+R?>UHNXXPgQ?Bs6!H6>i1zzigb1M>_c`njM+D?e6qO7n1T7mX5DQ${YmFBhYFZx
zA}UJT()X#00?d4}RZVLu^TErQl2HDe+s`%|JJd$K3~yl|S8j&Y_^){&&F_WS8V8ll
z#Aoe`+Fiye!~N<treCO?fx{LVN<Z)|jM*S?bK$bNspS^(r^I*bKbJU-CI|wyWyrNp
z!uxMyU2W(HBjirVfi;_S4#g=S$7W6&3L0;ZYve3BoXU9tlGU-A%aL5qj0`O3BouQa
ztwwmBg4Zypb&(AY=&g`Fn@1#W1vA*!hYPXtBlr?ND(@n}O;$I;XAypvR%FLhvL$;X
za`ckVjGvZ4UgS??&UFVa5xAGfoSUFjD<dl_zvo<W=}`v6%!+7jrg2%VwMe3-QWE~{
z`U6hQ^z_khh@15SSyL*T*pjsX!+;ibUoWePPcNWX_0*D^!jDq}3hb9Y-uqQ{$sL>g
zfaCzcA<h3i9Neo*0vIEcJ}F@5F0^{Fy>zQzdn$;z=t++H?aNqu-6e@pA+wc;Q`ESR
z1ci`K%QB(KiRj%{U*k+atyd=`z%Ioc$=sIaDaT8AEq(>p&1+3nkB_EPisYX-5xXn|
zp6|s?QH$&QMnTN4f)TK3tWeqH1G&jX235_l=aVh#Uo6^-G4T&gUXin33pVmncl7;)
zX9614>l&xWeGwcUu&Pt%6|pppf$5ZJXm!1$Z3%{O;|JNAvO=YNAI(QyNA0+pEN%tI
zIE<U0o-jo`QB!TT(yYp>XIB4Cl+_gz_l@Nvk#96OBy<Rb{CLPVbcf{)@54S1yt4vQ
z#<=8@L`m0s1x)lCn}zVJaZ|?Gtg2aMAVzV{*>$~l9<x-6E@c{BvmI0zP`IOC^ZcR2
zr=s4q0D}#KVKj8xcU$slhUp?#$3UE&0wSXNbmtn~oJi6f-|hFV%2x`Gh?MgqEG>;n
zgW-$vTN4P+*03``l#W5f%AE|Go`%IZOp5Fo`LE!x<*X^Hp~wIL(s_jbY>Gme1Tgn{
zrGW7}$6$DWvypvEv?)6tIZuaF3G`?cGq^RFAt@*-c7`UC{h(S%oSD9JEcjKgh6uQ!
z>t$yN7JS?73oV^%{?ddZWQ)*0V(ZC}8!hIi#Ft<C)Mrm~L!Z``FK4tkBFQJt?*nR7
z98`7J-2J&@Q;vRDUofjcf;B;h0VA~1Ce8u0pyXHow0%Jfva-o|Mi0&^+@@dH{=%G^
zei3gWPA+(u6)Z0^rN@BR|K7~=ZbWp*)-Yu>`Q(6vc8r3&?yv#vd-D$~?mH36?{PJ?
zN8RWoQK+tjDWTZPn8S=n*NIy19c#;{EX>LkFP$JMmv5DI{qjsq%;y~N5dZ+lJNM3?
zo_WSR^_#=RUoQPm;*$W&|K@TCu=2%oPG|LZr-^$8mf-od_0ROldVcEPgNg<Rq+y4e
z8jz8L0RJP3RwksQ`{U;*!Sled|BXJMIpNe<M7e(*`p>Tg`U4Y&!?N)I#{4tDOn+eB
z;NG(E{KovU^}nVv{(*_Y(LuO>+XjVjkiEd^K=}T{TF+N$I4nenTJF3a00936e~QEb

delta 3843
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
E04$itqW}N^

diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-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-omitted-vocabulary-property-compatible-with-import.xlsx
index 2343074e17caf19e8d978668779fdca33c2d5875..49a3450d386786688c93fff65e8bc9927938be59 100644
GIT binary patch
delta 3016
zcmaJ@XHXOB5+y<a3851dgd~VaN4iK65a}TxN^er6m!K3yj8suVjRJzSgoIuN=}4C@
zErLWrkSaw4>FvVx&D{ImkGH?h?wr~AW_Q1{J0!j$&S0QRNySD%OG`@;ruy5sjNu}H
z>J+?{0Z5<ugFGltD5o)OJ+%;;>_e7i3i@f{y~AUe>G@9c7C))o4?ptyn#;XCYHVD%
zgmx*6ul;CGtSL&10>1g}N3+z-wD<NhPn>x`4iw!He;=lZ7kOQiJL=D!KqZphwb6Tc
z<Z(FF?JF6KWzrOZOKrb$SpBf;HGJ{A_~#g=si&cQsWl4lA+C=-A>7Z=s89BS+P028
z0T|$ybtiFM`R1%g0x^p3C!v87#OJAj)l>63wq#LoX993PnUB}MMLP^Q@X=4YPsi(e
z>)V6y3s5*I0U13lX_I%5l{F<!1UQ{1zp!qa4oP`ETj~F`Q;MM<4zWKfM_zyWoh=~{
z$IM>x0<VxEG;dS$mJpAI9e_ZpNun{5XWRsz@W-k@Mv`iGIvPW=EVt&2N&*6u!GbRh
zx>vo+(`qsX`Z~5Rsl$(mGs&dlH1`iNZm{ZDZ{t0q4h#KOFoM<;ILXoRehk%&Q^=)q
zFWPIlPNieac{OMP&<_6mqMOi!jOF7EhTT1^dDajK>-_F^(1yl!t7^RqfS%O`v`AQw
zGd2ax@t3DFS3Bg<m%$AAHXfv@*!^ri4p_M6g=vok#ANE^PL_N<&f^&^Do^J+=-$c~
zY0rPmm3}TTo`11Q{LU@2&OM@OqdX8a+H9*7_ok0}*Z0OzA@;C<FStDw%$eqZU0oU_
zsJK<4RDR)j4A4<fX*PwfV!3si)@Fy>?4azLi{)#j*M4+`%MD~pvkR5hf8p|hF)L=8
zl02B;ABWtS1a?Hqnl=QTG-=r4Hz%Az+U0ZUvS=}ZOlZy4I6jhEj3+#M>}dqEzEq8F
zcLTK3`_`o1&G2VZr95+odHxhczyToVMe?ME`w&;X0$R#OV#BT1pj{9C<Rfz^XNwmv
zgx_vJU8GN-mEX>B@0<*?+hp$4n02eF1$eUIDdkN!Q@qR|UGhZ@nYLHPDy*m?_A8p0
zCCSaoy<~l+at`N!MTG3~7l+n<#68|PYBO`#xQ3+}Y+T>c0yb`3U#Zf8=u89RR-yt~
zab<_C=xKHGwG2@vkDu-$m51%4P7em<oJMx%Fc{GlH!i368~nbJjiP#yN2`Sz9ZR!r
z=7pk`6>0a~f}IuS8_7LH8GMB0_o!}})t7GW{5cJfC{&f@*EmwOg&2q<dbJ3M>mjW;
z4(n9GM`v(8h-<Sc$z6-r^{}2bdXc~U5Vf=Da_>Q9`zn5iOknL&|H8!d&HZe5bF8Pp
zqp!q;S3m40O-7ayl_fbgYj?&131PK&^SF#_?^;Po58XV}m1B^!)0{U@88@c^se2iS
z2LEOtP2cn~1a+QQ5^_}vu19kl&W~n3m7bu-$3ZZL+9SKFrsM;9v|(;kMx?=ZJgqM}
z<GBbE-lp>I?+8-Fpn@@%hL@Sgxdx|`0Fe|jSZAEd)!=dBG?I*GZKR7A%AJ%)f);Mf
zp?VjrKzd6b3xM_qjl3HVoDZ7DcNPu{z<7Ukr=8Cg^CY(7O_9B$7I0lSm!E$bkZ4uy
z*_+=~0dktc`<KgN;FeVx2!(kx(K|^=7`NKWTmGi#_Y+7O%Cf??S8f$UiI0w*7&gD6
zVHBugy)AqFkp($D(CAA6=s6iPKCXXkV|b|RYuA@s<k45Bx#@a*1}TqdyOB>c>W{IN
zH&#F((~(%#uj^Xs@;ze``je)--W9Otumd*3{uL^4FHk&#GN}3BwHo@HR-egUgSG@p
zuo$RIV!!?E`B|-+dU9S_bUhdRLAb#r6chCRdYIEY%-Q_}lfLw=JnZz#HO)PZks8qg
zgvp3r{sn!uD$>;!-|Q%wV%)Rk<j3Ur89;g1-hDdleEG><#CeVjMu4`97wRADv_KVv
z@+Fd3eJoQ2fP60?B8h0qRy~IB1P#L^!SF`STfzko%c(>N>fDmBx_TkEI~13*$)dLv
zncceI8s&B$Fhvx!x*+><MCdnM&bh~p%UI6w+`sQ@#YkO6s_;F68tBr{9^>1Z+kg}l
zW!w}L|Gf+-{$-peIKW-p=506qnLir>I{@ZKBfO@sFg5%vDJ`^48aN!vr^{2z1l@uO
z0J78b;XILqw*I|P+2bc*cY;z8@xz$c!M(YL*KM(0Rz3aBg(I#lKQ-<94M^r%zA0;8
zw-z^${e_g5GD&ooAFK30vB<K@m~aEf%k`*YbR@5Z+*mO8BF~*_dDr1!P{thF=Lr~^
zmJF*cj&8(!xQ=7Uo-X`kU8ACK)bZM6z3RiV-}<Hk(oPt=)4gsRm`nLEpaUm=5t;v>
zvTI(PJm04nW67e)v5a2Zw+QERCjt|mN>x<GH{g}uJj(femYvi4oGXX3OV<rypr!Lz
zbR65}l6ZWzWSKYWrB`-mpt;P_ijO(EH{Hc{c1ATSm}(+XAtfIUWbyR<RWcl*VI#Bm
zO1s@a>q9?_jf>D7Q*2tP#9bW>mnn$G-Q^x7O)prfFD1~bwYkbRqF}E=EGu+?Ka(IO
zu;6gWe53gB(#(1D*pRUI7CFKxjOj!5IJno1LF$LGDQu+?F=M|fdLb^_1@4^argluC
z&s@<kcWMY+cvm?Ef75V~e<n!T3@?i4D>U`$;r%%OHYlDjY?Yo^ai^4)zL#8@)FQha
z4QbSv<8)Yy=Pt8Jta}mhvV(Pdc^$foTYIK^bTS4sv`QYxauR@o0!s6L#sa&*2tfzk
zLLghO&^K%d=YOfoE^5=L@MXzNOIERCjkM7EDmuV#I308tIOHix$?v%pDE`rJ`PTy*
zlR?NE6Ah%6q%GeWQAE~nSGB|_GezEb%`A}Nc`&OF1(LW+GBp>A4!!Ioa`pB%ylu8p
zlAqeA$V8(bvz)F|G^$yYW}GG<`aHCSq3}$ODFAW4jwq8UKt(rxuH&6Q-{l^)twg`?
z`JXc5*o1Ob@i|?vtVwe!ll>@0^Eo{;VMWtwft60{hV6WgRlmAsF*iciaadzNG@Wc{
zPe?6EP+9+#$1KK88^%jVePCK_Z(Uxu-;S9P)E!PHpd>9zxzeKp5*nfxOVHcVQxdXb
z8N!Pgxl0<cj(L3Qx{SpShlDwO0oK<XB}8Psx}YkZ!dWJ%rQsJI)IavTq%^Wz#lkZ`
z#i9djUx5c$Hr2{5v2Go|G3$*$bwkd6*Y5tj;NIV#S+s0hkP_Pa%wtg5qjoEGn=vln
zLLO2LLnnN-#cF3>YeW2`Q(UwJ%gusEC#_mL^S`aaCNhhm5rP(X1;FFdD`6Gf*D5St
zT@rKXPD)^Vg?>-L>D_U8zjAZzNtf%05IK}_D1{mk#o}mN%|7JL^_$c<4|*BiiLveG
zbRGblF(0H^Uo4`8UJ4Uo)^i>Z)2M2@y2kAcc`+iJH*8U2rbn2xBX1|Prp|^^v!d=K
z%0x(nFvEP%{s5d5swQ?@EqwOFehX2lx(%NVTw#k+Ion7qiq@;VMH!^OPJoH`3wD|5
z#SBy){8~eq2hX<`CUcM+MEkDzO-9ugK;NbYi#4o)6sOJPA9822JiNIkx~w(vrieJ4
zgVRHC?u^nl*6JMpJ-UMhiPd{2dX;ig69ZlPf8V#*K9-R`S1o}R{~sOGW0(1J-iEWw
z{{b!Ratx;j??2LrrGZ?9o`#TXyN`xWa$h>B^{FQQW7Sw|h#>5g^Y5?2_7C9%4S}%}
zU<kGWLQi{2JZ&6y5CQ=#VizE=v!|iI-;QPGU<cr^mpPz+-lN082^hyZa`66fqfXp%
NERlns+JyZy{a<|*hgkps

delta 3082
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
S|8E;ydh=<q6B^vd#Qy+&>Tx9i

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 80ba617cae4fe1d6d89e57c8d56f78a97adc2b2c..5d488274e410c1da3765a66c97d4ceeff0f926f2 100644
GIT binary patch
delta 1556
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

delta 1548
zcmYL}cT^Gx9LK?dxDpaUapFJ>Fh?SsBTEx;rCAPC&Md)Q#;N7P%9UI3a^dyLFh%pu
z({g22dd{><J&T5yIg`kh8d=?my?6Kf=kq?l_rBjhzbz(BCJG)dl2R}L7z_qr2~7$H
zKnX0N*&Ila5HmtDUUG-*S<n$x^JcF*XXFMPRqPrHg_Qd#)VF(aVHa<&u@A}Uu;Q58
z+pQa!*q1{@X9?I-sV71o4qqG5J(6G2bsE+8N<xN0Xtf_5kLVx#0_n#Hp27@Ge&^yG
zHKO^WgU2#Fb+ohf`UPA4?zv9E3tEkS2<@Lb4Qy$iEbW=J1$Whah|Fg{r?G~Qo92tN
z`-2w2UU<<2rg5!k=$h5Ump^)0j04sFQ|n;?9^(vBY>nZ1?pNd9;9lD1JDIbbN3*|B
z96r_0hVG}2iG1i$lwQ;A!;*i7<lIo`@y(9=B)h&`r?K$&qK`>Q&uH*GOldzIco8PY
z$7i%Mx7mqZtJc7xtZuL^{Z0f{{#}fs)E0EenKgF4-)Y5euY&jJX8NlC(S(4pMJ+R+
zOTF!iWk$)*AjdeAN74g-TKnvxNS6G3fmnNRt8D=)bs-_|TG(+Ccm*!hGsf5vhn%;8
zs!xOtv*r?|2UJj3iP^o@QNxJmPu{SsTW(uA&ls{hz(|%+G88@Cy8n1_GeqQ8^qeFu
z|MGB<%^S{0-^NnL7eDMa*;yBa9ZVB^jx`#k8Y4YA2c&1GWn|A|$~GLQf{10gJco<8
zEnj_2N3xCS3MiqZ<}k40)@PvhSt%ta$5?fT0mdQ+g89?{A?K)7ljSEM?Nba+AE{Oj
zC7YYbf*jO8l*$g*AzMO<Bkj7u+;U&kT*uZC;`JzW^`jm&U!|OHk4XS8?UV;~y7Ly$
z%8wuhW1d2%<(2!Jva{4Rr>k_Yl7c<#72KiN*ZnK77(tjCvPyUIhv1~_wsEL3^Qw%S
zpKW5cO!4Gzjsj;&Q-0Y#qfuyehikII<qnpzPtmz5`@Yz$8*_ns$|q2g%)ObVG+xgn
zH{1>*hzv``$VY{wVz9zVKslzJU<czbD?pBHC2HOPZ}L+;y!)0xS;g&cd)j&S*3Iv$
zb3RlR-L18mdwq^=U!$0lu#+cI^I8<=>wd*ZA~rO4s$3TCzaB<swk5BZxKFTDe>|So
zG#co)X*m;T@d8yJ(}@Hb4}GJm>+q058e!%`xT`U*&takQo^3Q*7_O?bG*#A8f1Rm@
zp-qCa*5Dlx*PeDg%rUDTx!D;sj(*s98kImBsZmT1GUm6O_p{>K@lJA)(I<L3=*05I
zfx(b&zHaa^`6a;fStu}!r)r`|o3NnTRfM}rI^fL|3t4q$ulv0EL~Mav5^JF}<T))J
zUPkwOVOlRSj?1}NK)q67Qh^hu5Tt7=aiunO?HQNzsQDe5qv7b>yZ%3LCKZxeiYL-M
zBgXcucUX!%>yK?6<Sf0am#4%d?=&I5b>B!R<rTYE6TFof1xpj(F1f2wKAqZUW$&F;
z6dKkQZydKADF4@5+66ut%reqDb6^@neVcY_Q_J(?W8&%t&~W)-(xFJQ&RP9L^{-Pm
z7vo^hI5lf>W-G2F*Y<nzA;S)@@&dMoVz;M)-e35NvTo*<RAzE`%gsk`!?<NOMV2_r
zcyB@EK#B)n0~1{zml`FDC~$RDS~L~G-_AnmvLc2Q+9)xSX~oTDnL7|61%>~t8Of%k
zrTO5|*r3|Uk<}O&J`7h8TOK-~Z%7H`O1Z0FqLz=u=N$FAGzSFGOBo?}<sj+Po$0xT
zNp8NIT0FCZpohZgWH&th0C>$EhAVtw5iqaCWX1+6fm%=8Vy?=2xX6GdPY%JmqyYfD
zCIIk#IzivJvw2BDb$2|a_E_wWrxm1a*EgU9G1++KN%5vi!??TJpkgWh&Z$_5p$jJ|
zVhJC;|Ep(*!b#fV&(Rf8!WaMmFpvNMkURYUUa}v+jl^LATm!hl1|#&uf=6foacpOV
jj#wghWS)Hmp)D5Pj%cy_5xTpX9ob}qRneeI6>;Ui&W@Z1

diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-sample-property.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-sample-property.xlsx
index 5d2e04d7bff2e0651ecdc251703c44c524a4070c..de372840ce7a89ce52acaff8dc0bc13724c8f506 100644
GIT binary patch
delta 4145
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

delta 4064
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

diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type.xlsx
index d1c0491590faea8d876f23a0e97256d5a068fccb..9fbc5548c4ecd992c30230830e3ceeb2177d0d94 100644
GIT binary patch
delta 3684
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

delta 3643
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
NXgNk2;=Jp#{2!pKlTQEu

diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java
index 68497c088b8..084f44a657a 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java
@@ -1508,6 +1508,7 @@ public class AbstractTest extends SystemTestCase
         {
             creation.setVocabularyId(vocabularyPermId);
         }
+        creation.setMultiValue(false);
         return v3api.createPropertyTypes(sessionToken, Collections.singletonList(creation)).get(0);
     }
 
@@ -1525,6 +1526,7 @@ public class AbstractTest extends SystemTestCase
         creation.setSampleTypeId(sampleTypeId);
         creation.setLabel("label");
         creation.setDescription("description");
+        creation.setMultiValue(false);
         return v3api.createPropertyTypes(sessionToken, Collections.singletonList(creation)).get(0);
     }
 
@@ -1537,6 +1539,7 @@ public class AbstractTest extends SystemTestCase
         creation.setVocabularyId(vocabularyId);
         creation.setLabel("label");
         creation.setDescription("description");
+        creation.setMultiValue(false);
         return v3api.createPropertyTypes(sessionToken, Collections.singletonList(creation)).get(0);
     }
 
@@ -1718,6 +1721,7 @@ public class AbstractTest extends SystemTestCase
         creation.setDataType(DataType.DATE);
         creation.setLabel("Date");
         creation.setDescription("Date property type.");
+        creation.setMultiValue(false);
         return v3api.createPropertyTypes(sessionToken, Collections.singletonList(creation)).get(0);
     }
 
@@ -1728,6 +1732,7 @@ public class AbstractTest extends SystemTestCase
         creation.setDataType(DataType.TIMESTAMP);
         creation.setLabel("Timestamp");
         creation.setDescription("Timestamp property type.");
+        creation.setMultiValue(false);
         return v3api.createPropertyTypes(sessionToken, Collections.singletonList(creation)).get(0);
     }
 
@@ -1744,6 +1749,7 @@ public class AbstractTest extends SystemTestCase
         creation.setDataType(DataType.BOOLEAN);
         creation.setLabel("Boolean");
         creation.setDescription("Boolean property type.");
+        creation.setMultiValue(false);
         return v3api.createPropertyTypes(sessionToken, Collections.singletonList(creation)).get(0);
     }
 
@@ -1754,6 +1760,7 @@ public class AbstractTest extends SystemTestCase
         creation.setDataType(DataType.INTEGER);
         creation.setLabel("Integer");
         creation.setDescription("Integer property type.");
+        creation.setMultiValue(false);
         return v3api.createPropertyTypes(sessionToken, Collections.singletonList(creation)).get(0);
     }
 
@@ -1764,6 +1771,7 @@ public class AbstractTest extends SystemTestCase
         creation.setDataType(DataType.REAL);
         creation.setLabel("Real");
         creation.setDescription("Real property type.");
+        creation.setMultiValue(false);
         return v3api.createPropertyTypes(sessionToken, Collections.singletonList(creation)).get(0);
     }
 
@@ -1774,6 +1782,7 @@ public class AbstractTest extends SystemTestCase
         creation.setDataType(DataType.VARCHAR);
         creation.setLabel("Varchar");
         creation.setDescription("Varchar property type.");
+        creation.setMultiValue(false);
         return v3api.createPropertyTypes(sessionToken, Collections.singletonList(creation)).get(0);
     }
 
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePropertyTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePropertyTypeTest.java
index cdaf6d7e257..1d94575d156 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePropertyTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePropertyTypeTest.java
@@ -106,7 +106,7 @@ public class CreatePropertyTypeTest extends AbstractTest
         creation.setLabel("Test label");
         creation.setDescription("Test description");
         creation.setManagedInternally(propertyTypeCode.startsWith("$"));
-
+        creation.setMultiValue(false);
         assertExceptionMessage(new IDelegatedAction()
             {
                 @Override
@@ -129,7 +129,7 @@ public class CreatePropertyTypeTest extends AbstractTest
         creation.setDescription("only for testing");
         creation.setLabel("Test Property");
         creation.setManagedInternally(true);
-
+        creation.setMultiValue(false);
         // When
         List<PropertyTypePermId> ids = v3api.createPropertyTypes(sessionToken, Arrays.asList(creation));
 
@@ -162,7 +162,7 @@ public class CreatePropertyTypeTest extends AbstractTest
         creation.setDescription("only for testing");
         creation.setDataType(DataType.REAL);
         creation.setManagedInternally(true);
-
+        creation.setMultiValue(false);
         assertUserFailureException(new IDelegatedAction()
             {
                 @Override
@@ -183,7 +183,7 @@ public class CreatePropertyTypeTest extends AbstractTest
         creation.setDescription("only for testing");
         creation.setDataType(DataType.REAL);
         creation.setManagedInternally(false);
-
+        creation.setMultiValue(false);
         assertUserFailureException(new IDelegatedAction()
             {
                 @Override
@@ -207,7 +207,7 @@ public class CreatePropertyTypeTest extends AbstractTest
         HashMap<String, String> metaData = new HashMap<>();
         metaData.put("greeting", "hello { meta data }");
         creation.setMetaData(metaData);
-
+        creation.setMultiValue(false);
         List<PropertyTypePermId> ids = v3api.createPropertyTypes(sessionToken, Arrays.asList(creation));
         assertEquals(ids.toString(), "[TEST-PROPERTY]");
 
@@ -235,7 +235,7 @@ public class CreatePropertyTypeTest extends AbstractTest
         creation.setLabel("Test Property");
         creation.setSchema(EXAMPLE_SCHEMA);
         creation.setTransformation(EXAMPLE_XSLT);
-
+        creation.setMultiValue(false);
         // When
         List<PropertyTypePermId> ids = v3api.createPropertyTypes(sessionToken, Arrays.asList(creation));
 
@@ -270,7 +270,7 @@ public class CreatePropertyTypeTest extends AbstractTest
         creation.setDescription("only for testing");
         creation.setLabel("Test Vocabulary Property");
         creation.setVocabularyId(new VocabularyPermId("test_vocabulary"));
-
+        creation.setMultiValue(false);
         // When
         List<PropertyTypePermId> ids = v3api.createPropertyTypes(sessionToken, Arrays.asList(creation));
 
@@ -306,7 +306,7 @@ public class CreatePropertyTypeTest extends AbstractTest
         creation.setDescription("only for testing");
         creation.setLabel("Test Material Property");
         creation.setMaterialTypeId(new EntityTypePermId("SIRNA", EntityKind.MATERIAL));
-
+        creation.setMultiValue(false);
         // When
         List<PropertyTypePermId> ids = v3api.createPropertyTypes(sessionToken, Arrays.asList(creation));
 
@@ -342,7 +342,7 @@ public class CreatePropertyTypeTest extends AbstractTest
         creation.setDescription("only for testing");
         creation.setLabel("Test Sample Property");
         creation.setSampleTypeId(new EntityTypePermId("WELL", EntityKind.SAMPLE));
-
+        creation.setMultiValue(false);
         // When
         List<PropertyTypePermId> ids = v3api.createPropertyTypes(sessionToken, Arrays.asList(creation));
 
@@ -377,7 +377,7 @@ public class CreatePropertyTypeTest extends AbstractTest
         creation.setDataType(DataType.DATE);
         creation.setDescription("only for testing");
         creation.setLabel("Test Date Property");
-
+        creation.setMultiValue(false);
         // When
         List<PropertyTypePermId> ids = v3api.createPropertyTypes(sessionToken, Arrays.asList(creation));
 
@@ -599,6 +599,7 @@ public class CreatePropertyTypeTest extends AbstractTest
                     creation.setLabel("test label");
                     creation.setDescription("test description");
                     creation.setDataType(DataType.REAL);
+                    creation.setMultiValue(false);
                     v3api.createPropertyTypes(sessionToken, Arrays.asList(creation));
                 }
             }, new PropertyTypePermId("TEST"));
@@ -614,13 +615,13 @@ public class CreatePropertyTypeTest extends AbstractTest
         creation.setLabel("label1");
         creation.setDescription("description1");
         creation.setDataType(DataType.BOOLEAN);
-
+        creation.setMultiValue(false);
         PropertyTypeCreation creation2 = new PropertyTypeCreation();
         creation2.setCode("LOG_TEST_2");
         creation2.setLabel("label2");
         creation2.setDescription("description2");
         creation2.setDataType(DataType.BOOLEAN);
-
+        creation.setMultiValue(false);
         v3api.createPropertyTypes(sessionToken, Arrays.asList(creation, creation2));
 
         assertAccessLog(
@@ -641,6 +642,7 @@ public class CreatePropertyTypeTest extends AbstractTest
         creation.setLabel("Test");
         creation.setDescription("Testing");
         creation.setDataType(DataType.REAL);
+        creation.setMultiValue(false);
         return creation;
     }
 
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePropertyTypesTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePropertyTypesTest.java
index f7ace4f6297..6d78deacd3e 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePropertyTypesTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePropertyTypesTest.java
@@ -70,7 +70,7 @@ public class DeletePropertyTypesTest extends AbstractTest
         creation.setLabel("Test label");
         creation.setDescription("Test description");
         creation.setManagedInternally(propertyTypeCode.startsWith("$"));
-
+        creation.setMultiValue(false);
         List<PropertyTypePermId> ids = v3api.createPropertyTypes(registratorSessionToken, Arrays.asList(creation));
         assertEquals(ids.size(), 1);
 
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTest.java
index 2dc8c8d2fcc..130c78ec916 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTest.java
@@ -255,6 +255,7 @@ public class EvaluatePluginTest extends AbstractTest
         pTypeCreation.setDataType(DataType.VARCHAR);
         pTypeCreation.setLabel("Children and Components");
         pTypeCreation.setDescription("Chilrden & components");
+        pTypeCreation.setMultiValue(false);
         PropertyTypePermId pTypeId = v3api.createPropertyTypes(systemSessionToken, Arrays.asList(pTypeCreation)).get(0);
 
         SampleTypeCreation sTypeCreation = new SampleTypeCreation();
@@ -531,7 +532,7 @@ public class EvaluatePluginTest extends AbstractTest
             propertyTypeCreation.setLabel(propertyCode);
             propertyTypeCreation.setDescription(propertyCode);
             propertyTypeCreation.setDataType(DataType.VARCHAR);
-
+            propertyTypeCreation.setMultiValue(false);
             v3api.createPropertyTypes(sessionToken, Arrays.asList(propertyTypeCreation));
 
             PropertyAssignmentCreation propertyAssignmentCreation = new PropertyAssignmentCreation();
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateEntityTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateEntityTypeTest.java
index 5b192fe6c8c..7d4a26da3e8 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateEntityTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateEntityTypeTest.java
@@ -112,6 +112,7 @@ public abstract class UpdateEntityTypeTest<CREATION extends IEntityTypeCreation,
         propertyTypeCreation.setLabel("Test label");
         propertyTypeCreation.setDescription("Test description");
         propertyTypeCreation.setManagedInternally(propertyTypeCode.startsWith("$"));
+        propertyTypeCreation.setMultiValue(false);
         List<PropertyTypePermId> propertyTypeIds = v3api.createPropertyTypes(systemSessionToken, Arrays.asList(propertyTypeCreation));
 
         PropertyAssignmentCreation propertyAssignmentCreation = new PropertyAssignmentCreation();
@@ -201,6 +202,7 @@ public abstract class UpdateEntityTypeTest<CREATION extends IEntityTypeCreation,
         propertyTypeCreation.setLabel("Test label");
         propertyTypeCreation.setDescription("Test description");
         propertyTypeCreation.setManagedInternally(propertyTypeCode.startsWith("$"));
+        propertyTypeCreation.setMultiValue(false);
         List<PropertyTypePermId> propertyTypeIds = v3api.createPropertyTypes(systemSessionToken, Arrays.asList(propertyTypeCreation));
 
         PropertyAssignmentCreation propertyAssignmentCreation = new PropertyAssignmentCreation();
@@ -307,6 +309,7 @@ public abstract class UpdateEntityTypeTest<CREATION extends IEntityTypeCreation,
         propertyTypeCreation.setLabel("Test label");
         propertyTypeCreation.setDescription("Test description");
         propertyTypeCreation.setManagedInternally(propertyTypeCode.startsWith("$"));
+        propertyTypeCreation.setMultiValue(false);
         List<PropertyTypePermId> propertyTypeIds = v3api.createPropertyTypes(systemSessionToken, Arrays.asList(propertyTypeCreation));
 
         PropertyAssignmentCreation propertyAssignmentCreation = new PropertyAssignmentCreation();
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePropertyTypesTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePropertyTypesTest.java
index a5904370111..2d8b57d8deb 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePropertyTypesTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePropertyTypesTest.java
@@ -93,7 +93,7 @@ public class UpdatePropertyTypesTest extends AbstractTest
         creation.setLabel("Test label");
         creation.setDescription("Test description");
         creation.setManagedInternally(propertyTypeCode.startsWith("$"));
-
+        creation.setMultiValue(false);
         List<PropertyTypePermId> ids = v3api.createPropertyTypes(registratorSessionToken, Arrays.asList(creation));
         assertEquals(ids.size(), 1);
 
@@ -366,6 +366,7 @@ public class UpdatePropertyTypesTest extends AbstractTest
             {
                 typeCreation.setVocabularyId(new VocabularyPermId("ORGANISM"));
             }
+            typeCreation.setMultiValue(false);
             propertyTypes.add(typeCreation);
         }
         v3api.createPropertyTypes(sessionToken, propertyTypes);
@@ -514,6 +515,7 @@ public class UpdatePropertyTypesTest extends AbstractTest
         creation.setLabel("Test");
         creation.setDescription("Testing");
         creation.setDataType(DataType.XML);
+        creation.setMultiValue(false);
         PropertyTypePermId permId = v3api.createPropertyTypes(sessionToken, Arrays.asList(creation)).get(0);
         v3api.logout(sessionToken);
         return permId;
-- 
GitLab