Skip to content

Commit 6fc0f9a

Browse files
samsadsamsamsadsam
authored
Fix regressed unit tests (#610)
* fix first batch * tests fixed
1 parent f7ec121 commit 6fc0f9a

File tree

7 files changed

+38
-37
lines changed

7 files changed

+38
-37
lines changed

‎tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1724,7 +1724,7 @@ public async Task ValidateFeatureFlagsUnchangedLogged()
17241724
.Build();
17251725

17261726
Assert.Equal("SuperUsers", config["FeatureManagement:MyFeature2:EnabledFor:0:Name"]);
1727-
FirstKeyValue.Value = "newValue1";
1727+
FirstKeyValue = TestHelpers.ChangeValue(FirstKeyValue, "newValue1");
17281728

17291729
Thread.Sleep(RefreshInterval);
17301730
await refresher.TryRefreshAsync();
@@ -1817,7 +1817,7 @@ public async Task MapTransformFeatureFlagWithRefresh()
18171817
Assert.Equal("TestValue1", config["TestKey1"]);
18181818
Assert.Equal("NoUsers", config["FeatureManagement:MyFeature:EnabledFor:0:Name"]);
18191819

1820-
FirstKeyValue.Value = "newValue1";
1820+
FirstKeyValue = TestHelpers.ChangeValue(FirstKeyValue, "newValue1");
18211821
featureFlags[0] = ConfigurationModelFactory.ConfigurationSetting(
18221822
key: FeatureManagementConstants.FeatureFlagMarker + "myFeature",
18231823
value: @"

‎tests/Tests.AzureAppConfiguration/KeyVaultReferenceTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ Response<ConfigurationSetting> GetIfChanged(ConfigurationSetting setting, bool o
743743
Assert.Equal(_secretValue, config[_kv.Key]);
744744

745745
// Update sentinel key-value
746-
sentinelKv.Value = "Value2";
746+
sentinelKv = TestHelpers.ChangeValue(sentinelKv, "Value2");
747747
Thread.Sleep(refreshInterval);
748748
await refresher.RefreshAsync();
749749

@@ -815,7 +815,7 @@ Response<ConfigurationSetting> GetIfChanged(ConfigurationSetting setting, bool o
815815
Assert.Equal(_secretValue, config[_kv.Key]);
816816

817817
// Update sentinel key-value to trigger refresh operation
818-
sentinelKv.Value = "Value2";
818+
sentinelKv = TestHelpers.ChangeValue(sentinelKv, "Value2");
819819
Thread.Sleep(refreshInterval);
820820
await refresher.RefreshAsync();
821821

‎tests/Tests.AzureAppConfiguration/LoggingTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ Response<ConfigurationSetting> GetIfChanged(ConfigurationSetting setting, bool o
239239
Assert.Equal("SentinelValue", config["SentinelKey"]);
240240

241241
// Update sentinel key-value to trigger refreshAll operation
242-
sentinelKv.Value = "UpdatedSentinelValue";
242+
sentinelKv = TestHelpers.ChangeValue(sentinelKv, "UpdatedSentinelValue");
243243
Thread.Sleep(RefreshInterval);
244244
await refresher.TryRefreshAsync();
245245

@@ -377,7 +377,7 @@ public async Task ValidateFailoverToDifferentEndpointMessageLoggedAfterFailover(
377377
.Build();
378378

379379
Assert.Equal("TestValue1", config["TestKey1"]);
380-
FirstKeyValue.Value = "newValue1";
380+
_kvCollection[0] = TestHelpers.ChangeValue(FirstKeyValue, "newValue1");
381381

382382
Thread.Sleep(RefreshInterval);
383383
await refresher.TryRefreshAsync();
@@ -389,7 +389,7 @@ public async Task ValidateFailoverToDifferentEndpointMessageLoggedAfterFailover(
389389
.Throws(new RequestFailedException(HttpStatusCodes.TooManyRequests, "Too many requests"));
390390
mockClient2.Setup(c => c.ToString()).Returns("client");
391391

392-
FirstKeyValue.Value = "TestValue1";
392+
_kvCollection[0] = TestHelpers.ChangeValue(FirstKeyValue, "TestValue1");
393393

394394
Thread.Sleep(RefreshInterval);
395395
await refresher.TryRefreshAsync();
@@ -431,7 +431,7 @@ public async Task ValidateConfigurationUpdatedSuccessLoggedDuringRefresh()
431431
.Build();
432432

433433
Assert.Equal("TestValue1", config["TestKey1"]);
434-
FirstKeyValue.Value = "newValue1";
434+
_kvCollection[0] = TestHelpers.ChangeValue(FirstKeyValue, "newValue1");
435435

436436
Thread.Sleep(RefreshInterval);
437437
await refresher.TryRefreshAsync();
@@ -480,7 +480,7 @@ public async Task ValidateCorrectEndpointLoggedOnConfigurationUpdate()
480480
})
481481
.Build();
482482

483-
FirstKeyValue.Value = "newValue1";
483+
_kvCollection[0] = TestHelpers.ChangeValue(FirstKeyValue, "newValue1");
484484

485485
Thread.Sleep(RefreshInterval);
486486
await refresher.TryRefreshAsync();
@@ -528,7 +528,7 @@ public async Task ValidateCorrectKeyValueLoggedDuringRefresh()
528528
.Build();
529529

530530
Assert.Equal("TestValue1", config["TestKey1"]);
531-
FirstKeyValue.Value = "newValue1";
531+
_kvCollection[0] = TestHelpers.ChangeValue(FirstKeyValue, "newValue1");
532532

533533
Thread.Sleep(RefreshInterval);
534534
await refresher.TryRefreshAsync();

‎tests/Tests.AzureAppConfiguration/MapTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public async Task MapTransformWithRefresh()
181181
Assert.Equal("TestValue1 mapped first", config["TestKey1"]);
182182
Assert.Equal("TestValue2 second", config["TestKey2"]);
183183

184-
FirstKeyValue.Value = "newValue1";
184+
_kvCollection[0] = TestHelpers.ChangeValue(_kvCollection[0], "newValue1");
185185

186186
Thread.Sleep(RefreshInterval);
187187
await refresher.TryRefreshAsync();
@@ -232,8 +232,8 @@ public async Task MapTransformSettingKeyWithRefresh()
232232
Assert.Null(config["TestKey1"]);
233233
Assert.Equal("TestValue2", config["TestKey2"]);
234234

235-
FirstKeyValue.Value = "newValue1";
236-
_kvCollection.Last().Value = "newValue2";
235+
_kvCollection[0] = TestHelpers.ChangeValue(_kvCollection[0], "newValue1");
236+
_kvCollection[1] = TestHelpers.ChangeValue(_kvCollection[1], "newValue2");
237237

238238
Thread.Sleep(RefreshInterval);
239239
await refresher.TryRefreshAsync();
@@ -282,8 +282,8 @@ public async Task MapTransformSettingLabelWithRefresh()
282282

283283
Assert.Equal("TestValue1 changed", config["TestKey1"]);
284284
Assert.Equal("TestValue2 changed", config["TestKey2"]);
285-
FirstKeyValue.Value = "newValue1";
286-
_kvCollection.Last().Value = "newValue2";
285+
_kvCollection[0] = TestHelpers.ChangeValue(_kvCollection[0], "newValue1");
286+
_kvCollection[1] = TestHelpers.ChangeValue(_kvCollection[1], "newValue2");
287287

288288
Thread.Sleep(RefreshInterval);
289289
await refresher.TryRefreshAsync();
@@ -523,8 +523,8 @@ public async Task MapTransformSettingKeyWithLogAndRefresh()
523523
Assert.Null(config["TestKey1"]);
524524
Assert.Equal("TestValue2", config["TestKey2"]);
525525

526-
FirstKeyValue.Value = "newValue1";
527-
_kvCollection.Last().Value = "newValue2";
526+
_kvCollection[0] = TestHelpers.ChangeValue(_kvCollection[0], "newValue1");
527+
_kvCollection[1] = TestHelpers.ChangeValue(_kvCollection[1], "newValue2");
528528

529529
Thread.Sleep(RefreshInterval);
530530
await refresher.TryRefreshAsync();

‎tests/Tests.AzureAppConfiguration/PushRefreshTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ public async Task RefreshAsyncUpdatesConfig()
347347
.Build();
348348

349349
Assert.Equal("TestValue1", config["TestKey1"]);
350-
FirstKeyValue.Value = "newValue1";
350+
_kvCollection[0] = TestHelpers.ChangeValue(_kvCollection[0], "newValue1");
351351

352352
refresher.ProcessPushNotification(_pushNotificationList.First(), TimeSpan.FromSeconds(0));
353353
await refresher.RefreshAsync();

‎tests/Tests.AzureAppConfiguration/RefreshTests.cs‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public async Task RefreshTests_RefreshIsNotSkippedIfCacheIsExpired()
208208
.Build();
209209

210210
Assert.Equal("TestValue1", config["TestKey1"]);
211-
FirstKeyValue.Value = "newValue";
211+
_kvCollection[0] = TestHelpers.ChangeValue(FirstKeyValue, "newValue");
212212

213213
// Wait for the cache to expire
214214
Thread.Sleep(1500);
@@ -221,7 +221,6 @@ public async Task RefreshTests_RefreshIsNotSkippedIfCacheIsExpired()
221221
[Fact]
222222
public async Task RefreshTests_RefreshAllFalseDoesNotUpdateEntireConfiguration()
223223
{
224-
var keyValueCollection = new List<ConfigurationSetting>(_kvCollection);
225224
IConfigurationRefresher refresher = null;
226225
var mockClient = GetMockConfigurationClient();
227226

@@ -244,7 +243,7 @@ public async Task RefreshTests_RefreshAllFalseDoesNotUpdateEntireConfiguration()
244243
Assert.Equal("TestValue2", config["TestKey2"]);
245244
Assert.Equal("TestValue3", config["TestKey3"]);
246245

247-
keyValueCollection.ForEach(kv => kv.Value = "newValue");
246+
_kvCollection = _kvCollection.Select(kv => TestHelpers.ChangeValue(kv, "newValue")).ToList();
248247

249248
// Wait for the cache to expire
250249
Thread.Sleep(1500);
@@ -259,7 +258,6 @@ public async Task RefreshTests_RefreshAllFalseDoesNotUpdateEntireConfiguration()
259258
[Fact]
260259
public async Task RefreshTests_RefreshAllTrueUpdatesEntireConfiguration()
261260
{
262-
var keyValueCollection = new List<ConfigurationSetting>(_kvCollection);
263261
IConfigurationRefresher refresher = null;
264262
var mockClient = GetMockConfigurationClient();
265263

@@ -282,7 +280,7 @@ public async Task RefreshTests_RefreshAllTrueUpdatesEntireConfiguration()
282280
Assert.Equal("TestValue2", config["TestKey2"]);
283281
Assert.Equal("TestValue3", config["TestKey3"]);
284282

285-
keyValueCollection.ForEach(kv => kv.Value = "newValue");
283+
_kvCollection = _kvCollection.Select(kv => TestHelpers.ChangeValue(kv, "newValue")).ToList();
286284

287285
// Wait for the cache to expire
288286
Thread.Sleep(1500);
@@ -353,7 +351,7 @@ Response<ConfigurationSetting> GetIfChanged(ConfigurationSetting setting, bool o
353351
Assert.Equal("TestValue2", config["TestKey2"]);
354352
Assert.Equal("TestValue3", config["TestKey3"]);
355353

356-
keyValueCollection.First().Value = "newValue";
354+
keyValueCollection[0] = TestHelpers.ChangeValue(keyValueCollection[0], "newValue");
357355
keyValueCollection.Remove(keyValueCollection.FirstOrDefault(s => s.Key == "TestKey3" && s.Label == "label"));
358356

359357
// Wait for the cache to expire
@@ -426,8 +424,8 @@ Response<ConfigurationSetting> GetIfChanged(ConfigurationSetting setting, bool o
426424
Assert.Equal("TestValue2", config["TestKey2"]);
427425
Assert.Equal("TestValue3", config["TestKey3"]);
428426

429-
keyValueCollection.ElementAt(0).Value = "newValue1";
430-
keyValueCollection.ElementAt(1).Value = "newValue2";
427+
keyValueCollection[0] = TestHelpers.ChangeValue(keyValueCollection[0], "newValue1");
428+
keyValueCollection[1] = TestHelpers.ChangeValue(keyValueCollection[1], "newValue2");
431429
keyValueCollection.Remove(keyValueCollection.FirstOrDefault(s => s.Key == "TestKey3" && s.Label == "label"));
432430

433431
// Wait for the cache to expire
@@ -499,7 +497,7 @@ Response<ConfigurationSetting> GetIfChanged(ConfigurationSetting setting, bool o
499497
Assert.Equal("TestValue1", config["TestKey1"]);
500498
Assert.Equal(1, requestCount);
501499

502-
keyValueCollection.First().Value = "newValue";
500+
keyValueCollection[0] = TestHelpers.ChangeValue(keyValueCollection[0], "newValue");
503501

504502
// Simulate simultaneous refresh calls with expired cache from multiple threads
505503
var task1 = Task.Run(() => WaitAndRefresh(refresher, 1500));
@@ -606,7 +604,7 @@ public async Task RefreshTests_TryRefreshAsyncUpdatesConfigurationAndReturnsTrue
606604
.Build();
607605

608606
Assert.Equal("TestValue1", config["TestKey1"]);
609-
FirstKeyValue.Value = "newValue";
607+
_kvCollection[0] = TestHelpers.ChangeValue(_kvCollection[0], "newValue");
610608

611609
// Wait for the cache to expire
612610
Thread.Sleep(1500);
@@ -702,7 +700,7 @@ Response<ConfigurationSetting> GetIfChanged(ConfigurationSetting setting, bool o
702700
.Build();
703701

704702
Assert.Equal("TestValue1", config["TestKey1"]);
705-
FirstKeyValue.Value = "newValue";
703+
_kvCollection[0] = TestHelpers.ChangeValue(_kvCollection[0], "newValue");
706704

707705
// Wait for the cache to expire
708706
Thread.Sleep(1500);
@@ -823,7 +821,7 @@ Response<ConfigurationSetting> GetIfChanged(ConfigurationSetting setting, bool o
823821
Assert.Equal("TestValue2", config["TestKey2"]);
824822
Assert.Equal("TestValue3", config["TestKey3"]);
825823

826-
keyValueCollection.ForEach(kv => kv.Value = "newValue");
824+
keyValueCollection = keyValueCollection.Select(kv => TestHelpers.ChangeValue(kv, "newValue")).ToList();
827825

828826
// Wait for the cache to expire
829827
Thread.Sleep(1500);
@@ -874,7 +872,7 @@ public async Task RefreshTests_RefreshAllTrueForOverwrittenSentinelUpdatesEntire
874872
Assert.Equal("TestValue3", config["TestKey3"]);
875873
Assert.Equal("TestValueForLabel2", config["TestKeyWithMultipleLabels"]);
876874

877-
keyValueCollection.ForEach(kv => kv.Value = "newValue");
875+
_kvCollection = _kvCollection.Select(kv => TestHelpers.ChangeValue(kv, "newValue")).ToList();
878876

879877
// Wait for the cache to expire
880878
Thread.Sleep(1500);
@@ -890,8 +888,7 @@ public async Task RefreshTests_RefreshAllTrueForOverwrittenSentinelUpdatesEntire
890888
[Fact]
891889
public async Task RefreshTests_RefreshAllFalseForOverwrittenSentinelUpdatesConfig()
892890
{
893-
var keyValueCollection = new List<ConfigurationSetting>(_kvCollection);
894-
ConfigurationSetting refreshRegisteredSetting = keyValueCollection.FirstOrDefault(s => s.Key == "TestKeyWithMultipleLabels" && s.Label == "label1");
891+
ConfigurationSetting refreshRegisteredSetting = _kvCollection.FirstOrDefault(s => s.Key == "TestKeyWithMultipleLabels" && s.Label == "label1");
895892
var mockClient = GetMockConfigurationClient();
896893
IConfigurationRefresher refresher = null;
897894

@@ -916,7 +913,7 @@ public async Task RefreshTests_RefreshAllFalseForOverwrittenSentinelUpdatesConfi
916913
Assert.Equal("TestValue3", config["TestKey3"]);
917914
Assert.Equal("TestValueForLabel2", config["TestKeyWithMultipleLabels"]);
918915

919-
refreshRegisteredSetting.Value = "UpdatedValueForLabel1";
916+
_kvCollection[_kvCollection.IndexOf(refreshRegisteredSetting)] = TestHelpers.ChangeValue(refreshRegisteredSetting, "UpdatedValueForLabel1");
920917

921918
// Wait for the cache to expire
922919
Thread.Sleep(1500);
@@ -933,8 +930,7 @@ public async Task RefreshTests_RefreshAllFalseForOverwrittenSentinelUpdatesConfi
933930
[Fact]
934931
public async Task RefreshTests_RefreshRegisteredKvOverwritesSelectedKv()
935932
{
936-
var keyValueCollection = new List<ConfigurationSetting>(_kvCollection);
937-
ConfigurationSetting refreshAllRegisteredSetting = keyValueCollection.FirstOrDefault(s => s.Key == "TestKeyWithMultipleLabels" && s.Label == "label1");
933+
ConfigurationSetting refreshAllRegisteredSetting = _kvCollection.FirstOrDefault(s => s.Key == "TestKeyWithMultipleLabels" && s.Label == "label1");
938934
var mockClient = GetMockConfigurationClient();
939935
IConfigurationRefresher refresher = null;
940936

@@ -959,7 +955,7 @@ public async Task RefreshTests_RefreshRegisteredKvOverwritesSelectedKv()
959955
Assert.Equal("TestValue3", config["TestKey3"]);
960956
Assert.Equal("TestValueForLabel1", config["TestKeyWithMultipleLabels"]);
961957

962-
refreshAllRegisteredSetting.Value = "UpdatedValueForLabel1";
958+
_kvCollection[_kvCollection.IndexOf(refreshAllRegisteredSetting)] = TestHelpers.ChangeValue(refreshAllRegisteredSetting, "UpdatedValueForLabel1");
963959

964960
// Wait for the cache to expire
965961
Thread.Sleep(1500);

‎tests/Tests.AzureAppConfiguration/TestHelper.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,11 @@ public static ConfigurationSetting CloneSetting(ConfigurationSetting setting)
115115
return ConfigurationModelFactory.ConfigurationSetting(setting.Key, setting.Value, setting.Label, setting.ContentType, setting.ETag, setting.LastModified);
116116
}
117117

118+
public static ConfigurationSetting ChangeValue(ConfigurationSetting setting, string value)
119+
{
120+
return ConfigurationModelFactory.ConfigurationSetting(setting.Key, value, setting.Label, setting.ContentType, new ETag(Guid.NewGuid().ToString()), setting.LastModified);
121+
}
122+
118123
public static List<ConfigurationSetting> LoadJsonSettingsFromFile(string path)
119124
{
120125
List<ConfigurationSetting> _kvCollection = new List<ConfigurationSetting>();

0 commit comments

Comments
 (0)