From 2e451bcdab3c4b00008bee89d5ddd2f8e0960f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 26 Jun 2025 11:05:50 +0200 Subject: [PATCH] Modified CloudflareResponse to fit real responses --- .../CloudflareClientTests/DeleteAsyncTest.cs | 7 ++----- .../CloudflareClientTests/GetAsyncTest.cs | 7 ++----- .../CloudflareClientTests/PatchAsyncTest.cs | 7 ++----- .../CloudflareClientTests/PostAsyncTest.cs | 14 ++++---------- .../CloudflareClientTests/PutAsyncTest.cs | 7 ++----- Cloudflare/Models/CloudflareResponse.cs | 4 ++-- Extensions/Cloudflare.Zones/Models/Zone.cs | 2 +- 7 files changed, 15 insertions(+), 33 deletions(-) diff --git a/Cloudflare.Tests/CloudflareClientTests/DeleteAsyncTest.cs b/Cloudflare.Tests/CloudflareClientTests/DeleteAsyncTest.cs index aecc247..8caf75d 100644 --- a/Cloudflare.Tests/CloudflareClientTests/DeleteAsyncTest.cs +++ b/Cloudflare.Tests/CloudflareClientTests/DeleteAsyncTest.cs @@ -184,13 +184,10 @@ namespace Cloudflare.Core.Tests.CloudflareClientTests // Assert Assert.IsNotNull(response); Assert.IsTrue(response.Success); - Assert.IsNotNull(response.Errors); - Assert.IsNotNull(response.Messages); + Assert.IsNull(response.Errors); + Assert.IsNull(response.Messages); Assert.IsNull(response.ResultInfo); - Assert.AreEqual(0, response.Errors.Count); - Assert.AreEqual(0, response.Messages.Count); - Assert.AreEqual("This is an awesome text ;-)", response.Result); Assert.AreEqual(1, _httpHandlerMock.Callbacks.Count); diff --git a/Cloudflare.Tests/CloudflareClientTests/GetAsyncTest.cs b/Cloudflare.Tests/CloudflareClientTests/GetAsyncTest.cs index 204f889..2c7df06 100644 --- a/Cloudflare.Tests/CloudflareClientTests/GetAsyncTest.cs +++ b/Cloudflare.Tests/CloudflareClientTests/GetAsyncTest.cs @@ -205,13 +205,10 @@ namespace Cloudflare.Core.Tests.CloudflareClientTests // Assert Assert.IsNotNull(response); Assert.IsTrue(response.Success); - Assert.IsNotNull(response.Errors); - Assert.IsNotNull(response.Messages); + Assert.IsNull(response.Errors); + Assert.IsNull(response.Messages); Assert.IsNull(response.ResultInfo); - Assert.AreEqual(0, response.Errors.Count); - Assert.AreEqual(0, response.Messages.Count); - Assert.AreEqual("This is an awesome text ;-)", response.Result); Assert.AreEqual(1, _httpHandlerMock.Callbacks.Count); diff --git a/Cloudflare.Tests/CloudflareClientTests/PatchAsyncTest.cs b/Cloudflare.Tests/CloudflareClientTests/PatchAsyncTest.cs index b7cc08e..30a1b77 100644 --- a/Cloudflare.Tests/CloudflareClientTests/PatchAsyncTest.cs +++ b/Cloudflare.Tests/CloudflareClientTests/PatchAsyncTest.cs @@ -244,13 +244,10 @@ namespace Cloudflare.Core.Tests.CloudflareClientTests // Assert Assert.IsNotNull(response); Assert.IsTrue(response.Success); - Assert.IsNotNull(response.Errors); - Assert.IsNotNull(response.Messages); + Assert.IsNull(response.Errors); + Assert.IsNull(response.Messages); Assert.IsNull(response.ResultInfo); - Assert.AreEqual(0, response.Errors.Count); - Assert.AreEqual(0, response.Messages.Count); - Assert.AreEqual("This is an awesome text ;-)", response.Result); Assert.AreEqual(1, _httpHandlerMock.Callbacks.Count); diff --git a/Cloudflare.Tests/CloudflareClientTests/PostAsyncTest.cs b/Cloudflare.Tests/CloudflareClientTests/PostAsyncTest.cs index 332ee16..6900964 100644 --- a/Cloudflare.Tests/CloudflareClientTests/PostAsyncTest.cs +++ b/Cloudflare.Tests/CloudflareClientTests/PostAsyncTest.cs @@ -292,13 +292,10 @@ namespace Cloudflare.Core.Tests.CloudflareClientTests // Assert Assert.IsNotNull(response); Assert.IsTrue(response.Success); - Assert.IsNotNull(response.Errors); - Assert.IsNotNull(response.Messages); + Assert.IsNull(response.Errors); + Assert.IsNull(response.Messages); Assert.IsNull(response.ResultInfo); - Assert.AreEqual(0, response.Errors.Count); - Assert.AreEqual(0, response.Messages.Count); - Assert.AreEqual("This is an awesome text ;-)", response.Result); Assert.AreEqual(1, _httpHandlerMock.Callbacks.Count); @@ -369,13 +366,10 @@ namespace Cloudflare.Core.Tests.CloudflareClientTests // Assert Assert.IsNotNull(response); Assert.IsTrue(response.Success); - Assert.IsNotNull(response.Errors); - Assert.IsNotNull(response.Messages); + Assert.IsNull(response.Errors); + Assert.IsNull(response.Messages); Assert.IsNull(response.ResultInfo); - Assert.AreEqual(0, response.Errors.Count); - Assert.AreEqual(0, response.Messages.Count); - Assert.AreEqual("This is an awesome text ;-)", response.Result); Assert.AreEqual(1, _httpHandlerMock.Callbacks.Count); diff --git a/Cloudflare.Tests/CloudflareClientTests/PutAsyncTest.cs b/Cloudflare.Tests/CloudflareClientTests/PutAsyncTest.cs index 47f6d8d..3d59748 100644 --- a/Cloudflare.Tests/CloudflareClientTests/PutAsyncTest.cs +++ b/Cloudflare.Tests/CloudflareClientTests/PutAsyncTest.cs @@ -292,13 +292,10 @@ namespace Cloudflare.Core.Tests.CloudflareClientTests // Assert Assert.IsNotNull(response); Assert.IsTrue(response.Success); - Assert.IsNotNull(response.Errors); - Assert.IsNotNull(response.Messages); + Assert.IsNull(response.Errors); + Assert.IsNull(response.Messages); Assert.IsNull(response.ResultInfo); - Assert.AreEqual(0, response.Errors.Count); - Assert.AreEqual(0, response.Messages.Count); - Assert.AreEqual("This is an awesome text ;-)", response.Result); Assert.AreEqual(1, _httpHandlerMock.Callbacks.Count); diff --git a/Cloudflare/Models/CloudflareResponse.cs b/Cloudflare/Models/CloudflareResponse.cs index de24463..a0e4d16 100644 --- a/Cloudflare/Models/CloudflareResponse.cs +++ b/Cloudflare/Models/CloudflareResponse.cs @@ -10,13 +10,13 @@ /// Errors returned by the API call. /// [JsonProperty("errors")] - public IReadOnlyList Errors { get; set; } = []; + public IReadOnlyCollection? Errors { get; set; } /// /// Messages returned by the API call. /// [JsonProperty("messages")] - public IReadOnlyList Messages { get; set; } = []; + public IReadOnlyCollection? Messages { get; set; } /// /// Whether the API call was successful. diff --git a/Extensions/Cloudflare.Zones/Models/Zone.cs b/Extensions/Cloudflare.Zones/Models/Zone.cs index 4a13b95..9b98405 100644 --- a/Extensions/Cloudflare.Zones/Models/Zone.cs +++ b/Extensions/Cloudflare.Zones/Models/Zone.cs @@ -309,7 +309,7 @@ namespace AMWD.Net.Api.Cloudflare.Zones /// How often the customer is billed. /// [JsonProperty("frequency")] - public string? Frequency { get; set; } + public RenewFrequency? Frequency { get; set; } /// /// States if the subscription active.