Add unit test to delete method for custom objects test

Author: Ardjan-Aalberts

src/commercetools/testing/abstract.py

@@ -118,15 +118,10 @@ def delete_by_key(self, key):
             if obj["key"] == key:
                 return self.objects.pop(obj_id)
 
-    def delete_by_container_key(self, container, key):
-        return next(
-            (
-                obj
-                for obj in self.objects.values()
-                if obj["container"] == container and obj["key"] == key
-            ),
-            None,
-        )
+    def delete_by_container_and_key(self, container, key):
+        for obj in self.objects.values():
+            if obj["container"] == container and obj["key"] == key:
+                return obj
 
     def save(self, obj):
         assert obj["id"]
@@ -287,15 +282,15 @@ def delete_by_key(self, request, key):
             return create_commercetools_response(request, json=obj)
         return create_commercetools_response(request, status_code=404)
 
-    def delete_by_container_key(self, request, container, key):
+    def delete_by_container_and_key(self, request, container, key):
         obj = self.model.get_by_container_key(container, key)
         if obj:
             if self._verify_version:
                 response = self._validate_resource_version(request, obj)
                 if response is not None:
                     return response
 
-            obj = self.model.delete_by_container_key(key)
+            obj = self.model.delete_by_container_and_key(key)
             return create_commercetools_response(request, json=obj)
         return create_commercetools_response(request, status_code=404)
 

src/commercetools/testing/custom_objects.py

@@ -86,7 +86,7 @@ def urls(self):
             (
                 "^(?P<container>[^/]+)/(?P<key>[^/]+)$",
                 "DELETE",
-                self.delete_by_container_key,
+                self.delete_by_container_and_key,
             ),
             ("^(?P<container>[^/]+)$", "GET", self.query_by_container),
         ]
@@ -104,21 +104,17 @@ def get_by_container_key(self, request, container: str, key: str):
         item = self.model._get_by_container_key(container, key)
         if item:
             return create_commercetools_response(request, json=item)
-        else:
-            return create_commercetools_response(request, status_code=404)
+
+        return create_commercetools_response(request, status_code=404)
 
     def update_by_container_key(self, request, container: str, key: str):
         item = self.model._get_by_container_key(container, key)
         return self._update(request, item)
 
-    def delete_by_container_key(self, request, container: str, key: str):
+    def delete_by_container_and_key(self, request, container: str, key: str):
         item = self.model._get_by_container_key(container, key)
         if item:
-            if self._verify_version:
-                response = self._validate_resource_version(request, item)
-                if response is not None:
-                    return response
-
-            obj = self.model.delete_by_container_key(container, key)
+            obj = self.model.delete_by_container_and_key(container, key)
             return create_commercetools_response(request, json=obj)
+
         return create_commercetools_response(request, status_code=404)

tests/platform/test_service_custom_objects.py

@@ -87,3 +87,14 @@ def test_custom_object_query_by_container(old_client):
     result = old_client.custom_objects.query_by_container("unittest")
     assert len(result.results) == 2
     assert result.total == 2
+
+
+def test_delete_by_container_and_key(old_client):
+    custom_object = old_client.custom_objects.create_or_update(
+        models.CustomObjectDraft(container="unittest", key="test-object-1", value=1234)
+    )
+    assert custom_object.id
+    assert custom_object.key == "test-object-1"
+    assert old_client.custom_objects.delete_by_container_and_key(
+        container=custom_object.container, key=custom_object.key
+    )