From fac86d50419cf3bc870469dfb3d19644e2d320f4 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Wed, 15 Apr 2015 10:42:28 +0000
Subject: [PATCH] SSDM-1676: more text fixes
SVN: 33837
---
.../openbis/generic/server/business/bo/DataBO.java | 8 ++++++--
.../AbstractAssignmentSampleToExperimentTestCase.java | 11 +++++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java
index 47ffc587e46..a27b5c967fe 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java
@@ -631,9 +631,13 @@ public class DataBO extends AbstractDataSetBusinessObject implements IDataBO
entityPropertiesConverter.checkMandatoryProperties(data.getProperties(),
data.getDataSetType());
- this.getSessionFactory().getCurrentSession().evict(data);
- this.getSessionFactory().getCurrentSession().update(data);
+
+ data.setModificationDate(new Date(data.getModificationDate().getTime() + 1));
validateAndSave();
+
+ data.setModificationDate(new Date(data.getModificationDate().getTime() - 1));
+ validateAndSave();
+
}
private List<String> asListOrNull(String[] arrayOrNull)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractAssignmentSampleToExperimentTestCase.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractAssignmentSampleToExperimentTestCase.java
index 9f83e1409d1..07347fa5cc9 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractAssignmentSampleToExperimentTestCase.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractAssignmentSampleToExperimentTestCase.java
@@ -84,11 +84,16 @@ public abstract class AbstractAssignmentSampleToExperimentTestCase extends BaseT
AuthorizationRule assignSharedSampleToExperimentRule;
-
+ private static boolean fixtureRun = false;
+
@BeforeClass(dependsOnMethods = "loginAsSystem")
void createFixture() throws Exception
{
- sourceSpace = create(aSpace().withCode("sourceSpace"));
+ if (fixtureRun) {
+ return;
+ }
+
+ sourceSpace = create(aSpace().withCode("sourceSpace"));
destinationSpace = create(aSpace().withCode("destinationSpace"));
sourceProject = create(aProject().inSpace(sourceSpace));
@@ -125,6 +130,8 @@ public abstract class AbstractAssignmentSampleToExperimentTestCase extends BaseT
assignSharedSampleToExperimentRule =
and(rule(destination, RoleWithHierarchy.SPACE_USER),
rule(instance, RoleWithHierarchy.INSTANCE_ETL_SERVER));
+
+ fixtureRun = true;
}
@DataProvider
--
GitLab