Fix cross-test pollution issues (add suffix to public id).

Author: nitzanj

cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractApiTest.java

@@ -61,7 +61,6 @@ public static void setUpClass() throws IOException {
         cloudinary.uploader().upload(SRC_TEST_IMAGE, options);
         options = ObjectUtils.asMap("public_id", "context_2" + SUFFIX, "tags", new String[]{SDK_TEST_TAG, uniqueTag}, "context", context2);
         cloudinary.uploader().upload(SRC_TEST_IMAGE, options);
-        System.out.println("Generated tag suffix: " + SUFFIX);
     }
 
     @AfterClass
@@ -285,7 +284,7 @@ public void test08DeleteDerived() throws Exception {
     @Test()
     public void testDeleteDerivedByTransformation() throws Exception {
         // should allow deleting resources
-        String public_id = "api_test_123";
+        String public_id = "api_test_123" + SUFFIX;
         List<Transformation> transformations = new ArrayList<Transformation>();
         transformations.add(new Transformation().angle(90));
         transformations.add(new Transformation().width(120));
@@ -305,7 +304,7 @@ public void testDeleteDerivedByTransformation() throws Exception {
     @Test(expected = NotFound.class)
     public void test09DeleteResources() throws Exception {
         // should allow deleting resources
-        String public_id = "api_,test3";
+        String public_id = "api_,test3" + SUFFIX;
         cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("public_id", public_id, "tags", UPLOAD_TAGS));
         Map resource = api.resource(public_id, ObjectUtils.emptyMap());
         assertNotNull(resource);
@@ -712,35 +711,36 @@ public void testRestore() throws Exception {
 
     @Test
     public void testUploadMapping() throws Exception {
+        String aptTestUploadMapping = "api_test_upload_mapping" + SUFFIX;
         try {
-            api.deleteUploadMapping("api_test_upload_mapping", ObjectUtils.emptyMap());
+            api.deleteUploadMapping(aptTestUploadMapping, ObjectUtils.emptyMap());
         } catch (Exception ignored) {
 
         }
-        api.createUploadMapping("api_test_upload_mapping", ObjectUtils.asMap("template", "http://cloudinary.com"));
-        Map result = api.uploadMapping("api_test_upload_mapping", ObjectUtils.emptyMap());
+        api.createUploadMapping(aptTestUploadMapping, ObjectUtils.asMap("template", "http://cloudinary.com"));
+        Map result = api.uploadMapping(aptTestUploadMapping, ObjectUtils.emptyMap());
         assertEquals(result.get("template"), "http://cloudinary.com");
-        api.updateUploadMapping("api_test_upload_mapping", ObjectUtils.asMap("template", "http://res.cloudinary.com"));
-        result = api.uploadMapping("api_test_upload_mapping", ObjectUtils.emptyMap());
+        api.updateUploadMapping(aptTestUploadMapping, ObjectUtils.asMap("template", "http://res.cloudinary.com"));
+        result = api.uploadMapping(aptTestUploadMapping, ObjectUtils.emptyMap());
         assertEquals(result.get("template"), "http://res.cloudinary.com");
         result = api.uploadMappings(ObjectUtils.emptyMap());
         ListIterator mappings = ((ArrayList) result.get("mappings")).listIterator();
         boolean found = false;
         while (mappings.hasNext()) {
             Map mapping = (Map) mappings.next();
-            if (mapping.get("folder").equals("api_test_upload_mapping")
+            if (mapping.get("folder").equals(aptTestUploadMapping)
                     && mapping.get("template").equals("http://res.cloudinary.com")) {
                 found = true;
                 break;
             }
         }
         assertTrue(found);
-        api.deleteUploadMapping("api_test_upload_mapping", ObjectUtils.emptyMap());
+        api.deleteUploadMapping(aptTestUploadMapping, ObjectUtils.emptyMap());
         result = api.uploadMappings(ObjectUtils.emptyMap());
         found = false;
         while (mappings.hasNext()) {
             Map mapping = (Map) mappings.next();
-            if (mapping.get("folder").equals("api_test_upload_mapping")
+            if (mapping.get("folder").equals(aptTestUploadMapping)
                     && mapping.get("template").equals("http://res.cloudinary.com")) {
                 found = true;
                 break;