Modify explicit test - don't use twitter

Author: Amir Tocker

cloudinary-android-test/src/main/java/com/cloudinary/test/UploaderTest.java

@@ -149,11 +149,11 @@ public void testRename() throws Exception {
     public void testExplicit() throws Exception {
         if (cloudinary.config.apiSecret == null)
             return;
-        JSONObject result = new JSONObject(cloudinary.uploader().explicit("cloudinary",
-                ObjectUtils.asMap("eager", Collections.singletonList(new Transformation().crop("scale").width(2.0)), "type", "twitter_name")));
-        String url = cloudinary.url().type("twitter_name").transformation(new Transformation().crop("scale").width(2.0)).format("png")
-                .version(result.get("version")).generate("cloudinary");
-        assertEquals(result.getJSONArray("eager").getJSONObject(0).get("url"), url);
+        JSONObject result = new JSONObject(cloudinary.uploader().explicit("sample",
+                ObjectUtils.asMap("eager", Collections.singletonList(new Transformation().crop("scale").width(2.0)), "type", "upload")));
+        String url = cloudinary.url().transformation(new Transformation().crop("scale").width(2.0)).format("jpg")
+                .version(result.get("version")).generate("sample");
+        assertEquals(url, result.getJSONArray("eager").getJSONObject(0).get("url"));
     }
 
     public void testEager() throws Exception {
@@ -293,7 +293,7 @@ public void testCategorizationRequest() {
         try {
             cloudinary.uploader().upload(getAssetStream(TEST_IMAGE), ObjectUtils.asMap("categorization", "illegal"));
         } catch (Exception e) {
-            assertTrue(e.getMessage().matches(".*illegal is not a valid.*"));
+            assertTrue(e.getMessage().matches("(.*)(Illegal value|not a valid|invalid)(.*)"));
         }
     }
 
@@ -304,7 +304,7 @@ public void testDetectionRequest() {
         try {
             cloudinary.uploader().upload(getAssetStream(TEST_IMAGE), ObjectUtils.asMap("detection", "illegal"));
         } catch (Exception e) {
-            assertTrue(e.getMessage().matches(".*illegal is not a valid.*"));
+            assertTrue(e.getMessage().matches(".*(Illegal value|not a valid|invalid).*"));
         }
     }
 

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

@@ -147,8 +147,8 @@ public void testUniqueFilename() throws Exception {
 
     @Test
     public void testExplicit() throws IOException {
-        Map result = cloudinary.uploader().explicit("cloudinary", ObjectUtils.asMap("eager", Collections.singletonList(new Transformation().crop("scale").width(2.0)), "type", "twitter_name"));
-        String url = cloudinary.url().type("twitter_name").transformation(new Transformation().crop("scale").width(2.0)).format("png").version(result.get("version")).generate("cloudinary");
+        Map result = cloudinary.uploader().explicit("sample", ObjectUtils.asMap("eager", Collections.singletonList(new Transformation().crop("scale").width(2.0)), "type", "upload"));
+        String url = cloudinary.url().transformation(new Transformation().crop("scale").width(2.0)).format("jpg").version(result.get("version")).generate("sample");
         String eagerUrl = (String) ((Map) ((List) result.get("eager")).get(0)).get("url");
         String cloudName = cloudinary.config.cloudName;
         assertEquals(eagerUrl.substring(eagerUrl.indexOf(cloudName)), url.substring(url.indexOf(cloudName)));