From f05754824abbfb4b936a1e85f5532a712c2960b3 Mon Sep 17 00:00:00 2001
From: yvesn <yvesn>
Date: Tue, 26 Sep 2017 15:51:43 +0000
Subject: [PATCH] SSDM-5463: fixing build - not relying on ordering in query
result which might change; specifying data set kind CONTAINER for container
data set
SVN: 38772
---
.../datasetlister/DataSetListerTest.java | 23 +++++++++++++------
...ImagingDataSetRegistrationTransaction.java | 2 ++
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetListerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetListerTest.java
index c727fa08118..548791bf9db 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetListerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetListerTest.java
@@ -175,12 +175,11 @@ public class DataSetListerTest extends AbstractDAOTest
{
if (url.getDataStoreURL().equals("http://download_1"))
{
- assertEquals(Arrays.asList("20081105092159188-3", "20081105092159111-1",
+ assertListContains(Arrays.asList("20081105092159188-3", "20081105092159111-1",
"20081105092259000-19"), url.getDataSetCodes());
} else if (url.getDataStoreURL().equals("http://download_2"))
{
- assertEquals(Arrays.asList("20081105092259000-20", "20081105092259000-21"),
- url.getDataSetCodes());
+ assertListContains(Arrays.asList("20081105092259000-20", "20081105092259000-21"), url.getDataSetCodes());
} else
{
fail("URL " + url + " not expected.");
@@ -193,12 +192,11 @@ public class DataSetListerTest extends AbstractDAOTest
{
if (url.getDataStoreURL().equals("http://remote_1"))
{
- assertEquals(Arrays.asList("20081105092159188-3", "20081105092159111-1",
+ assertListContains(Arrays.asList("20081105092159188-3", "20081105092159111-1",
"20081105092259000-19"), url.getDataSetCodes());
} else if (url.getDataStoreURL().equals("http://remote_2"))
{
- assertEquals(Arrays.asList("20081105092259000-20", "20081105092259000-21"),
- url.getDataSetCodes());
+ assertListContains(Arrays.asList("20081105092259000-20", "20081105092259000-21"), url.getDataSetCodes());
} else
{
fail("URL " + url + " not expected.");
@@ -210,7 +208,18 @@ public class DataSetListerTest extends AbstractDAOTest
}
}
- @Test
+ private void assertListContains(List<String> expectedCodes, List<String> dataSetCodes)
+ {
+ for (String expectedCode : expectedCodes)
+ {
+ if (false == dataSetCodes.contains(expectedCode))
+ {
+ fail("Data set code " + expectedCode + " is expected to be in collection " + dataSetCodes);
+ }
+ }
+ }
+
+ @Test
public void testGetDataSetMetaDataForExistingDataSetCodesWithParentsShouldReturnDataSetsWithParents()
{
List<String> codes = new ArrayList<String>();
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v1/ImagingDataSetRegistrationTransaction.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v1/ImagingDataSetRegistrationTransaction.java
index f88dfa4e1e9..ff5549b5452 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v1/ImagingDataSetRegistrationTransaction.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v1/ImagingDataSetRegistrationTransaction.java
@@ -67,6 +67,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IDataSetImmutable;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.Size;
+import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSetKind;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria.MatchClause;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria.MatchClauseAttribute;
@@ -595,6 +596,7 @@ public class ImagingDataSetRegistrationTransaction extends DataSetRegistrationTr
factory.featureVectorContainerDatasetFactory, containerDatasetTypeCode);
containerDataSet.setContainedDataSetCodes(Collections.singletonList(mainDataset
.getDataSetCode()));
+ containerDataSet.setDataSetKind(DataSetKind.CONTAINER);
containerDataSet.setOriginalDataSet(mainDataset);
--
GitLab