From 3b1e2e3cbb7e6c1ba7c136c7d40eb80d05e4656b Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Sun, 12 Jun 2022 03:39:42 +0800 Subject: [PATCH] Fix UTs of the Orders module --- .../Orders/OrderAppServiceTests.cs | 19 +++++++++++++++---- .../Orders/TestOrderLinePriceOverrider.cs | 6 +++--- .../OrderTestData.cs | 18 ++++++++++-------- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/OrderAppServiceTests.cs b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/OrderAppServiceTests.cs index 885afd26..665890e8 100644 --- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/OrderAppServiceTests.cs +++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/OrderAppServiceTests.cs @@ -64,6 +64,17 @@ namespace EasyAbp.EShop.Orders.Orders Price = 2m, Currency = "CNY", ProductDetailId = OrderTestData.ProductDetail2Id + }, + new ProductSkuDto + { + Id = OrderTestData.ProductSku3Id, + Name = "My SKU 3", + OrderMinQuantity = 0, + OrderMaxQuantity = 100, + AttributeOptionIds = new List(), + Price = 3m, + Currency = "CNY", + ProductDetailId = OrderTestData.ProductDetail2Id } }, InventoryStrategy = InventoryStrategy.NoNeed, @@ -481,7 +492,7 @@ namespace EasyAbp.EShop.Orders.Orders new() { ProductId = OrderTestData.Product1Id, - ProductSkuId = OrderTestData.ProductSku2Id, + ProductSkuId = OrderTestData.ProductSku3Id, Quantity = 2 } } @@ -490,11 +501,11 @@ namespace EasyAbp.EShop.Orders.Orders await WithUnitOfWorkAsync(async () => { var order = await _orderAppService.CreateAsync(createOrderDto); - var orderLine = order.OrderLines.Find(x => x.ProductSkuId == OrderTestData.ProductSku2Id); + var orderLine = order.OrderLines.Find(x => x.ProductSkuId == OrderTestData.ProductSku3Id); - order.ProductTotalPrice.ShouldBe(10 * 1m + 2 * TestOrderLinePriceOverrider.Sku2UnitPrice); + order.ProductTotalPrice.ShouldBe(10 * 1m + 2 * TestOrderLinePriceOverrider.Sku3UnitPrice); orderLine.ShouldNotBeNull(); - orderLine.UnitPrice.ShouldBe(TestOrderLinePriceOverrider.Sku2UnitPrice); + orderLine.UnitPrice.ShouldBe(TestOrderLinePriceOverrider.Sku3UnitPrice); orderLine.TotalPrice.ShouldBe(orderLine.Quantity * orderLine.UnitPrice); }); } diff --git a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/TestOrderLinePriceOverrider.cs b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/TestOrderLinePriceOverrider.cs index 22d4c016..5d580aec 100644 --- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/TestOrderLinePriceOverrider.cs +++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/TestOrderLinePriceOverrider.cs @@ -7,14 +7,14 @@ namespace EasyAbp.EShop.Orders.Orders; public class TestOrderLinePriceOverrider : IOrderLinePriceOverrider, ITransientDependency { - public static decimal Sku2UnitPrice { get; set; } = 100m; + public static decimal Sku3UnitPrice { get; set; } = 100m; public async Task GetUnitPriceOrNullAsync(CreateOrderDto input, CreateOrderLineDto inputOrderLine, ProductDto product, ProductSkuDto productSku) { - if (inputOrderLine.ProductSkuId == OrderTestData.ProductSku2Id) + if (inputOrderLine.ProductSkuId == OrderTestData.ProductSku3Id) { - return Sku2UnitPrice; + return Sku3UnitPrice; } return null; diff --git a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/OrderTestData.cs b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/OrderTestData.cs index a12c181d..403c6e02 100644 --- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/OrderTestData.cs +++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/OrderTestData.cs @@ -6,25 +6,27 @@ namespace EasyAbp.EShop.Orders public class OrderTestData { public static Guid Order1Id { get; } = Guid.NewGuid(); - + public static Guid OrderLine1Id { get; } = Guid.NewGuid(); - + public static Guid Payment1Id { get; } = Guid.NewGuid(); - + public static Guid Store1Id { get; } = Guid.NewGuid(); public static Guid Product1Id { get; } = Guid.NewGuid(); public static Guid ProductSku1Id { get; } = Guid.NewGuid(); - + public static Guid ProductSku2Id { get; } = Guid.NewGuid(); - + + public static Guid ProductSku3Id { get; } = Guid.NewGuid(); + public static Guid ProductDetail1Id { get; } = Guid.NewGuid(); - + public static Guid ProductDetail2Id { get; } = Guid.NewGuid(); - + public static DateTime ProductLastModificationTime { get; } = DateTime.Today; - + public static DateTime ProductDetailLastModificationTime { get; } = DateTime.Today; } } \ No newline at end of file