test: 优化单元测试

Author: jianxuanbing

framework/src/Bing.Data/Bing/Data/Queries/Conditions/DateSegmentCondition.cs

@@ -26,13 +26,6 @@ public DateSegmentCondition(Expression<Func<TEntity, TProperty>> propertyExpress
         {
         }
 
-        /// <summary>
-        /// 最小值是否大于最大值
-        /// </summary>
-        /// <param name="min">最小值</param>
-        /// <param name="max">最大值</param>
-        protected override bool IsMinGreaterMax(DateTime? min, DateTime? max) => min > max;
-
         /// <summary>
         /// 获取最小值表达式
         /// </summary>

framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/Clauses/WhereClauseTest.cs

@@ -564,7 +564,7 @@ public void Test_WhereIfNotEmpty_7()
             Expression<Func<Sample, bool>> condition = t => t.Email.Contains("a") && t.IntValue == 1;
             AssertHelper.Throws<InvalidOperationException>(() => {
                 _clause.WhereIfNotEmpty(condition);
-            }, string.Format("仅允许添加一个条件,条件：{0}", condition));
+            }, $"仅允许添加一个条件，条件：{condition}");
         }
 
         #endregion

framework/tests/Bing.EventBus.Tests/Startup.cs

@@ -3,6 +3,7 @@
 using Microsoft.Extensions.Logging;
 using Xunit.DependencyInjection;
 using Xunit.DependencyInjection.Logging;
+
 namespace Bing.EventBus.Tests
 {
     /// <summary>

framework/tests/Bing.MailKit.Tests/MailKitEmailSenderTest.cs

@@ -59,14 +59,14 @@ public MailKitEmailSenderTest(ITestOutputHelper output) : base(output)
         [Fact]
         public void Test_SendEmail()
         {
-            var box = new EmailBox
-            {
-                Subject = "MailKit 测试发送邮件",
-                To = _to,
-                Body = "<p style='color:red'>测试一下红色字体的邮件</p>",
-                IsBodyHtml = true,
-            };
-            this._mailKitEmailSender.Send(box);
+            //var box = new EmailBox
+            //{
+            //    Subject = "MailKit 测试发送邮件",
+            //    To = _to,
+            //    Body = "<p style='color:red'>测试一下红色字体的邮件</p>",
+            //    IsBodyHtml = true,
+            //};
+            //this._mailKitEmailSender.Send(box);
         }
 
         /// <summary>

framework/tests/Bing.Tests/Applications/CrudServiceTest.Save.cs

@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using AutoMapper;
 using Bing.AutoMapper;
+using Bing.DependencyInjection;
 using Bing.Tests.Samples;
 using NSubstitute;
 using Xunit;
@@ -79,6 +80,7 @@ public CrudServiceTest()
             _unitOfWork = Substitute.For<IUnitOfWork>();
             _repository = Substitute.For<IRepositorySample>();
             _service = new CrudServiceSample(_unitOfWork, _repository);
+            _service.LazyServiceProvider = Substitute.For<ILazyServiceProvider>();
             var allAssemblyFinder = new AppDomainAllAssemblyFinder();
             var mapperProfileTypeFinder = new MapperProfileTypeFinder(allAssemblyFinder);
             var instances = mapperProfileTypeFinder

framework/tests/Bing.Tests/Applications/QueryServiceTest.cs

@@ -1,7 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using AutoMapper;
+using Bing.AutoMapper;
+using Bing.DependencyInjection;
+using Bing.ObjectMapping;
+using Bing.Reflection;
 using Bing.Tests.Samples;
 using NSubstitute;
 using Xunit;
@@ -54,8 +60,26 @@ public QueryServiceTest()
             _entity2 = new EntitySample(_id2) { Name = "B" };
             _repository = Substitute.For<IRepositorySample>();
             _service = new QueryServiceSample(_repository);
-            //var mapper = new AutoMapperMapper();
-            //MapperExtensions.SetMapper(mapper);
+            _service.LazyServiceProvider = Substitute.For<ILazyServiceProvider>();
+            var allAssemblyFinder = new AppDomainAllAssemblyFinder();
+            var mapperProfileTypeFinder = new MapperProfileTypeFinder(allAssemblyFinder);
+            var instances = mapperProfileTypeFinder
+                .FindAll()
+                .Select(type => Bing.Reflection.Reflections.CreateInstance<IObjectMapperProfile>(type))
+                .ToList();
+            var configuration = new MapperConfiguration(cfg =>
+            {
+                foreach (var instance in instances)
+                {
+
+                    Debug.WriteLine($"初始化AutoMapper配置：{instance.GetType().FullName}");
+                    instance.CreateMap();
+                    // ReSharper disable once SuspiciousTypeConversion.Global
+                    cfg.AddProfile(instance as Profile);
+                }
+            });
+            var mapper = new AutoMapperObjectMapper(configuration, instances);
+            ObjectMapperExtensions.SetMapper(mapper);
         }
 
         /// <summary>

framework/tests/Bing.Tests/Datas/Queries/Criterias/DateSegmentCriteriaTest.cs

@@ -35,59 +35,127 @@ public DateSegmentCriteriaTest(ITestOutputHelper output)
         {
             _output = output;
             _min = DateTime.Parse("2000-1-1 10:10:10");
-            _max = DateTime.Parse("2000-1-2 10:10:10");
+            _max = DateTime.Parse("2000-1-3 10:10:10");
         }
 
         /// <summary>
-        /// 测试 - 获取查询条件
+        /// 测试 - 获取查询条件 - 不包含边界
         /// </summary>
         [Fact]
-        public void Test_GetPredicate()
+        public void Test_GetCondition_Neither()
+        {
+            var result = new StringBuilder();
+            result.Append("t => ((t.DateValue >= Convert(Parse(\"2000/1/2 0:00:00\"), DateTime))");
+            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/3 0:00:00\"), DateTime)))");
+
+            var condition= new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Neither);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
+        }
+
+        /// <summary>
+        /// 测试 - 获取查询条件 - 不包含边界【可空】
+        /// </summary>
+        [Fact]
+        public void Test_GetCondition_Neither_With_Nullable()
+        {
+            var result = new StringBuilder();
+            result.Append("t => ((t.NullableDateValue >= Convert(Parse(\"2000/1/2 0:00:00\"), Nullable`1))");
+            result.Append(" AndAlso (t.NullableDateValue < Convert(Parse(\"2000/1/3 0:00:00\"), Nullable`1)))");
+
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Neither);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
+        }
+
+        /// <summary>
+        /// 测试 - 获取查询条件 - 包含左边
+        /// </summary>
+        [Fact]
+        public void Test_GetCondition_Left()
         {
             var result = new StringBuilder();
             result.Append("t => ((t.DateValue >= Convert(Parse(\"2000/1/1 0:00:00\"), DateTime))");
             result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/3 0:00:00\"), DateTime)))");
-            var criteria = new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Both);
-            _output.WriteLine(criteria.GetCondition().ToString());
-            Assert.Equal(result.ToString(), criteria.GetCondition().ToString());
 
-            result = new StringBuilder();
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Left);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
+        }
+
+        /// <summary>
+        /// 测试 - 获取查询条件 - 包含左边【可空】
+        /// </summary>
+        [Fact]
+        public void Test_GetCondition_Left_With_Nullable()
+        {
+            var result = new StringBuilder();
             result.Append("t => ((t.NullableDateValue >= Convert(Parse(\"2000/1/1 0:00:00\"), Nullable`1))");
             result.Append(" AndAlso (t.NullableDateValue < Convert(Parse(\"2000/1/3 0:00:00\"), Nullable`1)))");
-            var criteria2 = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Both);
-            _output.WriteLine(criteria2.GetCondition().ToString());
-            Assert.Equal(result.ToString(), criteria2.GetCondition().ToString());
+
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Left);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
         }
 
         /// <summary>
-        /// 测试 - 获取查询条件 - 设置边界
+        /// 测试 - 获取查询条件 - 包含右边
         /// </summary>
         [Fact]
-        public void Test_GetPredicate_Boundary()
+        public void Test_GetCondition_Right()
         {
             var result = new StringBuilder();
-            result.Append("t => ((t.DateValue > Convert(Parse(\"2000/1/1 0:00:00\"), DateTime))");
-            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/3 0:00:00\"), DateTime)))");
-            var criteria = new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Neither);
-            Assert.Equal(result.ToString(), criteria.GetCondition().ToString());
+            result.Append("t => ((t.DateValue >= Convert(Parse(\"2000/1/2 0:00:00\"), DateTime))");
+            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/4 0:00:00\"), DateTime)))");
+
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Right);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
+        }
 
-            result = new StringBuilder();
+        /// <summary>
+        /// 测试 - 获取查询条件 - 包含右边【可空】
+        /// </summary>
+        [Fact]
+        public void Test_GetCondition_Right_With_Nullable()
+        {
+            var result = new StringBuilder();
+            result.Append("t => ((t.NullableDateValue >= Convert(Parse(\"2000/1/2 0:00:00\"), Nullable`1))");
+            result.Append(" AndAlso (t.NullableDateValue < Convert(Parse(\"2000/1/4 0:00:00\"), Nullable`1)))");
+
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Right);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
+        }
+
+        /// <summary>
+        /// 测试 - 获取查询条件 - 包含两边
+        /// </summary>
+        [Fact]
+        public void Test_GetCondition_Both()
+        {
+            var result = new StringBuilder();
             result.Append("t => ((t.DateValue >= Convert(Parse(\"2000/1/1 0:00:00\"), DateTime))");
-            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/3 0:00:00\"), DateTime)))");
-            criteria = new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Left);
-            Assert.Equal(result.ToString(), criteria.GetCondition().ToString());
+            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/4 0:00:00\"), DateTime)))");
 
-            result = new StringBuilder();
-            result.Append("t => ((t.NullableDateValue > Convert(Parse(\"2000/1/1 0:00:00\"), Nullable`1))");
-            result.Append(" AndAlso (t.NullableDateValue <= Convert(Parse(\"2000/1/3 0:00:00\"), Nullable`1)))");
-            var criteria2 = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Right);
-            Assert.Equal(result.ToString(), criteria2.GetCondition().ToString());
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Both);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
+        }
 
-            result = new StringBuilder();
+        /// <summary>
+        /// 测试 - 获取查询条件 - 包含两边【可空】
+        /// </summary>
+        [Fact]
+        public void Test_GetCondition_Both_With_Nullable()
+        {
+            var result = new StringBuilder();
             result.Append("t => ((t.NullableDateValue >= Convert(Parse(\"2000/1/1 0:00:00\"), Nullable`1))");
-            result.Append(" AndAlso (t.NullableDateValue <= Convert(Parse(\"2000/1/3 0:00:00\"), Nullable`1)))");
-            criteria2 = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Both);
-            Assert.Equal(result.ToString(), criteria2.GetCondition().ToString());
+            result.Append(" AndAlso (t.NullableDateValue < Convert(Parse(\"2000/1/4 0:00:00\"), Nullable`1)))");
+
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Both);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
         }
     }
 }

framework/tests/Bing.Tests/Datas/Queries/QueryTest.cs

@@ -168,7 +168,7 @@ public void Test_Between_Date()
             var max = DateTime.Parse("2000-1-2 10:10:10");
             var result = new StringBuilder();
             result.Append("t => ((t.DateValue >= Convert(Parse(\"2000/1/1 0:00:00\"), DateTime))");
-            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/3 0:00:00\"), DateTime)))");
+            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/2 0:00:00\"), DateTime)))");
 
             _query.Between(t => t.DateValue, min, max, false);
             Assert.Equal(result.ToString(), _query.GetCondition().ToString());