diff --git a/aspnet-core/tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests/LINGYUN/Abp/Notifications/WeChat/MiniProgram/AbpNotificationsWeChatMiniProgramTestsModule.cs b/aspnet-core/tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests/LINGYUN/Abp/Notifications/WeChat/MiniProgram/AbpNotificationsWeChatMiniProgramTestsModule.cs index 2ab637ec4..292394526 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests/LINGYUN/Abp/Notifications/WeChat/MiniProgram/AbpNotificationsWeChatMiniProgramTestsModule.cs +++ b/aspnet-core/tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests/LINGYUN/Abp/Notifications/WeChat/MiniProgram/AbpNotificationsWeChatMiniProgramTestsModule.cs @@ -13,13 +13,12 @@ namespace LINGYUN.Abp.Notifications.WeChat.MiniProgram { PreConfigure(options => { - options.DefaultMsgPrefix = "[wmp-override]"; + // options.DefaultMsgPrefix = "[wmp-override]"; }); } public override void ConfigureServices(ServiceConfigurationContext context) { - // �Զ������ݴ������� Configure(options => { }); diff --git a/aspnet-core/tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests/LINGYUN/Abp/Notifications/WeChat/WeChatMiniProgramNotificationDataMapping_Tests.cs b/aspnet-core/tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests/LINGYUN/Abp/Notifications/WeChat/WeChatMiniProgramNotificationDataMapping_Tests.cs index d34ab28c9..689d9c761 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests/LINGYUN/Abp/Notifications/WeChat/WeChatMiniProgramNotificationDataMapping_Tests.cs +++ b/aspnet-core/tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests/LINGYUN/Abp/Notifications/WeChat/WeChatMiniProgramNotificationDataMapping_Tests.cs @@ -1,77 +1,77 @@ -using Microsoft.Extensions.Options; -using Shouldly; -using System; -using Xunit; - -namespace LINGYUN.Abp.Notifications.WeChat.MiniProgram -{ - public class WeChatMiniProgramNotificationDataMapping_Tests : AbpNotificationsWeChatMiniProgramTestsBase - { - private readonly NotificationData _notificationData; - protected AbpNotificationsPublishOptions NotificationsPublishOptions { get; } - protected AbpNotificationsWeChatMiniProgramOptions NotificationWeChatMiniProgramOptions { get; } - public WeChatMiniProgramNotificationDataMapping_Tests() - { - NotificationsPublishOptions = GetRequiredService>().Value; - NotificationWeChatMiniProgramOptions = GetRequiredService>().Value; - - _notificationData = new NotificationData(); - InitNotificationData(_notificationData); - } - - private void InitNotificationData(NotificationData data) - { - data.WriteStandardData("title", "message", DateTime.Now, "formUser", "description"); - data.WriteStandardData(NotificationWeChatMiniProgramOptions.DefaultMsgPrefix, "openid", "TEST"); - data.TrySetData("otherDataKey", "otherDataValue"); - } - - - [Fact] - public void Mapping_WeChatMiniProgram_Notification_Data_Test() - { - // var mappingOpenIdItem = NotificationsPublishOptions - // .NotificationDataMappings - // .GetMapItemOrDefault(WeChatMiniProgramNotificationPublishProvider.ProviderName, NotificationsTestsNames.Test1); - - // mappingOpenIdItem.ShouldNotBeNull(); - - // var mappingOpenIdData = mappingOpenIdItem.MappingFunc(_notificationData); - // mappingOpenIdData.TryGetData("openid").ShouldNotBeNull(); - // mappingOpenIdData.TryGetData("openid").ToString().ShouldBe("TEST"); - - // // 按照预定义规则,这条数据被丢弃 - // mappingOpenIdData.TryGetData("otherDataKey").ShouldBeNull(); - } - - [Fact] - public void Mapping_Standard_Notification_Data_Test() - { - // var mappingStandardItem = NotificationsPublishOptions - // .NotificationDataMappings - // .GetMapItemOrDefault(WeChatMiniProgramNotificationPublishProvider.ProviderName, NotificationsTestsNames.Test2); - - // var mappingStandardData = mappingStandardItem.MappingFunc(_notificationData); - - // // 按照自定义规则,其他数据被丢弃 - // mappingStandardData.TryGetData("openid").ShouldBeNull(); - // mappingStandardData.TryGetData("otherDataKey").ShouldBeNull(); - // mappingStandardData.ExtraProperties.Count.ShouldBe(6); - } - - [Fact] - public void Mapping_Origin_Notification_Data_Test() - { - // var mappingOriginItem = NotificationsPublishOptions - // .NotificationDataMappings - // .GetMapItemOrDefault(WeChatMiniProgramNotificationPublishProvider.ProviderName, NotificationsTestsNames.Test3); - - // var mappingOriginData = mappingOriginItem.MappingFunc(_notificationData); - - // // 按照自定义规则,所有数据被保留 - // mappingOriginData.TryGetData(NotificationWeChatMiniProgramOptions.DefaultMsgPrefix + "openid").ShouldNotBeNull(); - // mappingOriginData.TryGetData("otherDataKey").ShouldNotBeNull(); - // mappingOriginData.ExtraProperties.Count.ShouldBe(8); - } - } -} +using Microsoft.Extensions.Options; +using Shouldly; +using System; +using Xunit; + +namespace LINGYUN.Abp.Notifications.WeChat.MiniProgram +{ + public class WeChatMiniProgramNotificationDataMapping_Tests : AbpNotificationsWeChatMiniProgramTestsBase + { + private readonly NotificationData _notificationData; + protected AbpNotificationsPublishOptions NotificationsPublishOptions { get; } + protected AbpNotificationsWeChatMiniProgramOptions NotificationWeChatMiniProgramOptions { get; } + public WeChatMiniProgramNotificationDataMapping_Tests() + { + NotificationsPublishOptions = GetRequiredService>().Value; + NotificationWeChatMiniProgramOptions = GetRequiredService>().Value; + + _notificationData = new NotificationData(); + InitNotificationData(_notificationData); + } + + private void InitNotificationData(NotificationData data) + { + data.WriteStandardData("title", "message", DateTime.Now, "formUser", "description"); + // data.WriteStandardData(NotificationWeChatMiniProgramOptions.DefaultMsgPrefix, "openid", "TEST"); + data.TrySetData("otherDataKey", "otherDataValue"); + } + + + [Fact] + public void Mapping_WeChatMiniProgram_Notification_Data_Test() + { + // var mappingOpenIdItem = NotificationsPublishOptions + // .NotificationDataMappings + // .GetMapItemOrDefault(WeChatMiniProgramNotificationPublishProvider.ProviderName, NotificationsTestsNames.Test1); + + // mappingOpenIdItem.ShouldNotBeNull(); + + // var mappingOpenIdData = mappingOpenIdItem.MappingFunc(_notificationData); + // mappingOpenIdData.TryGetData("openid").ShouldNotBeNull(); + // mappingOpenIdData.TryGetData("openid").ToString().ShouldBe("TEST"); + + // // 按照预定义规则,这条数据被丢弃 + // mappingOpenIdData.TryGetData("otherDataKey").ShouldBeNull(); + } + + [Fact] + public void Mapping_Standard_Notification_Data_Test() + { + // var mappingStandardItem = NotificationsPublishOptions + // .NotificationDataMappings + // .GetMapItemOrDefault(WeChatMiniProgramNotificationPublishProvider.ProviderName, NotificationsTestsNames.Test2); + + // var mappingStandardData = mappingStandardItem.MappingFunc(_notificationData); + + // // 按照自定义规则,其他数据被丢弃 + // mappingStandardData.TryGetData("openid").ShouldBeNull(); + // mappingStandardData.TryGetData("otherDataKey").ShouldBeNull(); + // mappingStandardData.ExtraProperties.Count.ShouldBe(6); + } + + [Fact] + public void Mapping_Origin_Notification_Data_Test() + { + // var mappingOriginItem = NotificationsPublishOptions + // .NotificationDataMappings + // .GetMapItemOrDefault(WeChatMiniProgramNotificationPublishProvider.ProviderName, NotificationsTestsNames.Test3); + + // var mappingOriginData = mappingOriginItem.MappingFunc(_notificationData); + + // // 按照自定义规则,所有数据被保留 + // mappingOriginData.TryGetData(NotificationWeChatMiniProgramOptions.DefaultMsgPrefix + "openid").ShouldNotBeNull(); + // mappingOriginData.TryGetData("otherDataKey").ShouldNotBeNull(); + // mappingOriginData.ExtraProperties.Count.ShouldBe(8); + } + } +}