From ffb853322924834605a656d433e9ccdc79f706ec Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Fri, 30 Apr 2010 14:05:19 +0000
Subject: [PATCH] [LMS-1508] fixed tests
SVN: 15701
---
.../cisd/openbis/generic/server/CommonServerTest.java | 3 ++-
.../generic/server/business/bo/ExternalDataBOTest.java | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
index c78f0ef98fc..e8104f60f2f 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
@@ -1219,7 +1219,8 @@ public final class CommonServerTest extends AbstractServerTestCase
one(entityTypePropertyTypeBO).countAssignmentValues(propertyTypeCode,
entityTypeCode);
- will(returnValue(1)); // TODO BO test
+ will(returnValue(1));
+ // TODO 2009-09-10, Piotr Buczek: write BO and DAO tests
}
});
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBOTest.java
index 34bd3cd9550..1236dab12c0 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBOTest.java
@@ -68,7 +68,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.types.DataSetTypeCode;
* @author Franz-Josef Elmer
*/
// TODO 2009-09-10, Piotr Buczek: write tests with many parents and cycle check
-@Test(groups="broken")
public class ExternalDataBOTest extends AbstractBOTest
{
private static final TechId TECH_ID = new TechId(42l);
@@ -405,7 +404,8 @@ public class ExternalDataBOTest extends AbstractBOTest
context.checking(new Expectations()
{
{
- one(externalDataDAO).tryGetByTechId(TECH_ID, ExternalDataBO.PROPERTY_TYPES);
+ one(externalDataDAO).tryGetByTechId(TECH_ID, ExternalDataBO.PROPERTY_TYPES,
+ ExternalDataBO.DATA_SET_TYPE);
will(returnValue(dataSet));
one(propertiesConverter).updateProperties(
@@ -434,7 +434,8 @@ public class ExternalDataBOTest extends AbstractBOTest
context.checking(new Expectations()
{
{
- one(externalDataDAO).tryGetByTechId(TECH_ID, ExternalDataBO.PROPERTY_TYPES);
+ one(externalDataDAO).tryGetByTechId(TECH_ID, ExternalDataBO.PROPERTY_TYPES,
+ ExternalDataBO.DATA_SET_TYPE);
will(returnValue(dataSet));
ExperimentIdentifier identifier = EXPERIMENT_IDENTIFIER;
--
GitLab