tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

feat: add ConfigureAwait(false) to all await calls

pull/2500/head
Javier Campos 7 years ago
parent
e090f5768b
commit
4b2830d96f
15 changed files with 86 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingCacheItemInvalidator.cs
  2. 6
      modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementProvider.cs
  3. 20
      modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementStore.cs
  4. 12
      modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManager.cs
  5. 4
      modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/EfCoreSettingRepository.cs
  6. 4
      modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/MongoSettingRepository.cs
  7. 4
      modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs
  8. 2
      modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs
  9. 8
      modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingRepository_Tests.cs
  10. 12
      modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingTestDataBuilder.cs
  11. 6
      modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/DefaultValueSettingManagementProvider_Tests.cs
  12. 14
      modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingCacheItemInvalidator_Tests.cs
  13. 16
      modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManagementStore_Tests.cs
  14. 14
      modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManager_Basic_Tests.cs
  15. 48
      modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManager_User_Tests.cs

2
modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingCacheItemInvalidator.cs
View File

@ -23,7 +23,7 @@ namespace Volo.Abp.SettingManagement
eventData.Entity.ProviderKey
);
await Cache.RemoveAsync(cacheKey);
await Cache.RemoveAsync(cacheKey).ConfigureAwait(false);
}
protected virtual string CalculateCacheKey(string name, string providerName, string providerKey)

6
modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementProvider.cs
View File

@ -17,17 +17,17 @@ namespace Volo.Abp.SettingManagement
public async Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
{
return await SettingManagementStore.GetOrNullAsync(setting.Name, Name, NormalizeProviderKey(providerKey));
return await SettingManagementStore.GetOrNullAsync(setting.Name, Name, NormalizeProviderKey(providerKey)).ConfigureAwait(false);
}
public virtual async Task SetAsync(SettingDefinition setting, string value, string providerKey)
{
await SettingManagementStore.SetAsync(setting.Name, value, Name, NormalizeProviderKey(providerKey));
await SettingManagementStore.SetAsync(setting.Name, value, Name, NormalizeProviderKey(providerKey)).ConfigureAwait(false);
}
public virtual async Task ClearAsync(SettingDefinition setting, string providerKey)
{
await SettingManagementStore.DeleteAsync(setting.Name, Name, NormalizeProviderKey(providerKey));
await SettingManagementStore.DeleteAsync(setting.Name, Name, NormalizeProviderKey(providerKey)).ConfigureAwait(false);
}
protected virtual string NormalizeProviderKey(string providerKey)

20
modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementStore.cs
View File

@ -26,58 +26,58 @@ namespace Volo.Abp.SettingManagement
public async Task<string> GetOrNullAsync(string name, string providerName, string providerKey)
{
var cacheItem = await GetCacheItemAsync(name, providerName, providerKey);
var cacheItem = await GetCacheItemAsync(name, providerName, providerKey).ConfigureAwait(false);
return cacheItem.Value;
}
public async Task SetAsync(string name, string value, string providerName, string providerKey)
{
var setting = await SettingRepository.FindAsync(name, providerName, providerKey);
var setting = await SettingRepository.FindAsync(name, providerName, providerKey).ConfigureAwait(false);
if (setting == null)
{
setting = new Setting(GuidGenerator.Create(), name, value, providerName, providerKey);
await SettingRepository.InsertAsync(setting);
await SettingRepository.InsertAsync(setting).ConfigureAwait(false);
}
else
{
setting.Value = value;
await SettingRepository.UpdateAsync(setting);
await SettingRepository.UpdateAsync(setting).ConfigureAwait(false);
}
}
public async Task<List<SettingValue>> GetListAsync(string providerName, string providerKey)
{
var settings = await SettingRepository.GetListAsync(providerName, providerKey);
var settings = await SettingRepository.GetListAsync(providerName, providerKey).ConfigureAwait(false);
return settings.Select(s => new SettingValue(s.Name, s.Value)).ToList();
}
public async Task DeleteAsync(string name, string providerName, string providerKey)
{
var setting = await SettingRepository.FindAsync(name, providerName, providerKey);
var setting = await SettingRepository.FindAsync(name, providerName, providerKey).ConfigureAwait(false);
if (setting != null)
{
await SettingRepository.DeleteAsync(setting);
await SettingRepository.DeleteAsync(setting).ConfigureAwait(false);
}
}
protected virtual async Task<SettingCacheItem> GetCacheItemAsync(string name, string providerName, string providerKey)
{
var cacheKey = CalculateCacheKey(name, providerName, providerKey);
var cacheItem = await Cache.GetAsync(cacheKey);
var cacheItem = await Cache.GetAsync(cacheKey).ConfigureAwait(false);
if (cacheItem != null)
{
return cacheItem;
}
var setting = await SettingRepository.FindAsync(name, providerName, providerKey);
var setting = await SettingRepository.FindAsync(name, providerName, providerKey).ConfigureAwait(false);
cacheItem = new SettingCacheItem(setting?.Value);
await Cache.SetAsync(
cacheKey,
cacheItem
);
).ConfigureAwait(false);
return cacheItem;
}

