Skip to content

Commit 0ed36db

Browse files
const-cloudinaryconst-cloudinary
authored
Integrate with sub-account test service
1 parent 31ad42f commit 0ed36db

File tree

9 files changed

+39
-18
lines changed

9 files changed

+39
-18
lines changed

‎Shared.IntegrationTests/AdminApi/BrowseResourcesTest.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public void TestListResources()
2020
ListResourcesResult resources = m_cloudinary.ListResources();
2121
Assert.NotNull(resources);
2222
Assert.NotZero(resources.Resources.Length);
23-
Assert.NotNull(resources.Resources[0].AccessMode);
2423
}
2524

2625
[Test, RetryWithDelay]
@@ -424,7 +423,6 @@ public void TestGetResourceWithMetadata()
424423
Assert.IsNotNull(getResult);
425424
Assert.AreEqual(publicId, getResult.PublicId);
426425
Assert.NotNull(getResult.ImageMetadata);
427-
Assert.NotNull(getResult.AccessMode);
428426
}
429427

430428
[Test, RetryWithDelay]

‎Shared.IntegrationTests/SearchApi/SearchApiTest.cs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ public void TestPaginateResourcesLimitedByTagAndOrderedByAscendingPublicId()
111111
Assert.NotNull(result.Resources[0].Url);
112112
Assert.NotNull(result.Resources[0].SecureUrl);
113113
Assert.NotNull(result.Resources[0].Status);
114-
Assert.NotNull(result.Resources[0].AccessMode);
115114
Assert.Null(result.Resources[0].AccessControl);
116115
Assert.NotNull(result.Resources[0].Etag);
117116
Assert.NotNull(result.Resources[0].UploadedBy);
@@ -124,6 +123,8 @@ public void TestSearchAggregate()
124123
var result = m_cloudinary.Search()
125124
.Expression(m_expressionTag).Aggregate(AGG_FIELD_VALUE).Execute();
126125

126+
AssertSupportsAggregation(result);
127+
127128
Assert.NotNull(result.Resources);
128129
Assert.AreEqual(RESOURCES_COUNT, result.Resources.Count);
129130
Assert.IsNotEmpty(result.Aggregations);
@@ -146,6 +147,8 @@ public void TestRootResponseFieldsAreParsed()
146147
var result = m_cloudinary.Search().MaxResults(FIRST_PAGE_SIZE)
147148
.Expression(m_expressionTag).Aggregate(AGG_FIELD_VALUE).Execute();
148149

150+
AssertSupportsAggregation(result);
151+
149152
Assert.Greater(result.TotalCount, 1);
150153
Assert.Greater(result.Time, 0);
151154
Assert.IsNotEmpty(result.Resources);
@@ -181,7 +184,6 @@ public void TestResourceResponseFieldsAreParsed()
181184
Assert.IsTrue(foundResource.Url.Contains("http://"));
182185
Assert.IsTrue(foundResource.SecureUrl.Contains("https://"));
183186
Assert.AreEqual("active", foundResource.Status);
184-
Assert.AreEqual("public", foundResource.AccessMode);
185187
Assert.IsNull(foundResource.AccessControl);
186188
Assert.IsNotEmpty(foundResource.Etag);
187189
Assert.Contains(m_searchTag, foundResource.Tags);
@@ -190,5 +192,13 @@ public void TestResourceResponseFieldsAreParsed()
190192
Assert.AreEqual(0, foundResource.ImageAnalysis.FaceCount);
191193
Assert.IsNotNull(foundResource.ImageAnalysis);
192194
}
195+
196+
private static void AssertSupportsAggregation(SearchResult result)
197+
{
198+
if (result.Error?.Message.Contains("does not support aggregations") == true)
199+
{
200+
Assert.Inconclusive(result.Error.Message);
201+
}
202+
}
193203
}
194204
}

‎Shared.IntegrationTests/UploadApi/ArchiveMethodsTest.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ public void TestArchiveRequestParametersAndResponseFields()
158158
Assert.AreEqual("upload", result.Type);
159159
Assert.IsNotNull(result.Etag);
160160
Assert.AreEqual(false, result.Placeholder);
161-
Assert.IsNotNull(result.AccessMode);
162161
Assert.NotZero(result.ResourceCount);
163162
Assert.NotZero(result.Tags.Length);
164163
}
@@ -329,7 +328,7 @@ public void TestCreateArchiveErrorMessage()
329328
Assert.NotNull(folderUrl.Error);
330329
}
331330

332-
[Test]
331+
[Test, RetryWithDelay]
333332
public void TestDownloadBackedUpAsset()
334333
{
335334
var publicId = GetUniquePublicId();
@@ -350,7 +349,7 @@ public void TestDownloadBackedUpAsset()
350349
var versionId = getResourceResult.Versions[0].VersionId;
351350

352351
var assetBackedUpUrl = m_cloudinary.DownloadBackedUpAsset(assetId, versionId);
353-
352+
354353
Assert.True(assetBackedUpUrl.Contains(assetId));
355354
Assert.True(assetBackedUpUrl.Contains(versionId));
356355
Assert.True(UrlExists(assetBackedUpUrl));

‎Shared.IntegrationTests/UploadApi/ContextMethodsTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public void TestContext()
8080

8181
var res = m_cloudinary.GetResource(uploaded.PublicId);
8282

83-
Assert.AreEqual("value", res.Context["custom"]["key"].ToString());
84-
Assert.AreEqual("value2", res.Context["custom"]["key2"].ToString());
83+
Assert.AreEqual("value", res?.Context["custom"]?["key"]?.ToString());
84+
Assert.AreEqual("value2", res?.Context["custom"]?["key2"]?.ToString());
8585
}
8686
}
8787
}

