From fb091bd7dd1ae754ce4b56d1fa4376e93e2e8c07 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Wed, 3 Aug 2011 14:35:44 +0000
Subject: [PATCH] minor: update test expectations to the new test indices
SVN: 22326
---
.../business/bo/samplelister/SampleListingQueryTest.java | 6 +++---
.../generic/server/dataaccess/db/ExperimentDAOTest.java | 4 ++--
.../server/dataaccess/db/HibernateSearchDAOTest.java | 2 +-
.../cisd/openbis/systemtest/ExperimentBrowsingTest.java | 4 ++--
.../cisd/openbis/systemtest/SetSessionUserTest.java | 2 +-
.../systemtest/plugin/generic/SampleBrowsingTest.java | 4 ++--
.../systemtest/plugin/generic/SampleDetailsTest.java | 2 +-
.../sourceTest/sql/postgresql/078/023=experiments_all.tsv | 2 +-
openbis/sourceTest/sql/postgresql/078/043=samples_all.tsv | 6 +++---
9 files changed, 16 insertions(+), 16 deletions(-)
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 f80ae1ef468..4ef782c2349 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 eb2c0b665f9..d7e78f93892 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 413afd8b8ee..2b25f2011f4 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 70c9039157b..88c22550ee8 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 9dd7b01b5a1..b9a1a311a65 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 66922256756..880c7eea53d 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 52447edd15f..8d4f5a0ea9e 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 d70baacf9dd..2c33ff5881b 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 7211812cc76..2ce11b55e93 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
--
GitLab