Skip to content

Commit 41f8979

Browse files
YomesIncconst-cloudinary
YomesInc
authored and
const-cloudinary
committed
Enhance integration tests
1 parent eb2957f commit 41f8979

24 files changed

+235
-236
lines changed

‎CloudinaryDotNet.IntegrationTests/AdminApi/BrowseResourcesTest.cs

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void TestListResources()
1919

2020
ListResourcesResult resources = m_cloudinary.ListResources();
2121
Assert.NotNull(resources);
22-
Assert.NotZero(resources.Resources.Length);
22+
Assert.NotZero(resources.Resources.Length, resources.Error?.Message);
2323
}
2424

2525
[Test, RetryWithDelay]
@@ -57,17 +57,17 @@ public void TestListByModerationUpdate()
5757
requestParams.ModerationStatus = ModerationStatus.Pending;
5858
var pending = m_cloudinary.ListResources(requestParams);
5959

60-
Assert.True(approved.Resources.Where(r => r.PublicId == uploadResults[0].PublicId).Count() > 0);
61-
Assert.True(approved.Resources.Where(r => r.PublicId == uploadResults[1].PublicId).Count() == 0);
62-
Assert.True(approved.Resources.Where(r => r.PublicId == uploadResults[2].PublicId).Count() == 0);
60+
Assert.True(approved.Resources.Count(r => r.PublicId == uploadResults[0].PublicId) > 0, approved.Error?.Message);
61+
Assert.True(approved.Resources.Count(r => r.PublicId == uploadResults[1].PublicId) == 0, approved.Error?.Message);
62+
Assert.True(approved.Resources.Count(r => r.PublicId == uploadResults[2].PublicId) == 0, approved.Error?.Message);
6363

64-
Assert.True(rejected.Resources.Where(r => r.PublicId == uploadResults[0].PublicId).Count() == 0);
65-
Assert.True(rejected.Resources.Where(r => r.PublicId == uploadResults[1].PublicId).Count() > 0);
66-
Assert.True(rejected.Resources.Where(r => r.PublicId == uploadResults[2].PublicId).Count() == 0);
64+
Assert.True(rejected.Resources.Count(r => r.PublicId == uploadResults[0].PublicId) == 0, rejected.Error?.Message);
65+
Assert.True(rejected.Resources.Count(r => r.PublicId == uploadResults[1].PublicId) > 0, rejected.Error?.Message);
66+
Assert.True(rejected.Resources.Count(r => r.PublicId == uploadResults[2].PublicId) == 0, rejected.Error?.Message);
6767

68-
Assert.True(pending.Resources.Where(r => r.PublicId == uploadResults[0].PublicId).Count() == 0);
69-
Assert.True(pending.Resources.Where(r => r.PublicId == uploadResults[1].PublicId).Count() == 0);
70-
Assert.True(pending.Resources.Where(r => r.PublicId == uploadResults[2].PublicId).Count() > 0);
68+
Assert.True(pending.Resources.Count(r => r.PublicId == uploadResults[0].PublicId) == 0, pending.Error?.Message);
69+
Assert.True(pending.Resources.Count(r => r.PublicId == uploadResults[1].PublicId) == 0, pending.Error?.Message);
70+
Assert.True(pending.Resources.Count(r => r.PublicId == uploadResults[2].PublicId) > 0, pending.Error?.Message);
7171
}
7272

7373
[Test, Ignore("test needs to be re-written with mocking - it fails when there are many resources")]
@@ -131,15 +131,15 @@ public void TestResourcesCursor()
131131

132132
var result1 = m_cloudinary.ListResources(listParams);
133133

134-
Assert.IsNotNull(result1.Resources);
134+
Assert.IsNotNull(result1.Resources, result1.Error?.Message);
135135
Assert.AreEqual(1, result1.Resources.Length);
136136
Assert.IsFalse(String.IsNullOrEmpty(result1.NextCursor));
137137

138138
listParams.NextCursor = result1.NextCursor;
139139
var result2 = m_cloudinary.ListResources(listParams);
140140

141141
Assert.IsNotNull(result2.Resources);
142-
Assert.AreEqual(1, result2.Resources.Length);
142+
Assert.AreEqual(1, result2.Resources.Length, result2.Error?.Message);
143143
Assert.AreNotEqual(result1.Resources[0].PublicId, result2.Resources[0].PublicId);
144144
}
145145

@@ -165,7 +165,7 @@ public void TestResourceFullyQualifiedPublicId()
165165

166166
var result = m_cloudinary.ListResources(listParams);
167167

168-
Assert.IsNotNull(result.Resources);
168+
Assert.IsNotNull(result.Resources, result.Error?.Message);
169169
Assert.AreEqual(1, result.Resources.Length);
170170

171171
var res = result.Resources[0];
@@ -197,7 +197,7 @@ public void TestListResourcesStartAt()
197197
var resources = m_cloudinary.ListResources(
198198
new ListResourcesParams() { Type = STORAGE_TYPE_UPLOAD, StartAt = result.CreatedAt.AddMilliseconds(-10), Direction = "asc" });
199199

200-
Assert.NotNull(resources.Resources, "response should include resources");
200+
Assert.NotNull(resources.Resources, resources.Error?.Message);
201201
Assert.IsTrue(resources.Resources.Length > 0, "response should include at least one resources");
202202
Assert.IsNotNull(resources.Resources.FirstOrDefault(res => res.PublicId == result.PublicId));
203203
}
@@ -225,7 +225,7 @@ public void TestListResourcesByPrefix()
225225
result
226226
.Resources
227227
.Where(res => (res.Context == null ? false : res.Context["custom"]["context"].ToString() == "abc"))
228-
.Count() > 0);
228+
.Count() > 0, result.Error?.Message);
229229
}
230230

231231
[Test, RetryWithDelay]
@@ -307,7 +307,7 @@ private ImageUploadParams PrepareImageUploadParamsWithTag(string localTag, FileD
307307

308308
private void AssertListResourcesByTagResult(ListResourcesResult result)
309309
{
310-
Assert.AreEqual(2, result.Resources.Count());
310+
Assert.AreEqual(2, result.Resources.Count(), result.Error?.Message);
311311
}
312312

313313
[Test, RetryWithDelay]
@@ -334,7 +334,7 @@ public async Task TestListTagsAsync()
334334

335335
private void AssertListTagNotEmpty(ListTagsResult result)
336336
{
337-
Assert.Greater(result.Tags.Length, 0);
337+
Assert.Greater(result.Tags.Length, 0, result.Error?.Message);
338338
}
339339

340340
[Test, RetryWithDelay]
@@ -363,11 +363,11 @@ public void TestListTagsPrefix()
363363

364364
ListTagsResult result = m_cloudinary.ListTagsByPrefix(m_apiTag);
365365

366-
Assert.Contains(tag2, result.Tags);
366+
Assert.Contains(tag2, result.Tags, result.Error?.Message);
367367

368368
result = m_cloudinary.ListTagsByPrefix(tag3);
369369

370-
Assert.IsTrue(result.Tags.Length == 0);
370+
Assert.IsTrue(result.Tags.Length == 0, result.Error?.Message);
371371
}
372372

373373
[Test, RetryWithDelay]
@@ -389,7 +389,7 @@ public void TestGetResource()
389389
new GetResourceParams(publicId) { Phash = true });
390390

391391
Assert.IsNotNull(getResult);
392-
Assert.AreEqual(publicId, getResult.PublicId);
392+
Assert.AreEqual(publicId, getResult.PublicId, getResult.Error?.Message);
393393
Assert.AreEqual(1920, getResult.Width);
394394
Assert.AreEqual(1200, getResult.Height);
395395
Assert.AreEqual(FILE_FORMAT_JPG, getResult.Format);
@@ -421,7 +421,7 @@ public void TestGetResourceWithMetadata()
421421
});
422422

423423
Assert.IsNotNull(getResult);
424-
Assert.AreEqual(publicId, getResult.PublicId);
424+
Assert.AreEqual(publicId, getResult.PublicId, getResult.Error?.Message);
425425
Assert.NotNull(getResult.ImageMetadata);
426426
}
427427

@@ -436,7 +436,7 @@ public void TestGetPdfResourceWithNumberOfPages()
436436

437437
var uploadResult = m_cloudinary.Upload(uploadParams);
438438

439-
Assert.AreEqual(FILE_FORMAT_PDF, uploadResult.Format);
439+
Assert.AreEqual(FILE_FORMAT_PDF, uploadResult.Format, uploadResult.Error?.Message);
440440
Assert.AreEqual(TEST_PDF_PAGES_COUNT, uploadResult.Pages);
441441

442442
GetResourceResult getResult = m_cloudinary.GetResource(
@@ -448,7 +448,7 @@ public void TestGetPdfResourceWithNumberOfPages()
448448

449449
Assert.IsNotNull(getResult);
450450
Assert.AreEqual(uploadResult.PublicId, getResult.PublicId);
451-
Assert.NotNull(getResult.ImageMetadata);
451+
Assert.NotNull(getResult.ImageMetadata, getResult.Error?.Message);
452452
Assert.AreEqual(uploadResult.Pages, getResult.Pages);
453453
Assert.AreEqual(getResult.Pages, TEST_PDF_PAGES_COUNT);
454454
}
@@ -458,7 +458,7 @@ public void TestListResourceTypes()
458458
{
459459
// should allow listing resource_types
460460
ListResourceTypesResult result = m_cloudinary.ListResourceTypes();
461-
Assert.Contains(ResourceType.Image, result.ResourceTypes);
461+
Assert.Contains(ResourceType.Image, result.ResourceTypes, result.Error?.Message);
462462
}
463463

