Skip to content
Snippets Groups Projects
Commit db4a0548 authored by buczekp's avatar buczekp
Browse files

[LMS-2442] unit tests for listing share ids

SVN: 22475
parent c227d3ae
No related branches found
No related tags found
No related merge requests found
...@@ -75,6 +75,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.builders.SampleBuilder; ...@@ -75,6 +75,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.builders.SampleBuilder;
import ch.systemsx.cisd.openbis.generic.shared.dto.AtomicEntityOperationDetails; import ch.systemsx.cisd.openbis.generic.shared.dto.AtomicEntityOperationDetails;
import ch.systemsx.cisd.openbis.generic.shared.dto.AtomicEntityOperationResult; import ch.systemsx.cisd.openbis.generic.shared.dto.AtomicEntityOperationResult;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataPE; import ch.systemsx.cisd.openbis.generic.shared.dto.DataPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetShareId;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetTypePE; import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetUpdatesDTO; import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetUpdatesDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataStorePE; import ch.systemsx.cisd.openbis.generic.shared.dto.DataStorePE;
...@@ -193,6 +194,44 @@ public class ETLServiceTest extends AbstractServerTestCase ...@@ -193,6 +194,44 @@ public class ETLServiceTest extends AbstractServerTestCase
context.assertIsSatisfied(); context.assertIsSatisfied();
} }
@Test
public void testListShareIds()
{
prepareGetSession();
final List<DataSetShareId> list =
Arrays.asList(createDataSetShareId(1), createDataSetShareId(2),
createDataSetShareId(3));
context.checking(new Expectations()
{
{
one(dataStoreDAO).tryToFindDataStoreByCode(DSS_CODE);
DataStorePE store = new DataStorePE();
store.setId(DSS_ID);
store.setCode(DSS_CODE);
will(returnValue(store));
one(boFactory).createDatasetLister(SESSION);
will(returnValue(datasetLister));
one(datasetLister).listAllDataSetShareIdsByDataStore(DSS_ID);
will(returnValue(list));
}
});
List<DataSetShareId> result = createService().listShareIds(SESSION_TOKEN, DSS_CODE);
assertEquals(list, result);
context.assertIsSatisfied();
}
private DataSetShareId createDataSetShareId(int nr)
{
DataSetShareId result = new DataSetShareId();
result.setDataSetCode("ds-" + nr);
result.setShareId("share-" + nr);
return result;
}
@Test @Test
public void testRegisterDataStoreServer() public void testRegisterDataStoreServer()
{ {
......
...@@ -49,6 +49,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetArchivingStatus; ...@@ -49,6 +49,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetArchivingStatus;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TrackingDataSetCriteria; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TrackingDataSetCriteria;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetShareId;
import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE; import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
import ch.systemsx.cisd.openbis.generic.shared.translator.SampleTranslator; import ch.systemsx.cisd.openbis.generic.shared.translator.SampleTranslator;
...@@ -324,6 +325,28 @@ public class DatasetListerTest extends AbstractDAOTest ...@@ -324,6 +325,28 @@ public class DatasetListerTest extends AbstractDAOTest
assertEquals(14, list.size()); assertEquals(14, list.size());
} }
@Test
public void testListAllDataSetShareIdsByDataStore()
{
List<DataSetShareId> list = lister.listAllDataSetShareIdsByDataStore(1);
Collections.sort(list, new Comparator<DataSetShareId>()
{
public int compare(DataSetShareId o1, DataSetShareId o2)
{
return o1.getDataSetCode().compareTo(o2.getDataSetCode());
}
});
// NOTE: deleted data set "20081105092158673-1" is NOT ommited
DataSetShareId dataSet1 = list.get(0);
assertEquals("20081105092158673-1", dataSet1.getDataSetCode());
assertEquals(null, dataSet1.getShareId()); // having no share id shouldn't fail
DataSetShareId dataSet2 = list.get(1);
assertEquals("20081105092159111-1", dataSet2.getDataSetCode());
assertEquals(42L, dataSet2.getShareId());
assertEquals(15, list.size());
}
private void assertSameDataSetsForSameCode(Map<String, ExternalData> dataSetsByCode, private void assertSameDataSetsForSameCode(Map<String, ExternalData> dataSetsByCode,
List<ExternalData> dataSets) List<ExternalData> dataSets)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment