Fix cross-test pollution issues.

Add travis_job_id to public id of uploaded resources.
Delete newly created streaming profiles from account after test.

Author: nitzanj

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

@@ -57,11 +57,11 @@ public static void setUpClass() throws IOException {
 
         String context1 = TEST_KEY + "=alt";
         String context2 = TEST_KEY + "=alternate";
-        options = ObjectUtils.asMap("public_id", "context_1", "tags", new String[]{SDK_TEST_TAG, uniqueTag}, "context", context1);
+        options = ObjectUtils.asMap("public_id", "context_1" + SUFFIX, "tags", new String[]{SDK_TEST_TAG, uniqueTag}, "context", context1);
         cloudinary.uploader().upload(SRC_TEST_IMAGE, options);
-        options = ObjectUtils.asMap("public_id", "context_2", "tags", new String[]{SDK_TEST_TAG, uniqueTag}, "context", context2);
+        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("Suffix: " + SUFFIX);
+        System.out.println("Generated tag suffix: " + SUFFIX);
     }
 
     @AfterClass

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

@@ -8,14 +8,14 @@
 import com.cloudinary.utils.ObjectUtils;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
 import org.junit.rules.TestName;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;
@@ -26,6 +26,9 @@ abstract public class AbstractStreamingProfilesApiTest extends MockableTest {
     private static final String PROFILE_NAME = "api_test_streaming_profile" + SUFFIX;
     protected Api api;
     private static final List<String> PREDEFINED_PROFILES = Arrays.asList("4k", "full_hd", "hd", "sd", "full_hd_wifi", "full_hd_lean", "hd_lean");
+    public static final String UPDATE_PROFILE_NAME = PROFILE_NAME + "_update";
+    public static final String DELETE_PROFILE_NAME = PROFILE_NAME + "_delete";
+    public static final String CREATE_PROFILE_NAME = PROFILE_NAME + "_create";
 
     @BeforeClass
     public static void setUpClass() throws IOException {
@@ -48,14 +51,13 @@ public void setUp() {
 
     @Test
     public void testCreate() throws Exception {
-        final String name = PROFILE_NAME + "_create";
-        ApiResponse result = api.createStreamingProfile(name, null, Collections.singletonList(ObjectUtils.asMap(
+        ApiResponse result = api.createStreamingProfile(CREATE_PROFILE_NAME, null, Collections.singletonList(ObjectUtils.asMap(
                 "transformation", new Transformation().crop("limit").width(1200).height(1200).bitRate("5m")
         )), ObjectUtils.emptyMap());
 
         assertTrue(result.containsKey("data"));
         Map profile = (Map) result.get("data");
-        assertThat(profile, (Matcher) hasEntry("name", (Object) name));
+        assertThat(profile, (Matcher) hasEntry("name", (Object) CREATE_PROFILE_NAME));
     }
 
     @Test
@@ -82,39 +84,37 @@ public void testList() throws Exception {
     @Test
     public void testDelete() throws Exception {
         ApiResponse result;
-        final String name = PROFILE_NAME + "_delete";
         try {
-            api.createStreamingProfile(name, null, Collections.singletonList(ObjectUtils.asMap(
+            api.createStreamingProfile(DELETE_PROFILE_NAME, null, Collections.singletonList(ObjectUtils.asMap(
                     "transformation", new Transformation().crop("limit").width(1200).height(1200).bitRate("5m")
             )), ObjectUtils.emptyMap());
         } catch (AlreadyExists ignored) {
         }
 
-        result = api.deleteStreamingProfile(name);
+        result = api.deleteStreamingProfile(DELETE_PROFILE_NAME);
         assertTrue(result.containsKey("data"));
         Map profile = (Map) result.get("data");
-        assertThat(profile, (Matcher) hasEntry("name", (Object) (name)));
+        assertThat(profile, (Matcher) hasEntry("name", (Object) DELETE_PROFILE_NAME));
 
     }
 
     @Test
     public void testUpdate() throws Exception {
-        final String name = PROFILE_NAME + "_update";
         try {
-            api.createStreamingProfile(name, null, Collections.singletonList(ObjectUtils.asMap(
+            api.createStreamingProfile(UPDATE_PROFILE_NAME, null, Collections.singletonList(ObjectUtils.asMap(
                     "transformation", new Transformation().crop("limit").width(1200).height(1200).bitRate("5m")
             )), ObjectUtils.emptyMap());
         } catch (AlreadyExists ignored) {
         }
-        Map result = api.updateStreamingProfile(name, null, Collections.singletonList(
+        Map result = api.updateStreamingProfile(UPDATE_PROFILE_NAME, null, Collections.singletonList(
                 ObjectUtils.asMap("transformation",
                         new Transformation().crop("limit").width(800).height(800).bitRate("5m")
                 )), ObjectUtils.emptyMap());
 
         assertTrue(result.containsKey("data"));
         assertThat(result, (Matcher) hasEntry("message", (Object) "updated"));
         Map profile = (Map) result.get("data");
-        assertThat(profile, (Matcher) hasEntry("name", (Object) (name)));
+        assertThat(profile, (Matcher) hasEntry("name", (Object) UPDATE_PROFILE_NAME));
         assertThat(profile, Matchers.hasEntry(equalTo("representations"), (Matcher) hasItem(hasKey("transformation"))));
         final Map representation = (Map) ((List) profile.get("representations")).get(0);
         Map transformation = (Map) ((List)representation.get("transformation")).get(0);
@@ -125,4 +125,16 @@ public void testUpdate() throws Exception {
                 (Matcher) hasEntry("bit_rate", "5m")
         ));
     }
+
+    @AfterClass
+    public static void tearDownClass() {
+        Api api = new Cloudinary().api();
+        try {
+            api.deleteStreamingProfile(CREATE_PROFILE_NAME);
+            api.deleteStreamingProfile(DELETE_PROFILE_NAME);
+            api.deleteStreamingProfile(UPDATE_PROFILE_NAME);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }