SSDM-55: fixed more tests related to property creation and xls export.

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)));
         }

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));

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);
     }
 

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;
     }
 

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);
 

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();

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();

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;