SSDM-4912: UpdateLinkDataSetTest.removeAllCopies() added. Bug in...

SSDM-4912: UpdateLinkDataSetTest.removeAllCopies() added. Bug in UpdateDataSetLinkedDataExecutor (revealed by the added test) fixed

SVN: 37924

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetLinkedDataExecutor.java

@@ -114,18 +114,7 @@ public class UpdateDataSetLinkedDataExecutor implements IUpdateDataSetLinkedData
                 }
             }
 
-            outer: for (IContentCopyId iid : update.getContentCopies().getRemoved())
-            {
-                ContentCopyPermId id = (ContentCopyPermId) iid;
-                for (ContentCopyPE cc : entity.getContentCopies())
-                {
-                    if (id.getPermId().equals(cc.getId().toString()))
-                    {
-                        continue outer;
-                    }
-                    throw new UserFailureException("Trying to remove non-existing content copy " + id.getPermId());
-                }
-            }
+            assertAllRemovalsExists(entity, update);
 
             entity.getContentCopies().removeAll(remove);
             for (ContentCopyPE cc : remove)
@@ -136,4 +125,20 @@ public class UpdateDataSetLinkedDataExecutor implements IUpdateDataSetLinkedData
             addContentCopiesToLinkedDataExecutor.add(context, entity, update.getContentCopies().getAdded());
         }
     }
+
+    private void assertAllRemovalsExists(LinkDataPE entity, LinkedDataUpdate update)
+    {
+        outer: for (IContentCopyId iid : update.getContentCopies().getRemoved())
+        {
+            ContentCopyPermId id = (ContentCopyPermId) iid;
+            for (ContentCopyPE cc : entity.getContentCopies())
+            {
+                if (id.getPermId().equals(cc.getId().toString()))
+                {
+                    continue outer;
+                }
+            }
+            throw new UserFailureException("Trying to remove non-existing content copy " + id.getPermId());
+        }
+    }
 }

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractLinkDataSetTest.java

@@ -384,6 +384,7 @@ public abstract class AbstractLinkDataSetTest extends AbstractExternalDmsTest
 
                 { ExternalDmsAddressType.FILE_SYSTEM, null, null, null },
                 { ExternalDmsAddressType.FILE_SYSTEM, "code", null, null },
+                { ExternalDmsAddressType.FILE_SYSTEM, "code", "/path", null },
                 { ExternalDmsAddressType.FILE_SYSTEM, "code", "/path", "hash" },
                 { ExternalDmsAddressType.FILE_SYSTEM, "code", null, "hash" },
                 { ExternalDmsAddressType.FILE_SYSTEM, null, null, "hash" }

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateLinkDataSetTest.java

@@ -127,6 +127,19 @@ public class UpdateLinkDataSetTest extends AbstractLinkDataSetTest
         ContentCopyPermId ccid = new ContentCopyPermId(uuid());
         update(dataset(id).without(ccid));
     }
+    
+    @Test
+    void removeAllCopies()
+    {
+        ExternalDmsPermId dms = create(externalDms());
+        DataSetPermId id = create(linkDataSet().with(copyAt(dms)).with(copyAt(dms)));
+
+        List<ContentCopy> contentCopies = get(id).getLinkedData().getContentCopies();
+        update(dataset(id).without(contentCopies.get(0).getId(), contentCopies.get(1).getId()));
+
+        DataSet dataset = get(id);
+        assertThat(dataset.getLinkedData().getContentCopies().size(), is(0));
+    }
 
     @Test
     void legacyExternalCodeCanBeSetOnSingleCopyOpenBISDms()