fix integration tests for custom objects

Author: jenschude

commercetools/commercetools-sdk-java-api/src/integrationTest/java/cleanup/DeleteEverythingIntegrationTest.java

@@ -249,7 +249,7 @@ private void deleteAllCustomObjects() {
                     .get()
                     .executeBlocking().getBody();
             response.getResults().forEach(customObject -> {
-                CustomObjectFixtures.deleteCustomObject(customObject.getId(), customObject.getVersion());
+                CustomObjectFixtures.deleteCustomObject(customObject.getContainer(), customObject.getKey(), customObject.getVersion());
             });
         } while (response.getResults().size() != 0);
     }

commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/custom_object/CustomObjectFixtures.java

@@ -15,13 +15,13 @@ public class CustomObjectFixtures {
     public static void withCustomObject(final Consumer<CustomObject> consumer) {
         CustomObject customObject = createCustomObject();
         consumer.accept(customObject);
-        deleteCustomObject(customObject.getId(), customObject.getVersion());
+        deleteCustomObject(customObject.getContainer(), customObject.getKey(), customObject.getVersion());
     }
 
     public static void withUpdateableCustomObject(final UnaryOperator<CustomObject> operator) {
         CustomObject customObject = createCustomObject();
         customObject = operator.apply(customObject);
-        deleteCustomObject(customObject.getId(), customObject.getVersion());
+        deleteCustomObject(customObject.getContainer(), customObject.getKey(), customObject.getVersion());
     }
 
     public static CustomObject createCustomObject() {
@@ -41,10 +41,10 @@ public static CustomObject createCustomObject() {
         return customObject;
     }
 
-    public static CustomObject deleteCustomObject(final String id, final Long version) {
+    public static CustomObject deleteCustomObject(final String container, final String key, final Long version) {
         CustomObject customObject = CommercetoolsTestUtils.getProjectRoot()
                 .customObjects()
-                .withId(id)
+                .withContainerAndKey(container, key)
                 .delete()
                 .withVersion(version)
                 .executeBlocking().getBody();

commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/custom_object/CustomObjectIntegrationTests.java

@@ -14,17 +14,17 @@ public class CustomObjectIntegrationTests {
     @Test
     public void createAndDeleteById() {
         CustomObject customObject = CustomObjectFixtures.createCustomObject();
-        CustomObject deletedCustomObject = CustomObjectFixtures.deleteCustomObject(customObject.getId(), customObject.getVersion());
+        CustomObject deletedCustomObject = CustomObjectFixtures.deleteCustomObject(customObject.getContainer(), customObject.getKey(), customObject.getVersion());
 
         Assert.assertEquals(customObject.getId(), deletedCustomObject.getId());
     }
 
     @Test
-    public void getById() {
+    public void getByContainerKey() {
         CustomObjectFixtures.withCustomObject(customObject -> {
             CustomObject queriedCustomObject = CommercetoolsTestUtils.getProjectRoot()
                     .customObjects()
-                    .withId(customObject.getId())
+                    .withContainerAndKey(customObject.getContainer(), customObject.getKey())
                     .get()
                     .executeBlocking().getBody();