diff --git a/Contentstack.Core.Tests/Contentstack.Core.Tests.csproj b/Contentstack.Core.Tests/Contentstack.Core.Tests.csproj index 4dcac80..aff842e 100644 --- a/Contentstack.Core.Tests/Contentstack.Core.Tests.csproj +++ b/Contentstack.Core.Tests/Contentstack.Core.Tests.csproj @@ -13,20 +13,18 @@ - + all - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + diff --git a/Contentstack.Core.Tests/Mocks/EntryTestHelper.cs b/Contentstack.Core.Tests/Mocks/EntryTestHelper.cs index 4252c6c..c95948a 100644 --- a/Contentstack.Core.Tests/Mocks/EntryTestHelper.cs +++ b/Contentstack.Core.Tests/Mocks/EntryTestHelper.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Reflection; -using AutoFixture; using Contentstack.Core; using Contentstack.Core.Configuration; using Contentstack.Core.Models; @@ -58,12 +57,11 @@ public static Entry CreateEntry(ContentstackClient client, string contentTypeId /// public static ContentstackClient CreateMockClient(string mockResponse = null) { - var fixture = new Fixture(); var options = new ContentstackOptions() { - ApiKey = fixture.Create(), - DeliveryToken = fixture.Create(), - Environment = fixture.Create() + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N") }; var client = new ContentstackClient(new OptionsWrapper(options)); diff --git a/Contentstack.Core.Unit.Tests/AssetLibraryUnitTests.cs b/Contentstack.Core.Unit.Tests/AssetLibraryUnitTests.cs index 18c590c..f3b4dd3 100644 --- a/Contentstack.Core.Unit.Tests/AssetLibraryUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/AssetLibraryUnitTests.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Reflection; -using AutoFixture; using Contentstack.Core; using Contentstack.Core.Configuration; using Contentstack.Core.Internals; @@ -17,7 +16,6 @@ namespace Contentstack.Core.Unit.Tests /// public class AssetLibraryUnitTests { - private readonly IFixture _fixture = new Fixture(); private ContentstackClient _client; public AssetLibraryUnitTests() @@ -29,9 +27,9 @@ private void Initialize() { var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create() + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N") }; _client = new ContentstackClient(new OptionsWrapper(options)); } @@ -48,8 +46,8 @@ public void Where_AddsQueryParameter() { // Arrange var assetLibrary = CreateAssetLibrary(); - var key = _fixture.Create(); - var value = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); + var value = Guid.NewGuid().ToString("N"); // Act AssetLibrary result = assetLibrary.Where(key, value); @@ -73,7 +71,7 @@ public void Where_WithNullKey_DoesNotAddParameter() { // Arrange var assetLibrary = CreateAssetLibrary(); - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); // Act AssetLibrary result = assetLibrary.Where(null, value); @@ -88,7 +86,7 @@ public void Where_WithEmptyKey_DoesNotAddParameter() { // Arrange var assetLibrary = CreateAssetLibrary(); - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); // Act AssetLibrary result = assetLibrary.Where("", value); @@ -379,8 +377,8 @@ public void AddParam_AddsQueryParameter() { // Arrange var assetLibrary = CreateAssetLibrary(); - var key = _fixture.Create(); - var value = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); + var value = Guid.NewGuid().ToString("N"); // Act AssetLibrary result = assetLibrary.AddParam(key, value); @@ -529,7 +527,7 @@ public void SetHeaderForKey_AddsHeader() // Arrange var assetLibrary = CreateAssetLibrary(); var key = "custom_header"; - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); // Act AssetLibrary result = assetLibrary.SetHeaderForKey(key, value); @@ -552,7 +550,7 @@ public void RemoveHeader_RemovesHeader() // Arrange var assetLibrary = CreateAssetLibrary(); var key = "custom_header"; - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); assetLibrary.SetHeaderForKey(key, value); var headersField = typeof(AssetLibrary).GetField("_Headers", diff --git a/Contentstack.Core.Unit.Tests/AssetUnitTests.cs b/Contentstack.Core.Unit.Tests/AssetUnitTests.cs index 8dfda34..6b99540 100644 --- a/Contentstack.Core.Unit.Tests/AssetUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/AssetUnitTests.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Reflection; -using AutoFixture; using Contentstack.Core; using Contentstack.Core.Configuration; using Contentstack.Core.Internals; @@ -16,7 +15,6 @@ namespace Contentstack.Core.Unit.Tests /// public class AssetUnitTests { - private readonly IFixture _fixture = new Fixture(); private ContentstackClient _client; public AssetUnitTests() @@ -28,9 +26,9 @@ private void Initialize() { var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create() + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N") }; _client = new ContentstackClient(new OptionsWrapper(options)); } @@ -99,7 +97,7 @@ public void GetDeleteAt_WithoutDeletedAt_ReturnsMinValue() public void GetDeletedBy_WithDeletedBy_ReturnsUid() { // Arrange - var deletedBy = _fixture.Create(); + var deletedBy = Guid.NewGuid().ToString("N"); var attributes = new Dictionary { { "uid", "test_asset_uid" }, @@ -513,8 +511,8 @@ public void AddParam_AddsQueryParameter() { // Arrange var asset = CreateAsset(); - var key = _fixture.Create(); - var value = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); + var value = Guid.NewGuid().ToString("N"); // Act Asset result = asset.AddParam(key, value); @@ -603,7 +601,7 @@ public void SetHeader_AddsHeader() // Arrange var asset = CreateAsset(); var key = "custom_header"; - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); // Act asset.SetHeader(key, value); @@ -623,7 +621,7 @@ public void RemoveHeader_RemovesHeader() // Arrange var asset = CreateAsset(); var key = "custom_header"; - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); asset.SetHeader(key, value); var headersField = typeof(Asset).GetField("_Headers", diff --git a/Contentstack.Core.Unit.Tests/ConfigUnitTests.cs b/Contentstack.Core.Unit.Tests/ConfigUnitTests.cs index 075f65a..910be30 100644 --- a/Contentstack.Core.Unit.Tests/ConfigUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/ConfigUnitTests.cs @@ -2,7 +2,6 @@ using System.Linq; using System.Net; using System.Reflection; -using AutoFixture; using Contentstack.Core.Configuration; using Contentstack.Core.Internals; using Xunit; @@ -11,7 +10,6 @@ namespace Contentstack.Core.Unit.Tests { public class ConfigUnitTests { - private readonly IFixture _fixture = new Fixture(); private Config CreateConfig() { @@ -149,7 +147,7 @@ public void Environment_Set_UpdatesValue() { // Arrange var config = CreateConfig(); - var environment = _fixture.Create(); + var environment = Guid.NewGuid().ToString("N"); // Act config.Environment = environment; diff --git a/Contentstack.Core.Unit.Tests/ContentTypeUnitTests.cs b/Contentstack.Core.Unit.Tests/ContentTypeUnitTests.cs index 0f83efb..3ba6706 100644 --- a/Contentstack.Core.Unit.Tests/ContentTypeUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/ContentTypeUnitTests.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Reflection; -using AutoFixture; using Contentstack.Core; using Contentstack.Core.Configuration; using Contentstack.Core.Internals; @@ -16,7 +15,6 @@ namespace Contentstack.Core.Unit.Tests /// public class ContentTypeUnitTests { - private readonly IFixture _fixture = new Fixture(); private ContentstackClient _client; public ContentTypeUnitTests() @@ -28,9 +26,9 @@ private void Initialize() { var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create() + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N") }; _client = new ContentstackClient(new OptionsWrapper(options)); } @@ -46,7 +44,7 @@ private ContentType CreateContentType(string contentTypeId = "source") public void ContentTypeId_Get_ReturnsContentTypeId() { // Arrange - var contentTypeId = _fixture.Create(); + var contentTypeId = Guid.NewGuid().ToString("N"); var contentType = CreateContentType(contentTypeId); // Act @@ -61,7 +59,7 @@ public void ContentTypeId_Set_UpdatesContentTypeId() { // Arrange var contentType = CreateContentType(); - var newContentTypeId = _fixture.Create(); + var newContentTypeId = Guid.NewGuid().ToString("N"); // Act contentType.ContentTypeId = newContentTypeId; @@ -79,7 +77,7 @@ public void Entry_WithValidUid_ReturnsEntry() { // Arrange var contentType = CreateContentType(); - var entryUid = _fixture.Create(); + var entryUid = Guid.NewGuid().ToString("N"); // Act var entry = contentType.Entry(entryUid); @@ -161,7 +159,7 @@ public void SetHeader_AddsHeader() // Arrange var contentType = CreateContentType(); var key = "custom_header"; - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); // Act contentType.SetHeader(key, value); @@ -180,7 +178,7 @@ public void SetHeader_WithNullKey_DoesNotAddHeader() { // Arrange var contentType = CreateContentType(); - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); var headersField = typeof(ContentType).GetField("_Headers", BindingFlags.NonPublic | BindingFlags.Instance); var headersBefore = new Dictionary((Dictionary)headersField?.GetValue(contentType)); @@ -225,7 +223,7 @@ public void RemoveHeader_WithExistingKey_RemovesHeader() // Arrange var contentType = CreateContentType(); var key = "test_header"; - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); var headersField = typeof(ContentType).GetField("_Headers", BindingFlags.NonPublic | BindingFlags.Instance); diff --git a/Contentstack.Core.Unit.Tests/Contentstack.Core.Unit.Tests.csproj b/Contentstack.Core.Unit.Tests/Contentstack.Core.Unit.Tests.csproj index cfbb469..4287a91 100644 --- a/Contentstack.Core.Unit.Tests/Contentstack.Core.Unit.Tests.csproj +++ b/Contentstack.Core.Unit.Tests/Contentstack.Core.Unit.Tests.csproj @@ -7,20 +7,18 @@ - + all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - + + diff --git a/Contentstack.Core.Unit.Tests/ContentstackClientUnitTests.cs b/Contentstack.Core.Unit.Tests/ContentstackClientUnitTests.cs index f5073b8..6ec2fa8 100644 --- a/Contentstack.Core.Unit.Tests/ContentstackClientUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/ContentstackClientUnitTests.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; -using AutoFixture; using Contentstack.Core; using Contentstack.Core.Configuration; using Contentstack.Core.Internals; @@ -20,15 +19,14 @@ namespace Contentstack.Core.Unit.Tests /// public class ContentstackClientUnitTests { - private readonly IFixture _fixture = new Fixture(); private ContentstackClient CreateClient(string environment = null, string apiKey = null, string deliveryToken = null, string version = null) { var options = new ContentstackOptions() { - ApiKey = apiKey ?? _fixture.Create(), - DeliveryToken = deliveryToken ?? _fixture.Create(), - Environment = environment ?? _fixture.Create(), + ApiKey = apiKey ?? Guid.NewGuid().ToString("N"), + DeliveryToken = deliveryToken ?? Guid.NewGuid().ToString("N"), + Environment = environment ?? Guid.NewGuid().ToString("N"), Version = version }; return new ContentstackClient(new OptionsWrapper(options)); @@ -38,7 +36,7 @@ private ContentstackClient CreateClient(string environment = null, string apiKey public void GetEnvironment_ReturnsEnvironment() { // Arrange - var environment = _fixture.Create(); + var environment = Guid.NewGuid().ToString("N"); var client = CreateClient(environment); // Act @@ -68,8 +66,8 @@ public void GetEnvironment_WithNullEnvironment_ReturnsNull() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), Environment = null // Explicitly set to null }; var client = new ContentstackClient(new OptionsWrapper(options)); @@ -131,7 +129,7 @@ public void GetVersion_WithNullVersion_ReturnsDefault() public void GetApplicationKey_ReturnsApiKey() { // Arrange - var apiKey = _fixture.Create(); + var apiKey = Guid.NewGuid().ToString("N"); var client = CreateClient(apiKey: apiKey); // Act @@ -149,7 +147,7 @@ public void GetApplicationKey_ReturnsApiKey() public void GetAccessToken_WithDeliveryToken_ReturnsDeliveryToken() { // Arrange - var deliveryToken = _fixture.Create(); + var deliveryToken = Guid.NewGuid().ToString("N"); var client = CreateClient(deliveryToken: deliveryToken); // Act @@ -163,11 +161,11 @@ public void GetAccessToken_WithDeliveryToken_ReturnsDeliveryToken() public void GetAccessToken_WithAccessToken_ReturnsAccessToken() { // Arrange - var accessToken = _fixture.Create(); + var accessToken = Guid.NewGuid().ToString("N"); var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - Environment = _fixture.Create() + ApiKey = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N") }; typeof(ContentstackOptions).GetProperty("AccessToken")! .SetValue(options, accessToken); @@ -205,13 +203,13 @@ public void GetLivePreviewConfig_WithLivePreview_ReturnsConfig() var livePreview = new LivePreviewConfig() { Enable = true, - PreviewToken = _fixture.Create() + PreviewToken = Guid.NewGuid().ToString("N") }; var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = livePreview }; var client = new ContentstackClient(new OptionsWrapper(options)); @@ -233,7 +231,7 @@ public void ContentType_WithValidName_ReturnsContentType() { // Arrange var client = CreateClient(); - var contentTypeName = _fixture.Create(); + var contentTypeName = Guid.NewGuid().ToString("N"); // Act var result = client.ContentType(contentTypeName); @@ -278,7 +276,7 @@ public void GlobalField_WithValidName_ReturnsGlobalField() { // Arrange var client = CreateClient(); - var globalFieldName = _fixture.Create(); + var globalFieldName = Guid.NewGuid().ToString("N"); // Act var result = client.GlobalField(globalFieldName); @@ -326,7 +324,7 @@ public void Asset_WithValidUid_ReturnsAsset() { // Arrange var client = CreateClient(); - var assetUid = _fixture.Create(); + var assetUid = Guid.NewGuid().ToString("N"); // Act var result = client.Asset(assetUid); @@ -393,7 +391,7 @@ public void SetHeader_WithValidKeyAndValue_AddsHeader() // Arrange var client = CreateClient(); var key = "custom_header"; - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); // Act client.SetHeader(key, value); @@ -413,7 +411,7 @@ public void SetHeader_WithNullKey_DoesNotAddHeader() { // Arrange var client = CreateClient(); - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); var headersField = typeof(ContentstackClient).GetField("_LocalHeaders", BindingFlags.NonPublic | BindingFlags.Instance); var headersBefore = new Dictionary((Dictionary)headersField?.GetValue(client)); @@ -431,7 +429,7 @@ public void SetHeader_WithNullValue_DoesNotAddHeader() { // Arrange var client = CreateClient(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var headersField = typeof(ContentstackClient).GetField("_LocalHeaders", BindingFlags.NonPublic | BindingFlags.Instance); var headersBefore = new Dictionary((Dictionary)headersField?.GetValue(client)); @@ -477,7 +475,7 @@ public void RemoveHeader_WithExistingKey_RemovesHeader() // Arrange var client = CreateClient(); var key = "test_header"; - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); var headersField = typeof(ContentstackClient).GetField("_LocalHeaders", BindingFlags.NonPublic | BindingFlags.Instance); @@ -504,7 +502,7 @@ public void RemoveHeader_WithNonExistentKey_DoesNotThrow() { // Arrange var client = CreateClient(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var headersField = typeof(ContentstackClient).GetField("_LocalHeaders", BindingFlags.NonPublic | BindingFlags.Instance); var headersBefore = new Dictionary((Dictionary)headersField?.GetValue(client)); @@ -536,7 +534,7 @@ public void SetEntryUid_WithValidUid_SetsUid() { // Arrange var client = CreateClient(); - var entryUid = _fixture.Create(); + var entryUid = Guid.NewGuid().ToString("N"); var currentEntryUidField = typeof(ContentstackClient).GetField("currentEntryUid", BindingFlags.NonPublic | BindingFlags.Instance); @@ -591,7 +589,7 @@ public void SyncPaginationToken_Setup_VerifiesParameters() { // Arrange var client = CreateClient(); - var paginationToken = _fixture.Create(); + var paginationToken = Guid.NewGuid().ToString("N"); // Act - Just verify setup, not actual HTTP call // We can't easily test async methods without mocking HttpRequestHandler @@ -609,7 +607,7 @@ public void SyncToken_Setup_VerifiesParameters() { // Arrange var client = CreateClient(); - var syncToken = _fixture.Create(); + var syncToken = Guid.NewGuid().ToString("N"); // Act var method = typeof(ContentstackClient).GetMethod("SyncToken", @@ -901,7 +899,7 @@ public async Task LivePreviewQueryAsync_WithoutContentTypeUid_UsesCurrentContent { // Arrange var client = CreateClient(); - var currentContentTypeUid = _fixture.Create(); + var currentContentTypeUid = Guid.NewGuid().ToString("N"); var contentTypeUidField = typeof(ContentstackClient).GetField("currentContenttypeUid", BindingFlags.NonPublic | BindingFlags.Instance); contentTypeUidField?.SetValue(client, currentContentTypeUid); @@ -920,7 +918,7 @@ public async Task LivePreviewQueryAsync_WithoutEntryUid_UsesCurrentEntryUid() { // Arrange var client = CreateClient(); - var currentEntryUid = _fixture.Create(); + var currentEntryUid = Guid.NewGuid().ToString("N"); var entryUidField = typeof(ContentstackClient).GetField("currentEntryUid", BindingFlags.NonPublic | BindingFlags.Instance); entryUidField?.SetValue(client, currentEntryUid); @@ -1216,9 +1214,9 @@ public void GetLivePreviewData_WithLivePreviewEnabled_Setup_VerifiesConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -1243,9 +1241,9 @@ public void GetLivePreviewData_WithManagementToken_Setup_VerifiesConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -1270,9 +1268,9 @@ public void GetLivePreviewData_WithReleaseId_Setup_VerifiesConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -1298,9 +1296,9 @@ public void GetLivePreviewData_WithPreviewTimestamp_Setup_VerifiesConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -1326,9 +1324,9 @@ public void GetLivePreviewData_WithEmptyLivePreview_Setup_VerifiesConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -1354,9 +1352,9 @@ public void GetLivePreviewData_WithAccessTokenHeader_SkipsAccessToken() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, diff --git a/Contentstack.Core.Unit.Tests/ContentstackCollectionUnitTests.cs b/Contentstack.Core.Unit.Tests/ContentstackCollectionUnitTests.cs index a7a521c..74689f7 100644 --- a/Contentstack.Core.Unit.Tests/ContentstackCollectionUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/ContentstackCollectionUnitTests.cs @@ -2,7 +2,6 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using AutoFixture; using Contentstack.Core.Models; using Xunit; @@ -13,7 +12,6 @@ namespace Contentstack.Core.Unit.Tests /// public class ContentstackCollectionUnitTests { - private readonly IFixture _fixture = new Fixture(); #region Initialization Tests @@ -56,7 +54,7 @@ public void Skip_SetAndGet_ReturnsCorrectValue() { // Arrange var collection = new ContentstackCollection(); - var skipValue = _fixture.Create(); + var skipValue = Random.Shared.Next(1, 9999); // Act collection.Skip = skipValue; @@ -70,7 +68,7 @@ public void Limit_SetAndGet_ReturnsCorrectValue() { // Arrange var collection = new ContentstackCollection(); - var limitValue = _fixture.Create(); + var limitValue = Random.Shared.Next(1, 9999); // Act collection.Limit = limitValue; @@ -84,7 +82,7 @@ public void Count_SetAndGet_ReturnsCorrectValue() { // Arrange var collection = new ContentstackCollection(); - var countValue = _fixture.Create(); + var countValue = Random.Shared.Next(1, 9999); // Act collection.Count = countValue; diff --git a/Contentstack.Core.Unit.Tests/ContentstackConstantsUnitTests.cs b/Contentstack.Core.Unit.Tests/ContentstackConstantsUnitTests.cs index 11ad5e7..86e5185 100644 --- a/Contentstack.Core.Unit.Tests/ContentstackConstantsUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/ContentstackConstantsUnitTests.cs @@ -1,5 +1,5 @@ +using System; using System.Reflection; -using AutoFixture; using Contentstack.Core.Internals; using Xunit; @@ -7,7 +7,6 @@ namespace Contentstack.Core.Unit.Tests { public class ContentstackConstantsUnitTests { - private readonly IFixture _fixture = new Fixture(); [Fact] public void Instance_ReturnsNewInstance() @@ -28,7 +27,7 @@ public void ContentTypeUid_GetSet_Works() { // Arrange var instance = ContentstackConstants.Instance; - var uid = _fixture.Create(); + var uid = Guid.NewGuid().ToString("N"); // Act instance.ContentTypeUid = uid; @@ -43,7 +42,7 @@ public void EntryUid_GetSet_Works() { // Arrange var instance = ContentstackConstants.Instance; - var uid = _fixture.Create(); + var uid = Guid.NewGuid().ToString("N"); // Act instance.EntryUid = uid; diff --git a/Contentstack.Core.Unit.Tests/ContentstackConvertUnitTests.cs b/Contentstack.Core.Unit.Tests/ContentstackConvertUnitTests.cs index ce778fc..dd8f6a3 100644 --- a/Contentstack.Core.Unit.Tests/ContentstackConvertUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/ContentstackConvertUnitTests.cs @@ -2,7 +2,6 @@ using System.IO; using System.Reflection; using System.Text.RegularExpressions; -using AutoFixture; using Contentstack.Core.Internals; using Xunit; @@ -10,7 +9,6 @@ namespace Contentstack.Core.Unit.Tests { public class ContentstackConvertUnitTests { - private readonly IFixture _fixture = new Fixture(); [Fact] public void ToInt32_WithValidInteger_ReturnsInteger() diff --git a/Contentstack.Core.Unit.Tests/ContentstackEnumsUnitTests.cs b/Contentstack.Core.Unit.Tests/ContentstackEnumsUnitTests.cs index 59499c7..3b1005f 100644 --- a/Contentstack.Core.Unit.Tests/ContentstackEnumsUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/ContentstackEnumsUnitTests.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using AutoFixture; using Contentstack.Core.Internals; using Xunit; @@ -11,7 +10,6 @@ namespace Contentstack.Core.Unit.Tests /// public class ContentstackEnumsUnitTests { - private readonly IFixture _fixture = new Fixture(); #region CachePolicy Tests diff --git a/Contentstack.Core.Unit.Tests/ContentstackExceptionUnitTests.cs b/Contentstack.Core.Unit.Tests/ContentstackExceptionUnitTests.cs index bfa1eb9..27c4c78 100644 --- a/Contentstack.Core.Unit.Tests/ContentstackExceptionUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/ContentstackExceptionUnitTests.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Net; -using AutoFixture; using Contentstack.Core.Internals; using Xunit; @@ -12,7 +11,6 @@ namespace Contentstack.Core.Unit.Tests /// public class ContentstackExceptionUnitTests { - private readonly IFixture _fixture = new Fixture(); #region Initialization Tests @@ -34,7 +32,7 @@ public void ContentstackException_DefaultConstructor_InitializesCorrectly() public void ContentstackException_WithErrorMessage_InitializesCorrectly() { // Arrange - var errorMessage = _fixture.Create(); + var errorMessage = Guid.NewGuid().ToString("N"); // Act var exception = new ContentstackException(errorMessage); @@ -69,7 +67,7 @@ public void ErrorCode_SetAndGet_ReturnsCorrectValue() { // Arrange var exception = new ContentstackException(); - var errorCode = _fixture.Create(); + var errorCode = Random.Shared.Next(1, 9999); // Act exception.ErrorCode = errorCode; @@ -121,7 +119,7 @@ public void Errors_SetAndGet_ReturnsCorrectValue() public void ContentstackException_WithAllPropertiesSet_ReturnsAllValues() { // Arrange - var errorMessage = _fixture.Create(); + var errorMessage = Guid.NewGuid().ToString("N"); var errorCode = 404; var statusCode = HttpStatusCode.NotFound; var errors = new Dictionary diff --git a/Contentstack.Core.Unit.Tests/ContentstackOptionsUnitTests.cs b/Contentstack.Core.Unit.Tests/ContentstackOptionsUnitTests.cs index 7c9aee4..b5982f8 100644 --- a/Contentstack.Core.Unit.Tests/ContentstackOptionsUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/ContentstackOptionsUnitTests.cs @@ -1,7 +1,6 @@ using System; using System.Net; using System.Reflection; -using AutoFixture; using Contentstack.Core.Configuration; using Contentstack.Core.Internals; using Xunit; @@ -13,7 +12,6 @@ namespace Contentstack.Core.Unit.Tests /// public class ContentstackOptionsUnitTests { - private readonly IFixture _fixture = new Fixture(); #region Initialization Tests @@ -40,7 +38,7 @@ public void ApiKey_SetAndGet_ReturnsCorrectValue() { // Arrange var options = new ContentstackOptions(); - var apiKey = _fixture.Create(); + var apiKey = Guid.NewGuid().ToString("N"); // Act options.ApiKey = apiKey; @@ -54,7 +52,7 @@ public void DeliveryToken_SetAndGet_ReturnsCorrectValue() { // Arrange var options = new ContentstackOptions(); - var deliveryToken = _fixture.Create(); + var deliveryToken = Guid.NewGuid().ToString("N"); // Act options.DeliveryToken = deliveryToken; @@ -68,7 +66,7 @@ public void AccessToken_SetAndGet_ReturnsCorrectValue() { // Arrange var options = new ContentstackOptions(); - var accessToken = _fixture.Create(); + var accessToken = Guid.NewGuid().ToString("N"); // Act — use reflection so we still validate the deprecated property without CS0618 at compile time var accessTokenProp = typeof(ContentstackOptions).GetProperty("AccessToken")!; @@ -83,7 +81,7 @@ public void Environment_SetAndGet_ReturnsCorrectValue() { // Arrange var options = new ContentstackOptions(); - var environment = _fixture.Create(); + var environment = Guid.NewGuid().ToString("N"); // Act options.Environment = environment; @@ -223,9 +221,9 @@ public void EarlyAccessHeader_SetAndGet_ReturnsCorrectValue() public void ContentstackOptions_WithAllPropertiesSet_ReturnsAllValues() { // Arrange - var apiKey = _fixture.Create(); - var deliveryToken = _fixture.Create(); - var environment = _fixture.Create(); + var apiKey = Guid.NewGuid().ToString("N"); + var deliveryToken = Guid.NewGuid().ToString("N"); + var environment = Guid.NewGuid().ToString("N"); var host = "cdn.contentstack.io"; var region = ContentstackRegion.EU; var version = "v3"; diff --git a/Contentstack.Core.Unit.Tests/ContentstackRegionUnitTests.cs b/Contentstack.Core.Unit.Tests/ContentstackRegionUnitTests.cs index f6c4fe2..c87ca31 100644 --- a/Contentstack.Core.Unit.Tests/ContentstackRegionUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/ContentstackRegionUnitTests.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using AutoFixture; using Contentstack.Core.Internals; using Xunit; @@ -11,7 +10,6 @@ namespace Contentstack.Core.Unit.Tests /// public class ContentstackRegionUnitTests { - private readonly IFixture _fixture = new Fixture(); #region Enum Values Tests diff --git a/Contentstack.Core.Unit.Tests/EntryUnitTests.cs b/Contentstack.Core.Unit.Tests/EntryUnitTests.cs index ffea017..670fc11 100644 --- a/Contentstack.Core.Unit.Tests/EntryUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/EntryUnitTests.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; -using AutoFixture; using Contentstack.Core; using Contentstack.Core.Configuration; using Contentstack.Core.Internals; @@ -20,7 +19,6 @@ namespace Contentstack.Core.Unit.Tests /// public class EntryUnitTests { - private readonly IFixture _fixture = new Fixture(); private ContentstackClient _client; public EntryUnitTests() @@ -32,9 +30,9 @@ private void Initialize() { var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create() + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N") }; _client = new ContentstackClient(new OptionsWrapper(options)); } @@ -74,7 +72,7 @@ private Entry CreateEntryWithMockResponse(string mockResponse) public void Initialize_Entry_WithUid() { // Arrange - var entryUid = _fixture.Create(); + var entryUid = Guid.NewGuid().ToString("N"); var contentType = _client.ContentType("source"); // Act @@ -122,7 +120,7 @@ public void SetUid_WithValidUid_SetsUid() { // Arrange var entry = CreateEntry(); - var newUid = _fixture.Create(); + var newUid = Guid.NewGuid().ToString("N"); // Act entry.SetUid(newUid); @@ -308,7 +306,7 @@ public void Object_Set_UpdatesObjectAttributes() public void Title_Get_ReturnsTitle() { // Arrange - var title = _fixture.Create(); + var title = Guid.NewGuid().ToString("N"); var entry = CreateEntry(); entry.Title = title; @@ -324,7 +322,7 @@ public void Title_Set_UpdatesTitle() { // Arrange var entry = CreateEntry(); - var newTitle = _fixture.Create(); + var newTitle = Guid.NewGuid().ToString("N"); // Act entry.Title = newTitle; @@ -341,7 +339,7 @@ public void Title_Set_UpdatesTitle() public void Uid_Get_ReturnsUid() { // Arrange - var uid = _fixture.Create(); + var uid = Guid.NewGuid().ToString("N"); var entry = CreateEntry(); entry.Uid = uid; @@ -357,7 +355,7 @@ public void Uid_Set_UpdatesUid() { // Arrange var entry = CreateEntry(); - var newUid = _fixture.Create(); + var newUid = Guid.NewGuid().ToString("N"); // Act entry.Uid = newUid; @@ -491,7 +489,7 @@ public void GetDeletedAt_WithoutDeletedAt_ReturnsMinValue() public void GetDeletedBy_WithDeletedBy_ReturnsUid() { // Arrange - var deletedBy = _fixture.Create(); + var deletedBy = Guid.NewGuid().ToString("N"); var attributes = new Dictionary { { "uid", "test_entry_uid" }, @@ -927,7 +925,7 @@ public void SetCachePolicy_SupportsMethodChaining() public void GetTitle_ReturnsTitle() { // Arrange - var title = _fixture.Create(); + var title = Guid.NewGuid().ToString("N"); var entry = CreateEntry(); entry.Title = title; @@ -1007,8 +1005,8 @@ public void AddParam_AddsParameterAndReturnsEntry() { // Arrange var entry = CreateEntry(); - var key = _fixture.Create(); - var value = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); + var value = Guid.NewGuid().ToString("N"); // Act Entry result = entry.AddParam(key, value); @@ -1030,10 +1028,10 @@ public void AddParam_SupportsMethodChaining() { // Arrange var entry = CreateEntry(); - var key1 = _fixture.Create(); - var value1 = _fixture.Create(); - var key2 = _fixture.Create(); - var value2 = _fixture.Create(); + var key1 = Guid.NewGuid().ToString("N"); + var value1 = Guid.NewGuid().ToString("N"); + var key2 = Guid.NewGuid().ToString("N"); + var value2 = Guid.NewGuid().ToString("N"); // Act Entry result = entry @@ -1084,7 +1082,7 @@ public void IncludeOnlyReference_AddsQueryParameters() // Arrange var entry = CreateEntry(); string[] keys = { "name", "description" }; - string referenceKey = _fixture.Create(); + string referenceKey = Guid.NewGuid().ToString("N"); // Act Entry result = entry.IncludeOnlyReference(keys, referenceKey); @@ -1106,7 +1104,7 @@ public void IncludeOnlyReference_WithNullKeys_DoesNotAddParameters() { // Arrange var entry = CreateEntry(); - string referenceKey = _fixture.Create(); + string referenceKey = Guid.NewGuid().ToString("N"); // Act Entry result = entry.IncludeOnlyReference(null, referenceKey); @@ -1128,7 +1126,7 @@ public void IncludeExceptReference_AddsQueryParameters() // Arrange var entry = CreateEntry(); string[] keys = { "name", "description" }; - string referenceKey = _fixture.Create(); + string referenceKey = Guid.NewGuid().ToString("N"); // Act Entry result = entry.IncludeExceptReference(keys, referenceKey); @@ -1241,7 +1239,7 @@ public void IncludeReference_WithSingleField_AddsQueryParameter() { // Arrange var entry = CreateEntry(); - var referenceField = _fixture.Create(); + var referenceField = Guid.NewGuid().ToString("N"); // Act Entry result = entry.IncludeReference(referenceField); @@ -2407,9 +2405,9 @@ public void Entry_WithLivePreviewEnabled_Setup_VerifiesLivePreviewConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -2436,9 +2434,9 @@ public void Entry_WithLivePreviewEnabledAndPreviewToken_Setup_VerifiesConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -2464,9 +2462,9 @@ public void Entry_WithLivePreviewEnabledAndReleaseId_Setup_VerifiesConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -2493,9 +2491,9 @@ public void Entry_WithLivePreviewEnabledAndPreviewTimestamp_Setup_VerifiesConfig // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -2522,9 +2520,9 @@ public void Entry_WithLivePreviewEnabledAndEmptyLivePreview_Setup_VerifiesConfig // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -2551,9 +2549,9 @@ public void Entry_WithLivePreviewEnabledAndAccessTokenHeader_SkipsAccessToken() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, diff --git a/Contentstack.Core.Unit.Tests/GlobalFieldQueryUnitTests.cs b/Contentstack.Core.Unit.Tests/GlobalFieldQueryUnitTests.cs index 26a9670..ee11aea 100644 --- a/Contentstack.Core.Unit.Tests/GlobalFieldQueryUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/GlobalFieldQueryUnitTests.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Reflection; -using AutoFixture; using Contentstack.Core; using Contentstack.Core.Configuration; using Contentstack.Core.Internals; @@ -16,7 +15,6 @@ namespace Contentstack.Core.Unit.Tests /// public class GlobalFieldQueryUnitTests { - private readonly IFixture _fixture = new Fixture(); private ContentstackClient _client; public GlobalFieldQueryUnitTests() @@ -28,9 +26,9 @@ private void Initialize() { var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create() + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N") }; _client = new ContentstackClient(new OptionsWrapper(options)); } diff --git a/Contentstack.Core.Unit.Tests/GlobalFieldUnitTests.cs b/Contentstack.Core.Unit.Tests/GlobalFieldUnitTests.cs index 03d5800..0ed103d 100644 --- a/Contentstack.Core.Unit.Tests/GlobalFieldUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/GlobalFieldUnitTests.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Reflection; -using AutoFixture; using Contentstack.Core; using Contentstack.Core.Configuration; using Contentstack.Core.Models; @@ -15,7 +14,6 @@ namespace Contentstack.Core.Unit.Tests /// public class GlobalFieldUnitTests { - private readonly IFixture _fixture = new Fixture(); private ContentstackClient _client; public GlobalFieldUnitTests() @@ -27,9 +25,9 @@ private void Initialize() { var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create() + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N") }; _client = new ContentstackClient(new OptionsWrapper(options)); } @@ -101,7 +99,7 @@ public void SetHeader_AddsHeader() // Arrange var globalField = CreateGlobalField(); var key = "custom_header"; - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); // Act globalField.SetHeader(key, value); @@ -121,7 +119,7 @@ public void RemoveHeader_RemovesHeader() // Arrange var globalField = CreateGlobalField(); var key = "custom_header"; - var value = _fixture.Create(); + var value = Guid.NewGuid().ToString("N"); globalField.SetHeader(key, value); var headersField = typeof(GlobalField).GetField("_Headers", diff --git a/Contentstack.Core.Unit.Tests/JsonConverterUnitTests.cs b/Contentstack.Core.Unit.Tests/JsonConverterUnitTests.cs index bb9f1be..bd276b6 100644 --- a/Contentstack.Core.Unit.Tests/JsonConverterUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/JsonConverterUnitTests.cs @@ -2,7 +2,6 @@ using System.Buffers; using System.Text; using System.Text.Json; -using AutoFixture; using Contentstack.Core; using Contentstack.Core.Configuration; using Contentstack.Core.Internals; @@ -14,15 +13,14 @@ namespace Contentstack.Core.Unit.Tests { public class EntryJsonConverterUnitTests { - private readonly IFixture _fixture = new Fixture(); private ContentstackClient CreateClient() { var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create() + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N") }; return new ContentstackClient(new OptionsWrapper(options)); } @@ -60,15 +58,14 @@ public void Write_WithEntry_Completes() public class AssetJsonConverterUnitTests { - private readonly IFixture _fixture = new Fixture(); private ContentstackClient CreateClient() { var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create() + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N") }; return new ContentstackClient(new OptionsWrapper(options)); } diff --git a/Contentstack.Core.Unit.Tests/LivePreviewConfigUnitTests.cs b/Contentstack.Core.Unit.Tests/LivePreviewConfigUnitTests.cs index cef349f..e80009a 100644 --- a/Contentstack.Core.Unit.Tests/LivePreviewConfigUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/LivePreviewConfigUnitTests.cs @@ -1,5 +1,4 @@ using System; -using AutoFixture; using Contentstack.Core.Configuration; using Xunit; @@ -10,7 +9,6 @@ namespace Contentstack.Core.Unit.Tests /// public class LivePreviewConfigUnitTests { - private readonly IFixture _fixture = new Fixture(); #region Initialization Tests @@ -38,7 +36,7 @@ public void ManagementToken_SetAndGet_ReturnsCorrectValue() { // Arrange var config = new LivePreviewConfig(); - var token = _fixture.Create(); + var token = Guid.NewGuid().ToString("N"); // Act config.ManagementToken = token; @@ -52,7 +50,7 @@ public void PreviewToken_SetAndGet_ReturnsCorrectValue() { // Arrange var config = new LivePreviewConfig(); - var token = _fixture.Create(); + var token = Guid.NewGuid().ToString("N"); // Act config.PreviewToken = token; @@ -93,7 +91,7 @@ public void ReleaseId_SetAndGet_ReturnsCorrectValue() { // Arrange var config = new LivePreviewConfig(); - var releaseId = _fixture.Create(); + var releaseId = Guid.NewGuid().ToString("N"); // Act config.ReleaseId = releaseId; @@ -107,7 +105,7 @@ public void PreviewTimestamp_SetAndGet_ReturnsCorrectValue() { // Arrange var config = new LivePreviewConfig(); - var timestamp = _fixture.Create(); + var timestamp = Guid.NewGuid().ToString("N"); // Act config.PreviewTimestamp = timestamp; @@ -124,11 +122,11 @@ public void PreviewTimestamp_SetAndGet_ReturnsCorrectValue() public void LivePreviewConfig_WithAllPropertiesSet_ReturnsAllValues() { // Arrange - var managementToken = _fixture.Create(); - var previewToken = _fixture.Create(); + var managementToken = Guid.NewGuid().ToString("N"); + var previewToken = Guid.NewGuid().ToString("N"); var host = "preview.contentstack.io"; - var releaseId = _fixture.Create(); - var timestamp = _fixture.Create(); + var releaseId = Guid.NewGuid().ToString("N"); + var timestamp = Guid.NewGuid().ToString("N"); // Act var config = new LivePreviewConfig diff --git a/Contentstack.Core.Unit.Tests/Mokes/MockInfrastructureTest.cs b/Contentstack.Core.Unit.Tests/Mokes/MockInfrastructureTest.cs index 54e47a1..c758082 100644 --- a/Contentstack.Core.Unit.Tests/Mokes/MockInfrastructureTest.cs +++ b/Contentstack.Core.Unit.Tests/Mokes/MockInfrastructureTest.cs @@ -1,5 +1,4 @@ using System; -using AutoFixture; using Contentstack.Core; using Contentstack.Core.Configuration; using Contentstack.Core.Unit.Tests.Mokes; @@ -13,7 +12,6 @@ namespace Contentstack.Core.Unit.Tests.Mokes /// public class MockInfrastructureTest { - private readonly IFixture _fixture = new Fixture(); [Fact] public void MockResponse_CreateContentstackResponse_ShouldLoadFromResource() diff --git a/Contentstack.Core.Unit.Tests/QueryUnitTests.cs b/Contentstack.Core.Unit.Tests/QueryUnitTests.cs index 8871cb8..218fea0 100644 --- a/Contentstack.Core.Unit.Tests/QueryUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/QueryUnitTests.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using AutoFixture; using Contentstack.Core; using Contentstack.Core.Configuration; using Contentstack.Core.Models; @@ -17,7 +16,6 @@ namespace Contentstack.Core.Unit.Tests /// public class QueryUnitTests { - private readonly IFixture _fixture = new Fixture(); private ContentstackClient _client; public QueryUnitTests() @@ -29,9 +27,9 @@ private void Initialize() { var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create() + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N") }; _client = new ContentstackClient(new OptionsWrapper(options)); } @@ -49,7 +47,7 @@ public void NotExists_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); // Act Query result = query.NotExists(key); @@ -110,7 +108,7 @@ public void IncludeOnlyReference_AddsQueryParameters() // Arrange var query = CreateQuery(); string[] keys = { "name", "description" }; - string referenceKey = _fixture.Create(); + string referenceKey = Guid.NewGuid().ToString("N"); // Act Query result = query.IncludeOnlyReference(keys, referenceKey); @@ -133,7 +131,7 @@ public void IncludeExceptReference_AddsQueryParameters() // Arrange var query = CreateQuery(); string[] keys = { "name", "description" }; - string referenceKey = _fixture.Create(); + string referenceKey = Guid.NewGuid().ToString("N"); // Act Query result = query.IncludeExceptReference(keys, referenceKey); @@ -222,8 +220,8 @@ public void Where_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); - var value = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); + var value = Guid.NewGuid().ToString("N"); // Act Query result = query.Where(key, value); @@ -249,7 +247,7 @@ public void LessThan_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var value = 100; // Act @@ -274,7 +272,7 @@ public void LessThanOrEqualTo_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var value = 100; // Act @@ -299,7 +297,7 @@ public void GreaterThan_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var value = 100; // Act @@ -324,7 +322,7 @@ public void GreaterThanOrEqualTo_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var value = 100; // Act @@ -349,8 +347,8 @@ public void NotEqualTo_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); - var value = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); + var value = Guid.NewGuid().ToString("N"); // Act Query result = query.NotEqualTo(key, value); @@ -378,7 +376,7 @@ public void ContainedIn_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var values = new object[] { "value1", "value2", "value3" }; // Act @@ -403,7 +401,7 @@ public void NotContainedIn_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var values = new object[] { "value1", "value2", "value3" }; // Act @@ -428,7 +426,7 @@ public void Exists_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); // Act Query result = query.Exists(key); @@ -457,7 +455,7 @@ public void Ascending_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); // Act Query result = query.Ascending(key); @@ -478,7 +476,7 @@ public void Descending_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); // Act Query result = query.Descending(key); @@ -714,7 +712,7 @@ public void IncludeReference_WithSingleField_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var fieldUid = _fixture.Create(); + var fieldUid = Guid.NewGuid().ToString("N"); // Act Query result = query.IncludeReference(fieldUid); @@ -874,8 +872,8 @@ public void AddParam_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); - var value = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); + var value = Guid.NewGuid().ToString("N"); // Act Query result = query.AddParam(key, value); @@ -993,7 +991,7 @@ public void Regex_WithKeyAndRegex_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var regex = "test.*pattern"; // Act @@ -1019,7 +1017,7 @@ public void Regex_WithKeyRegexAndModifiers_AddsQueryParameter() { // Arrange var query = CreateQuery(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var regex = "test.*pattern"; var modifiers = "i"; @@ -1121,7 +1119,7 @@ public void Variant_WithString_AddsHeader() { // Arrange var query = CreateQuery(); - var variantHeader = _fixture.Create(); + var variantHeader = Guid.NewGuid().ToString("N"); // Act Query result = query.Variant(variantHeader); @@ -2275,9 +2273,9 @@ public void Query_WithLivePreviewEnabled_Setup_VerifiesLivePreviewConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -2309,9 +2307,9 @@ public void Query_WithLivePreviewEnabledAndPreviewToken_Setup_VerifiesConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -2337,9 +2335,9 @@ public void Query_WithLivePreviewEnabledAndReleaseId_Setup_VerifiesConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -2366,9 +2364,9 @@ public void Query_WithLivePreviewEnabledAndPreviewTimestamp_Setup_VerifiesConfig // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -2395,9 +2393,9 @@ public void Query_WithLivePreviewEnabledAndEmptyLivePreview_Setup_VerifiesConfig // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), LivePreview = new LivePreviewConfig { Enable = true, @@ -2428,9 +2426,9 @@ public void Query_WithTaxonomyInstance_Setup_VerifiesConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create() + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N") }; var client = new ContentstackClient(new OptionsWrapper(options)); var taxonomy = client.Taxonomies(); @@ -2451,8 +2449,8 @@ public void Query_WithTaxonomyInstanceAndEnvironment_Setup_VerifiesConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), Environment = "test_environment" }; var client = new ContentstackClient(new OptionsWrapper(options)); @@ -2474,9 +2472,9 @@ public void Query_WithTaxonomyInstanceAndBranch_Setup_VerifiesConfig() // Arrange var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create(), + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N"), Branch = "test_branch" }; var client = new ContentstackClient(new OptionsWrapper(options)); diff --git a/Contentstack.Core.Unit.Tests/SyncStackUnitTests.cs b/Contentstack.Core.Unit.Tests/SyncStackUnitTests.cs index f84bb09..e1e3ef9 100644 --- a/Contentstack.Core.Unit.Tests/SyncStackUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/SyncStackUnitTests.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using AutoFixture; using Contentstack.Core.Models; using Xunit; @@ -12,7 +11,6 @@ namespace Contentstack.Core.Unit.Tests /// public class SyncStackUnitTests { - private readonly IFixture _fixture = new Fixture(); #region Initialization Tests @@ -91,7 +89,7 @@ public void TotalCount_SetAndGet_ReturnsCorrectValue() { // Arrange var syncStack = new SyncStack(); - var totalCount = _fixture.Create(); + var totalCount = Random.Shared.Next(1, 9999); // Act syncStack.TotalCount = totalCount; @@ -135,7 +133,7 @@ public void SyncToken_SetAndGet_ReturnsCorrectValue() { // Arrange var syncStack = new SyncStack(); - var syncToken = _fixture.Create(); + var syncToken = Guid.NewGuid().ToString("N"); // Act syncStack.SyncToken = syncToken; @@ -182,7 +180,7 @@ public void PaginationToken_SetAndGet_ReturnsCorrectValue() { // Arrange var syncStack = new SyncStack(); - var paginationToken = _fixture.Create(); + var paginationToken = Guid.NewGuid().ToString("N"); // Act syncStack.PaginationToken = paginationToken; diff --git a/Contentstack.Core.Unit.Tests/TaxonomyUnitTests.cs b/Contentstack.Core.Unit.Tests/TaxonomyUnitTests.cs index f4f5e92..632e339 100644 --- a/Contentstack.Core.Unit.Tests/TaxonomyUnitTests.cs +++ b/Contentstack.Core.Unit.Tests/TaxonomyUnitTests.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Reflection; -using AutoFixture; using Contentstack.Core; using Contentstack.Core.Configuration; using Contentstack.Core.Internals; @@ -16,7 +15,6 @@ namespace Contentstack.Core.Unit.Tests /// public class TaxonomyUnitTests { - private readonly IFixture _fixture = new Fixture(); private ContentstackClient _client; public TaxonomyUnitTests() @@ -28,9 +26,9 @@ private void Initialize() { var options = new ContentstackOptions() { - ApiKey = _fixture.Create(), - DeliveryToken = _fixture.Create(), - Environment = _fixture.Create() + ApiKey = Guid.NewGuid().ToString("N"), + DeliveryToken = Guid.NewGuid().ToString("N"), + Environment = Guid.NewGuid().ToString("N") }; _client = new ContentstackClient(new OptionsWrapper(options)); } @@ -47,7 +45,7 @@ public void Above_AddsQueryParameter() { // Arrange var taxonomy = CreateTaxonomy(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var value = 100; // Act @@ -76,7 +74,7 @@ public void EqualAndAbove_AddsQueryParameter() { // Arrange var taxonomy = CreateTaxonomy(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var value = 100; // Act @@ -105,7 +103,7 @@ public void Below_AddsQueryParameter() { // Arrange var taxonomy = CreateTaxonomy(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var value = 100; // Act @@ -134,7 +132,7 @@ public void EqualAndBelow_AddsQueryParameter() { // Arrange var taxonomy = CreateTaxonomy(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var value = 100; // Act @@ -174,7 +172,7 @@ public void Above_WithNullValue_ThrowsException() { // Arrange var taxonomy = CreateTaxonomy(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); // Act & Assert Assert.Throws(() => taxonomy.Above(key, null)); @@ -196,7 +194,7 @@ public void EqualAndAbove_WithNullValue_ThrowsException() { // Arrange var taxonomy = CreateTaxonomy(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); // Act & Assert Assert.Throws(() => taxonomy.EqualAndAbove(key, null)); @@ -218,7 +216,7 @@ public void Below_WithNullValue_ThrowsException() { // Arrange var taxonomy = CreateTaxonomy(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); // Act & Assert Assert.Throws(() => taxonomy.Below(key, null)); @@ -240,7 +238,7 @@ public void EqualAndBelow_WithNullValue_ThrowsException() { // Arrange var taxonomy = CreateTaxonomy(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); // Act & Assert Assert.Throws(() => taxonomy.EqualAndBelow(key, null)); @@ -251,7 +249,7 @@ public void Above_WithDifferentValueTypes_AddsQueryParameter() { // Arrange var taxonomy = CreateTaxonomy(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); // Act taxonomy.Above(key, "string_value"); @@ -269,7 +267,7 @@ public void Below_WithDoubleValue_AddsQueryParameter() { // Arrange var taxonomy = CreateTaxonomy(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var value = 123.45; // Act @@ -529,7 +527,7 @@ public void Above_WithNegativeValue_AddsQueryParameter() { // Arrange var taxonomy = CreateTaxonomy(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var value = -100; // Act @@ -548,7 +546,7 @@ public void Below_WithZeroValue_AddsQueryParameter() { // Arrange var taxonomy = CreateTaxonomy(); - var key = _fixture.Create(); + var key = Guid.NewGuid().ToString("N"); var value = 0; // Act diff --git a/Contentstack.Core/Contentstack.Core.csproj b/Contentstack.Core/Contentstack.Core.csproj index 2c40f42..82d484b 100644 --- a/Contentstack.Core/Contentstack.Core.csproj +++ b/Contentstack.Core/Contentstack.Core.csproj @@ -29,9 +29,9 @@ - + - +