464464
[Test, Ignore("test needs to be re-written with mocking - it fails when there are many resources")]
@@ -492,7 +492,7 @@ public void TestGetResourceCinemagraphAnalysis()
492492

493493
var getResult = m_cloudinary.GetResource(getResourceParams);
494494

495-
Assert.GreaterOrEqual(getResult.CinemagraphAnalysis.CinemagraphScore, 0);
495+
Assert.GreaterOrEqual(getResult.CinemagraphAnalysis.CinemagraphScore, 0, getResult.Error?.Message);
496496
}
497497

498498
[Test, RetryWithDelay]
@@ -525,12 +525,12 @@ public void TestGetResourceVersions()
525525
Versions = true
526526
});
527527

528-
Assert.IsNotNull(resultWithVersion.Versions);
528+
Assert.IsNotNull(resultWithVersion.Versions, resultWithVersion.Error?.Message);
529529
Assert.NotZero(resultWithVersion.Versions.Count);
530530

531531
var result = m_cloudinary.GetResource(new GetResourceParams(uploadResult.PublicId));
532532

533-
Assert.IsNull(result.Versions);
533+
Assert.IsNull(result.Versions, result.Error?.Message);
534534
}
535535
}
536536
}

‎CloudinaryDotNet.IntegrationTests/AdminApi/DeleteResourcesTest.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,19 @@ public async Task TestDeleteAsync()
5555
private void AssertResourceExists(GetResourceResult resource, string publicId)
5656
{
5757
Assert.IsNotNull(resource);
58-
Assert.AreEqual(publicId, resource.PublicId);
58+
Assert.AreEqual(publicId, resource.PublicId, resource.Error?.Message);
5959
}
6060

6161
private void AssertResourceDoesNotExist(GetResourceResult resource)
6262
{
6363
Assert.IsNotNull(resource);
64-
Assert.IsNull(resource.PublicId);
64+
Assert.IsNull(resource.PublicId, resource.Error?.Message);
6565
}
6666

6767
private void AssertResourceDeleted(DelResResult result, string deletedPublicId, string nonExistingPublicId)
6868
{
6969
Assert.IsNotNull(result);
70-
Assert.AreEqual("not_found", result.Deleted[nonExistingPublicId]);
70+
Assert.AreEqual("not_found", result.Deleted[nonExistingPublicId], result.Error?.Message);
7171
Assert.AreEqual("deleted", result.Deleted[deletedPublicId]);
7272
}
7373

@@ -97,18 +97,18 @@ public void TestDeleteByTransformation()
9797
var resource = m_cloudinary.GetResource(publicId);
9898

9999
Assert.IsNotNull(resource);
100-
Assert.AreEqual(3, resource.Derived.Length);
100+
Assert.AreEqual(3, resource.Derived.Length, resource.Error?.Message);
101101

102102
var delParams = new DelResParams { Transformations = transformations };
103103
delParams.PublicIds.Add(publicId);
104104

105105
DelResResult delResult = m_cloudinary.DeleteResources(delParams);
106-
Assert.IsNotNull(delResult.Deleted);
106+
Assert.IsNotNull(delResult.Deleted, delResult.Error?.Message);
107107
Assert.AreEqual(1, delResult.Deleted.Count);
108108

109109
resource = m_cloudinary.GetResource(publicId);
110110
Assert.IsNotNull(resource);
111-
Assert.AreEqual(resource.Derived.Length, 0);
111+
Assert.AreEqual(resource.Derived.Length, 0, resource.Error?.Message);
112112
}
113113

114114
[Test, RetryWithDelay]
@@ -128,11 +128,11 @@ public void TestDeleteByPrefix()
128128

129129
GetResourceResult resource = m_cloudinary.GetResource(publicId);
130130
Assert.IsNotNull(resource);
131-
Assert.AreEqual(publicId, resource.PublicId);
131+
Assert.AreEqual(publicId, resource.PublicId, resource.Error?.Message);
132132

133133
m_cloudinary.DeleteResourcesByPrefix(prefix);
134134
resource = m_cloudinary.GetResource(publicId);
135-
Assert.IsTrue(String.IsNullOrEmpty(resource.PublicId));
135+
Assert.IsTrue(String.IsNullOrEmpty(resource.PublicId), resource.Error?.Message);
136136
}
137137

138138
[Test, RetryWithDelay]
@@ -159,19 +159,19 @@ public void TestDeleteByPrefixAndTransformation()
159159

160160
GetResourceResult resource = m_cloudinary.GetResource(publicId);
161161
Assert.IsNotNull(resource);
162-
Assert.AreEqual(3, resource.Derived.Length);
162+
Assert.AreEqual(3, resource.Derived.Length, resource.Error?.Message);
163163

164164
var delResult = m_cloudinary.DeleteResources(new DelResParams
165165
{
166166
Prefix = prefix,
167167
Transformations = transformations
168168
});
169169
Assert.NotNull(delResult.Deleted);
170-
Assert.AreEqual(delResult.Deleted.Count, 1);
170+
Assert.AreEqual(delResult.Deleted.Count, 1, delResult.Error?.Message);
171171

172172
resource = m_cloudinary.GetResource(publicId);
173173
Assert.IsNotNull(resource);
174-
Assert.AreEqual(resource.Derived.Length, 0);
174+
Assert.AreEqual(resource.Derived.Length, 0, resource.Error?.Message);
175175
}
176176

177177
[Test, RetryWithDelay]
@@ -193,12 +193,12 @@ public void TestDeleteByTag()
193193
GetResourceResult resource = m_cloudinary.GetResource(publicId);
194194

195195
Assert.IsNotNull(resource);
196-
Assert.AreEqual(publicId, resource.PublicId);
196+
Assert.AreEqual(publicId, resource.PublicId, resource.Error?.Message);
197197

198198
DelResResult delResult = m_cloudinary.DeleteResourcesByTag(tag);
199199

200200
resource = m_cloudinary.GetResource(publicId);
201-
Assert.IsTrue(String.IsNullOrEmpty(resource.PublicId));
201+
Assert.IsTrue(String.IsNullOrEmpty(resource.PublicId), resource.Error?.Message);
202202
}
203203

204204
[Test, RetryWithDelay]
@@ -229,20 +229,20 @@ public void TestDeleteByTagAndTransformation()
229229
Transformations = new List<Transformation> { m_simpleTransformation }
230230
});
231231

232-
Assert.NotNull(delResult.Deleted);
233-
Assert.AreEqual(delResult.Deleted.Count, 1);
232+
Assert.NotNull(delResult.Deleted, delResult.Error?.Message);
233+
Assert.AreEqual(delResult.Deleted.Count, 1, delResult.Error?.Message);
234234

235235
delResult = m_cloudinary.DeleteResources(new DelResParams
236236
{
237237
Tag = tag,
238238
Transformations = new List<Transformation>() { m_simpleTransformationAngle, m_explicitTransformation }
239239
});
240240

241-
Assert.NotNull(delResult.Deleted);
241+
Assert.NotNull(delResult.Deleted, delResult.Error?.Message);
242242

243243
GetResourceResult resource = m_cloudinary.GetResource(publicId);
244244
Assert.IsNotNull(resource);
245-
Assert.AreEqual(resource.Derived.Length, 0);
245+
Assert.AreEqual(resource.Derived.Length, 0, resource.Error?.Message);
246246
}
247247

248248
[Test, RetryWithDelay]
@@ -264,13 +264,13 @@ public void TestDeleteDerived()
264264
GetResourceResult resource = m_cloudinary.GetResource(publicId);
265265

266266
Assert.IsNotNull(resource);
267-
Assert.AreEqual(1, resource.Derived.Length);
267+
Assert.AreEqual(1, resource.Derived.Length, resource.Error?.Message);
268268

269269
DelDerivedResResult delDerivedResult = m_cloudinary.DeleteDerivedResources(resource.Derived[0].Id);
270-
Assert.AreEqual(1, delDerivedResult.Deleted.Values.Count);
270+
Assert.AreEqual(1, delDerivedResult.Deleted.Values.Count, delDerivedResult.Error?.Message);
271271

272272
resource = m_cloudinary.GetResource(publicId);
273-
Assert.IsFalse(String.IsNullOrEmpty(resource.PublicId));
273+
Assert.IsFalse(String.IsNullOrEmpty(resource.PublicId), resource.Error?.Message);
274274
}
275275

276276
[Test]
@@ -300,7 +300,7 @@ public void TestDeleteResultDeleteCountProperty()
300300
delParams.PublicIds.Add(publicId);
301301

302302
DelResResult delResult = m_cloudinary.DeleteResources(delParams);
303-
Assert.IsNotNull(delResult.Deleted);
303+
Assert.IsNotNull(delResult.Deleted, delResult.Error?.Message);
304304
Assert.AreEqual(1, delResult.DeletedCounts.Count);
305305
}
306306
}

0 commit comments

Comments
 (0)