Skip to content

Commit e885ac9

Browse files
author
Amir Tocker
committed
Correct array parameters
1 parent 2b70537 commit e885ac9

File tree

2 files changed

+27
-12
lines changed

2 files changed

+27
-12
lines changed

Cloudinary.Test/CloudinaryTest.cs

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,8 @@ public void TestEnglishText()
494494
tParams.FontStyle = "italic";
495495
TextResult textResult = m_cloudinary.Text(tParams);
496496

497-
Assert.AreEqual(67, textResult.Width);
498-
Assert.AreEqual(11, textResult.Height);
497+
Assert.IsTrue(textResult.Width > 0);
498+
Assert.IsTrue(textResult.Height > 0);
499499
}
500500

501501
[Test]
@@ -2364,7 +2364,7 @@ public void TestPostParamsInTheBody()
23642364
/// <summary>
23652365
/// Uploads test image with params specified
23662366
/// </summary>
2367-
private void UploadImageForTestArchive(string archiveTag, double width, bool useFileName)
2367+
private ImageUploadResult UploadImageForTestArchive(string archiveTag, double width, bool useFileName)
23682368
{
23692369
ImageUploadParams uploadParams = new ImageUploadParams()
23702370
{
@@ -2373,7 +2373,7 @@ private void UploadImageForTestArchive(string archiveTag, double width, bool use
23732373
UseFilename = useFileName,
23742374
Tags = archiveTag
23752375
};
2376-
m_cloudinary.Upload(uploadParams);
2376+
return m_cloudinary.Upload(uploadParams);
23772377
}
23782378

23792379
[Test]
@@ -2382,23 +2382,38 @@ public void TestCreateArchive()
23822382
string archiveTag = string.Format("archive_tag_{0}", UnixTimeNow());
23832383
string targetPublicId = string.Format("archive_id_{0}", UnixTimeNow());
23842384

2385-
UploadImageForTestArchive(archiveTag, 2.0, true);
2385+
ImageUploadResult res = UploadImageForTestArchive(archiveTag, 2.0, true);
23862386

2387-
ArchiveParams parameters = new ArchiveParams().Tags(new List<string> { archiveTag }).TargetPublicId(targetPublicId);
2387+
ArchiveParams parameters = new ArchiveParams().Tags(new List<string> { archiveTag, "no_such_tag" }).TargetPublicId(targetPublicId);
23882388
ArchiveResult result = m_cloudinary.CreateArchive(parameters);
23892389
Assert.AreEqual(string.Format("{0}.zip", targetPublicId), result.PublicId);
23902390
Assert.AreEqual(1, result.FileCount);
23912391

2392-
UploadImageForTestArchive(archiveTag, 500, false);
2392+
ImageUploadResult res2 = UploadImageForTestArchive(archiveTag, 500, false);
23932393

2394-
parameters = new ArchiveParams().Tags(new List<string> { archiveTag })
2394+
parameters = new ArchiveParams().PublicIds(new List<string> { res.PublicId, res2.PublicId })
23952395
.Transformations(new List<Transformation> { new Transformation().Width("0.5"), new Transformation().Width(2) })
23962396
.FlattenFolders(true)
23972397
.UseOriginalFilename(true);
23982398
result = m_cloudinary.CreateArchive(parameters);
23992399
Assert.AreEqual(2, result.FileCount);
24002400
}
24012401

2402+
[Test]
2403+
public void TestCreateArchiveMultiplePublicIds()
2404+
{
2405+
// should support archiving based on multiple public IDs
2406+
string archiveTag = string.Format("archive_tag_{0}", UnixTimeNow());
2407+
string targetPublicId = string.Format("archive_id_{0}", UnixTimeNow());
2408+
2409+
UploadImageForTestArchive(archiveTag, 2.0, true);
2410+
2411+
ArchiveParams parameters = new ArchiveParams().Tags(new List<string> { archiveTag, "sadf" }).TargetPublicId(targetPublicId);
2412+
ArchiveResult result = m_cloudinary.CreateArchive(parameters);
2413+
Assert.AreEqual(string.Format("{0}.zip", targetPublicId), result.PublicId);
2414+
Assert.AreEqual(1, result.FileCount);
2415+
}
2416+
24022417
[Test]
24032418
public void TestDownloadArchive()
24042419
{

Cloudinary/Actions/ArchiveParams.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,13 +358,13 @@ public override SortedDictionary<string, object> ToParamsDictionary()
358358
AddParam(dict, "mode", Api.GetCloudinaryParam(Mode()));
359359

360360
if (m_tags != null && m_tags.Count > 0)
361-
AddParam(dict, "tags", string.Join(",", m_tags.ToArray()));
361+
AddParam(dict, "tags", m_tags);
362362

363363
if (m_publicIds != null && m_publicIds.Count > 0)
364-
AddParam(dict, "public_ids", string.Join(",", m_publicIds.ToArray()));
364+
AddParam(dict, "public_ids", m_publicIds);
365365

366366
if (m_prefixes != null && m_prefixes.Count > 0)
367-
AddParam(dict, "prefixes", string.Join(",", m_prefixes.ToArray()));
367+
AddParam(dict, "prefixes", m_prefixes);
368368

369369
if (!string.IsNullOrEmpty(m_resourceType))
370370
AddParam(dict, "resource_type", m_resourceType);
@@ -402,7 +402,7 @@ public override SortedDictionary<string, object> ToParamsDictionary()
402402
AddParam(dict, "target_public_id", m_targetPublicId);
403403

404404
if (m_targetTags != null && m_targetTags.Count > 0)
405-
AddParam(dict, "target_tags", string.Join(",", m_targetTags.ToArray()));
405+
AddParam(dict, "target_tags", m_targetTags);
406406
}
407407

408408
if (m_expiresAt > 0 && m_mode == ArchiveCallMode.Download)

0 commit comments

Comments
 (0)