12
modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManager.cs
View File

@ -79,7 +79,7 @@ namespace Volo.Abp.SettingManagement
var providerValue = await provider.GetOrNullAsync(
setting,
provider.Name == providerName ? providerKey : null
);
).ConfigureAwait(false);
if (providerValue != null)
{
value = providerValue;
@ -91,7 +91,7 @@ namespace Volo.Abp.SettingManagement
value = await providerList[0].GetOrNullAsync(
setting,
providerKey
);
).ConfigureAwait(false);
}
if (setting.IsEncrypted)
@ -132,7 +132,7 @@ namespace Volo.Abp.SettingManagement
if (providers.Count > 1 && !forceToSet && setting.IsInherited && value != null)
{
var fallbackValue = await GetOrNullInternalAsync(name, providers[1].Name, null);
var fallbackValue = await GetOrNullInternalAsync(name, providers[1].Name, null).ConfigureAwait(false);
if (fallbackValue == value)
{
//Clear the value if it's same as it's fallback value
@ -148,14 +148,14 @@ namespace Volo.Abp.SettingManagement
{
foreach (var provider in providers)
{
await provider.ClearAsync(setting, providerKey);
await provider.ClearAsync(setting, providerKey).ConfigureAwait(false);
}
}
else
{
foreach (var provider in providers)
{
await provider.SetAsync(setting, value, providerKey);
await provider.SetAsync(setting, value, providerKey).ConfigureAwait(false);
}
}
}
@ -182,7 +182,7 @@ namespace Volo.Abp.SettingManagement
value = await provider.GetOrNullAsync(
setting,
provider.Name == providerName ? providerKey : null
);
).ConfigureAwait(false);
if (value != null)
{

4
modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/EfCoreSettingRepository.cs
View File

@ -20,7 +20,7 @@ namespace Volo.Abp.SettingManagement.EntityFrameworkCore
return await DbSet
.FirstOrDefaultAsync(
s => s.Name == name && s.ProviderName == providerName && s.ProviderKey == providerKey
);
).ConfigureAwait(false);
}
public async Task<List<Setting>> GetListAsync(string providerName, string providerKey)
@ -28,7 +28,7 @@ namespace Volo.Abp.SettingManagement.EntityFrameworkCore
return await DbSet
.Where(
s => s.ProviderName == providerName && s.ProviderKey == providerKey
).ToListAsync();
).ToListAsync().ConfigureAwait(false);
}
}
}

4
modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/MongoSettingRepository.cs
View File

@ -18,12 +18,12 @@ namespace Volo.Abp.SettingManagement.MongoDB
public async Task<Setting> FindAsync(string name, string providerName, string providerKey)
{
return await GetMongoQueryable().FirstOrDefaultAsync(s => s.Name == name && s.ProviderName == providerName && s.ProviderKey == providerKey);
return await GetMongoQueryable().FirstOrDefaultAsync(s => s.Name == name && s.ProviderName == providerName && s.ProviderKey == providerKey).ConfigureAwait(false);
}
public async Task<List<Setting>> GetListAsync(string providerName, string providerKey)
{
return await GetMongoQueryable().Where(s => s.ProviderName == providerName && s.ProviderKey == providerKey).ToListAsync();
return await GetMongoQueryable().Where(s => s.ProviderName == providerName && s.ProviderKey == providerKey).ToListAsync().ConfigureAwait(false);
}
}
}

4
modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs
View File

