diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java
index f80ae1ef468f83c8b8e86bc99f10ada55e890723..4ef782c2349a85132eb83544b8fb551e3a83f35e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java
@@ -143,7 +143,7 @@ public class SampleListingQueryTest extends AbstractDAOTest
@Test
public void testSampleCount()
{
- assertEquals(689, query.getSampleCount(dbInstanceId)); // without deleted
+ assertEquals(692, query.getSampleCount(dbInstanceId)); // without deleted
}
@Test
@@ -266,7 +266,7 @@ public class SampleListingQueryTest extends AbstractDAOTest
assertTrue(msg, EqualsBuilder.reflectionEquals(sample, sample2));
++sampleCount;
}
- assertEquals(29, sampleCount); // without deleted
+ assertEquals(30, sampleCount); // without deleted
}
@Test
@@ -322,7 +322,7 @@ public class SampleListingQueryTest extends AbstractDAOTest
assertNotNull(msg, sample.expe_id);
++sampleCount;
}
- assertEquals(12, sampleCount); // without deleted
+ assertEquals(15, sampleCount); // without deleted
}
@Test
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java
index eb2c0b665f957e8e0e0fe894b727530e9d4faad0..d7e78f938924e86d420f11ae764f4d07aa9f1786 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java
@@ -152,7 +152,7 @@ public class ExperimentDAOTest extends AbstractDAOTest
daoFactory.getExperimentDAO().listExperimentsWithProperties(expType,
projectDefault, null);
Collections.sort(experiments);
- assertEquals(1, experiments.size());
+ assertEquals(2, experiments.size());
assertContains(experiments, CISD_CISD_DEFAULT_EXP_REUSE);
assertNotContains(experiments, CISD_CISD_DEFAULT_EXP_X);
}
@@ -176,7 +176,7 @@ public class ExperimentDAOTest extends AbstractDAOTest
daoFactory.getExperimentDAO().listExperimentsWithProperties(expType, null,
spaceCisd);
Collections.sort(experiments);
- assertEquals(5, experiments.size());
+ assertEquals(6, experiments.size());
assertContains(experiments, CISD_CISD_NEMO_EXP10);
assertContains(experiments, CISD_CISD_NEMO_EXP11);
assertContains(experiments, CISD_CISD_DEFAULT_EXP_REUSE);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
index 413afd8b8eeffc991959c7466a62fa299dd1e138..2b25f2011f4fd628daf1fc2e708f8376ac882ad3 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
@@ -153,7 +153,7 @@ public final class HibernateSearchDAOTest extends AbstractDAOTest
final List<MatchingEntity> hits =
hibernateSearchDAO.searchEntitiesByTerm(SearchableEntity.EXPERIMENT, query,
createDataProvider(), useWildcardMode, 0, Integer.MAX_VALUE);
- assertEquals(4, hits.size());
+ assertEquals(5, hits.size());
for (MatchingEntity matchingEntity : hits)
{
AssertionUtil.assertContainsInsensitive(querySubstring, matchingEntity.getCode());
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/ExperimentBrowsingTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/ExperimentBrowsingTest.java
index 70c9039157bf889dc2b8c9c6da6134279ad3cc27..88c22550ee8fd809627acf7ec0733394a478eb3f 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/ExperimentBrowsingTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/ExperimentBrowsingTest.java
@@ -78,8 +78,8 @@ public class ExperimentBrowsingTest extends SystemTestCase
assertEquals(null, e1.getDeletion());
assertObjectWithCodeDoesNotExists(resultSet, "EXP-X"); // deleted
assertEquals(false, resultSet.getResultSet().isPartial());
- assertEquals(1, resultSet.getResultSet().getTotalLength());
- assertEquals(1, resultSet.getResultSet().getList().size());
+ assertEquals(2, resultSet.getResultSet().getTotalLength());
+ assertEquals(2, resultSet.getResultSet().getList().size());
}
@Test
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SetSessionUserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SetSessionUserTest.java
index 9dd7b01b5a135acd2427a632c545b69088267629..b9a1a311a65ad30a5044c57ac487c0bd7f90a7ac 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SetSessionUserTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SetSessionUserTest.java
@@ -144,7 +144,7 @@ public class SetSessionUserTest extends SystemTestCase
criteria.setSampleType(sampleType);
criteria.setIncludeSpace(true);
// INSTANCE ADMIN sees all samples that were not deleted
- assertEquals(11, commonServer.listSamples(sessionToken, criteria).size());
+ assertEquals(12, commonServer.listSamples(sessionToken, criteria).size());
commonServer.setSessionUser(sessionToken, "test");
commonServer.setSessionUser(sessionToken, "observer"); // allowed because still user 'test'
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java
index 66922256756359c26cb57f8c61e897624170d71f..880c7eea53d5ea0c9054c0621356aa28e82d7623 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java
@@ -70,7 +70,7 @@ public class SampleBrowsingTest extends GenericSystemTestCase
ResultSetWithEntityTypes<Sample> samples =
commonClientService.listSamples(new ListSampleDisplayCriteria(listCriteria));
- assertEquals(29, samples.getResultSet().getTotalLength());
+ assertEquals(30, samples.getResultSet().getTotalLength());
List<BasicEntityType> availableEntityTypes = new ArrayList<BasicEntityType>();
availableEntityTypes.addAll(samples.getAvailableEntityTypes());
@@ -162,7 +162,7 @@ public class SampleBrowsingTest extends GenericSystemTestCase
ResultSetWithEntityTypes<Sample> samples =
commonClientService.listSamples(new ListSampleDisplayCriteria(listCriteria));
- assertEquals(11, samples.getResultSet().getTotalLength());
+ assertEquals(12, samples.getResultSet().getTotalLength());
assertEquals("[CELL_PLATE]", samples.getAvailableEntityTypes().toString());
GridRowModels<Sample> list = samples.getResultSet().getList();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleDetailsTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleDetailsTest.java
index 52447edd15ffea77e838fa242dd3053c80f3d1ad..8d4f5a0ea9e5f429766fed434ddd1132e2dd3869 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleDetailsTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleDetailsTest.java
@@ -131,7 +131,7 @@ public class SampleDetailsTest extends GenericSystemTestCase
ResultSetWithEntityTypes<Sample> samples =
commonClientService.listSamples(new ListSampleDisplayCriteria(listCriteria));
- assertEquals(11, samples.getResultSet().getTotalLength());
+ assertEquals(12, samples.getResultSet().getTotalLength());
assertEquals("[CELL_PLATE]", samples.getAvailableEntityTypes().toString());
GridRowModels<Sample> list = samples.getResultSet().getList();
diff --git a/openbis/sourceTest/sql/postgresql/078/023=experiments_all.tsv b/openbis/sourceTest/sql/postgresql/078/023=experiments_all.tsv
index d70baacf9ddb113a7fd79483535e544f73ffa618..2c33ff5881bc9d1708dab5e85cd92984af61e737 100644
--- a/openbis/sourceTest/sql/postgresql/078/023=experiments_all.tsv
+++ b/openbis/sourceTest/sql/postgresql/078/023=experiments_all.tsv
@@ -6,4 +6,4 @@
18 EXP-TEST-1 2 \N 2 2009-02-09 12:10:39.077782+01 3 \N f 2009-03-18 10:50:19.475958+01 200902091239077-1033
19 EXP-TEST-2 2 \N 2 2009-02-09 12:10:58.949516+01 4 \N f 2009-03-18 10:50:19.475958+01 200902091258949-1034
20 EXP-TEST-2 1 \N 2 2009-02-09 12:17:55.058768+01 3 \N f 2009-03-18 10:50:19.475958+01 200902091255058-1035
-21 EXP-WELLS 1 14 2 2008-11-05 09:22:37.246+01 1 4 f 2009-03-18 10:50:19.475958+01 200811050937246-1036
+21 EXP-WELLS 1 14 2 2008-11-05 09:22:37.246+01 1 \N f 2009-03-18 10:50:19.475958+01 200811050937246-1036
diff --git a/openbis/sourceTest/sql/postgresql/078/043=samples_all.tsv b/openbis/sourceTest/sql/postgresql/078/043=samples_all.tsv
index 7211812cc760594eb6a5074544e73eb82e5c4561..2ce11b55e93b275046aa47e9fd9af8135a268b70 100644
--- a/openbis/sourceTest/sql/postgresql/078/043=samples_all.tsv
+++ b/openbis/sourceTest/sql/postgresql/078/043=samples_all.tsv
@@ -1018,6 +1018,6 @@
1042 CP-TEST-1 3 2009-02-09 12:09:19.327518+01 2 \N \N 1 \N 2009-08-18 17:54:11.56+02 18 200902091219327-1025
1043 CP-TEST-2 3 2009-02-09 12:09:50.077973+01 2 \N \N 1 \N 2009-08-18 17:54:36.929+02 19 200902091250077-1026
988 3VCP7 3 2008-11-05 09:21:46.559+01 2 \N \N 1 \N 2010-10-25 14:48:36.245+02 \N 200811050946559-981
-1050 PLATE_WELLSEARCH 3 2009-02-09 12:09:50.077973+01 2 4 \N 1 \N 2009-08-18 17:54:36.929+02 21 200902091250077-1050
-1051 WELL-A01 6 2009-02-09 12:09:50.077973+01 2 4 \N 1 1050 2009-08-18 17:54:36.929+02 21 200902091250077-1051
-1052 WELL-A02 6 2009-02-09 12:09:50.077973+01 2 4 \N 1 1050 2009-08-18 17:54:36.929+02 21 200902091250077-1052
+1050 PLATE_WELLSEARCH 3 2009-02-09 12:09:50.077973+01 2 \N \N 1 \N 2009-08-18 17:54:36.929+02 21 200902091250077-1050
+1051 WELL-A01 6 2009-02-09 12:09:50.077973+01 2 \N \N 1 1050 2009-08-18 17:54:36.929+02 21 200902091250077-1051
+1052 WELL-A02 6 2009-02-09 12:09:50.077973+01 2 \N \N 1 1050 2009-08-18 17:54:36.929+02 21 200902091250077-1052