[LMS-2163] update test db indices (part2)

SVN: 20621

openbis/sourceTest/sql/postgresql/068/039=sample_properties.tsv

@@ -35,5 +35,6 @@
 49	1020	13	42	\N	2	2010-10-25 14:49:35.990096+02	2010-10-25 14:49:35.990096+02	\N
 50	1021	13	42	\N	2	2010-10-25 14:49:35.990096+02	2010-10-25 14:49:35.990096+02	\N
 43	979	13	49	\N	2	2010-10-25 14:49:35.990096+02	2010-10-25 14:50:02.171+02	\N
-51	1051	12	\N	\N	2	2010-10-25 14:49:35.990096+02	2010-10-25 14:49:35.990096+02	3693
-52	1052	12	\N	\N	2	2010-10-25 14:49:35.990096+02	2010-10-25 14:49:35.990096+02	3694
+51	1051	11	\N	\N	2	2010-10-25 14:49:35.990096+02	2010-10-25 14:49:35.990096+02	34
+52	1051	12	\N	\N	2	2010-10-25 14:49:35.990096+02	2010-10-25 14:49:35.990096+02	35
+53	1052	12	\N	\N	2	2010-10-25 14:49:35.990096+02	2010-10-25 14:49:35.990096+02	3694

screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/WellContentLoaderTest.java

@@ -71,6 +71,35 @@ public class WellContentLoaderTest extends AbstractScreeningDAOTest
         List<WellContent> wellContents =
                 WellContentLoader.load(session, businessObjectFactory, daoFactory, searchCriteria);
 
+        // the test database contains two matching wells
+        assertEquals(1, wellContents.size());
+        for (WellContent wc : wellContents)
+        {
+            assertPropertiesPresent(wc);
+        }
+    }
+
+    /**
+     * Test that the same well is not displayed twice if the search query matches two different
+     * materials inside the well.
+     */
+    @Test(enabled = false)
+    public void testDuplicateWellsFilteredOut()
+    {
+        String[] materialCodes = new String[]
+            { "BACTERIUM-X", "BACTERIUM-Y" };
+        String[] materialTypeCodes =
+            { "BACTERIUM" };
+
+        WellSearchCriteria searchCriteria =
+                new WellSearchCriteria(ExperimentSearchCriteria.createAllExperiments(),
+                        MaterialSearchCriteria.createCodesCriteria(materialCodes,
+                                materialTypeCodes, false));
+
+        Session session = createSession(getSystemPerson());
+        List<WellContent> wellContents =
+                WellContentLoader.load(session, businessObjectFactory, daoFactory, searchCriteria);
+
         // the test database contains two matching wells
         assertEquals(2, wellContents.size());
         for (WellContent wc : wellContents)