@ -23,7 +23,7 @@ namespace Volo.Abp.SettingManagement.Web.Navigation
var settingPageCreationContext = new SettingPageCreationContext(context.ServiceProvider);
if (
!settingManagementPageOptions.Contributors.Any() ||
!(await CheckAnyOfPagePermissionsGranted(settingManagementPageOptions, settingPageCreationContext))
!(await CheckAnyOfPagePermissionsGranted(settingManagementPageOptions, settingPageCreationContext).ConfigureAwait(false))
)
{
return;
@ -49,7 +49,7 @@ namespace Volo.Abp.SettingManagement.Web.Navigation
{
foreach (var contributor in settingManagementPageOptions.Contributors)
{
if (await contributor.CheckPermissionsAsync(settingPageCreationContext))
if (await contributor.CheckPermissionsAsync(settingPageCreationContext).ConfigureAwait(false))
{
return true;
}

2
modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs
View File

@ -26,7 +26,7 @@ namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement
foreach (var contributor in _options.Contributors)
{
await contributor.ConfigureAsync(SettingPageCreationContext);
await contributor.ConfigureAsync(SettingPageCreationContext).ConfigureAwait(false);
}
}
}

8
modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingRepository_Tests.cs
View File

@ -26,25 +26,25 @@ namespace Volo.Abp.SettingManagement
"MySetting1",
GlobalSettingValueProvider.ProviderName,
null
)).Value.ShouldBe("42");
).ConfigureAwait(false)).Value.ShouldBe("42");
(await SettingRepository.FindAsync(
"MySetting2",
UserSettingValueProvider.ProviderName,
TestData.User1Id.ToString()
)).Value.ShouldBe("user1-store-value");
).ConfigureAwait(false)).Value.ShouldBe("user1-store-value");
(await SettingRepository.FindAsync(
"Undefined-Setting",
GlobalSettingValueProvider.ProviderName,
null
)).ShouldBeNull();
).ConfigureAwait(false)).ShouldBeNull();
}
[Fact]
public async Task GetListAsync()
{
var settings = await SettingRepository.GetListAsync(GlobalSettingValueProvider.ProviderName, null);
var settings = await SettingRepository.GetListAsync(GlobalSettingValueProvider.ProviderName, null).ConfigureAwait(false);
settings.Any().ShouldBeTrue();
settings.ShouldContain(s => s.Name == "MySetting1" && s.Value == "42");
settings.ShouldContain(s => s.Name == "MySetting2" && s.Value == "default-store-value");

12
modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingTestDataBuilder.cs
View File

@ -30,7 +30,7 @@ namespace Volo.Abp.SettingManagement
"42",
GlobalSettingValueProvider.ProviderName
)
);
).ConfigureAwait(false);
await _settingRepository.InsertAsync(
new Setting(
@ -39,7 +39,7 @@ namespace Volo.Abp.SettingManagement
"default-store-value",
GlobalSettingValueProvider.ProviderName
)
);
).ConfigureAwait(false);
await _settingRepository.InsertAsync(
new Setting(
@ -49,7 +49,7 @@ namespace Volo.Abp.SettingManagement
UserSettingValueProvider.ProviderName,
_testData.User1Id.ToString()
)
);
).ConfigureAwait(false);
await _settingRepository.InsertAsync(
new Setting(
@ -59,7 +59,7 @@ namespace Volo.Abp.SettingManagement
UserSettingValueProvider.ProviderName,
_testData.User2Id.ToString()
)
);
).ConfigureAwait(false);
await _settingRepository.InsertAsync(
new Setting(
@ -68,7 +68,7 @@ namespace Volo.Abp.SettingManagement
"default-store-value",
GlobalSettingValueProvider.ProviderName
)
);
).ConfigureAwait(false);
await _settingRepository.InsertAsync(
new Setting(
@ -78,7 +78,7 @@ namespace Volo.Abp.SettingManagement
UserSettingValueProvider.ProviderName,
_testData.User1Id.ToString()
)
);
).ConfigureAwait(false);
}
}
}

6
modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/DefaultValueSettingManagementProvider_Tests.cs
View File

