Updated ZONE unit tests to latest recommendations

This commit is contained in:
2025-08-08 17:59:25 +02:00
parent b806fcda4a
commit ab510a85fc
23 changed files with 265 additions and 246 deletions

View File

@@ -10,6 +10,8 @@ namespace Cloudflare.Zones.Tests.ZoneSettingsExtensions
[TestClass]
public class EditMultipleZoneSettingsTest
{
public TestContext TestContext { get; set; }
private const string ZoneId = "023e105f4ecef8ad9ca31a8372d0c353";
private Mock<ICloudflareClient> _clientMock;
@@ -57,7 +59,7 @@ namespace Cloudflare.Zones.Tests.ZoneSettingsExtensions
// Act
#pragma warning disable CS0618
var response = await client.EditMultipleZoneSettings(_request);
var response = await client.EditMultipleZoneSettings(_request, TestContext.CancellationTokenSource.Token);
#pragma warning restore CS0618
// Assert
@@ -65,16 +67,16 @@ namespace Cloudflare.Zones.Tests.ZoneSettingsExtensions
Assert.IsTrue(response.Success);
Assert.AreEqual(_response.Result, response.Result);
Assert.AreEqual(1, _callbacks.Count);
Assert.HasCount(1, _callbacks);
var callback = _callbacks.First();
Assert.AreEqual($"/zones/{ZoneId}/settings", callback.RequestPath);
var (requestPath, request) = _callbacks.First();
Assert.AreEqual($"/zones/{ZoneId}/settings", requestPath);
Assert.IsNotNull(callback.Request);
Assert.AreEqual(2, callback.Request.Count);
Assert.IsNotNull(request);
Assert.HasCount(2, request);
Assert.IsInstanceOfType<SSL>(callback.Request.First());
Assert.IsInstanceOfType<WebP>(callback.Request.Last());
Assert.IsInstanceOfType<SSL>(request.First());
Assert.IsInstanceOfType<WebP>(request.Last());
}
private ICloudflareClient GetClient()

View File

@@ -11,6 +11,8 @@ namespace Cloudflare.Zones.Tests.ZoneSettingsExtensions
[TestClass]
public class EditZoneSettingTest
{
public TestContext TestContext { get; set; }
private const string ZoneId = "023e105f4ecef8ad9ca31a8372d0c353";
private Mock<ICloudflareClient> _clientMock;
@@ -51,21 +53,21 @@ namespace Cloudflare.Zones.Tests.ZoneSettingsExtensions
var client = GetClient();
// Act
var response = await client.EditZoneSetting(_request);
var response = await client.EditZoneSetting(_request, TestContext.CancellationTokenSource.Token);
// Assert
Assert.IsNotNull(response);
Assert.IsTrue(response.Success);
Assert.AreEqual(_response.Result, response.Result);
Assert.AreEqual(1, _callbacks.Count);
Assert.HasCount(1, _callbacks);
var callback = _callbacks.First();
Assert.AreEqual($"/zones/{ZoneId}/settings/ssl", callback.RequestPath);
var (requestPath, request) = _callbacks.First();
Assert.AreEqual($"/zones/{ZoneId}/settings/ssl", requestPath);
Assert.IsNotNull(callback.Request);
Assert.AreEqual("origin_pull", callback.Request["value"]);
Assert.IsFalse(callback.Request.ContainsKey("enabled"));
Assert.IsNotNull(request);
Assert.AreEqual("origin_pull", request["value"]);
Assert.IsFalse(request.ContainsKey("enabled"));
}
[TestMethod]
@@ -78,35 +80,32 @@ namespace Cloudflare.Zones.Tests.ZoneSettingsExtensions
var client = GetClient();
// Act
var response = await client.EditZoneSetting(_request);
var response = await client.EditZoneSetting(_request, TestContext.CancellationTokenSource.Token);
// Assert
Assert.IsNotNull(response);
Assert.IsTrue(response.Success);
Assert.AreEqual(_response.Result, response.Result);
Assert.AreEqual(1, _callbacks.Count);
Assert.HasCount(1, _callbacks);
var callback = _callbacks.First();
Assert.AreEqual($"/zones/{ZoneId}/settings/ssl", callback.RequestPath);
var (requestPath, request) = _callbacks.First();
Assert.AreEqual($"/zones/{ZoneId}/settings/ssl", requestPath);
Assert.IsNotNull(callback.Request);
Assert.AreEqual(enabled, callback.Request["enabled"]);
Assert.IsFalse(callback.Request.ContainsKey("value"));
Assert.IsNotNull(request);
Assert.AreEqual(enabled, request["enabled"]);
Assert.IsFalse(request.ContainsKey("value"));
}
[TestMethod]
[ExpectedException(typeof(ArgumentException))]
public async Task ShouldThrowArgumentException()
{
// Arrange
var request = new EditZoneSettingRequest<TestSetting>(ZoneId, new TestSetting());
var client = GetClient();
// Act
var response = await client.EditZoneSetting(request);
// Assert - ArgumentException
// Act & Assert
await Assert.ThrowsExactlyAsync<ArgumentException>(async () => await client.EditZoneSetting(request, TestContext.CancellationTokenSource.Token));
}
private ICloudflareClient GetClient()

