BIS-291 SP-450 fix the sample update builder to not remove container

from sample with every update.
Ammend test class to test the correct behaviour

SVN: 28090

openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java

@@ -86,29 +86,6 @@ public class UnassignSampleFromSpaceTest extends BaseTest
         perform(anUpdateOf(sample).removingSpace());
     }
 
-    @Test
-    public void childSampleCanBeUnassignedFromSpace() throws Exception
-    {
-        Sample parent = create(aSample().inExperiment(experiment));
-        Sample child = create(aSample().withParent(parent).inExperiment(experiment));
-
-        perform(anUpdateOf(child).removingSpace());
-
-        assertThat(child, hasNoSpace());
-    }
-
-    @Test
-    public void spaceAssignmentOfParentSampleIsNotChangedWhenChildSampleIsUnassignedFromSpace()
-            throws Exception
-    {
-        Sample parent = create(aSample().inExperiment(experiment));
-        Sample child = create(aSample().withParent(parent).inExperiment(experiment));
-
-        perform(anUpdateOf(child).removingSpace());
-
-        assertThat(parent, is(inSpace(space)));
-    }
-
     @Test(expectedExceptions =
         { UserFailureException.class })
     public void childSampleCantBeUnassignedFromSpace() throws Exception
@@ -117,8 +94,6 @@ public class UnassignSampleFromSpaceTest extends BaseTest
         Sample child = create(aSample().withParent(parent).inExperiment(experiment));
 
         perform(anUpdateOf(child).removingSpace());
-
-        assertThat(child, hasNoSpace());
     }
 
     @Test
@@ -144,15 +119,14 @@ public class UnassignSampleFromSpaceTest extends BaseTest
         assertThat(child, is(inSpace(space)));
     }
 
-    @Test
+    @Test(expectedExceptions =
+        { UserFailureException.class })
     public void componentOfSpaceLevelSampleCanBeUnassignedFromSpace() throws Exception
     {
         Sample container = create(aSample().inExperiment(experiment));
         Sample component = create(aSample().inExperiment(experiment).inContainer(container));
 
         perform(anUpdateOf(component).removingSpace());
-
-        assertThat(component, hasNoSpace());
     }
 
     @Test

openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SampleUpdateBuilder.java

@@ -65,7 +65,7 @@ public class SampleUpdateBuilder extends UpdateBuilder<SampleUpdatesDTO>
         this.version = sample.getVersion();
         this.sampleIdentifier = id(sample);
         this.parents = null;
-        this.container = null;
+        this.container = sample.getContainer();
     }
 
     public SampleUpdateBuilder toExperiment(Experiment experiment)