Skip to content

Commit 527b603

Browse files
OMpawar-21OMpawar-21
authored
Merge pull request #207 from contentstack/master
chore: back-merge master into development
2 parents 0a33df5 + 71aaf92 commit 527b603

12 files changed

Lines changed: 106 additions & 99 deletions

File tree

‎Contentstack.Core.Tests/Integration/ErrorHandling/ErrorHandlingComprehensiveTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public async Task Error_InvalidAPIKey_ThrowsException()
3333
var options = new ContentstackOptions()
3434
{
3535
Host = TestDataHelper.Host,
36-
ApiKey = "invalid_api_key_xyz_123",
36+
ApiKey = Guid.NewGuid().ToString("N"),
3737
DeliveryToken = TestDataHelper.DeliveryToken,
3838
Environment = TestDataHelper.Environment
3939
};

‎Contentstack.Core.Tests/Integration/StackTests/StackOperationsComprehensiveTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ public async Task Stack_InvalidAPIKey_ThrowsError()
441441

442442
var options = new ContentstackOptions()
443443
{
444-
ApiKey = "invalid_api_key_12345",
444+
ApiKey = Guid.NewGuid().ToString("N"),
445445
DeliveryToken = TestDataHelper.DeliveryToken,
446446
Environment = TestDataHelper.Environment
447447
};

‎Contentstack.Core.Unit.Tests/AssetLibraryUnitTests.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -103,20 +103,20 @@ public void Where_WithExistingKey_UpdatesQueryParameter()
103103
{
104104
// Arrange
105105
var assetLibrary = CreateAssetLibrary();
106-
var key = "filename";
106+
var fieldName = "filename";
107107
var value1 = "image1.jpg";
108108
var value2 = "image2.jpg";
109109

110110
// Act
111-
assetLibrary.Where(key, value1);
112-
assetLibrary.Where(key, value2);
111+
assetLibrary.Where(fieldName, value1);
112+
assetLibrary.Where(fieldName, value2);
113113

114114
// Assert
115115
var urlQueriesField = typeof(AssetLibrary).GetField("UrlQueries",
116116
BindingFlags.NonPublic | BindingFlags.Instance);
117117
var urlQueries = (Dictionary<string, object>)urlQueriesField?.GetValue(assetLibrary);
118118
var query = urlQueries?["query"] as JsonObject;
119-
Assert.Equal(value2, query[key]?.GetValue<string>());
119+
Assert.Equal(value2, query[fieldName]?.GetValue<string>());
120120
}
121121

122122
#endregion
@@ -528,44 +528,44 @@ public void SetHeaderForKey_AddsHeader()
528528
{
529529
// Arrange
530530
var assetLibrary = CreateAssetLibrary();
531-
var key = "custom_header";
531+
var headerName = "custom_header";
532532
var value = _fixture.Create<string>();
533533

534534
// Act
535-
AssetLibrary result = assetLibrary.SetHeaderForKey(key, value);
535+
AssetLibrary result = assetLibrary.SetHeaderForKey(headerName, value);
536536

537537
// Assert
538538
Assert.NotNull(result);
539539
Assert.Equal(assetLibrary, result);
540-
541-
var headersField = typeof(AssetLibrary).GetField("_Headers",
540+
541+
var headersField = typeof(AssetLibrary).GetField("_Headers",
542542
BindingFlags.NonPublic | BindingFlags.Instance);
543543
var headers = (Dictionary<string, object>)headersField?.GetValue(assetLibrary);
544-
545-
Assert.True(headers?.ContainsKey(key) ?? false);
546-
Assert.Equal(value, headers?[key]?.ToString());
544+
545+
Assert.True(headers?.ContainsKey(headerName) ?? false);
546+
Assert.Equal(value, headers?[headerName]?.ToString());
547547
}
548548

549549
[Fact]
550550
public void RemoveHeader_RemovesHeader()
551551
{
552552
// Arrange
553553
var assetLibrary = CreateAssetLibrary();
554-
var key = "custom_header";
554+
var headerName = "custom_header";
555555
var value = _fixture.Create<string>();
556-
assetLibrary.SetHeaderForKey(key, value);
557-
558-
var headersField = typeof(AssetLibrary).GetField("_Headers",
556+
assetLibrary.SetHeaderForKey(headerName, value);
557+
558+
var headersField = typeof(AssetLibrary).GetField("_Headers",
559559
BindingFlags.NonPublic | BindingFlags.Instance);
560560
var headersBefore = (Dictionary<string, object>)headersField?.GetValue(assetLibrary);
561-
Assert.True(headersBefore?.ContainsKey(key) ?? false);
561+
Assert.True(headersBefore?.ContainsKey(headerName) ?? false);
562562

563563
// Act
564-
assetLibrary.RemoveHeader(key);
564+
assetLibrary.RemoveHeader(headerName);
565565

566566
// Assert
567567
var headersAfter = (Dictionary<string, object>)headersField?.GetValue(assetLibrary);
568-
Assert.False(headersAfter?.ContainsKey(key) ?? true);
568+
Assert.False(headersAfter?.ContainsKey(headerName) ?? true);
569569
}
570570

571571
#endregion

‎Contentstack.Core.Unit.Tests/AssetUnitTests.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -287,17 +287,17 @@ public void GetUpdatedBy_WithoutUpdatedBy_ThrowsException()
287287
public void Get_WithValidKey_ReturnsValue()
288288
{
289289
// Arrange
290-
var key = "filename";
290+
var fieldName = "filename";
291291
var value = "test.jpg";
292292
var attributes = new Dictionary<string, object>
293293
{
294294
{ "uid", "test_asset_uid" },
295-
{ key, value }
295+
{ fieldName, value }
296296
};
297297
var asset = CreateAssetWithAttributes(attributes);
298298

299299
// Act
300-
var result = asset.Get(key);
300+
var result = asset.Get(fieldName);
301301

302302
// Assert
303303
Assert.Equal(value, result);
@@ -602,41 +602,41 @@ public void SetHeader_AddsHeader()
602602
{
603603
// Arrange
604604
var asset = CreateAsset();
605-
var key = "custom_header";
605+
var headerName = "custom_header";
606606
var value = _fixture.Create<string>();
607607

608608
// Act
609-
asset.SetHeader(key, value);
609+
asset.SetHeader(headerName, value);
610610

611611
// Assert
612-
var headersField = typeof(Asset).GetField("_Headers",
612+
var headersField = typeof(Asset).GetField("_Headers",
613613
BindingFlags.NonPublic | BindingFlags.Instance);
614614
var headers = (Dictionary<string, object>)headersField?.GetValue(asset);
615-
616-
Assert.True(headers?.ContainsKey(key) ?? false);
617-
Assert.Equal(value, headers?[key]?.ToString());
615+
616+
Assert.True(headers?.ContainsKey(headerName) ?? false);
617+
Assert.Equal(value, headers?[headerName]?.ToString());
618618
}
619619

620620
[Fact]
621621
public void RemoveHeader_RemovesHeader()
622622
{
623623
// Arrange
624624
var asset = CreateAsset();
625-
var key = "custom_header";
625+
var headerName = "custom_header";
626626
var value = _fixture.Create<string>();
627-
asset.SetHeader(key, value);
628-
629-
var headersField = typeof(Asset).GetField("_Headers",
627+
asset.SetHeader(headerName, value);
628+
629+
var headersField = typeof(Asset).GetField("_Headers",
630630
BindingFlags.NonPublic | BindingFlags.Instance);
631631
var headersBefore = (Dictionary<string, object>)headersField?.GetValue(asset);
632-
Assert.True(headersBefore?.ContainsKey(key) ?? false);
632+
Assert.True(headersBefore?.ContainsKey(headerName) ?? false);
633633

634634
// Act
635-
asset.RemoveHeader(key);
635+
asset.RemoveHeader(headerName);
636636

637637
// Assert
638638
var headersAfter = (Dictionary<string, object>)headersField?.GetValue(asset);
639-
Assert.False(headersAfter?.ContainsKey(key) ?? true);
639+
Assert.False(headersAfter?.ContainsKey(headerName) ?? true);
640640
}
641641

642642
[Fact]

‎Contentstack.Core.Unit.Tests/ContentTypeUnitTests.cs‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -160,19 +160,19 @@ public void SetHeader_AddsHeader()
160160
{
161161
// Arrange
162162
var contentType = CreateContentType();
163-
var key = "custom_header";
163+
var headerName = "custom_header";
164164
var value = _fixture.Create<string>();
165165

166166
// Act
167-
contentType.SetHeader(key, value);
167+
contentType.SetHeader(headerName, value);
168168

169169
// Assert
170-
var headersField = typeof(ContentType).GetField("_Headers",
170+
var headersField = typeof(ContentType).GetField("_Headers",
171171
BindingFlags.NonPublic | BindingFlags.Instance);
172172
var headers = (Dictionary<string, object>)headersField?.GetValue(contentType);
173-
174-
Assert.True(headers?.ContainsKey(key) ?? false);
175-
Assert.Equal(value, headers?[key]?.ToString());
173+
174+
Assert.True(headers?.ContainsKey(headerName) ?? false);
175+
Assert.Equal(value, headers?[headerName]?.ToString());
176176
}
177177

178178
[Fact]
@@ -198,21 +198,21 @@ public void SetHeader_WithExistingKey_ReplacesHeader()
198198
{
199199
// Arrange
200200
var contentType = CreateContentType();
201-
var key = "test_header";
201+
var headerName = "test_header";
202202
var value1 = "value1";
203203
var value2 = "value2";
204204

205205
// Act
206-
contentType.SetHeader(key, value1);
207-
contentType.SetHeader(key, value2);
206+
contentType.SetHeader(headerName, value1);
207+
contentType.SetHeader(headerName, value2);
208208

209209
// Assert
210-
var headersField = typeof(ContentType).GetField("_Headers",
210+
var headersField = typeof(ContentType).GetField("_Headers",
211211
BindingFlags.NonPublic | BindingFlags.Instance);
212212
var headers = (Dictionary<string, object>)headersField?.GetValue(contentType);
213-
214-
Assert.True(headers?.ContainsKey(key) ?? false);
215-
Assert.Equal(value2, headers?[key]?.ToString());
213+
214+
Assert.True(headers?.ContainsKey(headerName) ?? false);
215+
Assert.Equal(value2, headers?[headerName]?.ToString());
216216
}
217217

218218
#endregion
@@ -224,35 +224,35 @@ public void RemoveHeader_WithExistingKey_RemovesHeader()
224224
{
225225
// Arrange
226226
var contentType = CreateContentType();
227-
var key = "test_header";
227+
var headerName = "test_header";
228228
var value = _fixture.Create<string>();
229-
230-
var headersField = typeof(ContentType).GetField("_Headers",
229+
230+
var headersField = typeof(ContentType).GetField("_Headers",
231231
BindingFlags.NonPublic | BindingFlags.Instance);
232-
contentType.SetHeader(key, value);
232+
contentType.SetHeader(headerName, value);
233233
var headersAfterSet = (Dictionary<string, object>)headersField?.GetValue(contentType);
234-
Assert.True(headersAfterSet?.ContainsKey(key) ?? false);
234+
Assert.True(headersAfterSet?.ContainsKey(headerName) ?? false);
235235

236236
// Act
237-
contentType.RemoveHeader(key);
237+
contentType.RemoveHeader(headerName);
238238

239239
// Assert
240240
var headersAfterRemove = (Dictionary<string, object>)headersField?.GetValue(contentType);
241-
Assert.False(headersAfterRemove?.ContainsKey(key) ?? true);
241+
Assert.False(headersAfterRemove?.ContainsKey(headerName) ?? true);
242242
}
243243

244244
[Fact]
245245
public void RemoveHeader_WithNonExistentKey_DoesNotThrow()
246246
{
247247
// Arrange
248248
var contentType = CreateContentType();
249-
var key = "non_existent_header";
250-
var headersField = typeof(ContentType).GetField("_Headers",
249+
var headerName = "non_existent_header";
250+
var headersField = typeof(ContentType).GetField("_Headers",
251251
BindingFlags.NonPublic | BindingFlags.Instance);
252252
var headersBefore = new Dictionary<string, object>((Dictionary<string, object>)headersField?.GetValue(contentType));
253253

254254
// Act - Should not throw
255-
contentType.RemoveHeader(key);
255+
contentType.RemoveHeader(headerName);
256256

257257
// Assert
258258
var headersAfter = (Dictionary<string, object>)headersField?.GetValue(contentType);

‎Contentstack.Core.Unit.Tests/ContentstackClientUnitTests.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -392,20 +392,20 @@ public void SetHeader_WithValidKeyAndValue_AddsHeader()
392392
{
393393
// Arrange
394394
var client = CreateClient();
395-
var key = "custom_header";
395+
var headerName = "custom_header";
396396
var value = _fixture.Create<string>();
397397

398398
// Act
399-
client.SetHeader(key, value);
399+
client.SetHeader(headerName, value);
400400

401401
// Assert - Verify header was actually set using reflection
402-
var headersField = typeof(ContentstackClient).GetField("_LocalHeaders",
402+
var headersField = typeof(ContentstackClient).GetField("_LocalHeaders",
403403
BindingFlags.NonPublic | BindingFlags.Instance);
404404
var headers = (Dictionary<string, object>)headersField?.GetValue(client);
405-
405+
406406
Assert.NotNull(headers);
407-
Assert.True(headers.ContainsKey(key));
408-
Assert.Equal(value, headers[key]?.ToString());
407+
Assert.True(headers.ContainsKey(headerName));
408+
Assert.Equal(value, headers[headerName]?.ToString());
409409
}
410410

411411
[Fact]
@@ -449,22 +449,22 @@ public void SetHeader_WithExistingKey_ReplacesHeader()
449449
{
450450
// Arrange
451451
var client = CreateClient();
452-
var key = "test_header";
452+
var headerName = "test_header";
453453
var value1 = "value1";
454454
var value2 = "value2";
455455

456456
// Act
457-
client.SetHeader(key, value1);
458-
client.SetHeader(key, value2);
457+
client.SetHeader(headerName, value1);
458+
client.SetHeader(headerName, value2);
459459

460460
// Assert - Verify header was replaced
461-
var headersField = typeof(ContentstackClient).GetField("_LocalHeaders",
461+
var headersField = typeof(ContentstackClient).GetField("_LocalHeaders",
462462
BindingFlags.NonPublic | BindingFlags.Instance);
463463
var headers = (Dictionary<string, object>)headersField?.GetValue(client);
464-
464+
465465
Assert.NotNull(headers);
466-
Assert.True(headers.ContainsKey(key));
467-
Assert.Equal(value2, headers[key]?.ToString());
466+
Assert.True(headers.ContainsKey(headerName));
467+
Assert.Equal(value2, headers[headerName]?.ToString());
468468
}
469469

470470
#endregion
@@ -476,26 +476,26 @@ public void RemoveHeader_WithExistingKey_RemovesHeader()
476476
{
477477
// Arrange
478478
var client = CreateClient();
479-
var key = "test_header";
479+
var headerName = "test_header";
480480
var value = _fixture.Create<string>();
481-
482-
var headersField = typeof(ContentstackClient).GetField("_LocalHeaders",
481+
482+
var headersField = typeof(ContentstackClient).GetField("_LocalHeaders",
483483
BindingFlags.NonPublic | BindingFlags.Instance);
484484
var headersBefore = new Dictionary<string, object>((Dictionary<string, object>)headersField?.GetValue(client));
485485
var initialCount = headersBefore.Count;
486-
487-
client.SetHeader(key, value);
486+
487+
client.SetHeader(headerName, value);
488488
var headersAfterSet = (Dictionary<string, object>)headersField?.GetValue(client);
489-
Assert.True(headersAfterSet?.ContainsKey(key) ?? false);
489+
Assert.True(headersAfterSet?.ContainsKey(headerName) ?? false);
490490
Assert.Equal(initialCount + 1, headersAfterSet?.Count ?? 0);
491491

492492
// Act
493-
client.RemoveHeader(key);
493+
client.RemoveHeader(headerName);
494494

495495
// Assert - Verify header was actually removed
496496
var headersAfterRemove = (Dictionary<string, object>)headersField?.GetValue(client);
497497
Assert.NotNull(headersAfterRemove);
498-
Assert.False(headersAfterRemove.ContainsKey(key));
498+
Assert.False(headersAfterRemove.ContainsKey(headerName));
499499
Assert.Equal(initialCount, headersAfterRemove.Count);
500500
}
501501

‎Contentstack.Core.Unit.Tests/EntryUnitTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -580,16 +580,16 @@ public void GetUid_WithNullUid_ReturnsNull()
580580
public void Get_WithValidKey_ReturnsValue()
581581
{
582582
// Arrange
583-
var key = "test_key";
583+
var fieldName = "test_key";
584584
var value = "test_value";
585585
var attributes = new Dictionary<string, object>
586586
{
587-
{ key, value }
587+
{ fieldName, value }
588588
};
589589
var entry = CreateEntryWithAttributes(attributes);
590590

591591
// Act
592-
var result = entry.Get(key);
592+
var result = entry.Get(fieldName);
593593

594594
// Assert
595595
Assert.Equal(value, result);

0 commit comments

Comments
 (0)