Browse Source

Cleaning

pull/24373/head
Mark Cilia Vincenti 9 months ago
parent
commit
9db10bbd57
  1. 3
      framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/ObjectExtending/MvcUiObjectExtensionPropertyInfoExtensions.cs
  2. 6
      framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs
  3. 32
      framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/PostConfigureAbpRabbitMqEventBusOptions.cs
  4. 3
      framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/ProxyScriptingJsFuncHelper.cs
  5. 166
      framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager_Tests.cs

3
framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/ObjectExtending/MvcUiObjectExtensionPropertyInfoExtensions.cs

@ -9,7 +9,8 @@ namespace Volo.Abp.ObjectExtending;
public static class MvcUiObjectExtensionPropertyInfoExtensions public static class MvcUiObjectExtensionPropertyInfoExtensions
{ {
private static readonly FrozenSet<Type> NumberTypes = new HashSet<Type> { private static readonly FrozenSet<Type> NumberTypes = new HashSet<Type>
{
typeof(int), typeof(int),
typeof(long), typeof(long),
typeof(byte), typeof(byte),

6
framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs

@ -12,7 +12,8 @@ namespace Volo.Abp.BlazoriseUI;
public static class BlazoriseUiObjectExtensionPropertyInfoExtensions public static class BlazoriseUiObjectExtensionPropertyInfoExtensions
{ {
private static readonly FrozenSet<Type> NumberTypes = new HashSet<Type> { private static readonly FrozenSet<Type> NumberTypes = new HashSet<Type>
{
typeof(int), typeof(int),
typeof(long), typeof(long),
typeof(byte), typeof(byte),
@ -39,7 +40,8 @@ public static class BlazoriseUiObjectExtensionPropertyInfoExtensions
typeof(decimal?) typeof(decimal?)
}.ToFrozenSet(); }.ToFrozenSet();
private static readonly FrozenSet<Type> TextEditSupportedAttributeTypes = new HashSet<Type> { private static readonly FrozenSet<Type> TextEditSupportedAttributeTypes = new HashSet<Type>
{
typeof(EmailAddressAttribute), typeof(EmailAddressAttribute),
typeof(UrlAttribute), typeof(UrlAttribute),
typeof(PhoneAttribute) typeof(PhoneAttribute)

32
framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/PostConfigureAbpRabbitMqEventBusOptions.cs

@ -6,23 +6,23 @@ namespace Volo.Abp.EventBus.RabbitMq;
public class PostConfigureAbpRabbitMqEventBusOptions : IPostConfigureOptions<AbpRabbitMqEventBusOptions> public class PostConfigureAbpRabbitMqEventBusOptions : IPostConfigureOptions<AbpRabbitMqEventBusOptions>
{ {
private readonly FrozenSet<string> _uint64QueueArguments = new HashSet<string>() private readonly FrozenSet<string> _uint64QueueArguments = new HashSet<string>
{ {
"x-delivery-limit", "x-delivery-limit",
"x-expires", "x-expires",
"x-message-ttl", "x-message-ttl",
"x-max-length", "x-max-length",
"x-max-length-bytes", "x-max-length-bytes",
"x-quorum-initial-group-size", "x-quorum-initial-group-size",
"x-quorum-target-group-size", "x-quorum-target-group-size",
"x-stream-filter-size-bytes", "x-stream-filter-size-bytes",
"x-stream-max-segment-size-bytes", "x-stream-max-segment-size-bytes",
}.ToFrozenSet(); }.ToFrozenSet();
private readonly FrozenSet<string> _boolQueueArguments = new HashSet<string>() private readonly FrozenSet<string> _boolQueueArguments = new HashSet<string>
{ {
"x-single-active-consumer" "x-single-active-consumer"
}.ToFrozenSet(); }.ToFrozenSet();
public virtual void PostConfigure(string? name, AbpRabbitMqEventBusOptions options) public virtual void PostConfigure(string? name, AbpRabbitMqEventBusOptions options)
{ {

3
framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/ProxyScriptingJsFuncHelper.cs

@ -11,7 +11,8 @@ internal static class ProxyScriptingJsFuncHelper
{ {
private const string ValidJsVariableNameChars = "abcdefghijklmnopqrstuxwvyzABCDEFGHIJKLMNOPQRSTUXWVYZ0123456789_"; private const string ValidJsVariableNameChars = "abcdefghijklmnopqrstuxwvyzABCDEFGHIJKLMNOPQRSTUXWVYZ0123456789_";
private static readonly FrozenSet<string> ReservedWords = new HashSet<string> { private static readonly FrozenSet<string> ReservedWords = new HashSet<string>
{
"abstract", "abstract",
"else", "else",
"instanceof", "instanceof",

166
framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager_Tests.cs

@ -1,38 +1,38 @@
using System; using System;
using System.Collections.Frozen; using System.Collections.Frozen;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Shouldly; using Shouldly;
using Volo.Abp.AutoMapper; using Volo.Abp.AutoMapper;
using Volo.Abp.Localization; using Volo.Abp.Localization;
using Volo.Abp.MultiLingualObjects.TestObjects; using Volo.Abp.MultiLingualObjects.TestObjects;
using Volo.Abp.Testing; using Volo.Abp.Testing;
using Xunit; using Xunit;
namespace Volo.Abp.MultiLingualObjects; namespace Volo.Abp.MultiLingualObjects;
public class MultiLingualObjectManager_Tests : AbpIntegratedTest<AbpMultiLingualObjectsTestModule> public class MultiLingualObjectManager_Tests : AbpIntegratedTest<AbpMultiLingualObjectsTestModule>
{ {
private readonly IMultiLingualObjectManager _multiLingualObjectManager; private readonly IMultiLingualObjectManager _multiLingualObjectManager;
private readonly MultiLingualBook _book; private readonly MultiLingualBook _book;
private readonly List<MultiLingualBook> _books; private readonly List<MultiLingualBook> _books;
private readonly IMapperAccessor _mapperAccessor; private readonly IMapperAccessor _mapperAccessor;
private readonly FrozenDictionary<string, string> _testTranslations = new Dictionary<string, string>() private readonly FrozenDictionary<string, string> _testTranslations = new Dictionary<string, string>
{ {
["ar"] = "C# التعمق في", ["ar"] = "C# التعمق في",
["zh-Hans"] = "深入理解C#", ["zh-Hans"] = "深入理解C#",
["en"] = "C# in Depth" ["en"] = "C# in Depth"
}.ToFrozenDictionary(); }.ToFrozenDictionary();
public MultiLingualObjectManager_Tests() public MultiLingualObjectManager_Tests()
{ {
_multiLingualObjectManager = ServiceProvider.GetRequiredService<IMultiLingualObjectManager>(); _multiLingualObjectManager = ServiceProvider.GetRequiredService<IMultiLingualObjectManager>();
//Single Lookup //Single Lookup
_book = GetTestBook("en", "zh-Hans"); _book = GetTestBook("en", "zh-Hans");
//Bulk lookup //Bulk lookup
_books = new List<MultiLingualBook> _books = new List<MultiLingualBook>
{ {
//has no translations //has no translations
@ -46,14 +46,14 @@ public class MultiLingualObjectManager_Tests : AbpIntegratedTest<AbpMultiLingual
//arabic + english + chineese //arabic + english + chineese
GetTestBook("en", "ar", "zh-Hans") GetTestBook("en", "ar", "zh-Hans")
}; };
_mapperAccessor = ServiceProvider.GetRequiredService<IMapperAccessor>(); _mapperAccessor = ServiceProvider.GetRequiredService<IMapperAccessor>();
} }
MultiLingualBook GetTestBook(params string[] included) MultiLingualBook GetTestBook(params string[] included)
{ {
var id = Guid.NewGuid(); var id = Guid.NewGuid();
//Single book //Single book
var res = new MultiLingualBook(id, 100); var res = new MultiLingualBook(id, 100);
foreach (var language in included) foreach (var language in included)
{ {
res.Translations.Add(new MultiLingualBookTranslation res.Translations.Add(new MultiLingualBookTranslation
@ -66,45 +66,45 @@ public class MultiLingualObjectManager_Tests : AbpIntegratedTest<AbpMultiLingual
return res; return res;
} }
[Fact] [Fact]
public async Task GetTranslationAsync() public async Task GetTranslationAsync()
{ {
using (CultureHelper.Use("en-us")) using (CultureHelper.Use("en-us"))
{ {
var translation = await _multiLingualObjectManager.GetTranslationAsync<MultiLingualBook, MultiLingualBookTranslation>(_book); var translation = await _multiLingualObjectManager.GetTranslationAsync<MultiLingualBook, MultiLingualBookTranslation>(_book);
translation.ShouldNotBeNull(); translation.ShouldNotBeNull();
translation.Name.ShouldBe(_testTranslations["en"]); translation.Name.ShouldBe(_testTranslations["en"]);
} }
} }
[Fact] [Fact]
public async Task GetTranslationFromListAsync() public async Task GetTranslationFromListAsync()
{ {
using (CultureHelper.Use("en-us")) using (CultureHelper.Use("en-us"))
{ {
var translation = await _multiLingualObjectManager.GetTranslationAsync(_book.Translations); var translation = await _multiLingualObjectManager.GetTranslationAsync(_book.Translations);
translation.ShouldNotBeNull(); translation.ShouldNotBeNull();
translation.Name.ShouldBe(_testTranslations["en"]); translation.Name.ShouldBe(_testTranslations["en"]);
} }
} }
[Fact] [Fact]
public async Task Should_Get_Specified_Language() public async Task Should_Get_Specified_Language()
{ {
using (CultureHelper.Use("zh-Hans")) using (CultureHelper.Use("zh-Hans"))
{ {
var translation = await _multiLingualObjectManager.GetTranslationAsync<MultiLingualBook, MultiLingualBookTranslation>(_book, culture: "en"); var translation = await _multiLingualObjectManager.GetTranslationAsync<MultiLingualBook, MultiLingualBookTranslation>(_book, culture: "en");
translation.ShouldNotBeNull(); translation.ShouldNotBeNull();
translation.Name.ShouldBe(_testTranslations["en"]); translation.Name.ShouldBe(_testTranslations["en"]);
} }
} }
[Fact] [Fact]
public async Task GetBulkTranslationsAsync() public async Task GetBulkTranslationsAsync()
{ {
using (CultureHelper.Use("en-us")) using (CultureHelper.Use("en-us"))
{ {
var translations = await _multiLingualObjectManager.GetBulkTranslationsAsync<MultiLingualBook, MultiLingualBookTranslation>(_books); var translations = await _multiLingualObjectManager.GetBulkTranslationsAsync<MultiLingualBook, MultiLingualBookTranslation>(_books);
foreach (var (entity, translation) in translations) foreach (var (entity, translation) in translations)
{ {
@ -118,26 +118,26 @@ public class MultiLingualObjectManager_Tests : AbpIntegratedTest<AbpMultiLingual
translation.ShouldBeNull(); translation.ShouldBeNull();
} }
} }
} }
} }
[Fact] [Fact]
public async Task GetBulkTranslationsFromListAsync() public async Task GetBulkTranslationsFromListAsync()
{ {
using (CultureHelper.Use("en-us")) using (CultureHelper.Use("en-us"))
{ {
var translations = await _multiLingualObjectManager.GetBulkTranslationsAsync(_books.Select(x => x.Translations)); var translations = await _multiLingualObjectManager.GetBulkTranslationsAsync(_books.Select(x => x.Translations));
foreach (var translation in translations) foreach (var translation in translations)
{ {
translation?.Name.ShouldBe(_testTranslations["en"]); translation?.Name.ShouldBe(_testTranslations["en"]);
} }
} }
} }
[Fact] [Fact]
public async Task TestBulkMapping() public async Task TestBulkMapping()
{ {
using (CultureHelper.Use("en-us")) using (CultureHelper.Use("en-us"))
{ {
var translations = await _multiLingualObjectManager.GetBulkTranslationsAsync<MultiLingualBook, MultiLingualBookTranslation>(_books); var translations = await _multiLingualObjectManager.GetBulkTranslationsAsync<MultiLingualBook, MultiLingualBookTranslation>(_books);
var translationsDict = translations.ToDictionary(x => x.entity.Id, x => x.translation); var translationsDict = translations.ToDictionary(x => x.entity.Id, x => x.translation);
@ -153,5 +153,5 @@ public class MultiLingualObjectManager_Tests : AbpIntegratedTest<AbpMultiLingual
Assert.Equal(og.Translations.FirstOrDefault(x => x.Language == "en")?.Name, m.Name); Assert.Equal(og.Translations.FirstOrDefault(x => x.Language == "en")?.Name, m.Name);
} }
} }
} }
} }

Loading…
Cancel
Save