@ -21,7 +21,7 @@ namespace Volo.Abp.SettingManagement
var defaultValueSettingManagementProvider = new DefaultValueSettingManagementProvider();
(await defaultValueSettingManagementProvider
.GetOrNullAsync(mySetting3, DefaultValueSettingValueProvider.ProviderName)).ShouldBe("123");
.GetOrNullAsync(mySetting3, DefaultValueSettingValueProvider.ProviderName).ConfigureAwait(false)).ShouldBe("123");
}
[Fact]
@ -30,7 +30,7 @@ namespace Volo.Abp.SettingManagement
var mySetting3 = _settingDefinitionManager.Get("MySetting3");
await Assert.ThrowsAsync<AbpException>(async () => await new DefaultValueSettingManagementProvider().SetAsync(mySetting3, "123",
DefaultValueSettingValueProvider.ProviderName));
DefaultValueSettingValueProvider.ProviderName).ConfigureAwait(false)).ConfigureAwait(false);
}
[Fact]
@ -40,7 +40,7 @@ namespace Volo.Abp.SettingManagement
await Assert.ThrowsAsync<AbpException>(async () =>
await new DefaultValueSettingManagementProvider().ClearAsync(mySetting3,
DefaultValueSettingValueProvider.ProviderName));
DefaultValueSettingValueProvider.ProviderName).ConfigureAwait(false)).ConfigureAwait(false);
}
}
}

14
modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingCacheItemInvalidator_Tests.cs
View File

