From 741a5672c838c35bfbded8ab0137577a76b1c969 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Tue, 15 Jan 2013 08:26:08 +0000
Subject: [PATCH] BIS-291 SP-450 force checking business rules in all cases fix
the test to reflect correct behaviour.
SVN: 28096
---
.../business/bo/AbstractSampleBusinessObject.java | 7 ++-----
.../systemtest/UnassignSampleFromSpaceTest.java | 15 ++-------------
2 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java
index 482f492349f..b88636fe80e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java
@@ -454,11 +454,8 @@ abstract class AbstractSampleBusinessObject extends AbstractSampleIdentifierBusi
{
checkPropertiesBusinessRules(sample, cacheOrNull);
checkExperimentBusinessRules(dataDAO, sample);
- if (spaceUpdated)
- {
- checkParentBusinessRules(sample);
- checkContainerBusinessRules(sample);
- }
+ checkParentBusinessRules(sample);
+ checkContainerBusinessRules(sample);
}
protected void checkPropertiesBusinessRules(SamplePE sample,
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java
index efed5639522..64229c716c9 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java
@@ -111,6 +111,7 @@ public class UnassignSampleFromSpaceTest extends BaseTest
public void spaceAssignmentOfChildSampleIsNotChangedWhenParentSampleIsUnassignedFromSpace()
throws Exception
{
+
Sample parent = create(aSample().inExperiment(experiment));
Sample child = create(aSample().withParent(parent).inExperiment(experiment));
@@ -121,7 +122,7 @@ public class UnassignSampleFromSpaceTest extends BaseTest
@Test(expectedExceptions =
{ UserFailureException.class })
- public void componentOfSpaceLevelSampleCanBeUnassignedFromSpace() throws Exception
+ public void componentOfSpaceLevelSampleCantBeUnassignedFromSpace() throws Exception
{
Sample container = create(aSample().inExperiment(experiment));
Sample component = create(aSample().inExperiment(experiment).inContainer(container));
@@ -129,18 +130,6 @@ public class UnassignSampleFromSpaceTest extends BaseTest
perform(anUpdateOf(component).removingSpace());
}
- @Test
- public void spaceAssociationOfContainerSampleIsNotChangedWhenComponentSampleIsUnassignedFromSpace()
- throws Exception
- {
- Sample container = create(aSample().inExperiment(experiment));
- Sample component = create(aSample().inExperiment(experiment).inContainer(container));
-
- perform(anUpdateOf(component).removingSpace());
-
- assertThat(container, is(inSpace(space)));
- }
-
@Test
public void containerOfSpaceLevelSampleCanBeUnassignedFromSpace() throws Exception
{
--
GitLab