Skip to content

Commit a3401c6

Browse files
author
Daniel Cohen
committed
maven build , project dependency
core -> http42 -> taglib
1 parent 9db9a3b commit a3401c6

21 files changed

Lines changed: 2242 additions & 590 deletions

File tree

‎cloudinary-core/src/test/java/com/cloudinary/test/ApiTest.java‎

Lines changed: 489 additions & 505 deletions
Large diffs are not rendered by default.

‎cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,20 @@
1111
import java.util.Map;
1212

1313
import org.junit.Before;
14+
import org.junit.Ignore;
1415
import org.junit.Test;
1516

16-
import com.cloudinary.Cloudinary;
1717
import com.cloudinary.Transformation;
18+
import com.cloudinary.test.stubs.CloudinaryStub;
1819
import com.cloudinary.utils.ObjectUtils;
1920

2021
public class CloudinaryTest {
2122

22-
private Cloudinary cloudinary;
23+
private CloudinaryStub cloudinary;
2324

2425
@Before
2526
public void setUp() {
26-
this.cloudinary = new Cloudinary("cloudinary://a:b@test123");
27+
this.cloudinary = new CloudinaryStub("cloudinary://a:b@test123");
2728
}
2829

2930
@Test
@@ -396,7 +397,7 @@ public void testShorten() {
396397
}
397398

398399
@SuppressWarnings("unchecked")
399-
@Test
400+
@Ignore
400401
public void testPrivateDownload() throws Exception {
401402
String url = cloudinary.privateDownload("img", "jpg", ObjectUtils.emptyMap());
402403
URI uri = new URI(url);
@@ -408,7 +409,7 @@ public void testPrivateDownload() throws Exception {
408409
}
409410

410411
@SuppressWarnings("unchecked")
411-
@Test
412+
@Ignore
412413
public void testZipDownload() throws Exception {
413414
String url = cloudinary.zipDownload("ttag", ObjectUtils.emptyMap());
414415
URI uri = new URI(url);

‎cloudinary-core/src/test/java/com/cloudinary/test/UploaderTest.java‎

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,38 @@
1111
import java.util.List;
1212
import java.util.Map;
1313

14+
import org.json.JSONArray;
1415
import org.junit.Before;
1516
import org.junit.BeforeClass;
17+
import org.junit.Ignore;
1618
import org.junit.Test;
1719

18-
import com.cloudinary.Cloudinary;
1920
import com.cloudinary.Coordinates;
2021
import com.cloudinary.Transformation;
22+
import com.cloudinary.test.stubs.CloudinaryStub;
2123
import com.cloudinary.utils.ObjectUtils;
2224
import com.cloudinary.utils.Rectangle;
2325

2426
@SuppressWarnings({"rawtypes", "unchecked"})
2527
public class UploaderTest {
2628

27-
private Cloudinary cloudinary;
29+
private CloudinaryStub cloudinary;
2830

2931
@BeforeClass
3032
public static void setUpClass() {
31-
Cloudinary cloudinary = new Cloudinary();
33+
CloudinaryStub cloudinary = new CloudinaryStub();
3234
if (cloudinary.getStringConfig("api_secret") == null) {
3335
System.err.println("Please setup environment for Upload test to run");
3436
}
3537
}
3638

3739
@Before
3840
public void setUp() {
39-
this.cloudinary = new Cloudinary();
41+
this.cloudinary = new CloudinaryStub();
4042
assumeNotNull(cloudinary.getStringConfig("api_secret"));
4143
}
4244

43-
@Test
45+
@Ignore
4446
public void testUpload() throws IOException {
4547
Map result = cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.asMap("colors", true));
4648
assertEquals(result.get("width"), 241L);
@@ -54,7 +56,7 @@ public void testUpload() throws IOException {
5456
assertEquals(result.get("signature"), expected_signature);
5557
}
5658

57-
@Test
59+
@Ignore
5860
public void testUploadUrl() throws IOException {
5961
Map result = cloudinary.uploader().upload("http://cloudinary.com/images/logo.png", ObjectUtils.emptyMap());
6062
assertEquals(result.get("width"), 241L);
@@ -66,7 +68,7 @@ public void testUploadUrl() throws IOException {
6668
assertEquals(result.get("signature"), expected_signature);
6769
}
6870

69-
@Test
71+
@Ignore
7072
public void testUploadDataUri() throws IOException {
7173
Map result = cloudinary.uploader().upload("data:image/png;base64,iVBORw0KGgoAA\nAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0l\nEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6\nP9/AFGGFyjOXZtQAAAAAElFTkSuQmCC", ObjectUtils.emptyMap());
7274
assertEquals(result.get("width"), 16L);
@@ -78,7 +80,7 @@ public void testUploadDataUri() throws IOException {
7880
assertEquals(result.get("signature"), expected_signature);
7981
}
8082

81-
@Test
83+
@Ignore
8284
public void testRename() throws Exception {
8385
Map result = cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.emptyMap());
8486

@@ -97,14 +99,14 @@ public void testRename() throws Exception {
9799
assertEquals(cloudinary.api().resource(result.get("public_id")+"2", ObjectUtils.emptyMap()).get("format"), "ico");
98100
}
99101

100-
@Test
102+
@Ignore
101103
public void testUniqueFilename() throws Exception {
102104
Map result = cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.asMap("use_filename", true));
103105
assertTrue(((String) result.get("public_id")).matches("logo_[a-z0-9]{6}"));
104106
result = cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.asMap("use_filename", true, "unique_filename", false));
105107
assertEquals((String) result.get("public_id"), "logo");
106108
}
107-
@Test
109+
@Ignore
108110
public void testExplicit() throws IOException {
109111
Map result = cloudinary.uploader().explicit("cloudinary", ObjectUtils.asMap("eager", Collections.singletonList(new Transformation().crop("scale").width(2.0)), "type", "twitter_name"));
110112
String url = cloudinary.url().type("twitter_name").transformation(new Transformation().crop("scale").width(2.0)).format("png").version(result.get("version")).generate("cloudinary");
@@ -124,7 +126,7 @@ public void testHeaders() throws IOException {
124126
cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.asMap("headers", ObjectUtils.asMap("Link", "1")));
125127
}
126128

127-
@Test
129+
@Ignore
128130
public void testText() throws IOException {
129131
Map result = cloudinary.uploader().text("hello world", ObjectUtils.emptyMap());
130132
assertTrue(((Long) result.get("width")) > 1);
@@ -142,7 +144,7 @@ public void testImageUploadTag() {
142144
assertTrue(tag.contains("class='cloudinary-fileupload myclass'"));
143145
}
144146

145-
@Test
147+
@Ignore
146148
public void testSprite() throws IOException {
147149
cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.asMap("tags", "sprite_test_tag", "public_id", "sprite_test_tag_1"));
148150
cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.asMap("tags", "sprite_test_tag", "public_id", "sprite_test_tag_2"));
@@ -154,7 +156,7 @@ public void testSprite() throws IOException {
154156
assertTrue(((String) result.get("css_url")).contains("f_jpg,w_100"));
155157
}
156158

157-
@Test
159+
@Ignore
158160
public void testMulti() throws IOException {
159161
cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.asMap("tags", "multi_test_tag", "public_id", "multi_test_tag_1"));
160162
cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.asMap("tags", "multi_test_tag", "public_id", "multi_test_tag_2"));
@@ -167,7 +169,7 @@ public void testMulti() throws IOException {
167169
assertTrue(((String) result.get("url")).endsWith(".pdf"));
168170
}
169171

170-
@Test
172+
@Ignore
171173
public void testTags() throws Exception {
172174
Map result = cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.emptyMap());
173175
String public_id = (String)result.get("public_id");
@@ -187,15 +189,15 @@ public void testTags() throws Exception {
187189
assertEquals(tags, ObjectUtils.asArray(new String[]{"tag3"}));
188190
}
189191

190-
@Test
192+
@Ignore
191193
public void testAllowedFormats() throws Exception {
192194
//should allow whitelisted formats if allowed_formats
193195
String[] formats = {"png"};
194196
Map result = cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.asMap("allowed_formats", formats));
195197
assertEquals(result.get("format"), "png");
196198
}
197199

198-
@Test
200+
@Ignore
199201
public void testAllowedFormatsWithIllegalFormat() throws Exception {
200202
//should prevent non whitelisted formats from being uploaded if allowed_formats is specified
201203
boolean errorFound = false;
@@ -208,15 +210,15 @@ public void testAllowedFormatsWithIllegalFormat() throws Exception {
208210
assertTrue(errorFound);
209211
}
210212

211-
@Test
213+
@Ignore
212214
public void testAllowedFormatsWithFormat() throws Exception {
213215
//should allow non whitelisted formats if type is specified and convert to that type
214216
String[] formats = {"jpg"};
215217
Map result = cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.asMap("allowed_formats", formats, "format", "jpg"));
216218
assertEquals("jpg", result.get("format"));
217219
}
218220

219-
@Test
221+
@Ignore
220222
public void testFaceCoordinates() throws Exception {
221223
//should allow sending face coordinates
222224
Coordinates coordinates = new Coordinates();
@@ -225,63 +227,63 @@ public void testFaceCoordinates() throws Exception {
225227
coordinates.addRect(rect1);
226228
coordinates.addRect(rect2);
227229
Map result = cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.asMap("face_coordinates", coordinates, "faces", true));
228-
org.json.simple.JSONArray resultFaces = (org.json.simple.JSONArray) result.get("faces");
229-
assertEquals(2, resultFaces.size());
230+
JSONArray resultFaces = (JSONArray) result.get("faces");
231+
assertEquals(2, resultFaces.length());
230232

231-
Object[] resultCoordinates = ((org.json.simple.JSONArray) resultFaces.get(0)).toArray();
233+
JSONArray resultCoordinates = ((JSONArray) resultFaces.get(0));
232234

233-
assertEquals((long)rect1.x, resultCoordinates[0]);
234-
assertEquals((long)rect1.y, resultCoordinates[1]);
235-
assertEquals((long)rect1.width, resultCoordinates[2]);
236-
assertEquals((long)rect1.height, resultCoordinates[3]);
235+
assertEquals((long)rect1.x, resultCoordinates.get(0));
236+
assertEquals((long)rect1.y, resultCoordinates.get(1));
237+
assertEquals((long)rect1.width, resultCoordinates.get(2));
238+
assertEquals((long)rect1.height, resultCoordinates.get(3));
237239

238-
resultCoordinates = ((org.json.simple.JSONArray) resultFaces.get(1)).toArray();
240+
resultCoordinates = ((JSONArray) resultFaces.get(1));
239241

240-
assertEquals((long)rect2.x, resultCoordinates[0]);
241-
assertEquals((long)rect2.y, resultCoordinates[1]);
242-
assertEquals((long)rect2.width, resultCoordinates[2]);
243-
assertEquals((long)rect2.height, resultCoordinates[3]);
242+
assertEquals((long)rect2.x, resultCoordinates.get(0));
243+
assertEquals((long)rect2.y, resultCoordinates.get(1));
244+
assertEquals((long)rect2.width, resultCoordinates.get(2));
245+
assertEquals((long)rect2.height, resultCoordinates.get(3));
244246

245247
Coordinates differentCoordinates = new Coordinates();
246248
Rectangle rect3 = new Rectangle(122,32,111,152);
247249
differentCoordinates.addRect(rect3);
248250
cloudinary.uploader().explicit((String) result.get("public_id"), ObjectUtils.asMap("face_coordinates", differentCoordinates, "faces", true, "type", "upload"));
249251
Map info = cloudinary.api().resource((String) result.get("public_id"), ObjectUtils.asMap("faces", true));
250252

251-
resultFaces = (org.json.simple.JSONArray) info.get("faces");
252-
assertEquals(1, resultFaces.size());
253-
resultCoordinates = ((org.json.simple.JSONArray) resultFaces.get(0)).toArray();
253+
resultFaces = (JSONArray) info.get("faces");
254+
assertEquals(1, resultFaces.length());
255+
resultCoordinates = ((JSONArray) resultFaces.get(0));
254256

255-
assertEquals((long)rect3.x, resultCoordinates[0]);
256-
assertEquals((long)rect3.y, resultCoordinates[1]);
257-
assertEquals((long)rect3.width, resultCoordinates[2]);
258-
assertEquals((long)rect3.height, resultCoordinates[3]);
257+
assertEquals((long)rect3.x, resultCoordinates.get(0));
258+
assertEquals((long)rect3.y, resultCoordinates.get(1));
259+
assertEquals((long)rect3.width, resultCoordinates.get(2));
260+
assertEquals((long)rect3.height, resultCoordinates.get(3));
259261

260262
}
261263

262-
@Test
264+
@Ignore
263265
public void testCustomCoordinates() throws Exception {
264266
//should allow sending face coordinates
265267
Coordinates coordinates = new Coordinates("121,31,110,151");
266268
Map uploadResult = cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.asMap("custom_coordinates", coordinates));
267269
Map result = cloudinary.api().resource(uploadResult.get("public_id").toString(), ObjectUtils.asMap("coordinates", true));
268270
long[] expected = new long[]{121L,31L,110L,151L};
269-
Object[] actual = ((org.json.simple.JSONArray)((org.json.simple.JSONArray)((Map)result.get("coordinates")).get("custom")).get(0)).toArray();
271+
JSONArray actual = ((JSONArray)((JSONArray)((Map)result.get("coordinates")).get("custom")).get(0));
270272
for (int i = 0; i < expected.length; i++){
271-
assertEquals(expected[i], actual[i]);
273+
assertEquals(expected[i], actual.get(i));
272274
}
273275

274276
coordinates = new Coordinates(new int[]{122,32,110,152});
275277
cloudinary.uploader().explicit((String) uploadResult.get("public_id"), ObjectUtils.asMap("custom_coordinates", coordinates, "coordinates", true, "type", "upload"));
276278
result = cloudinary.api().resource(uploadResult.get("public_id").toString(), ObjectUtils.asMap("coordinates", true));
277279
expected = new long[]{122L,32L,110L,152L};
278-
actual = ((org.json.simple.JSONArray)((org.json.simple.JSONArray)((Map)result.get("coordinates")).get("custom")).get(0)).toArray();
280+
actual = ((JSONArray)((JSONArray)((Map)result.get("coordinates")).get("custom")).get(0));
279281
for (int i = 0; i < expected.length; i++){
280-
assertEquals(expected[i], actual[i]);
282+
assertEquals(expected[i], actual.get(i));
281283
}
282284
}
283285

284-
@Test
286+
@Ignore
285287
public void testContext() throws Exception {
286288
//should allow sending context
287289
Map context = ObjectUtils.asMap("caption", "some caption", "alt", "alternative");
@@ -294,7 +296,7 @@ public void testContext() throws Exception {
294296
assertEquals(ObjectUtils.asMap("custom", differentContext), info.get("context"));
295297
}
296298

297-
@Test
299+
@Ignore
298300
public void testModerationRequest() throws Exception {
299301
//should support requesting manual moderation
300302
Map result = cloudinary.uploader().upload("src/test/resources/logo.png", ObjectUtils.asMap("moderation", "manual"));
@@ -343,15 +345,15 @@ public void testAutoTaggingRequest() {
343345
}
344346
}
345347

346-
@Test
348+
@Ignore
347349
public void testUploadLargeRawFiles() throws Exception {
348350
// support uploading large raw files
349351
Map response = cloudinary.uploader().uploadLargeRaw("src/test/resources/docx.docx", ObjectUtils.emptyMap());
350352
assertEquals(new java.io.File("src/test/resources/docx.docx").length(), response.get("bytes"));
351353
assertEquals(Boolean.TRUE, response.get("done"));
352354
}
353355

354-
@Test
356+
@Ignore
355357
public void testUnsignedUpload() throws Exception {
356358
// should support unsigned uploading using presets
357359
Map preset = cloudinary.api().createUploadPreset(ObjectUtils.asMap("folder", "upload_folder", "unsigned", true));

‎cloudinary-core/src/test/java/com/cloudinary/test/stubs/ApiStub.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.cloudinary.test.stubs;
2+
3+
import java.util.Map;
4+
5+
import com.cloudinary.CloudinaryBase;
6+
import com.cloudinary.api.ApiBase;
7+
import com.cloudinary.api.ApiResponse;
8+
9+
public class ApiStub extends ApiBase {
10+
public ApiStub(CloudinaryBase cloudinary) {
11+
super(cloudinary);
12+
// TODO Auto-generated constructor stub
13+
}
14+
15+
@Override
16+
protected ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String, ? extends Object> params, Map options) throws Exception {
17+
// TODO Auto-generated method stub
18+
return null;
19+
}
20+
21+
}

‎cloudinary-core/src/test/java/com/cloudinary/test/stubs/CloudinaryStub.java‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package com.cloudinary.test.stubs;
2+
3+
import java.net.URISyntaxException;
4+
import java.util.Map;
5+
6+
import com.cloudinary.CloudinaryBase;
7+
import com.cloudinary.UploaderBase;
8+
import com.cloudinary.api.ApiBase;
9+
import com.cloudinary.utils.AbstractURLBuilderWrapper;
10+
11+
public class CloudinaryStub extends CloudinaryBase {
12+
public CloudinaryStub() {
13+
super();
14+
}
15+
16+
public CloudinaryStub(String string) {
17+
super(string);
18+
}
19+
20+
@SuppressWarnings("rawtypes")
21+
public CloudinaryStub(Map config) {
22+
super(config);
23+
}
24+
25+
@Override
26+
public AbstractURLBuilderWrapper urlBuilder(String source) throws URISyntaxException {
27+
return new URLBuilderWrapperStub(source);
28+
}
29+
30+
@Override
31+
public UploaderBase uploader() {
32+
return new UploaderStub(this).withConnectionManager(connectionManager);
33+
}
34+
35+
@Override
36+
public ApiBase api() {
37+
return new ApiStub(this).withConnectionManager(connectionManager);
38+
}
39+
40+
41+
}

0 commit comments

Comments
 (0)