Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Checkout tests - remove unused using
KrzysztofPajakb4f9e0bcf008
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/ActivatedValueForPurchasedGiftVouchersCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/ActivatedValueForPurchasedGiftVouchersCommandHandlerTests.csindex b4fff56c5..d60262ea5 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/ActivatedValueForPurchasedGiftVouchersCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/ActivatedValueForPurchasedGiftVouchersCommandHandlerTests.cs@@ -9,9 +9,6 @@ using Grand.Domain.Orders;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;using System.Threading.Tasks;namespace Grand.Business.Checkout.Tests.Commands.Orders@@ -36,17 +33,16 @@ namespace Grand.Business.Checkout.Tests.Commands.Orders[TestMethod]public async Task Handle_InvokeExpectedMethods(){- var command = new ActivatedValueForPurchasedGiftVouchersCommand()- {+ var command = new ActivatedValueForPurchasedGiftVouchersCommand() {Order = new Order()};- var gift = new GiftVoucher() { RecipientEmail = "fdsf", SenderEmail = "aaa",IsGiftVoucherActivated=false };+ var gift = new GiftVoucher() { RecipientEmail = "fdsf", SenderEmail = "aaa", IsGiftVoucherActivated = false };command.Activate = true;command.Order.OrderItems.Add(new OrderItem() { });_langService.Setup(c => c.GetLanguageById(It.IsAny<string>())).ReturnsAsync(new Language());_giftVoucherMock.Setup(c => c.GetAllGiftVouchers(It.IsAny<string>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(),It.IsAny<bool?>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()))- .ReturnsAsync(new PagedList<GiftVoucher>() {gift });+ .ReturnsAsync(new PagedList<GiftVoucher>() { gift });await _handler.Handle(command, default);Assert.IsTrue(gift.IsGiftVoucherActivated);@@ -57,8 +53,7 @@ namespace Grand.Business.Checkout.Tests.Commands.Orders[TestMethod]public async Task Handle_Deactivate(){- var command = new ActivatedValueForPurchasedGiftVouchersCommand()- {+ var command = new ActivatedValueForPurchasedGiftVouchersCommand() {Order = new Order()};var gift = new GiftVoucher() { RecipientEmail = "fdsf", SenderEmail = "aaa", IsGiftVoucherActivated = true };diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CalculateLoyaltyPointsCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CalculateLoyaltyPointsCommandHandlerTests.csindex 1462abb0b..1edb732d0 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CalculateLoyaltyPointsCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CalculateLoyaltyPointsCommandHandlerTests.cs@@ -2,10 +2,6 @@using Grand.Business.Checkout.Commands.Models.Orders;using Grand.Domain.Orders;using Microsoft.VisualStudio.TestTools.UnitTesting;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;using System.Threading.Tasks;namespace Grand.Business.Checkout.Tests.Commands.Orders@@ -28,8 +24,7 @@ namespace Grand.Business.Checkout.Tests.Commands.Orders{_settings.Enabled = true;_settings.PointsForPurchases_Amount = 20;- var command = new CalculateLoyaltyPointsCommand()- {+ var command = new CalculateLoyaltyPointsCommand() {Customer = null};var result = await _handler.Handle(command, default);@@ -41,8 +36,7 @@ namespace Grand.Business.Checkout.Tests.Commands.Orders{_settings.Enabled = false;_settings.PointsForPurchases_Amount = 20;- var command = new CalculateLoyaltyPointsCommand()- {+ var command = new CalculateLoyaltyPointsCommand() {Customer = new Domain.Customers.Customer()};var result = await _handler.Handle(command, default);@@ -55,12 +49,11 @@ namespace Grand.Business.Checkout.Tests.Commands.Orders_settings.Enabled = true;_settings.PointsForPurchases_Amount = 10;_settings.PointsForPurchases_Points = 2;- var command = new CalculateLoyaltyPointsCommand()- {+ var command = new CalculateLoyaltyPointsCommand() {Customer = new Domain.Customers.Customer(),- Amount=100+ Amount = 100};-+Assert.AreEqual(20, await _handler.Handle(command, default));command.Amount = 200;Assert.AreEqual(40, await _handler.Handle(command, default));diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CancelOrderCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CancelOrderCommandHandlerTests.csindex 5368c31f2..6d53d5189 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CancelOrderCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CancelOrderCommandHandlerTests.cs@@ -13,8 +13,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;using System;using System.Collections.Generic;-using System.Linq;-using System.Text;using System.Threading.Tasks;namespace Grand.Business.Checkout.Tests.Commands.Orders@@ -71,9 +69,8 @@ namespace Grand.Business.Checkout.Tests.Commands.Orderspublic async Task Handle_InvokeExpectedMethods(){var command = new CancelOrderCommand();- command.Order = new Order()- {- Id="id"+ command.Order = new Order() {+ Id = "id"};_shipmentServiceMock.Setup(c => c.GetShipmentsByOrder("id")).ReturnsAsync(new List<Shipment>());await _handler.Handle(command, default);diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CheckOrderStatusCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CheckOrderStatusCommandHandlerTests.csindex 72893cb56..9708c6e51 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CheckOrderStatusCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CheckOrderStatusCommandHandlerTests.cs@@ -6,10 +6,6 @@ using Grand.Domain.Payments;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;using System.Threading.Tasks;namespace Grand.Business.Checkout.Tests.Commands.Orders@@ -28,7 +24,7 @@ namespace Grand.Business.Checkout.Tests.Commands.Orders_mediatorMock = new Mock<IMediator>();_orderSerivce = new Mock<IOrderService>();_settings = new OrderSettings();- _handler = new CheckOrderStatusCommandHandler(_mediatorMock.Object,_orderSerivce.Object,_settings);+ _handler = new CheckOrderStatusCommandHandler(_mediatorMock.Object, _orderSerivce.Object, _settings);}[TestMethod]diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/CheckoutAttributeExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/CheckoutAttributeExtensionsTests.csindex 05491f5ee..cc649a66f 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/CheckoutAttributeExtensionsTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/CheckoutAttributeExtensionsTests.cs@@ -2,11 +2,8 @@using Grand.Domain.Catalog;using Grand.Domain.Orders;using Microsoft.VisualStudio.TestTools.UnitTesting;-using System;using System.Collections.Generic;using System.Linq;-using System.Text;-using System.Threading.Tasks;namespace Grand.Business.Checkout.Tests.Extensions{@@ -33,9 +30,9 @@ namespace Grand.Business.Checkout.Tests.Extensionspublic void ShouldHaveValues_ReturnExpectedResults(){List<CheckoutAttribute> attributes = new List<CheckoutAttribute>();- var atr1=new CheckoutAttribute { Id = "1", Name = "Attribute001", AttributeControlTypeId=AttributeControlType.Checkboxes };- var atr2 = new CheckoutAttribute { Id = "2", Name = "Attribute002", AttributeControlTypeId = AttributeControlType.TextBox};- var atr3 = new CheckoutAttribute { Id = "3", Name = "Attribute003", AttributeControlTypeId = AttributeControlType.Datepicker};+ var atr1 = new CheckoutAttribute { Id = "1", Name = "Attribute001", AttributeControlTypeId = AttributeControlType.Checkboxes };+ var atr2 = new CheckoutAttribute { Id = "2", Name = "Attribute002", AttributeControlTypeId = AttributeControlType.TextBox };+ var atr3 = new CheckoutAttribute { Id = "3", Name = "Attribute003", AttributeControlTypeId = AttributeControlType.Datepicker };var atr4 = new CheckoutAttribute { Id = "4", Name = "Attribute004", AttributeControlTypeId = AttributeControlType.FileUpload };var atr5 = new CheckoutAttribute { Id = "5", Name = "Attribute005", AttributeControlTypeId = AttributeControlType.DropdownList };CheckoutAttribute atr6 = null;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/OrderExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/OrderExtensionsTests.csindex 6d1368776..b452b07d3 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/OrderExtensionsTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/OrderExtensionsTests.cs@@ -3,10 +3,6 @@ using Grand.Domain.Catalog;using Grand.Domain.Orders;using Microsoft.VisualStudio.TestTools.UnitTesting;using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;namespace Grand.Business.Checkout.Tests.Extensions{@@ -63,7 +59,7 @@ namespace Grand.Business.Checkout.Tests.Extensionspublic void HasItemsToAddToShipment_NullOrder_ThrowException(){Order order = null;- Assert.ThrowsException<ArgumentNullException>(()=>order.HasItemsToAddToShipment());+ Assert.ThrowsException<ArgumentNullException>(() => order.HasItemsToAddToShipment());}[TestMethod]diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/PaymentExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/PaymentExtensionsTests.csindex 05e1d41d5..3bee1869b 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/PaymentExtensionsTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/PaymentExtensionsTests.cs@@ -4,10 +4,6 @@ using Grand.Domain.Payments;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;namespace Grand.Business.Checkout.Tests.Extensions{@@ -23,7 +19,7 @@ namespace Grand.Business.Checkout.Tests.Extensions}[TestMethod()]- public void IsPaymentMethodActive_ReturnExpectedResult()+ public void IsPaymentMethodActive_ReturnExpectedResult(){var settings = new PaymentSettings();_providerMock.Setup(c => c.SystemName).Returns("paypal");@@ -45,7 +41,7 @@ namespace Grand.Business.Checkout.Tests.Extensions{IPaymentProvider provider = null;var settings = new PaymentSettings();- Assert.ThrowsException<ArgumentNullException>(() =>provider.IsPaymentMethodActive(settings));+ Assert.ThrowsException<ArgumentNullException>(() => provider.IsPaymentMethodActive(settings));}}}diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShippingExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShippingExtensionsTests.csindex e0543a864..30344b23e 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShippingExtensionsTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShippingExtensionsTests.cs@@ -4,10 +4,6 @@ using Grand.Domain.Shipping;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;namespace Grand.Business.Checkout.Tests.Extensions{@@ -49,7 +45,7 @@ namespace Grand.Business.Checkout.Tests.Extensionsvar method = new ShippingMethod();var countryId = "countryId";Assert.IsFalse(method.CountryRestrictionExists(countryId));- method.RestrictedCountries.Add(new Domain.Directory.Country() { Id=countryId});+ method.RestrictedCountries.Add(new Domain.Directory.Country() { Id = countryId });Assert.IsTrue(method.CountryRestrictionExists(countryId));}@@ -57,7 +53,7 @@ namespace Grand.Business.Checkout.Tests.Extensionspublic void CustomerGroupRestrictionExists_ReturnExpectedResult(){var method = new ShippingMethod();- var roleId= "role";+ var roleId = "role";Assert.IsFalse(method.CustomerGroupRestrictionExists(roleId));method.RestrictedGroups.Add(roleId);Assert.IsTrue(method.CustomerGroupRestrictionExists(roleId));diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShoppingCartExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShoppingCartExtensionsTests.csindex 1141d1fc9..e271dc909 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShoppingCartExtensionsTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShoppingCartExtensionsTests.cs@@ -1,11 +1,8 @@using Grand.Business.Checkout.Extensions;using Grand.Domain.Orders;using Microsoft.VisualStudio.TestTools.UnitTesting;-using System;using System.Collections.Generic;using System.Linq;-using System.Text;-using System.Threading.Tasks;namespace Grand.Business.Checkout.Tests.Extensions{@@ -25,7 +22,7 @@ namespace Grand.Business.Checkout.Tests.ExtensionsshoppingCartItems.Add(new ShoppingCartItem() { IsShipEnabled = true });Assert.IsTrue(shoppingCartItems.RequiresShipping());}-+[TestMethod]public void LimitPerStore_ReturnExpectedResults(){diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.csindex a9a846dcd..8e206640b 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs@@ -9,9 +9,6 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;using System.Threading;using System.Threading.Tasks;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.csindex c410896dd..e355a4968 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs@@ -9,7 +9,6 @@ using Moq;using System;using System.Collections.Generic;using System.Linq;-using System.Text;using System.Threading;using System.Threading.Tasks;@@ -48,7 +47,7 @@ namespace Grand.Business.Checkout.Tests.Services.GiftVouchers[TestMethod]public async Task InsertGiftVoucher_InovokeExpectedMethods(){- await _service.InsertGiftVoucher(new GiftVoucher() { Code="code"});+ await _service.InsertGiftVoucher(new GiftVoucher() { Code = "code" });_repositoryMock.Verify(c => c.InsertAsync(It.IsAny<GiftVoucher>()), Times.Once);_mediatorMock.Verify(c => c.Publish(It.IsAny<EntityInserted<GiftVoucher>>(), default(CancellationToken)), Times.Once);}diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.csindex bd55791a9..5ce346fca 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderServiceTests.cs@@ -6,9 +6,6 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;using System.Threading;using System.Threading.Tasks;@@ -28,7 +25,7 @@ namespace Grand.Business.Checkout.Tests.Services.Orders_orderRepositoryMock = new Mock<IRepository<Order>>();_orderNoteRepositoryMock = new Mock<IRepository<OrderNote>>();_mediatorMock = new Mock<IMediator>();- _service = new OrderService(_orderRepositoryMock.Object,_orderNoteRepositoryMock.Object,_mediatorMock.Object);+ _service = new OrderService(_orderRepositoryMock.Object, _orderNoteRepositoryMock.Object, _mediatorMock.Object);}[TestMethod]diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.csindex f74feb351..b0568d43e 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderStatusServiceTests.cs@@ -7,9 +7,6 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;using System.Threading;using System.Threading.Tasks;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.csindex 06a36fcc2..93be90e86 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs@@ -155,7 +155,7 @@ namespace Grand.Business.Checkout.Tests.Services.Paymentsnew ShoppingCartItem(),new ShoppingCartItem()};- Assert.AreEqual(100,await _paymentService.GetAdditionalHandlingFee(cart, "systemName"));+ Assert.AreEqual(100, await _paymentService.GetAdditionalHandlingFee(cart, "systemName"));}[TestMethod]diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.csindex b0a58daef..ddff6ce57 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentTransactionServiceTests.cs@@ -6,9 +6,6 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;using System.Threading;using System.Threading.Tasks;@@ -26,7 +23,7 @@ namespace Grand.Business.Checkout.Tests.Services.Payments{_repositoryMock = new Mock<IRepository<PaymentTransaction>>();_mediatorMock = new Mock<IMediator>();- _service = new PaymentTransactionService(_repositoryMock.Object,_mediatorMock.Object);+ _service = new PaymentTransactionService(_repositoryMock.Object, _mediatorMock.Object);}[TestMethod]diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.csindex 791ee82e1..7d12752d6 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs@@ -8,9 +8,6 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;using System.Threading;using System.Threading.Tasks;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.csindex 4ce2dd3de..ca3ce3ace 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs@@ -8,9 +8,6 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;using System.Threading;using System.Threading.Tasks;@@ -30,7 +27,7 @@ namespace Grand.Business.Checkout.Tests.Services.Shipping_repositoryMock = new Mock<IRepository<PickupPoint>>();_mediatorMock = new Mock<IMediator>();_cacheMock = new Mock<ICacheBase>();- _service = new PickupPointService(_repositoryMock.Object,_mediatorMock.Object,_cacheMock.Object);+ _service = new PickupPointService(_repositoryMock.Object, _mediatorMock.Object, _cacheMock.Object);}[TestMethod]diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.csindex 2b0307d0c..8beb21ebb 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs@@ -8,9 +8,6 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;using System.Threading;using System.Threading.Tasks;diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingServiceTests.csindex 877f11daf..af3a726e0 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingServiceTests.cs@@ -10,10 +10,8 @@ using Grand.Domain.Shipping;using Grand.Domain.Stores;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-using System;using System.Collections.Generic;using System.Linq;-using System.Text;using System.Threading.Tasks;namespace Grand.Business.Checkout.Tests.Services.Shipping@@ -40,8 +38,8 @@ namespace Grand.Business.Checkout.Tests.Services.Shipping_shippingProviderSettings = new ShippingProviderSettings();_shippingSettings = new ShippingSettings();_rateProviderMock = new Mock<IShippingRateCalculationProvider>();- _service = new ShippingService(_warehouseMock.Object,_loggerMock.Object,_translationServiceMock.Object,_countryServiceMokc.Object,- new List<IShippingRateCalculationProvider>() { _rateProviderMock.Object},_shippingProviderSettings,_shippingSettings);+ _service = new ShippingService(_warehouseMock.Object, _loggerMock.Object, _translationServiceMock.Object, _countryServiceMokc.Object,+ new List<IShippingRateCalculationProvider>() { _rateProviderMock.Object }, _shippingProviderSettings, _shippingSettings);}[TestMethod]@@ -49,15 +47,15 @@ namespace Grand.Business.Checkout.Tests.Services.Shipping{_rateProviderMock.Setup(c => c.LimitedToStores).Returns(new List<string>());_rateProviderMock.Setup(c => c.LimitedToGroups).Returns(new List<string>());- var result = await _service.LoadActiveShippingRateCalculationProviders(new Customer(),"storeId");+ var result = await _service.LoadActiveShippingRateCalculationProviders(new Customer(), "storeId");Assert.IsTrue(result.Count == 0);}[TestMethod]public async Task LoadActiveShippingRateCalculationProviders_HideShipmentMethods_ReturnEmptyList(){- _rateProviderMock.Setup(c => c.LimitedToStores).Returns(new List<string>() { "storeId"});- _rateProviderMock.Setup(c => c.LimitedToGroups).Returns(new List<string>() { });+ _rateProviderMock.Setup(c => c.LimitedToStores).Returns(new List<string>() { "storeId" });+ _rateProviderMock.Setup(c => c.LimitedToGroups).Returns(new List<string>() { });_rateProviderMock.Setup(c => c.HideShipmentMethods(It.IsAny<IList<ShoppingCartItem>>())).ReturnsAsync(true);var result = await _service.LoadActiveShippingRateCalculationProviders(new Customer(), "storeId");Assert.IsTrue(result.Count == 0);@@ -68,12 +66,12 @@ namespace Grand.Business.Checkout.Tests.Services.Shipping{_shippingProviderSettings.ActiveSystemNames = new List<string>() { "sysname" };_rateProviderMock.Setup(c => c.LimitedToStores).Returns(new List<string>() { "storeId" });- _rateProviderMock.Setup(c => c.LimitedToGroups).Returns(new List<string>() { });+ _rateProviderMock.Setup(c => c.LimitedToGroups).Returns(new List<string>() { });_rateProviderMock.Setup(c => c.SystemName).Returns("sysname");_rateProviderMock.Setup(c => c.HideShipmentMethods(It.IsAny<IList<ShoppingCartItem>>())).ReturnsAsync(false);var result = await _service.LoadActiveShippingRateCalculationProviders(new Customer(), "storeId");Assert.IsTrue(result.Count == 1);- Assert.AreEqual(result.First().SystemName,_rateProviderMock.Object.SystemName);+ Assert.AreEqual(result.First().SystemName, _rateProviderMock.Object.SystemName);}[TestMethod]@@ -91,15 +89,14 @@ namespace Grand.Business.Checkout.Tests.Services.Shippingvar customer = new Customer();var shippingAddress = new Address();var store = new Store() { Id = "id" };- var warehouse = new Warehouse()- {- Address =null+ var warehouse = new Warehouse() {+ Address = null};_warehouseMock.Setup(c => c.GetWarehouseById(It.IsAny<string>())).ReturnsAsync(warehouse);var result = await _service.CreateShippingOptionRequests(customer, cart, shippingAddress, store);- Assert.AreEqual(result.ShippingAddress, shippingAddress);+ Assert.AreEqual(result.ShippingAddress, shippingAddress);Assert.AreEqual(result.StoreId, "id");Assert.AreEqual(result.Customer, customer);}@@ -119,8 +116,7 @@ namespace Grand.Business.Checkout.Tests.Services.Shippingvar customer = new Customer();var shippingAddress = new Address();var store = new Store() { Id = "id" };- var warehouse = new Warehouse()- {+ var warehouse = new Warehouse() {Address = null};_warehouseMock.Setup(c => c.GetWarehouseById(It.IsAny<string>())).ReturnsAsync(warehouse);diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.csindex f3ccceb13..410c6fac8 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs@@ -8,9 +8,6 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;using System.Threading;using System.Threading.Tasks;@@ -30,7 +27,7 @@ namespace Grand.Business.Checkout.Tests.Services.Shipping_repositoryMock = new Mock<IRepository<Warehouse>>();_mediatorMock = new Mock<IMediator>();_cacheMock = new Mock<ICacheBase>();- _service = new WarehouseService(_repositoryMock.Object,_mediatorMock.Object,_cacheMock.Object);+ _service = new WarehouseService(_repositoryMock.Object, _mediatorMock.Object, _cacheMock.Object);}