BIS-170 / SP-279: Changing the owner of dataset from sample to experiment is impossible in the U

SVN: 26840

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java

@@ -567,6 +567,7 @@ public class DataBO extends AbstractDataSetBusinessObject implements IDataBO
             updateSample(data, updates.getSampleIdentifierOrNull());
         } else
         {
+            data.setSample(null);
             updateExperiment(data, updates.getExperimentIdentifierOrNull());
         }
 

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

@@ -196,6 +196,17 @@ public class AssignDataSetToSampleTest extends BaseTest
         assertThat(component, is(inSample(sourceSample)));
     }
 
+    @Test
+    public void dataSetCanBeUnassignedFromSample() throws Exception
+    {
+        ExternalData data = create(aDataSet().inSample(sourceSample));
+
+        perform(anUpdateOf(data).removingSample());
+
+        assertThat(data, hasNoSample());
+        assertThat(data, is(inExperiment(sourceExperiment)));
+    }
+
     Space unrelatedAdmin;
 
     Space unrelatedObserver;

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

@@ -102,6 +102,12 @@ public class DataSetUpdateBuilder extends UpdateBuilder<DataSetUpdatesDTO>
         return this;
     }
 
+    public DataSetUpdateBuilder removingSample()
+    {
+        this.sampleIdentifier = null;
+        return this;
+    }
+
     public DataSetUpdateBuilder withContainer(ExternalData dataSet)
     {
         this.containerCode = dataSet.getCode();