From 463bad87b3ac7c2e3f9b2503cd30fb95257acb54 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 22 Nov 2017 09:04:07 +0000
Subject: [PATCH] SSDM-5888 : Making flaky test less flaky
SVN: 38930
---
.../bo/datasetlister/DatasetListerTest.java | 21 +++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerTest.java
index 2b24c86b642..23e657a84bd 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerTest.java
@@ -55,6 +55,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Code;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ContainerDataSet;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetArchivingStatus;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IDatasetLocationNode;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Metaproject;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PhysicalDataSet;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
@@ -240,7 +241,7 @@ public class DatasetListerTest extends AbstractDAOTest
@Test
public void testListByTrackingCriteriaWithSampleType()
{
- // when
+ // when
List<AbstractExternalData> dataSets =
lister.listByTrackingCriteria(new TrackingDataSetCriteria("CELL_PLATE", 6));
Collections.sort(dataSets, (o1, o2) -> (int) (o1.getId() - o2.getId()));
@@ -372,6 +373,17 @@ public class DatasetListerTest extends AbstractDAOTest
assertEquals("20110509092359990-12", containedDataSets.get(1).getCode());
}
+ private void assertProperty(AbstractExternalData dataset, String propertyCode, String propertyAsString)
+ {
+ for (IEntityProperty property : dataset.getProperties())
+ {
+ if (property.getPropertyType().getCode().equals(propertyCode))
+ {
+ assertEquals(propertyAsString, property.tryGetAsString());
+ }
+ }
+ }
+
@Test
public void testListByDataStore()
{
@@ -398,9 +410,10 @@ public class DatasetListerTest extends AbstractDAOTest
assertEquals("CISD", dataSet.getExperiment().getProject().getSpace().getCode());
assertEquals("CP-TEST-1", dataSet.getSample().getCode());
assertEquals("CISD", dataSet.getSample().getSpace().getCode());
- assertEquals(
- "[COMMENT: no comment, GENDER: FEMALE, BACTERIUM: BACTERIUM1 (BACTERIUM), ANY_MATERIAL: 1000_C (SIRNA)]",
- dataSet.getProperties().toString());
+ assertProperty(dataSet, "COMMENT", "no comment");
+ assertProperty(dataSet, "GENDER", "FEMALE");
+ assertProperty(dataSet, "BACTERIUM", "BACTERIUM1 (BACTERIUM)");
+ assertProperty(dataSet, "ANY_MATERIAL", "1000_C (SIRNA)");
assertEquals("a/1", ((PhysicalDataSet) dataSet).getLocation());
assertEquals("42", ((PhysicalDataSet) dataSet).getShareId());
assertEquals(4711L, ((PhysicalDataSet) dataSet).getSize().longValue());
--
GitLab