From c94ce9bc6d800badf76de8e5130f8b59c89bd3a5 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Thu, 26 Jul 2012 08:18:16 +0000
Subject: [PATCH] BIS-128 SP-205 fix broken tests
SVN: 26216
---
.../server/dataaccess/db/ExperimentDAOTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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 98ebf387e85..e3b82e7f93b 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
@@ -394,7 +394,7 @@ public class ExperimentDAOTest extends AbstractDAOTest
ExperimentPE experiment = createExperiment("CISD", "CISD", "NEMO", "EXP12", "SIRNA_HCS");
daoFactory.getExperimentDAO().createOrUpdateExperiment(experiment, getTestPerson());
- assertEquals(1, threadOperations.size());
+ assertEquals(2, threadOperations.size());
assertEquals(asDynamicPropertyEvaluationOperation(experiment), threadOperations.get(0));
List<ExperimentPE> experimentsAfter = daoFactory.getExperimentDAO().listExperiments();
@@ -424,7 +424,7 @@ public class ExperimentDAOTest extends AbstractDAOTest
daoFactory.getExperimentDAO().createOrUpdateExperiment(experiment, getTestPerson());
- assertEquals(1, threadOperations.size());
+ assertEquals(2, threadOperations.size());
assertEquals(asDynamicPropertyEvaluationOperation(experiment), threadOperations.get(0));
List<ExperimentPE> experimentsAfter = daoFactory.getExperimentDAO().listExperiments();
@@ -492,16 +492,16 @@ public class ExperimentDAOTest extends AbstractDAOTest
ExperimentPE experiment = createExperiment("CISD", "CISD", "NEMO", "EXP13", "SIRNA_HCS");
daoFactory.getExperimentDAO().createOrUpdateExperiment(experiment, getTestPerson());
- assertEquals(1, threadOperations.size());
+ assertEquals(2, threadOperations.size());
assertEquals(asDynamicPropertyEvaluationOperation(experiment), threadOperations.get(0));
ExperimentPE experiment2 =
createExperiment("CISD", "CISD", "NEMO", "EXP12", "COMPOUND_HCS");
daoFactory.getExperimentDAO().createOrUpdateExperiment(experiment2, getTestPerson());
- assertEquals(2, threadOperations.size());
+ assertEquals(4, threadOperations.size());
assertEquals(asDynamicPropertyEvaluationOperation(experiment), threadOperations.get(0));
- assertEquals(asDynamicPropertyEvaluationOperation(experiment2), threadOperations.get(1));
+ assertEquals(asDynamicPropertyEvaluationOperation(experiment2), threadOperations.get(2));
List<ExperimentPE> experimentsAfter = daoFactory.getExperimentDAO().listExperiments();
Collections.sort(experimentsAfter);
--
GitLab