SampleListingWorker fixed, SampleListingWorkerTest fixed and extended

SVN: 18167

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java

@@ -472,6 +472,10 @@ final class SampleListingWorker extends AbstractLister
     private Iterable<SampleRecord> tryGetIteratorForParentSamples()
     {
         Collection<Long> ids = criteria.getChildrenSampleIds();
+        if (ids.isEmpty())
+        {
+            return null;
+        }
         return query.getParentSamplesForChildren(parentRelationhipTypeId, new LongOpenHashSet(ids));
     }
 

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListOrSearchSampleCriteria.java

@@ -171,7 +171,7 @@ public final class ListOrSearchSampleCriteria extends ListSampleCriteria
     {
         if (listCriteria == null)
     {
-            return null;
+            return Collections.<Long>emptySet();
     }
         Collection<Long> childrenSampleIds = listCriteria.getChildrenSampleIds();
         if (childrenSampleIds != null)
@@ -183,10 +183,7 @@ public final class ListOrSearchSampleCriteria extends ListSampleCriteria
         {
             return Collections.<Long>emptySet();
         }
-        else
-        {
-            return Collections.<Long>singleton(childSampleId.getId());
-        }
+        return Collections.<Long>singleton(childSampleId.getId());
     }
     
     @Override

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorkerTest.java

@@ -177,6 +177,34 @@ public class SampleListingWorkerTest extends AbstractDAOTest
             checkSpace(s);
         }
     }
+    
+    @Test
+    public void testListSamplesForChildren()
+    {
+        final ListSampleCriteria baseCriteria =
+            ListSampleCriteria.createForChildren(Arrays.asList(CHILDREN_IDS));
+        final ListOrSearchSampleCriteria criteria = new ListOrSearchSampleCriteria(baseCriteria);
+        final SampleListingWorker worker =
+            SampleListingWorker.create(criteria, BASE_INDEX_URL, sampleListerDAO, secondaryDAO);
+        final List<Sample> list = worker.load();
+        assertEquals(2, list.size());
+        for (Sample s : list)
+        {
+            long sId = s.getId().longValue();
+            long pId = s.getGeneratedFrom().getId().longValue();
+            if (sId == PARENT1_ID)
+            {
+                assertTrue(pId == GRANDPARENT1_ID);
+            } else if (sId == PARENT2_ID)
+            {
+                assertTrue(pId == GRANDPARENT2_ID);
+            } else
+            {
+                fail("unexpected parent id " + pId);
+            }
+            checkSpace(s);
+        }
+    }
 
     @Test
     public void testListSamplesForExperiment()