From 17926b9827eca42714d0a778b009201d693e3e58 Mon Sep 17 00:00:00 2001
From: izabel <izabel>
Date: Tue, 15 Jun 2010 13:25:49 +0000
Subject: [PATCH] [LMS-1563] add unit test
SVN: 16527
---
.../cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java | 6 +++---
.../openbis/dss/etl/dataaccess/ImagingUploadDAOTest.java | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java
index a03411c3a2b..089eb3fd30c 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java
@@ -124,7 +124,7 @@ public class HCSDatasetLoader implements IHCSDatasetLoader
assert wellLocation.getX() <= getContainer().getNumberOfColumns();
assert wellLocation.getY() <= getContainer().getNumberOfRows();
- long chosenChannelId = // FIXME Jun 15, 2010, IA: tests
+ long chosenChannelId =
query.getChannelIdByChannelNameDatasetIdOrExperimentId(getDataset().getId(),
getContainer().getExperimentId(), chosenChannel);
@@ -143,8 +143,8 @@ public class HCSDatasetLoader implements IHCSDatasetLoader
if (imageDTO != null)
{
content =
- new ThumbnailContent(contentRepository.getContent(imageDTO.getFilePath()),
- thumbnailSizeOrNull);
+ new ThumbnailContent(contentRepository.getContent(imageDTO
+ .getFilePath()), thumbnailSizeOrNull);
}
} else
{
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/ImagingUploadDAOTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/ImagingUploadDAOTest.java
index a64bccc760f..12bf8626e3b 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/ImagingUploadDAOTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/ImagingUploadDAOTest.java
@@ -138,6 +138,10 @@ public class ImagingUploadDAOTest extends AbstractDBTest
AssertJUnit.assertTrue(channels[0] == channelId1 && channels[1] == channelId2
|| channels[1] == channelId1 && channels[0] == channelId2);
+ // test get id of first channel
+ assertEquals(channels[0], dao.getChannelIdByChannelNameDatasetIdOrExperimentId(datasetId,
+ experimentId, "dsChannel"));
+
List<ImgChannelDTO> experimentChannels = dao.getChannelsByExperimentId(experimentId);
assertEquals(1, experimentChannels.size());
--
GitLab