add discard_original_filename upload flag. Formatting in tests

TalLevAmi · TalLevAmi · commit c297bd7af5fd · 2014-01-27T18:34:02.000+02:00
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Uploader.java b/cloudinary-core/src/main/java/com/cloudinary/Uploader.java
@@ -35,7 +35,7 @@ public class Uploader {
 	public Uploader(Cloudinary cloudinary) {
 		this.cloudinary = cloudinary;
 	}
-	static final String[] BOOLEAN_UPLOAD_OPTIONS = new String[] {"backup", "exif", "faces", "colors", "image_metadata", "use_filename", "unique_filename", "eager_async", "invalidate", "overwrite"};
+	static final String[] BOOLEAN_UPLOAD_OPTIONS = new String[] {"backup", "exif", "faces", "colors", "image_metadata", "use_filename", "unique_filename", "eager_async", "invalidate", "discard_original_filename", "overwrite"};
 
 	public Map<String, Object> buildUploadParams(Map options) {
         if (options == null) options = Cloudinary.emptyMap();
diff --git a/cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java b/cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java
@@ -394,51 +394,39 @@ public void testSpriteCss() {
 		assertEquals("http://res.cloudinary.com/test123/image/sprite/test.css", result);
 	}
 
-    @SuppressWarnings("unchecked")
-	@Test
-    public void testEscapePublicId() {
-        // should escape public_ids
-        Map<String, String> tests = Cloudinary.asMap(
-            "a b", "a%20b",
-            "a+b", "a%2Bb",
-            "a%20b", "a%20b",
-            "a-b", "a-b",
-            "a??b", "a%3F%3Fb");
-        for (Map.Entry<String, String> entry : tests.entrySet()) {
-            String result = cloudinary.url().generate(entry.getKey());        	
-            assertEquals("http://res.cloudinary.com/test123/image/upload/" + entry.getValue(), result);			
+	@SuppressWarnings("unchecked")
+	@Test
+	public void testEscapePublicId() {
+		// should escape public_ids
+		Map<String, String> tests = Cloudinary.asMap("a b", "a%20b", "a+b", "a%2Bb", "a%20b", "a%20b", "a-b", "a-b", "a??b", "a%3F%3Fb");
+		for (Map.Entry<String, String> entry : tests.entrySet()) {
+			String result = cloudinary.url().generate(entry.getKey());
+			assertEquals("http://res.cloudinary.com/test123/image/upload/" + entry.getValue(), result);
 		}
-    }
-    
-    @Test
-    public void testSignedUrl() {
-    	// should correctly sign a url
-    	String expected = "http://res.cloudinary.com/test123/image/upload/s--MaRXzoEC--/c_crop,h_20,w_10/v1234/image.jpg";
-    	String actual = cloudinary.url().version(1234).
-    			transformation(new Transformation().crop("crop").width(10).height(20)).
-    			signed(true).
-    			generate("image.jpg");
-    	assertEquals(expected, actual);
-    	
-    	expected = "http://res.cloudinary.com/test123/image/upload/s--ZlgFLQcO--/v1234/image.jpg";
-    	actual = cloudinary.url().version(1234).
-    			signed(true).
-    			generate("image.jpg");
-    	assertEquals(expected, actual);
-    	
-    	expected = "http://res.cloudinary.com/test123/image/upload/s--Ai4Znfl3--/c_crop,h_20,w_10/image.jpg";
-    	actual = cloudinary.url().
-    			transformation(new Transformation().crop("crop").width(10).height(20)).
-    			signed(true).
-    			generate("image.jpg");
-    	assertEquals(expected, actual);
-    }
-    
-    public void testUtils() {
-    	assertEquals(Cloudinary.asBoolean(true, null), true);
-    	assertEquals(Cloudinary.asBoolean(false, null), false);
-    }
-	
+	}
+
+	@Test
+	public void testSignedUrl() {
+		// should correctly sign a url
+		String expected = "http://res.cloudinary.com/test123/image/upload/s--MaRXzoEC--/c_crop,h_20,w_10/v1234/image.jpg";
+		String actual = cloudinary.url().version(1234).transformation(new Transformation().crop("crop").width(10).height(20)).signed(true)
+				.generate("image.jpg");
+		assertEquals(expected, actual);
+
+		expected = "http://res.cloudinary.com/test123/image/upload/s--ZlgFLQcO--/v1234/image.jpg";
+		actual = cloudinary.url().version(1234).signed(true).generate("image.jpg");
+		assertEquals(expected, actual);
+
+		expected = "http://res.cloudinary.com/test123/image/upload/s--Ai4Znfl3--/c_crop,h_20,w_10/image.jpg";
+		actual = cloudinary.url().transformation(new Transformation().crop("crop").width(10).height(20)).signed(true).generate("image.jpg");
+		assertEquals(expected, actual);
+	}
+
+	public void testUtils() {
+		assertEquals(Cloudinary.asBoolean(true, null), true);
+		assertEquals(Cloudinary.asBoolean(false, null), false);
+	}
+
 	public static Map<String, String> getUrlParameters(URI uri) throws UnsupportedEncodingException {
 		Map<String, String> params = new HashMap<String, String>();
 		for (String param : uri.getQuery().split("&")) {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class Uploader {`
`35`	`35`	`public Uploader(Cloudinary cloudinary) {`
`36`	`36`	`this.cloudinary = cloudinary;`
`37`	`37`	`}`
`38`		`- static final String[] BOOLEAN_UPLOAD_OPTIONS = new String[] {"backup", "exif", "faces", "colors", "image_metadata", "use_filename", "unique_filename", "eager_async", "invalidate", "overwrite"};`
	`38`	`+ static final String[] BOOLEAN_UPLOAD_OPTIONS = new String[] {"backup", "exif", "faces", "colors", "image_metadata", "use_filename", "unique_filename", "eager_async", "invalidate", "discard_original_filename", "overwrite"};`
`39`	`39`
`40`	`40`	`public Map<String, Object> buildUploadParams(Map options) {`
`41`	`41`	`if (options == null) options = Cloudinary.emptyMap();`