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 36e3d3d5a7f3eed64dc8c6071d19cb556437ff16..e3120bfe082d6baa09c1712bcc76b723181f0c23 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 26a9dd5bf1e01b30b0d1527ed846567edc7bbfe4..0ffda7d680add6df95c79bd9cb484728a007e7c0 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
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-compatible-with-import.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-compatible-with-import.xlsx differ
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
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-filtered-attributes-compatible-with-import.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-filtered-attributes-compatible-with-import.xlsx differ
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
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-filtered-attributes.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-filtered-attributes.xlsx differ
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
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-bare-sample-property.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-bare-sample-property.xlsx differ
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
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-chained-sample-properties.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-chained-sample-properties.xlsx differ
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
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-cyclic-sample-properties.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-cyclic-sample-properties.xlsx differ
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
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-sample-property.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-sample-property.xlsx differ
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
Binary files 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 and 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 differ
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
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-vocabulary-property.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-vocabulary-property.xlsx differ
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
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-sample-property.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-sample-property.xlsx differ
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
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type.xlsx differ
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 68497c088b8b155918dd64c8990205bb81dcf882..084f44a657a152f71bf0de45b086ca27b08db991 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 cdaf6d7e2571e8052c07c42dc92cf738692f0976..1d94575d156ba547ca1ea343a9c9f07d3ac231ee 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 f7ace4f6297127c76d86e8b63f4d69a54f2bb118..6d78deacd3e14bc3ddad9d4b2831e98f601e8838 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 2dc8c8d2fcc4fc98e564b256fda5c622b53cda96..130c78ec9162f86e0af3e64bea13b2d6d72b2d9a 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 5b192fe6c8cc354199ec99423b9960293b94844f..7d4a26da3e81194c20a2b71ce89eb7544d8a855b 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 a59043701115a6664b9783d6dfff7165c657e851..2d8b57d8deb60d74709c4466ad92eec7034f8156 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;