View File

@@ -10,6 +10,8 @@ namespace Cloudflare.Zones.Tests.ZoneSettingsExtensions
[TestClass]
public class GetAllZoneSettingsTest
{
public TestContext TestContext { get; set; }
private const string ZoneId = "023e105f4ecef8ad9ca31a8372d0c353";
private Mock<ICloudflareClient> _clientMock;
@@ -47,7 +49,7 @@ namespace Cloudflare.Zones.Tests.ZoneSettingsExtensions
// Act
#pragma warning disable CS0618
var response = await client.GetAllZoneSettings(ZoneId);
var response = await client.GetAllZoneSettings(ZoneId, TestContext.CancellationTokenSource.Token);
#pragma warning restore CS0618
// Assert
@@ -55,11 +57,11 @@ namespace Cloudflare.Zones.Tests.ZoneSettingsExtensions
Assert.IsTrue(response.Success);
Assert.AreEqual(_response.Result, response.Result);
Assert.AreEqual(1, _callbacks.Count);
Assert.HasCount(1, _callbacks);
var callback = _callbacks.First();
Assert.AreEqual($"/zones/{ZoneId}/settings", callback.RequestPath);
Assert.IsNull(callback.QueryFilter);
var (requestPath, queryFilter) = _callbacks.First();
Assert.AreEqual($"/zones/{ZoneId}/settings", requestPath);
Assert.IsNull(queryFilter);
_clientMock.Verify(m => m.GetAsync<IReadOnlyCollection<ZoneSettingBase>>($"/zones/{ZoneId}/settings", null, It.IsAny<CancellationToken>()), Times.Once);
_clientMock.VerifyNoOtherCalls();

View File

@@ -10,6 +10,8 @@ namespace Cloudflare.Zones.Tests.ZoneSettingsExtensions
[TestClass]
public class GetZoneSettingTest
{
public TestContext TestContext { get; set; }
private const string ZoneId = "023e105f4ecef8ad9ca31a8372d0c353";
private Mock<ICloudflareClient> _clientMock;
@@ -43,34 +45,31 @@ namespace Cloudflare.Zones.Tests.ZoneSettingsExtensions
var client = GetClient();
// Act
var response = await client.GetZoneSetting<SSL>(ZoneId);
var response = await client.GetZoneSetting<SSL>(ZoneId, TestContext.CancellationTokenSource.Token);
// Assert
Assert.IsNotNull(response);
Assert.IsTrue(response.Success);
Assert.AreEqual(_response.Result, response.Result);
Assert.AreEqual(1, _callbacks.Count);
Assert.HasCount(1, _callbacks);
var callback = _callbacks.First();
Assert.AreEqual($"/zones/{ZoneId}/settings/ssl", callback.RequestPath);
Assert.IsNull(callback.QueryFilter);
var (requestPath, queryFilter) = _callbacks.First();
Assert.AreEqual($"/zones/{ZoneId}/settings/ssl", requestPath);
Assert.IsNull(queryFilter);
_clientMock.Verify(m => m.GetAsync<SSL>($"/zones/{ZoneId}/settings/ssl", null, It.IsAny<CancellationToken>()), Times.Once);
_clientMock.VerifyNoOtherCalls();
}
[TestMethod]
[ExpectedException(typeof(ArgumentException))]
public async Task ShouldThrowArgumentException()
{
// Arrange
var client = GetClient();
// Act
var response = await client.GetZoneSetting<TestSetting>(ZoneId);
// Assert - ArgumentException
// Act & Assert
await Assert.ThrowsExactlyAsync<ArgumentException>(async () => await client.GetZoneSetting<TestSetting>(ZoneId, TestContext.CancellationTokenSource.Token));
}
private ICloudflareClient GetClient()