SP-169 BIS-90 improve system test

SVN: 25948

datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/rich-test/data-set-handler.py

@@ -25,10 +25,21 @@ def create_experiment_if_needed(transaction):
 
     return exp
 
+
+def createMaterials(transaction):
+    for x in range(0,100):
+        mat = transaction.createNewMaterial("RM_%d" % x, "GENE")
+        mat.setPropertyValue("GENE_SYMBOL", "RM_%d_S" %x)
+
 def process(transaction):
+    # create experiment
     experiment = create_experiment_if_needed(transaction)
+    
+    # register link data set
     link = transaction.createNewDataSet("LINK_TYPE", "FR_LINK_CODE")
     link.setExperiment(experiment)
     link.setExternalCode("EX_CODE")
     link.setExternalDataManagementSystem(transaction.getExternalDataManagementSystem("DMS_1"))
 
+    # register many materials
+    createMaterials(transaction)

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java

@@ -27,7 +27,11 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
 import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.LinkDataSet;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ListMaterialCriteria;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Material;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Project;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
 
@@ -59,6 +63,8 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase
         assertSpaceProjectExperiment(openBISService);
 
         assertLinkedDataSetImported(openBISService);
+
+        assert100MaterialsCreated(openBISService);
     }
 
     private void assertSpaceProjectExperiment(IEncapsulatedOpenBISService openBISService)
@@ -87,6 +93,33 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase
         assertEquals("RICH_EXPERIMENT", experiment.getCode());
     }
 
+    private void assert100MaterialsCreated(IEncapsulatedOpenBISService openBISService)
+    {
+        LinkedList<MaterialIdentifier> ids = new LinkedList<MaterialIdentifier>();
+
+        for (int i = 0; i < 100; i++)
+        {
+            MaterialIdentifier ident =
+ MaterialIdentifier.tryParseIdentifier("RM_" + i + " (GENE)");
+            ids.add(ident);
+        }
+
+        ListMaterialCriteria criteria = ListMaterialCriteria.createFromMaterialIdentifiers(ids);
+        List<Material> materials = openBISService.listMaterials(criteria, true);
+
+        assertEquals(100, materials.size());
+
+        for (Material m : materials)
+        {
+            String code = m.getCode();
+            String expectedGeneSymbol = code + "_S";
+            IEntityProperty property = m.getProperties().get(0);
+            assertEquals("GENE_SYMBOL", property.getPropertyType().getCode());
+            assertEquals(expectedGeneSymbol, property.getValue());
+        }
+
+    }
+
     private void assertLinkedDataSetImported(IEncapsulatedOpenBISService openBISService)
     {
         ExternalData a = listOneDataSet(openBISService, "FR_LINK_CODE");