From d0ae8b254a99ab4937f52fb583090849de9e2354 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Tue, 16 Aug 2011 21:30:11 +0000
Subject: [PATCH] LMS-2386 fix unit tests
SVN: 22513
---
.../server/logic/HCSImageDatasetLoader.java | 2 +-
.../logic/FeatureVectorDatasetLoaderTest.java | 6 +++---
.../logic/HCSImageDatasetLoaderTest.java | 20 +++++++++----------
.../server/logic/ScreeningApiImplTest.java | 5 +++++
4 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/HCSImageDatasetLoader.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/HCSImageDatasetLoader.java
index fd09b36705d..edc6067f90c 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/HCSImageDatasetLoader.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/HCSImageDatasetLoader.java
@@ -128,7 +128,7 @@ class HCSImageDatasetLoader extends PlateDatasetLoader
}
}
- return listFilteredChildrenDataSets(imageDatasets,
+ return fetchChildrenDataSets(imageDatasets,
ScreeningConstants.HCS_SEGMENTATION_IMAGE_DATASET_TYPE_PATTERN,
createDatasetLister());
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/FeatureVectorDatasetLoaderTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/FeatureVectorDatasetLoaderTest.java
index 2e9295e4348..713f35f55e0 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/FeatureVectorDatasetLoaderTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/FeatureVectorDatasetLoaderTest.java
@@ -52,7 +52,7 @@ public class FeatureVectorDatasetLoaderTest extends AbstractServerTestCase
screeningBOFactory = context.mock(IScreeningBusinessObjectFactory.class);
}
- @Test(groups = "broken")
+ @Test
public void testGetFeatureVectorDatasets()
{
final RecordingMatcher<ListOrSearchSampleCriteria> recordingCriteriaMatcher =
@@ -90,10 +90,10 @@ public class FeatureVectorDatasetLoaderTest extends AbstractServerTestCase
one(datasetLister).listBySampleIds(new HashSet<Long>(Arrays.asList(42l)));
will(returnValue(Arrays.asList(ids1, fds1, fds2, ids2, fds3, fds4, ds1)));
- one(datasetLister).listByParentTechIds(Arrays.asList(1l, 2l));
+ exactly(2).of(datasetLister).listByParentTechIds(Arrays.asList(1l, 2l));
will(returnValue(Arrays.asList(fds1, fds2, fds3, ds1)));
- one(datasetLister).listParentIds(Arrays.asList(11l, 12l, 21l));
+ exactly(2).of(datasetLister).listParentIds(Arrays.asList(11l, 12l, 21l));
HashMap<Long, Set<Long>> map = new HashMap<Long, Set<Long>>();
map.put(11l, Collections.singleton(1l));
map.put(12l, Collections.singleton(1l));
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/HCSImageDatasetLoaderTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/HCSImageDatasetLoaderTest.java
index 445002fad14..e10ec7993fb 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/HCSImageDatasetLoaderTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/HCSImageDatasetLoaderTest.java
@@ -72,7 +72,7 @@ public class HCSImageDatasetLoaderTest extends AbstractServerTestCase
return new DataSetBuilder(id).store(dataStoreBuilder.getStore()).experiment(experiment);
}
- @Test(groups = "broken")
+ @Test
public void testGetSegmentationImageDatasetReferences()
{
final RecordingMatcher<ListOrSearchSampleCriteria> recordingCriteriaMatcher =
@@ -146,15 +146,15 @@ public class HCSImageDatasetLoaderTest extends AbstractServerTestCase
return o1.getDatasetCode().compareTo(o2.getDatasetCode());
}
});
- assertEquals("sds1 (plate: /S/P1 [s-1])", references.get(0).toString());
- assertEquals("ids1 (plate: /S/P1 [s-1])", references.get(0)
- .getParentImageDatasetReference().toString());
- assertEquals("sds2 (plate: /S/P1 [s-1])", references.get(1).toString());
- assertEquals("ids1 (plate: /S/P1 [s-1])", references.get(1)
- .getParentImageDatasetReference().toString());
- assertEquals("sds3 (plate: /S/P1 [s-1])", references.get(2).toString());
- assertEquals("ids2 (plate: /S/P1 [s-1])", references.get(2)
- .getParentImageDatasetReference().toString());
+ ImageDatasetReference ref0 = references.get(0);
+ assertEquals("sds1 (plate: /S/P1 [s-1])", ref0.toString());
+ assertEquals("ids1 (plate: /S/P1 [s-1])", ref0.getParentImageDatasetReference().toString());
+ ImageDatasetReference ref1 = references.get(1);
+ assertEquals("sds2 (plate: /S/P1 [s-1])", ref1.toString());
+ assertEquals("ids1 (plate: /S/P1 [s-1])", ref1.getParentImageDatasetReference().toString());
+ ImageDatasetReference ref2 = references.get(2);
+ assertEquals("sds3 (plate: /S/P1 [s-1])", ref2.toString());
+ assertEquals("ids2 (plate: /S/P1 [s-1])", ref2.getParentImageDatasetReference().toString());
assertEquals(3, references.size());
context.assertIsSatisfied();
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImplTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImplTest.java
index ae87c8ed382..4920f6ddc65 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImplTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImplTest.java
@@ -256,6 +256,11 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
one(datasetLister).listByParentTechIds(Arrays.asList(1l, 2l));
will(returnValue(Arrays.asList(imageSegmentationDataSet, imageAnalysisDataSet)));
+
+ one(datasetLister).listParentIds(Arrays.asList(3l));
+ HashMap<Long, Set<Long>> result = new HashMap<Long, Set<Long>>();
+ result.put(3l, Collections.singleton(2l));
+ will(returnValue(result));
}
});
--
GitLab