From 12fa0d810f383c7cf364f14b1f5948a7c390be2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Tue, 30 Mar 2021 16:18:17 +0300 Subject: [PATCH] Remove sync usage of IMultiLingualObjectManager --- .../IMultiLingualObjectManager.cs | 7 - .../MultiLingualObjectManager.cs | 11 -- .../MultiLingualObjectManager_Tests.cs | 11 -- .../MultiLingualObject_Tests.cs | 132 ------------------ 4 files changed, 161 deletions(-) delete mode 100644 framework/test/Volo.Abp.MultiLingualObject.Tests/Volo/Abp/MultiLingualObject/MultiLingualObject_Tests.cs diff --git a/framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/IMultiLingualObjectManager.cs b/framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/IMultiLingualObjectManager.cs index 48128648a0..7cd860f9ef 100644 --- a/framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/IMultiLingualObjectManager.cs +++ b/framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/IMultiLingualObjectManager.cs @@ -4,13 +4,6 @@ namespace Volo.Abp.MultiLingualObject { public interface IMultiLingualObjectManager { - TTranslation GetTranslation( - TMultiLingual multiLingual, - string culture = null, - bool fallbackToParentCultures = true) - where TMultiLingual : IHasMultiLingual - where TTranslation : class, IMultiLingualTranslation; - Task GetTranslationAsync( TMultiLingual multiLingual, string culture = null, diff --git a/framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/MultiLingualObjectManager.cs b/framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/MultiLingualObjectManager.cs index ed41778fd5..f8e653120a 100644 --- a/framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/MultiLingualObjectManager.cs +++ b/framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/MultiLingualObjectManager.cs @@ -21,17 +21,6 @@ namespace Volo.Abp.MultiLingualObject SettingProvider = settingProvider; } - public TTranslation GetTranslation( - TMultiLingual multiLingual, - string culture = null, - bool fallbackToParentCultures = true) - where TMultiLingual : IHasMultiLingual - where TTranslation : class, IMultiLingualTranslation - { - return AsyncHelper.RunSync(() => - GetTranslationAsync(multiLingual, culture, fallbackToParentCultures)); - } - public virtual async Task GetTranslationAsync( TMultiLingual multiLingual, string culture = null, diff --git a/framework/test/Volo.Abp.MultiLingualObject.Tests/Volo/Abp/MultiLingualObject/MultiLingualObjectManager_Tests.cs b/framework/test/Volo.Abp.MultiLingualObject.Tests/Volo/Abp/MultiLingualObject/MultiLingualObjectManager_Tests.cs index 269bf91b54..d23d3153b1 100644 --- a/framework/test/Volo.Abp.MultiLingualObject.Tests/Volo/Abp/MultiLingualObject/MultiLingualObjectManager_Tests.cs +++ b/framework/test/Volo.Abp.MultiLingualObject.Tests/Volo/Abp/MultiLingualObject/MultiLingualObjectManager_Tests.cs @@ -40,17 +40,6 @@ namespace Volo.Abp.MultiLingualObject _book.Translations.Add(zh); } - [Fact] - public void GetTranslation() - { - using (CultureHelper.Use("en-us")) - { - var translation = _multiLingualObjectManager.GetTranslation(_book); - - translation.Name.ShouldBe("C# in Depth"); - } - } - [Fact] public async Task GetTranslationAsync() { diff --git a/framework/test/Volo.Abp.MultiLingualObject.Tests/Volo/Abp/MultiLingualObject/MultiLingualObject_Tests.cs b/framework/test/Volo.Abp.MultiLingualObject.Tests/Volo/Abp/MultiLingualObject/MultiLingualObject_Tests.cs deleted file mode 100644 index 917a11a2a8..0000000000 --- a/framework/test/Volo.Abp.MultiLingualObject.Tests/Volo/Abp/MultiLingualObject/MultiLingualObject_Tests.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System; -using System.Collections.Generic; -using Microsoft.Extensions.DependencyInjection; -using Shouldly; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Localization; -using Volo.Abp.MultiLingualObject.TestObjects; -using Volo.Abp.ObjectMapping; -using Volo.Abp.Testing; -using Xunit; - -namespace Volo.Abp.MultiLingualObject -{ - public class MultiLingualObject_Tests : AbpIntegratedTest - { - private readonly IObjectMapper _objectMapper; - private readonly MultiLingualBook _book; - - public MultiLingualObject_Tests() - { - _objectMapper = ServiceProvider.GetRequiredService(); - - var id = Guid.NewGuid(); - _book = new MultiLingualBook(id, 100) - { - Translations = new List() - }; - - var en = new MultiLingualBookTranslation - { - Language = "en", - Name = "C# in Depth", - }; - var zh = new MultiLingualBookTranslation - { - Language = "zh-Hans", - Name = "深入理解C#", - }; - - _book.Translations.Add(en); - _book.Translations.Add(zh); - } - - protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options) - { - options.UseAutofac(); - } - - [Fact] - public void Should_Map_Current_UI_Culture() - { - using (CultureHelper.Use("zh-Hans")) - { - var bookDto = _objectMapper.Map(_book); - - bookDto.Name.ShouldBe("深入理解C#"); - bookDto.Price.ShouldBe(_book.Price); - bookDto.Id.ShouldBe(_book.Id); - } - } - - [Fact] - public void Should_Map_Fallback_UI_Culture() - { - using (CultureHelper.Use("en-us")) - { - var bookDto = _objectMapper.Map(_book); - - bookDto.Name.ShouldBe("C# in Depth"); - bookDto.Price.ShouldBe(_book.Price); - bookDto.Id.ShouldBe(_book.Id); - } - } - - [Fact] - public void Should_Map_Default_Language() - { - using (CultureHelper.Use("tr")) - { - var bookDto = _objectMapper.Map(_book); - - bookDto.Name.ShouldBe("C# in Depth"); - bookDto.Price.ShouldBe(_book.Price); - bookDto.Id.ShouldBe(_book.Id); - } - } - - [Fact] - public void NoTranslations_ShouldStillMapObject() - { - _book.Translations.Clear(); - - using (CultureHelper.Use("tr")) - { - var bookDto = _objectMapper.Map(_book); - - bookDto.Name.ShouldBeNull(); - bookDto.Price.ShouldBe(_book.Price); - bookDto.Id.ShouldBe(_book.Id); - } - } - } - - public class MultiLingualBookObjectMapper : IObjectMapper, - ITransientDependency - { - private readonly IMultiLingualObjectManager _multiLingualObjectManager; - - public MultiLingualBookObjectMapper(IMultiLingualObjectManager multiLingualObjectManager) - { - _multiLingualObjectManager = multiLingualObjectManager; - } - - public MultiLingualBookDto Map(MultiLingualBook source) - { - var translation = - _multiLingualObjectManager.GetTranslation(source); - - return new MultiLingualBookDto - { - Price = source.Price, - Id = source.Id, - Name = translation?.Name - }; - } - - public MultiLingualBookDto Map(MultiLingualBook source, MultiLingualBookDto destination) - { - return default; - } - } -}