Adapt ApiTest and ContextTest to parallel test runs.

Author: nitzanj

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

@@ -35,7 +35,7 @@ abstract public class AbstractApiTest extends MockableTest {
     public static final String API_TEST_UPLOAD_PRESET_2 = API_TEST_UPLOAD_PRESET + "2";
     public static final String API_TEST_UPLOAD_PRESET_3 = API_TEST_UPLOAD_PRESET + "3";
     public static final String API_TEST_UPLOAD_PRESET_4 = API_TEST_UPLOAD_PRESET + "4";
-    public static final String[] UPLOAD_TAGS = {SDK_TEST_TAG, uniqueTag};
+    public static final String[] UPLOAD_TAGS = {SDK_TEST_TAG, SDK_TEST_TAG + "_api", uniqueTag};
     public static final String EXPLICIT_TRANSFORMATION_NAME = "c_scale,l_text:Arial_60:" + SUFFIX + ",w_100";
     public static final Transformation EXPLICIT_TRANSFORMATION = new Transformation().width(100).crop("scale").overlay(new TextLayer().text(SUFFIX).fontFamily("Arial").fontSize(60));
     public static final String TEST_KEY = "test-key" + SUFFIX;
@@ -49,17 +49,17 @@ public static void setUpClass() throws IOException {
             System.err.println("Please setup environment for Upload test to run");
             return;
         }
-        Map options = ObjectUtils.asMap("public_id", API_TEST, "tags", new String[]{SDK_TEST_TAG, uniqueTag}, "context", "key=value", "eager",
+        Map options = ObjectUtils.asMap("public_id", API_TEST, "tags", UPLOAD_TAGS, "context", "key=value", "eager",
                 Collections.singletonList(EXPLICIT_TRANSFORMATION));
         cloudinary.uploader().upload(SRC_TEST_IMAGE, options);
         options.put("public_id", API_TEST_1);
         cloudinary.uploader().upload(SRC_TEST_IMAGE, options);
 
         String context1 = TEST_KEY + "=alt";
         String context2 = TEST_KEY + "=alternate";
-        options = ObjectUtils.asMap("public_id", "context_1" + SUFFIX, "tags", new String[]{SDK_TEST_TAG, uniqueTag}, "context", context1);
+        options = ObjectUtils.asMap("public_id", "context_1" + SUFFIX, "tags", UPLOAD_TAGS, "context", context1);
         cloudinary.uploader().upload(SRC_TEST_IMAGE, options);
-        options = ObjectUtils.asMap("public_id", "context_2" + SUFFIX, "tags", new String[]{SDK_TEST_TAG, uniqueTag}, "context", context2);
+        options = ObjectUtils.asMap("public_id", "context_2" + SUFFIX, "tags", UPLOAD_TAGS, "context", context2);
         cloudinary.uploader().upload(SRC_TEST_IMAGE, options);
     }
 

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

@@ -21,7 +21,7 @@
 @SuppressWarnings({"rawtypes", "unchecked"})
 abstract public class AbstractContextTest extends MockableTest {
 
-    private static final String CONTEXT_TAG = "context_tag_" + String.valueOf(System.currentTimeMillis());
+    private static final String CONTEXT_TAG = "context_tag_" + String.valueOf(System.currentTimeMillis()) + SUFFIX;
     private static Map resource;
     public static final Map CONTEXT = asMap("caption", "some cäption", "alt", "alternativè");
     private Uploader uploader;