@ -29,9 +29,9 @@ namespace Volo.Abp.SettingManagement
public async Task GetOrNullAsync_Should_Cached()
{
// Act
(await _cache.GetAsync(SettingCacheItem.CalculateCacheKey("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString()))).ShouldBeNull();
await _settingManagementStore.GetOrNullAsync("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString());
(await _cache.GetAsync(SettingCacheItem.CalculateCacheKey("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString()))).ShouldNotBeNull();
(await _cache.GetAsync(SettingCacheItem.CalculateCacheKey("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString())).ConfigureAwait(false)).ShouldBeNull();
await _settingManagementStore.GetOrNullAsync("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString()).ConfigureAwait(false);
(await _cache.GetAsync(SettingCacheItem.CalculateCacheKey("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString())).ConfigureAwait(false)).ShouldNotBeNull();
}
[Fact]
@ -39,15 +39,15 @@ namespace Volo.Abp.SettingManagement
{
// Arrange
// GetOrNullAsync will cache language.
await _settingManagementStore.GetOrNullAsync("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString());
await _settingManagementStore.GetOrNullAsync("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString()).ConfigureAwait(false);
// Act
var lang = await _settingRepository.FindAsync("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString());
await _settingRepository.DeleteAsync(lang);
var lang = await _settingRepository.FindAsync("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString()).ConfigureAwait(false);
await _settingRepository.DeleteAsync(lang).ConfigureAwait(false);
// Assert
(await _cache.GetAsync(
SettingCacheItem.CalculateCacheKey("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString()))).ShouldBeNull();
SettingCacheItem.CalculateCacheKey("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString())).ConfigureAwait(false)).ShouldBeNull();
}
}
}

16
modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManagementStore_Tests.cs
View File

@ -25,7 +25,7 @@ namespace Volo.Abp.SettingManagement
public async Task GetOrNull_NotExist_Should_Be_Null()
{
var value = await _settingManagementStore.GetOrNullAsync("notExistName", "notExistProviderName",
"notExistProviderKey");
"notExistProviderKey").ConfigureAwait(false);
value.ShouldBeNull();
}
@ -33,7 +33,7 @@ namespace Volo.Abp.SettingManagement
[Fact]
public async Task GetOrNullAsync()
{
var value = await _settingManagementStore.GetOrNullAsync("MySetting1", GlobalSettingValueProvider.ProviderName, null);
var value = await _settingManagementStore.GetOrNullAsync("MySetting1", GlobalSettingValueProvider.ProviderName, null).ConfigureAwait(false);
value.ShouldNotBeNull();
value.ShouldBe("42");
@ -42,22 +42,22 @@ namespace Volo.Abp.SettingManagement
[Fact]
public async Task SetAsync()
{
var setting = await _settingRepository.FindAsync(_testData.SettingId);
var setting = await _settingRepository.FindAsync(_testData.SettingId).ConfigureAwait(false);
setting.Value.ShouldBe("42");
await _settingManagementStore.SetAsync("MySetting1", "43", GlobalSettingValueProvider.ProviderName, null);
await _settingManagementStore.SetAsync("MySetting1", "43", GlobalSettingValueProvider.ProviderName, null).ConfigureAwait(false);
(await _settingRepository.FindAsync(_testData.SettingId)).Value.ShouldBe("43");
(await _settingRepository.FindAsync(_testData.SettingId).ConfigureAwait(false)).Value.ShouldBe("43");
}
[Fact]
public async Task DeleteAsync()
{
(await _settingRepository.FindAsync(_testData.SettingId)).ShouldNotBeNull();
(await _settingRepository.FindAsync(_testData.SettingId).ConfigureAwait(false)).ShouldNotBeNull();
await _settingManagementStore.DeleteAsync("MySetting1", GlobalSettingValueProvider.ProviderName, null);
await _settingManagementStore.DeleteAsync("MySetting1", GlobalSettingValueProvider.ProviderName, null).ConfigureAwait(false);
(await _settingRepository.FindAsync(_testData.SettingId)).ShouldBeNull();
(await _settingRepository.FindAsync(_testData.SettingId).ConfigureAwait(false)).ShouldBeNull();
}
}

14
modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManager_Basic_Tests.cs
View File

@ -21,26 +21,26 @@ namespace Volo.Abp.SettingManagement
{
await Assert.ThrowsAsync<AbpException>(
async () => await _settingProvider.GetOrNullAsync("UndefinedSetting")
);
.ConfigureAwait(false)).ConfigureAwait(false);
}
[Fact]
public async Task Should_Get_Default_Value_If_Not_Set_In_Store()
{
var value = await _settingProvider.GetOrNullAsync("SettingNotSetInStore");
var value = await _settingProvider.GetOrNullAsync("SettingNotSetInStore").ConfigureAwait(false);
value.ShouldBe("default-value");
}
[Fact]
public async Task Should_Get_Base_Store_Value()
{
(await _settingProvider.GetOrNullAsync("MySetting1")).ShouldBe("42");
(await _settingProvider.GetOrNullAsync("MySetting1").ConfigureAwait(false)).ShouldBe("42");
}
[Fact]
public async Task Should_Get_All_Base_Store_Values()
{
var settingValues = await _settingProvider.GetAllAsync();
var settingValues = await _settingProvider.GetAllAsync().ConfigureAwait(false);
settingValues.ShouldContain(sv => sv.Name == "MySetting1" && sv.Value == "42");
settingValues.ShouldContain(sv => sv.Name == "MySetting2" && sv.Value == "default-store-value");
settingValues.ShouldContain(sv => sv.Name == "SettingNotSetInStore" && sv.Value == "default-value");
@ -49,10 +49,10 @@ namespace Volo.Abp.SettingManagement
[Fact]
public async Task Should_Set_Global_Value()
{
await _settingManager.SetGlobalAsync("MySetting1", "43");
await _settingManager.SetGlobalAsync("MySetting1", "43").ConfigureAwait(false);
(await _settingManager.GetOrNullGlobalAsync("MySetting1")).ShouldBe("43");
(await _settingProvider.GetOrNullAsync("MySetting1")).ShouldBe("43");
(await _settingManager.GetOrNullGlobalAsync("MySetting1").ConfigureAwait(false)).ShouldBe("43");
(await _settingProvider.GetOrNullAsync("MySetting1").ConfigureAwait(false)).ShouldBe("43");
}
}
}

48
modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManager_User_Tests.cs
View File

@ -35,67 +35,67 @@ namespace Volo.Abp.SettingManagement
[Fact]
public async Task Should_Get_From_Store_For_Given_User()
{
(await _settingManager.GetOrNullForUserAsync("MySetting2", _testData.User1Id)).ShouldBe("user1-store-value");
(await _settingManager.GetOrNullForUserAsync("MySetting2", _testData.User2Id)).ShouldBe("user2-store-value");
(await _settingManager.GetOrNullForUserAsync("MySetting2", _testData.User1Id).ConfigureAwait(false)).ShouldBe("user1-store-value");
(await _settingManager.GetOrNullForUserAsync("MySetting2", _testData.User2Id).ConfigureAwait(false)).ShouldBe("user2-store-value");
}
[Fact]
public async Task Should_Fallback_To_Default_Store_Value_When_No_Value_For_Given_User()
{
(await _settingManager.GetOrNullForUserAsync("MySetting2", Guid.NewGuid())).ShouldBe("default-store-value");
(await _settingManager.GetOrNullForUserAsync("MySetting2", Guid.NewGuid()).ConfigureAwait(false)).ShouldBe("default-store-value");
}
[Fact]
public async Task Should_Not_Fallback_To_Default_Store_Value_When_No_Value_For_Given_User_But_Specified_Fallback_As_False()
{
(await _settingManager.GetOrNullForUserAsync("MySetting2", Guid.NewGuid(), fallback: false)).ShouldBeNull();
(await _settingManager.GetOrNullForUserAsync("MySetting2", Guid.NewGuid(), fallback: false).ConfigureAwait(false)).ShouldBeNull();
}
[Fact]
public async Task Should_Get_From_Store_For_Current_User()
{
_currentUserId = _testData.User1Id;
(await _settingProvider.GetOrNullAsync("MySetting2")).ShouldBe("user1-store-value");
(await _settingProvider.GetOrNullAsync("MySetting2").ConfigureAwait(false)).ShouldBe("user1-store-value");
_currentUserId = _testData.User2Id;
(await _settingProvider.GetOrNullAsync("MySetting2")).ShouldBe("user2-store-value");
(await _settingProvider.GetOrNullAsync("MySetting2").ConfigureAwait(false)).ShouldBe("user2-store-value");
}
[Fact]
public async Task Should_Fallback_To_Default_Store_Value_When_No_Value_For_Current_User()
{
_currentUserId = Guid.NewGuid();
(await _settingProvider.GetOrNullAsync("MySetting2")).ShouldBe("default-store-value");
(await _settingProvider.GetOrNullAsync("MySetting2").ConfigureAwait(false)).ShouldBe("default-store-value");
}
[Fact]
public async Task Should_Get_From_Store_For_Current_User_With_GetOrNullForCurrentUserAsync()
{
_currentUserId = _testData.User1Id;
(await _settingManager.GetOrNullForCurrentUserAsync("MySetting2")).ShouldBe("user1-store-value");
(await _settingManager.GetOrNullForCurrentUserAsync("MySetting2").ConfigureAwait(false)).ShouldBe("user1-store-value");
_currentUserId = _testData.User2Id;
(await _settingManager.GetOrNullForCurrentUserAsync("MySetting2")).ShouldBe("user2-store-value");
(await _settingManager.GetOrNullForCurrentUserAsync("MySetting2").ConfigureAwait(false)).ShouldBe("user2-store-value");
}
[Fact]
public async Task Should_Fallback_To_Default_Store_Value_When_No_Value_For_Current_User_With_GetOrNullForCurrentUserAsync()
{
_currentUserId = Guid.NewGuid();
(await _settingProvider.GetOrNullAsync("MySetting2")).ShouldBe("default-store-value");
(await _settingProvider.GetOrNullAsync("MySetting2").ConfigureAwait(false)).ShouldBe("default-store-value");
}
[Fact]
public async Task Should_Not_Fallback_To_Default_Store_Value_When_No_Value_For_Current_User_But_Specified_Fallback_As_False()
{
_currentUserId = Guid.NewGuid();
(await _settingManager.GetOrNullForCurrentUserAsync("MySetting2", fallback: false)).ShouldBeNull();
(await _settingManager.GetOrNullForCurrentUserAsync("MySetting2", fallback: false).ConfigureAwait(false)).ShouldBeNull();
}
[Fact]
public async Task Should_Get_All_From_Store_For_Given_User()
{
var settingValues = await _settingManager.GetAllForUserAsync(_testData.User1Id);
var settingValues = await _settingManager.GetAllForUserAsync(_testData.User1Id).ConfigureAwait(false);
settingValues.ShouldContain(sv => sv.Name == "MySetting1" && sv.Value == "42");
settingValues.ShouldContain(sv => sv.Name == "MySetting2" && sv.Value == "user1-store-value");
settingValues.ShouldContain(sv => sv.Name == "SettingNotSetInStore" && sv.Value == "default-value");
@ -104,7 +104,7 @@ namespace Volo.Abp.SettingManagement
[Fact]
public async Task Should_Get_All_From_Store_For_Given_User_Without_Fallback()
{
var settingValues = await _settingManager.GetAllForUserAsync(_testData.User1Id, fallback: false);
var settingValues = await _settingManager.GetAllForUserAsync(_testData.User1Id, fallback: false).ConfigureAwait(false);
settingValues.ShouldContain(sv => sv.Name == "MySetting2" && sv.Value == "user1-store-value");
settingValues.ShouldContain(sv => sv.Name == "MySettingWithoutInherit" && sv.Value == "user1-store-value");
settingValues.ShouldNotContain(sv => sv.Name == "MySetting1");
@ -113,7 +113,7 @@ namespace Volo.Abp.SettingManagement
[Fact]
public async Task Should_Delete_Setting_Record_When_Set_To_Null()
{
await _settingManager.SetForUserAsync(_testData.User1Id, "MySetting2", null);
await _settingManager.SetForUserAsync(_testData.User1Id, "MySetting2", null).ConfigureAwait(false);
GetSettingsFromDbContext(
UserSettingValueProvider.ProviderName,
@ -125,12 +125,12 @@ namespace Volo.Abp.SettingManagement
[Fact]
public async Task Should_Change_User_Setting()
{
(await _settingManager.GetOrNullForUserAsync("MySetting2", _testData.User1Id))
(await _settingManager.GetOrNullForUserAsync("MySetting2", _testData.User1Id).ConfigureAwait(false))
.ShouldBe("user1-store-value");
await _settingManager.SetForUserAsync(_testData.User1Id, "MySetting2", "user1-new-store-value");
await _settingManager.SetForUserAsync(_testData.User1Id, "MySetting2", "user1-new-store-value").ConfigureAwait(false);
(await _settingManager.GetOrNullForUserAsync("MySetting2", _testData.User1Id))
(await _settingManager.GetOrNullForUserAsync("MySetting2", _testData.User1Id).ConfigureAwait(false))
.ShouldBe("user1-new-store-value");
GetSettingsFromDbContext(
@ -147,7 +147,7 @@ namespace Volo.Abp.SettingManagement
_testData.User1Id,
"MySetting2",
"default-store-value"
);
).ConfigureAwait(false);
GetSettingsFromDbContext(
UserSettingValueProvider.ProviderName,
@ -155,7 +155,7 @@ namespace Volo.Abp.SettingManagement
"MySetting2"
).Count.ShouldBe(0);
(await _settingManager.GetOrNullForUserAsync("MySetting2", _testData.User1Id))
(await _settingManager.GetOrNullForUserAsync("MySetting2", _testData.User1Id).ConfigureAwait(false))
.ShouldBe("default-store-value");
}
@ -167,7 +167,7 @@ namespace Volo.Abp.SettingManagement
"MySetting2",
"default-store-value",
forceToSet: true
);
).ConfigureAwait(false);
GetSettingsFromDbContext(
UserSettingValueProvider.ProviderName,
@ -175,16 +175,16 @@ namespace Volo.Abp.SettingManagement
"MySetting2"
).Single().Value.ShouldBe("default-store-value");
(await _settingManager.GetOrNullForUserAsync("MySetting2", _testData.User1Id))
(await _settingManager.GetOrNullForUserAsync("MySetting2", _testData.User1Id).ConfigureAwait(false))
.ShouldBe("default-store-value");
}
[Fact]
public async Task Should_Get_For_Given_User_For_Non_Inherited_Setting()
{
(await _settingManager.GetOrNullForUserAsync("MySettingWithoutInherit", _testData.User1Id)).ShouldBe("user1-store-value");
(await _settingManager.GetOrNullForUserAsync("MySettingWithoutInherit", _testData.User2Id)).ShouldBeNull(); //Does not inherit!
(await _settingManager.GetOrNullGlobalAsync("MySettingWithoutInherit")).ShouldBe("default-store-value");
(await _settingManager.GetOrNullForUserAsync("MySettingWithoutInherit", _testData.User1Id).ConfigureAwait(false)).ShouldBe("user1-store-value");
(await _settingManager.GetOrNullForUserAsync("MySettingWithoutInherit", _testData.User2Id).ConfigureAwait(false)).ShouldBeNull(); //Does not inherit!
(await _settingManager.GetOrNullGlobalAsync("MySettingWithoutInherit").ConfigureAwait(false)).ShouldBe("default-store-value");
}
}
}
Write Preview
Loading…
Cancel
Save