Skip to content
Snippets Groups Projects
Commit 17926b98 authored by izabel's avatar izabel
Browse files

[LMS-1563] add unit test

SVN: 16527
parent 9170eac0
No related branches found
No related tags found
No related merge requests found
...@@ -124,7 +124,7 @@ public class HCSDatasetLoader implements IHCSDatasetLoader ...@@ -124,7 +124,7 @@ public class HCSDatasetLoader implements IHCSDatasetLoader
assert wellLocation.getX() <= getContainer().getNumberOfColumns(); assert wellLocation.getX() <= getContainer().getNumberOfColumns();
assert wellLocation.getY() <= getContainer().getNumberOfRows(); assert wellLocation.getY() <= getContainer().getNumberOfRows();
long chosenChannelId = // FIXME Jun 15, 2010, IA: tests long chosenChannelId =
query.getChannelIdByChannelNameDatasetIdOrExperimentId(getDataset().getId(), query.getChannelIdByChannelNameDatasetIdOrExperimentId(getDataset().getId(),
getContainer().getExperimentId(), chosenChannel); getContainer().getExperimentId(), chosenChannel);
...@@ -143,8 +143,8 @@ public class HCSDatasetLoader implements IHCSDatasetLoader ...@@ -143,8 +143,8 @@ public class HCSDatasetLoader implements IHCSDatasetLoader
if (imageDTO != null) if (imageDTO != null)
{ {
content = content =
new ThumbnailContent(contentRepository.getContent(imageDTO.getFilePath()), new ThumbnailContent(contentRepository.getContent(imageDTO
thumbnailSizeOrNull); .getFilePath()), thumbnailSizeOrNull);
} }
} else } else
{ {
......
...@@ -138,6 +138,10 @@ public class ImagingUploadDAOTest extends AbstractDBTest ...@@ -138,6 +138,10 @@ public class ImagingUploadDAOTest extends AbstractDBTest
AssertJUnit.assertTrue(channels[0] == channelId1 && channels[1] == channelId2 AssertJUnit.assertTrue(channels[0] == channelId1 && channels[1] == channelId2
|| channels[1] == channelId1 && channels[0] == 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); List<ImgChannelDTO> experimentChannels = dao.getChannelsByExperimentId(experimentId);
assertEquals(1, experimentChannels.size()); assertEquals(1, experimentChannels.size());
......
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