‎Shared.IntegrationTests/UploadApi/ExplicitMethodsTest.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public void TestCustomCoordinates()
264264
{
265265
//should allow sending custom coordinates
266266

267-
var coordinates = new CloudinaryDotNet.Core.Rectangle(121, 31, 110, 151);
267+
var coordinates = new Core.Rectangle(121, 31, 110, 151);
268268

269269
var upResult = m_cloudinary.Upload(new ImageUploadParams()
270270
{
@@ -352,7 +352,7 @@ public void TestResponsiveBreakpoints()
352352
Assert.AreEqual(900, expResult.ResponsiveBreakpoints[0].Breakpoints[0].Width);
353353
Assert.AreEqual(100, expResult.ResponsiveBreakpoints[0].Breakpoints[3].Width);
354354
}
355-
355+
356356
[Test, RetryWithDelay]
357357
public void TestMetadata()
358358
{
@@ -437,7 +437,6 @@ public void TestExplicitOptionalParameters()
437437
Assert.NotNull(explicitResult.Phash);
438438
Assert.NotZero(explicitResult.Faces.Length);
439439
Assert.Zero(explicitResult.CinemagraphAnalysis.CinemagraphScore);
440-
Assert.NotNull(explicitResult.AccessMode);
441440
Assert.NotNull(explicitResult.Etag);
442441
Assert.NotNull(explicitResult.Placeholder);
443442
Assert.NotNull(explicitResult.OriginalFilename);

‎Shared.IntegrationTests/UploadApi/RenameMethodsTest.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ public void TestRename()
2222
var uploadResult2 = m_cloudinary.Upload(uploadParams);
2323

2424
var renameResult = m_cloudinary.Rename(uploadResult1.PublicId, toPublicId);
25-
25+
Assert.AreEqual(HttpStatusCode.OK, renameResult.StatusCode);
26+
2627
var getResult = m_cloudinary.GetResource(toPublicId);
2728
Assert.NotNull(getResult);
2829

‎Shared.IntegrationTests/UploadApi/TextMethodsTest.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ private void AssertEnglishText(TextResult result)
5252
Assert.NotNull(result.Placeholder);
5353
Assert.NotNull(result.Url);
5454
Assert.NotNull(result.SecureUrl);
55-
Assert.NotNull(result.AccessMode);
5655
}
5756

5857
[Test, RetryWithDelay]

‎Shared.IntegrationTests/UploadApi/UploadMethodsTest.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ public void TestUploadAndGetResource()
868868
{
869869
//should allow sending custom coordinates
870870

871-
var coordinates = new CloudinaryDotNet.Core.Rectangle(121, 31, 110, 151);
871+
var coordinates = new Core.Rectangle(121, 31, 110, 151);
872872

873873
var upResult = m_cloudinary.Upload(new ImageUploadParams()
874874
{
@@ -935,6 +935,9 @@ public void TestMetadata()
935935
Assert.NotNull(metadataResult);
936936

937937
var metadataFieldId = metadataResult.ExternalId;
938+
939+
Assert.NotNull(metadataFieldId);
940+
938941
if (!string.IsNullOrEmpty(metadataFieldId))
939942
m_metadataFieldsToClear.Add(metadataFieldId);
940943

‎before_build.ps1‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
Write-Host "Setting up appsettings.json for tests"
22

3+
$apiEndpoint = "https://sub-account-testing.cloudinary.com/create_sub_account"
4+
5+
$postParams = @{
6+
"prefix"="DotNet"
7+
} | ConvertTo-Json
8+
9+
$res = Invoke-WebRequest -Uri $apiEndpoint -ContentType "application/json" -Method POST -Body $postParams | ConvertFrom-Json
10+
11+
$cloud = $res.payload
12+
313
$strConfigSource = "$env:APPVEYOR_BUILD_FOLDER\Shared.IntegrationTests\appsettings.json.sample"
414
$strConfigDest = "$env:APPVEYOR_BUILD_FOLDER\Shared.IntegrationTests\appsettings.json"
515

616
Copy-Item $strConfigSource -Destination $strConfigDest
717

818
(Get-Content $strConfigDest).replace('"ApiBaseAddress": ""', '"ApiBaseAddress": "' + $env:ApiBaseAddress + '"') | Set-Content $strConfigDest
9-
(Get-Content $strConfigDest).replace('"CloudName": ""', '"CloudName": "' + $env:CloudName + '"') | Set-Content $strConfigDest
10-
(Get-Content $strConfigDest).replace('"ApiKey": ""', '"ApiKey": "'+ $env:ApiKey + '"') | Set-Content $strConfigDest
11-
(Get-Content $strConfigDest).replace('"ApiSecret": ""', '"ApiSecret": "' + $env:ApiSecret + '"') | Set-Content $strConfigDest
19+
(Get-Content $strConfigDest).replace('"CloudName": ""', '"CloudName": "' + $cloud.cloudName + '"') | Set-Content $strConfigDest
20+
(Get-Content $strConfigDest).replace('"ApiKey": ""', '"ApiKey": "'+ $cloud.cloudApiKey + '"') | Set-Content $strConfigDest
21+
(Get-Content $strConfigDest).replace('"ApiSecret": ""', '"ApiSecret": "' + $cloud.cloudApiSecret + '"') | Set-Content $strConfigDest
22+
23+
Write-Host "CloudName: $($cloud.cloudName)"
1224

1325
Write-Host "Done"

0 commit comments

Comments
 (0)