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
Fix test
KrzysztofPajak0b0a45430622
diff --git a/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs b/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.csindex e9a517821..da771adc8 100644--- a/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs+++ b/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs@@ -202,7 +202,7 @@ namespace Grand.Business.Common.Services.Directorypublic virtual double ConvertCurrency(double amount, double exchangeRate){if (amount != 0 && exchangeRate != 0)- return amount * exchangeRate;+ return Math.Round(amount * exchangeRate, 6);return 0;}diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceServiceTests.csindex d840290d7..e6dbcc769 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceServiceTests.cs@@ -19,6 +19,7 @@ using Grand.Domain.Orders;using Grand.Domain.Stores;using Grand.Infrastructure;using Grand.Infrastructure.Caching;+using Grand.SharedKernel.Extensions;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;@@ -55,6 +56,8 @@ namespace Grand.Business.Catalog.Tests.Service.Prices[TestInitialize()]public void TestInitialize(){+ CommonPath.BaseDirectory = "";+_store = new Store { Id = "1" };tempWorkContext = new Mock<IWorkContext>();{@@ -176,15 +179,15 @@ namespace Grand.Business.Catalog.Tests.Service.PricesAssert.AreEqual(49.99, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 5)).finalPrice);Assert.AreEqual(49.99, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 9)).finalPrice);- Assert.AreEqual(10M, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 10)).finalPrice);- Assert.AreEqual(10M, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 11)).finalPrice);- Assert.AreEqual(10M, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 151)).finalPrice);- Assert.AreEqual(10M, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 199)).finalPrice);+ Assert.AreEqual(10, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 10)).finalPrice);+ Assert.AreEqual(10, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 11)).finalPrice);+ Assert.AreEqual(10, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 151)).finalPrice);+ Assert.AreEqual(10, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 199)).finalPrice);var p1 = (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 200)).finalPrice;- Assert.AreEqual(2M, p1);- Assert.AreEqual(2M, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 201)).finalPrice);- Assert.AreEqual(2M, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 22201)).finalPrice);+ Assert.AreEqual(2, p1);+ Assert.AreEqual(2, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 201)).finalPrice);+ Assert.AreEqual(2, (await _pricingService.GetFinalPrice(product, customer, _currency, 0, false, 22201)).finalPrice);}@@ -246,7 +249,7 @@ namespace Grand.Business.Catalog.Tests.Service.Pricesvar finalprice = await _pricingService.GetFinalPrice(product, customer, _currency, 0, true, 1);var pp = finalprice.finalPrice;- Assert.AreEqual(39.99M, pp);+ Assert.AreEqual(39.99, pp);}[TestMethod()]@@ -307,7 +310,7 @@ namespace Grand.Business.Catalog.Tests.Service.PricestempDiscountServiceMock.Setup(x => x.GetAllDiscounts(DiscountType.AssignedToCollections, "1", _currency.CurrencyCode, "", "", false)).ReturnsAsync(new List<Discount>());tempDiscountServiceMock.Setup(x => x.GetAllDiscounts(DiscountType.AssignedToAllProducts, "1", _currency.CurrencyCode, "", "", false)).ReturnsAsync(new List<Discount>());var subtotal = (await _pricingService.GetSubTotal(shoppingCartItem, product001)).subTotal;- Assert.AreEqual(110.22M, subtotal);+ Assert.AreEqual(110.22, subtotal);}}}diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.csindex b9bfcfa7c..1fc21a474 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.cs@@ -14,6 +14,7 @@ using System.Linq;using System.Text;using System.Threading.Tasks;using Grand.Domain.Catalog;+using Grand.SharedKernel.Extensions;namespace Grand.Business.Catalog.Tests.Service.Tax{@@ -37,6 +38,8 @@ namespace Grand.Business.Catalog.Tests.Service.Tax[TestInitialize()]public void TestInitialize(){+ CommonPath.BaseDirectory = "";+var serviceProvider = new Mock<IServiceProvider>();serviceProvider.Setup(x => x.GetService(typeof(FixedRateTestTaxProvider))).Returns(new FixedRateTestTaxProvider());_serviceProvider = serviceProvider.Object;@@ -124,9 +127,9 @@ namespace Grand.Business.Catalog.Tests.Service.Taxvar customer = new Customer { IsTaxExempt = true }; //not taxablevar product = new Product();- Assert.AreEqual(Math.Round(909.0909090909090909090909091M, 2), (await _taxService.GetProductPrice(product, "0", 1000, true, customer, true)).productprice);+ Assert.AreEqual(Math.Round(909.0909090, 2), (await _taxService.GetProductPrice(product, "0", 1000, true, customer, true)).productprice);Assert.AreEqual(1000, (await _taxService.GetProductPrice(product, "0", 1000, true, customer, false)).productprice);- Assert.AreEqual(Math.Round(909.0909090909090909090909091M, 2), (await _taxService.GetProductPrice(product, "0", 1000, false, customer, true)).productprice);+ Assert.AreEqual(Math.Round(909.0909090, 2), (await _taxService.GetProductPrice(product, "0", 1000, false, customer, true)).productprice);Assert.AreEqual(1000, (await _taxService.GetProductPrice(product, "0", 1000, false, customer, false)).productprice);}