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
Tests - fix namespace
support2d61ac49735a
diff --git a/src/Tests/Grand.Business.Authentication.Tests/Events/CustomerDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Authentication.Tests/Events/CustomerDeletedEventHandlerTests.csindex ce3884186..dca0bbeaa 100644--- a/src/Tests/Grand.Business.Authentication.Tests/Events/CustomerDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Authentication.Tests/Events/CustomerDeletedEventHandlerTests.cs@@ -1,9 +1,10 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Authentication.Events;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Grand.Domain.Data;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Authentication.Events.Tests+namespace Grand.Business.Authentication.Tests.Events{[TestClass()]public class CustomerDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Authentication.Tests/Services/ExternalAuthenticationServiceTests.cs b/src/Tests/Grand.Business.Authentication.Tests/Services/ExternalAuthenticationServiceTests.csindex 3a81ab82f..9591e8159 100644--- a/src/Tests/Grand.Business.Authentication.Tests/Services/ExternalAuthenticationServiceTests.cs+++ b/src/Tests/Grand.Business.Authentication.Tests/Services/ExternalAuthenticationServiceTests.cs@@ -1,4 +1,4 @@-using Grand.Business.Authentication.Tests;+using Grand.Business.Authentication.Services;using Grand.Business.Core.Interfaces.Authentication;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Customers;@@ -10,7 +10,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Authentication.Services.Tests+namespace Grand.Business.Authentication.Tests.Services{[TestClass()]public class ExternalAuthenticationServiceTestsdiff --git a/src/Tests/Grand.Business.Authentication.Tests/Services/RefreshTokenServiceTests.cs b/src/Tests/Grand.Business.Authentication.Tests/Services/RefreshTokenServiceTests.csindex d60a6905e..7e080afa8 100644--- a/src/Tests/Grand.Business.Authentication.Tests/Services/RefreshTokenServiceTests.cs+++ b/src/Tests/Grand.Business.Authentication.Tests/Services/RefreshTokenServiceTests.cs@@ -1,10 +1,11 @@-using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Authentication.Services;+using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Domain;using Grand.Domain.Security;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Authentication.Services.Tests+namespace Grand.Business.Authentication.Tests.Services{[TestClass()]public class RefreshTokenServiceTestsdiff --git a/src/Tests/Grand.Business.Authentication.Tests/Services/TwoFactorAuthenticationServiceTests.cs b/src/Tests/Grand.Business.Authentication.Tests/Services/TwoFactorAuthenticationServiceTests.csindex 7300203a9..b406d7b6c 100644--- a/src/Tests/Grand.Business.Authentication.Tests/Services/TwoFactorAuthenticationServiceTests.cs+++ b/src/Tests/Grand.Business.Authentication.Tests/Services/TwoFactorAuthenticationServiceTests.cs@@ -1,17 +1,11 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Authentication.Services;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Grand.Infrastructure;-using Moq;+using Grand.Business.Authentication.Services;using Grand.Business.Core.Interfaces.Common.Directory;-using Google.Authenticator;using Grand.Domain.Customers;+using Grand.Infrastructure;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Authentication.Services.Tests+namespace Grand.Business.Authentication.Tests.Services{[TestClass()]public class TwoFactorAuthenticationServiceTestsdiff --git a/src/Tests/Grand.Business.Authentication.Tests/Startup/StartupApplicationTests.cs b/src/Tests/Grand.Business.Authentication.Tests/Startup/StartupApplicationTests.csindex b89daa1e0..52f44ed1c 100644--- a/src/Tests/Grand.Business.Authentication.Tests/Startup/StartupApplicationTests.cs+++ b/src/Tests/Grand.Business.Authentication.Tests/Startup/StartupApplicationTests.cs@@ -3,7 +3,7 @@ using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Authentication.Tests+namespace Grand.Business.Authentication.Tests.Startup{[TestClass()]public class StartupApplicationTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/BrandDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/BrandDeletedEventHandlerTests.csindex 861e72007..5d11aa226 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/BrandDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/BrandDeletedEventHandlerTests.cs@@ -1,9 +1,10 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Events.Handlers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Catalog.Events.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Events.Handlers{[TestClass()]public class BrandDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CategoryDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CategoryDeletedEventHandlerTests.csindex dc37a628e..f8385713d 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CategoryDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CategoryDeletedEventHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Events.Handlers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Domain.Seo;@@ -8,7 +9,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Events.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Events.Handlers{[TestClass()]public class CategoryDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CollectionDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CollectionDeletedEventHandlerTests.csindex d082664e5..651e4907a 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CollectionDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/CollectionDeletedEventHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Events.Handlers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Domain.Seo;@@ -8,7 +9,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Events.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Events.Handlers{[TestClass()]public class CollectionDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeleteMeasureUnitOnProductEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeleteMeasureUnitOnProductEventHandlerTests.csindex 27ffd30ed..46dc98b44 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeleteMeasureUnitOnProductEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeleteMeasureUnitOnProductEventHandlerTests.cs@@ -1,11 +1,11 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Events.Handlers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Domain.Directory;using Microsoft.VisualStudio.TestTools.UnitTesting;--namespace Grand.Business.Catalog.Events.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Events.Handlers{[TestClass()]public class DeleteMeasureUnitOnProductEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeliveryDateDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeliveryDateDeletedEventHandlerTests.csindex 69aba5b3f..2f73bd768 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeliveryDateDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DeliveryDateDeletedEventHandlerTests.cs@@ -1,11 +1,11 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Events.Handlers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Domain.Shipping;using Microsoft.VisualStudio.TestTools.UnitTesting;--namespace Grand.Business.Catalog.Events.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Events.Handlers{[TestClass()]public class DeliveryDateDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DiscountDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DiscountDeletedEventHandlerTests.csindex 85bb8b622..6ecb7e6c2 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DiscountDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/DiscountDeletedEventHandlerTests.cs@@ -1,8 +1,8 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Events.Handlers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Domain.Discounts;-using Grand.Domain.Seo;using Grand.Domain.Vendors;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Tests.Caching;@@ -10,7 +10,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Events.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Events.Handlers{[TestClass()]public class DiscountDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/ProductDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/ProductDeletedEventHandlerTests.csindex 9baced549..66edc7fd9 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/ProductDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/ProductDeletedEventHandlerTests.cs@@ -1,19 +1,14 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Catalog.Events.Handlers;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Grand.Domain.Data;-using Grand.Domain.Catalog;-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Events.Handlers;using Grand.Business.Core.Interfaces.Catalog.Products;-using Moq;+using Grand.Data.Tests.MongoDb;+using Grand.Domain.Catalog;using Grand.Domain.Customers;+using Grand.Domain.Data;using Grand.Domain.Seo;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Catalog.Events.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Events.Handlers{[TestClass()]public class ProductDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/ProductPublishEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/ProductPublishEventHandlerTests.csindex fbb4511f4..2dffc9588 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/ProductPublishEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/ProductPublishEventHandlerTests.cs@@ -1,8 +1,9 @@-using Grand.Infrastructure.Caching;+using Grand.Business.Catalog.Events.Handlers;+using Grand.Infrastructure.Caching;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Events.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Events.Handlers{[TestClass()]public class ProductPublishEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/TaxCategoryDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/TaxCategoryDeletedEventHandlerTests.csindex 1c346e8f6..5596f8b5d 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/TaxCategoryDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/TaxCategoryDeletedEventHandlerTests.cs@@ -1,10 +1,11 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Events.Handlers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Domain.Tax;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Catalog.Events.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Events.Handlers{[TestClass()]public class TaxCategoryDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/UpdateProductOnCartEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/UpdateProductOnCartEventHandlerTests.csindex 5a0a7be2f..fb7ce01ad 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/UpdateProductOnCartEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/UpdateProductOnCartEventHandlerTests.cs@@ -1,16 +1,11 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Catalog.Events.Handlers;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Grand.Domain.Customers;-using Grand.Domain.Data;+using Grand.Business.Catalog.Events.Handlers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;+using Grand.Domain.Customers;+using Grand.Domain.Data;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Catalog.Events.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Events.Handlers{[TestClass()]public class UpdateProductOnCartEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/WarehouseDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/WarehouseDeletedEventHandlerTests.csindex 4174e1d77..4e62e6f52 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/WarehouseDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Events/Handlers/WarehouseDeletedEventHandlerTests.cs@@ -1,11 +1,11 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Events.Handlers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Domain.Shipping;-using Grand.Domain.Tax;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Catalog.Events.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Events.Handlers{[TestClass()]public class WarehouseDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateProductReviewTotalsCommandHandlerTest.cs b/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateProductReviewTotalsCommandHandlerTest.csindex edc7457a8..9e3f2090b 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateProductReviewTotalsCommandHandlerTest.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateProductReviewTotalsCommandHandlerTest.cs@@ -1,4 +1,4 @@-using Grand.Business.Catalog.Commands.Handlers;+using Grand.Business.Catalog.Commands;using Grand.Business.Core.Commands.Catalog;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Data.Tests.MongoDb;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPersonalizedProductsQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPersonalizedProductsQueryHandlerTests.csindex 75bc2c0ad..a5f8a55bb 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPersonalizedProductsQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPersonalizedProductsQueryHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Catalog.Queries.Handlers;+using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Domain.Catalog;using Grand.Domain.Customers;using Grand.Domain.Data;@@ -6,7 +7,7 @@ using Grand.Infrastructure.Caching;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Queries.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Queries.Handlers{[TestClass()]public class GetPersonalizedProductsQueryHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPriceByCustomerProductQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPriceByCustomerProductQueryHandlerTests.csindex f32c168bf..d21cfa177 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPriceByCustomerProductQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetPriceByCustomerProductQueryHandlerTests.cs@@ -1,13 +1,11 @@-using Grand.Business.Core.Interfaces.Catalog.Products;-using Grand.Domain.Catalog;+using Grand.Business.Catalog.Queries.Handlers;using Grand.Domain.Customers;using Grand.Domain.Data;using Grand.Infrastructure.Caching;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-using System;-namespace Grand.Business.Catalog.Queries.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Queries.Handlers{[TestClass()]public class GetPriceByCustomerProductQueryHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetProductArchByIdQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetProductArchByIdQueryHandlerTests.csindex f608cb794..bd7a04f91 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetProductArchByIdQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetProductArchByIdQueryHandlerTests.cs@@ -1,13 +1,10 @@-using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Catalog.Queries.Handlers;using Grand.Domain.Catalog;-using Grand.Domain.Customers;using Grand.Domain.Data;-using Grand.Infrastructure.Caching;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-using System;-namespace Grand.Business.Catalog.Queries.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Queries.Handlers{[TestClass()]public class GetProductArchByIdQueryHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetRecommendedProductsQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetRecommendedProductsQueryHandlerTests.csindex 28bad4b94..27e0f7123 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetRecommendedProductsQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetRecommendedProductsQueryHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Catalog.Queries.Handlers;+using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Domain.Catalog;using Grand.Domain.Customers;using Grand.Domain.Data;@@ -6,7 +7,7 @@ using Grand.Infrastructure.Caching;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Queries.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Queries.Handlers{[TestClass()]public class GetRecommendedProductsQueryHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSearchProductsQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSearchProductsQueryHandlerTests.csindex 6abc5e9c2..b7a5fd9af 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSearchProductsQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSearchProductsQueryHandlerTests.cs@@ -1,17 +1,12 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Catalog.Queries.Handlers;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Grand.Domain.Data;-using Grand.Domain.Catalog;-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Queries.Handlers;using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Data.Tests.MongoDb;+using Grand.Domain.Catalog;+using Grand.Domain.Data;+using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Queries.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Queries.Handlers{[TestClass()]public class GetSearchProductsQueryHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSuggestedProductsQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSuggestedProductsQueryHandlerTests.csindex 7eaf6af08..08891d306 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSuggestedProductsQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetSuggestedProductsQueryHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Catalog.Queries.Handlers;+using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Domain.Catalog;using Grand.Domain.Customers;using Grand.Domain.Data;@@ -6,7 +7,7 @@ using Grand.Infrastructure.Caching;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Queries.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Queries.Handlers{[TestClass()]public class GetSuggestedProductsQueryHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.csindex b9352a826..17cdf30f9 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.cs@@ -1,15 +1,10 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Catalog.Queries.Handlers;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;+using Grand.Business.Catalog.Queries.Handlers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;using Grand.Domain.Vendors;-using Grand.Data.Tests.MongoDb;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Catalog.Queries.Handlers.Tests+namespace Grand.Business.Catalog.Tests.Queries.Handlers{[TestClass()]public class GetVendorByIdQueryHandlerTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandLayoutServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandLayoutServiceTests.csindex ff9d06e0d..679ecb25c 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandLayoutServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandLayoutServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Services.Brands;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Infrastructure.Caching;@@ -7,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Brands.Tests+namespace Grand.Business.Catalog.Tests.Services.Brands{[TestClass()]public class BrandLayoutServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandServiceTests.csindex d3987d275..fe4b7807a 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Brands/BrandServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Services.Brands;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;using Grand.Domain.Data;@@ -10,7 +11,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Brands.Tests+namespace Grand.Business.Catalog.Tests.Services.Brands{[TestClass()]public class BrandServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/ProductCategoryServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/ProductCategoryServiceTests.csindex 32b12f6ae..8a78e577e 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/ProductCategoryServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/ProductCategoryServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Services.Categories;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;using Grand.Domain.Data;@@ -10,7 +11,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Categories.Tests+namespace Grand.Business.Catalog.Tests.Services.Categories{[TestClass()]public class ProductCategoryServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionLayoutServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionLayoutServiceTests.csindex e66a55343..6ded0de53 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionLayoutServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionLayoutServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Services.Collections;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Infrastructure.Caching;@@ -7,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Collections.Tests+namespace Grand.Business.Catalog.Tests.Services.Collections{[TestClass()]public class CollectionLayoutServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionServiceTests.csindex d9a5a2798..5d86ff596 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/CollectionServiceTests.cs@@ -1,5 +1,5 @@-using Grand.Business.Core.Interfaces.Catalog.Collections;-using Grand.Business.Catalog.Services.Collections;+using Grand.Business.Catalog.Services.Collections;+using Grand.Business.Core.Interfaces.Catalog.Collections;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Domain.Catalog;using Grand.Domain.Data;@@ -10,7 +10,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Tests.Service.Collections+namespace Grand.Business.Catalog.Tests.Services.Collections{[TestClass()]public class CollectionServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/ProductCollectionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/ProductCollectionServiceTests.csindex e979736c9..f59689148 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/ProductCollectionServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Collections/ProductCollectionServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Services.Collections;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;using Grand.Domain.Data;@@ -10,7 +11,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Collections.Tests+namespace Grand.Business.Catalog.Tests.Services.Collections{[TestClass()]public class ProductCollectionServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/GeoLookupServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/GeoLookupServiceTests.csindex 9c239edeb..75374186d 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/GeoLookupServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Directory/GeoLookupServiceTests.cs@@ -1,15 +1,10 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Catalog.Services.Directory;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Moq;+using Grand.Business.Catalog.Services.Directory;using Grand.Business.Core.Interfaces.Common.Logging;using Grand.SharedKernel.Extensions;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Catalog.Services.Directory.Tests+namespace Grand.Business.Catalog.Tests.Services.Directory{[TestClass()]public class GeoLookupServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.csindex 68e318347..7e4a78ac6 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Discounts/DiscountServiceTests.cs@@ -1,4 +1,4 @@-using Grand.Business.Catalog.Tests.Services.Discounts;+using Grand.Business.Catalog.Services.Discounts;using Grand.Business.Core.Interfaces.Catalog.Discounts;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Utilities.Catalog;@@ -15,7 +15,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Discounts.Tests+namespace Grand.Business.Catalog.Tests.Services.Discounts{[TestClass()]public class DiscountServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.csindex 8c38d9021..04afc6c58 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/BrandImportDataObjectTests.cs@@ -1,6 +1,7 @@using AutoMapper;using Grand.Business.Catalog.Services.Brands;-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Catalog.Services.ExportImport;+using Grand.Business.Core.Dto;using Grand.Business.Core.Interfaces.Catalog.Brands;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Seo;@@ -15,12 +16,11 @@ using Grand.Infrastructure.Caching;using Grand.Infrastructure.Mapper;using Grand.Infrastructure.Tests.Caching;using Grand.Infrastructure.TypeSearch;-using Grand.Infrastructure.TypeSearchers;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.ExportImport.Tests+namespace Grand.Business.Catalog.Tests.Services.ExportImport{[TestClass()]public class BrandImportDataObjectTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.csindex 8a247af23..90fe25916 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CategoryImportDataObjectTests.cs@@ -1,7 +1,8 @@using AutoMapper;using Grand.Business.Catalog.Services.Categories;-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Catalog.Services.ExportImport;using Grand.Business.Common.Services.Security;+using Grand.Business.Core.Dto;using Grand.Business.Core.Interfaces.Catalog.Categories;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Seo;@@ -20,7 +21,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.ExportImport.Tests+namespace Grand.Business.Catalog.Tests.Services.ExportImport{[TestClass()]public class CategoryImportDataObjectTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.csindex 840874b4e..6034e8716 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/CollectionImportDataObjectTests.cs@@ -1,7 +1,8 @@using AutoMapper;using Grand.Business.Catalog.Services.Collections;-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Catalog.Services.ExportImport;using Grand.Business.Common.Services.Security;+using Grand.Business.Core.Dto;using Grand.Business.Core.Interfaces.Catalog.Collections;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Seo;@@ -20,7 +21,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.ExportImport.Tests+namespace Grand.Business.Catalog.Tests.Services.ExportImport{[TestClass()]public class CollectionImportDataObjectTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.csindex dcbe8dfe7..7d856e07a 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs@@ -1,8 +1,15 @@using AutoMapper;+using Grand.Business.Catalog.Services.ExportImport;using Grand.Business.Catalog.Services.Products;-using Grand.Business.Catalog.Services.ExportImport.Dto;using Grand.Business.Common.Services.Security;+using Grand.Business.Core.Dto;+using Grand.Business.Core.Interfaces.Catalog.Brands;+using Grand.Business.Core.Interfaces.Catalog.Categories;+using Grand.Business.Core.Interfaces.Catalog.Collections;+using Grand.Business.Core.Interfaces.Catalog.Directory;using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Core.Interfaces.Catalog.Tax;+using Grand.Business.Core.Interfaces.Checkout.Shipping;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Seo;using Grand.Business.Core.Interfaces.Storage;@@ -15,19 +22,12 @@ using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Mapper;using Grand.Infrastructure.Tests.Caching;-using Grand.Infrastructure.TypeSearchers;+using Grand.Infrastructure.TypeSearch;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-using Grand.Business.Core.Interfaces.Checkout.Shipping;-using Grand.Business.Core.Interfaces.Catalog.Tax;-using Grand.Business.Core.Interfaces.Catalog.Directory;-using Grand.Business.Core.Interfaces.Catalog.Categories;-using Grand.Business.Core.Interfaces.Catalog.Brands;-using Grand.Business.Core.Interfaces.Catalog.Collections;-using Grand.Infrastructure.TypeSearch;-namespace Grand.Business.Catalog.Services.ExportImport.Tests+namespace Grand.Business.Catalog.Tests.Services.ExportImport{[TestClass()]public class ProductImportDataObjectTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.csindex 0c3ef1801..becbf98eb 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs@@ -1,9 +1,9 @@-using Grand.Business.Core.Interfaces.Catalog.Prices;-using Grand.Business.Catalog.Services.Prices;+using Grand.Business.Catalog.Services.Prices;+using Grand.Business.Common.Services.Directory;+using Grand.Business.Core.Interfaces.Catalog.Prices;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Security;-using Grand.Business.Common.Services.Directory;using Grand.Domain.Data;using Grand.Domain.Data.Mongo;using Grand.Domain.Directory;@@ -16,7 +16,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Tests.Service.Prices+namespace Grand.Business.Catalog.Tests.Services.Prices{[TestClass()]public class PriceFormatterTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.csindex bf873638d..068d4f86d 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs@@ -1,14 +1,16 @@-using Grand.Business.Core.Interfaces.Catalog.Brands;+using Grand.Business.Catalog.Services.Prices;+using Grand.Business.Common.Services.Directory;+using Grand.Business.Core.Interfaces.Catalog.Brands;using Grand.Business.Core.Interfaces.Catalog.Categories;using Grand.Business.Core.Interfaces.Catalog.Collections;using Grand.Business.Core.Interfaces.Catalog.Discounts;using Grand.Business.Core.Interfaces.Catalog.Prices;using Grand.Business.Core.Interfaces.Catalog.Products;-using Grand.Business.Catalog.Services.Prices;-using Grand.Business.Core.Utilities.Catalog;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Security;+using Grand.Business.Core.Utilities.Catalog;using Grand.Domain.Catalog;+using Grand.Domain.Common;using Grand.Domain.Customers;using Grand.Domain.Data;using Grand.Domain.Data.Mongo;@@ -22,10 +24,8 @@ using Grand.SharedKernel.Extensions;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-using Grand.Business.Common.Services.Directory;-using Grand.Domain.Common;-namespace Grand.Business.Catalog.Tests.Service.Prices+namespace Grand.Business.Catalog.Tests.Services.Prices{[TestClass()]public class PriceServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.csindex 5e4d23b55..d9bc0e7e2 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/AuctionServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Services.Products;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;using Grand.Domain.Data;@@ -10,7 +11,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Products.Tests+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class AuctionServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CopyProductServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CopyProductServiceTests.csindex a2709e9c2..35013ce5e 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CopyProductServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CopyProductServiceTests.cs@@ -8,7 +8,7 @@ using Grand.Domain.Seo;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Tests.Service.Products+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class CopyProductServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CustomerGroupProductServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CustomerGroupProductServiceTests.csindex 3bef13ce8..ed4e9c44e 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CustomerGroupProductServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/CustomerGroupProductServiceTests.cs@@ -7,7 +7,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Tests.Service.Products+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class CustomerGroupProductServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.csindex e81a8725a..3db37d60c 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/InventoryManageServiceTests.cs@@ -1,6 +1,5 @@-using Grand.Business.Common.Services.Security;+using Grand.Business.Catalog.Services.Products;using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Business.Core.Interfaces.Common.Security;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;@@ -14,7 +13,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Products.Tests+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.csindex 68aa9cd84..58b9bd84e 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/OutOfStockSubscriptionServiceTests.cs@@ -1,20 +1,15 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Catalog.Services.Products;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Grand.Domain.Data;+using Grand.Business.Catalog.Services.Products;+using Grand.Business.Core.Commands.Catalog;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;+using Grand.Domain.Common;+using Grand.Domain.Data;+using Grand.SharedKernel.Extensions;using MediatR;+using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-using Grand.Data.Tests.MongoDb;-using Grand.SharedKernel.Extensions;-using Grand.Domain.Common;-using Grand.Business.Core.Commands.Catalog;-namespace Grand.Business.Catalog.Services.Products.Tests+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class OutOfStockSubscriptionServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeFormatterTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeFormatterTests.csindex c693284af..a966e8789 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeFormatterTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeFormatterTests.cs@@ -1,25 +1,20 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Catalog.Services.Products;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Grand.Infrastructure;-using Moq;-using MediatR;-using Grand.Business.Core.Interfaces.Common.Security;-using Grand.SharedKernel.Extensions;+using Grand.Business.Catalog.Services.Products;using Grand.Business.Common.Services.Security;-using Grand.Domain.Customers;+using Grand.Business.Core.Interfaces.Catalog.Prices;using Grand.Business.Core.Interfaces.Catalog.Products;-using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Catalog.Tax;-using Grand.Business.Core.Interfaces.Catalog.Prices;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Common.Security;using Grand.Domain.Catalog;using Grand.Domain.Common;+using Grand.Domain.Customers;+using Grand.Infrastructure;+using Grand.SharedKernel.Extensions;+using MediatR;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Catalog.Services.Products.Tests+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class ProductAttributeFormatterTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeParserTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeParserTests.csindex c84809a75..88ec84e8b 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeParserTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeParserTests.cs@@ -2,7 +2,7 @@using Grand.Domain.Common;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Catalog.Tests.Service.Products+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class ProductExtensionsAttributeParserTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeServiceTests.csindex 3051c4d71..8d1e25af1 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductAttributeServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Services.Products;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Infrastructure.Caching;@@ -8,8 +9,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;--namespace Grand.Business.Catalog.Services.Products.Tests+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class ProductAttributeServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductCourseServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductCourseServiceTests.csindex 2ad65008f..19d21c6b6 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductCourseServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductCourseServiceTests.cs@@ -1,10 +1,11 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Services.Products;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Courses;using Grand.Domain.Data;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Catalog.Services.Products.Tests+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class ProductCourseServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductLayoutServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductLayoutServiceTests.csindex fab6d8815..2e37e2ea8 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductLayoutServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductLayoutServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Services.Products;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Infrastructure.Caching;@@ -7,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Products.Tests+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class ProductLayoutServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReservationServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReservationServiceTests.csindex 93ed4bef3..6fcb97d7d 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReservationServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReservationServiceTests.cs@@ -1,11 +1,12 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Services.Products;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Products.Tests+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class ProductReservationServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.csindex 304132f33..0d49a095f 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductReviewServiceTests.cs@@ -1,11 +1,12 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Services.Products;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Products.Tests+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class ProductReviewServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.csindex 65cea978b..a735633ce 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Common.Services.Security;+using Grand.Business.Catalog.Services.Products;+using Grand.Business.Common.Services.Security;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Queries.Catalog;using Grand.Data.Tests.MongoDb;@@ -14,7 +15,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Products.Tests+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class ProductServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductTagServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductTagServiceTests.csindex 4206dd36c..4799872a7 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductTagServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/ProductTagServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Services.Products;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Infrastructure.Caching;@@ -8,8 +9,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;--namespace Grand.Business.Catalog.Services.Products.Tests+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class ProductTagServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/RecentlyViewedProductsServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/RecentlyViewedProductsServiceTests.csindex 596e00290..5bccba417 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/RecentlyViewedProductsServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/RecentlyViewedProductsServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Catalog.Services.Products;+using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;@@ -8,7 +9,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Products.Tests+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class RecentlyViewedProductsServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/SpecificationAttributeServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/SpecificationAttributeServiceTests.csindex c49003cb4..8c2308716 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/SpecificationAttributeServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/SpecificationAttributeServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Catalog.Services.Products;+using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;@@ -8,7 +9,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Products.Tests+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class SpecificationAttributeServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/StockQuantityServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/StockQuantityServiceTests.csindex d8049d7ff..467628776 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Products/StockQuantityServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Products/StockQuantityServiceTests.cs@@ -1,12 +1,12 @@-using Grand.Business.Core.Interfaces.Catalog.Products;-using Grand.Business.Catalog.Services.Products;+using Grand.Business.Catalog.Services.Products;+using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Domain.Catalog;+using Grand.Domain.Common;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-using Grand.Domain.Common;-namespace Grand.Business.Catalog.Tests.Service.Products+namespace Grand.Business.Catalog.Tests.Services.Products{[TestClass()]public class StockQuantityServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/FixedRateTestTaxProvider.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/FixedRateTestTaxProvider.csindex b2b172d4d..78fb4c2da 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/FixedRateTestTaxProvider.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/FixedRateTestTaxProvider.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Utilities.Catalog;using Grand.Infrastructure.Plugins;using Microsoft.AspNetCore.Routing;-namespace Grand.Business.Catalog.Tests.Service.Tax+namespace Grand.Business.Catalog.Tests.Services.Tax{public class FixedRateTestTaxProvider : BasePlugin, ITaxProvider{diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxCategoryServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxCategoryServiceTests.csindex 171b899cb..a6c8b925b 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxCategoryServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxCategoryServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Catalog.Services.Tax;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;using Grand.Domain.Tax;using Grand.Infrastructure.Caching;@@ -7,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Catalog.Services.Tax.Tests+namespace Grand.Business.Catalog.Tests.Services.Tax{[TestClass()]public class TaxCategoryServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxServiceTests.csindex 60f33c3d2..3bf941ce7 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/TaxServiceTests.cs@@ -1,18 +1,18 @@-using Grand.Business.Core.Interfaces.Catalog.Tax;-using Grand.Business.Catalog.Services.Tax;+using Grand.Business.Catalog.Services.Tax;+using Grand.Business.Core.Interfaces.Catalog.Directory;+using Grand.Business.Core.Interfaces.Catalog.Tax;using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Interfaces.Common.Logging;+using Grand.Domain.Catalog;using Grand.Domain.Common;using Grand.Domain.Customers;using Grand.Domain.Tax;-using Grand.Business.Core.Interfaces.Common.Logging;using Grand.Infrastructure;+using Grand.SharedKernel.Extensions;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-using Grand.Domain.Catalog;-using Grand.SharedKernel.Extensions;-using Grand.Business.Core.Interfaces.Catalog.Directory;-namespace Grand.Business.Catalog.Tests.Service.Tax+namespace Grand.Business.Catalog.Tests.Services.Tax{[TestClass()]public class TaxServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/VatServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/VatServiceTests.csindex e8ea7e506..851b8d1b2 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/VatServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Tax/VatServiceTests.cs@@ -1,7 +1,8 @@-using Grand.Domain.Tax;+using Grand.Business.Catalog.Services.Tax;+using Grand.Domain.Tax;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Catalog.Services.Tax.Tests+namespace Grand.Business.Catalog.Tests.Services.Tax{[TestClass()]public class VatServiceTestsdiff --git a/src/Tests/Grand.Business.Catalog.Tests/Startup/StartupApplicationTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Startup/StartupApplicationTests.csindex 5dfa2a4ba..932bcbd63 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Startup/StartupApplicationTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Startup/StartupApplicationTests.cs@@ -1,14 +1,9 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Catalog.Startup;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Microsoft.Extensions.DependencyInjection;+using Grand.Business.Catalog.Startup;using Microsoft.Extensions.Configuration;+using Microsoft.Extensions.DependencyInjection;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Catalog.Startup.Tests+namespace Grand.Business.Catalog.Tests.Startup{[TestClass()]public class StartupApplicationTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AddCustomerReservationCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AddCustomerReservationCommandHandlerTests.csindex 4060a087e..8116996cd 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AddCustomerReservationCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AddCustomerReservationCommandHandlerTests.cs@@ -1,16 +1,11 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Checkout.Commands.Handlers.Orders;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;+using Grand.Business.Checkout.Commands.Handlers.Orders;using Grand.Business.Core.Interfaces.Catalog.Products;-using Moq;using Grand.Domain;using Grand.Domain.Catalog;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class AddCustomerReservationCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AddRequiredProductsCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AddRequiredProductsCommandHandlerTests.csindex 213132c55..793979904 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AddRequiredProductsCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AddRequiredProductsCommandHandlerTests.cs@@ -1,19 +1,14 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Checkout.Commands.Handlers.Orders;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Moq;-using Grand.Business.Core.Interfaces.Checkout.Orders;-using Grand.Domain.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Core.Interfaces.Checkout.Orders;+using Grand.Business.Core.Utilities.Checkout;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Business.Core.Utilities.Checkout;+using Grand.Domain.Orders;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class AddRequiredProductsCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandlerTests.csindex dd8b3ca9f..8f61bbb61 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandlerTests.cs@@ -1,15 +1,16 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Business.Checkout.Commands.Handlers.Orders;using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Customers;-using MediatR;-using Moq;using Grand.Domain.Customers;using Grand.Domain.Directory;+using MediatR;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class AwardLoyaltyPointsCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CancelOrderItemCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CancelOrderItemCommandHandlerTests.csindex 0461b6b91..32ad64327 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CancelOrderItemCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CancelOrderItemCommandHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Commands.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Shipping;@@ -10,7 +11,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class CancelOrderItemCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CaptureCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CaptureCommandHandlerTests.csindex 71b60551c..903bff86d 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CaptureCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/CaptureCommandHandlerTests.cs@@ -1,16 +1,15 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;-using Grand.Domain.Orders;-using Grand.Domain.Payments;-using MediatR;-using Moq;using Grand.Business.Core.Interfaces.Checkout.Payments;using Grand.Business.Core.Interfaces.Common.Logging;using Grand.Business.Core.Queries.Checkout.Orders;+using Grand.Domain.Payments;+using MediatR;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class CaptureCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderCommandHandlerTests.csindex 668af9c87..ca7b5eeba 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderCommandHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Commands.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Catalog.Discounts;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Checkout.Orders;@@ -9,7 +10,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class DeleteOrderCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderItemCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderItemCommandHandlerTests.csindex 7c20aa20d..c29e5d921 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderItemCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/DeleteOrderItemCommandHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Commands.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;using Grand.Business.Core.Interfaces.Checkout.Orders;@@ -10,7 +11,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class DeleteOrderItemCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/InsertOrderItemCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/InsertOrderItemCommandHandlerTests.csindex 5720b8147..3c2b4f910 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/InsertOrderItemCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/InsertOrderItemCommandHandlerTests.cs@@ -1,16 +1,16 @@-using Grand.Business.Core.Commands.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Shipping;using Grand.Domain.Catalog;using Grand.Domain.Orders;-using Grand.Domain.Shipping;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class InsertOrderItemCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandlerTests.csindex 120bbf7a7..9e678d332 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandlerTests.cs@@ -1,16 +1,15 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;+using Grand.Business.Core.Interfaces.Checkout.Payments;+using Grand.Business.Core.Queries.Checkout.Orders;using Grand.Domain.Orders;using Grand.Domain.Payments;using MediatR;+using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-using Grand.Business.Core.Interfaces.Checkout.Payments;-using Grand.Business.Core.Interfaces.Common.Logging;-using Grand.Business.Core.Queries.Checkout.Orders;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class MarkAsAuthorizedCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsPaidCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsPaidCommandHandlerTests.csindex 2268ae15f..27b0a3774 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsPaidCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MarkAsPaidCommandHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Commands.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Payments;using Grand.Business.Core.Queries.Checkout.Orders;@@ -8,7 +9,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class MarkAsPaidCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MaxOrderNumberCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MaxOrderNumberCommandHandlerTests.csindex 449a70981..592138f80 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MaxOrderNumberCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/MaxOrderNumberCommandHandlerTests.cs@@ -1,9 +1,10 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;using Grand.Domain.Orders;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class MaxOrderNumberCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/OrderStatusCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/OrderStatusCommandHandlerTests.csindex d4841c82e..e01a66bf8 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/OrderStatusCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/OrderStatusCommandHandlerTests.cs@@ -1,17 +1,15 @@-using Grand.Business.Core.Commands.Checkout.Orders;-using Grand.Business.Core.Interfaces.Catalog.Discounts;-using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;-using Grand.Business.Core.Interfaces.Checkout.Shipping;using Grand.Business.Core.Interfaces.Common.Pdf;using Grand.Business.Core.Interfaces.Customers;using Grand.Business.Core.Interfaces.Messages;using Grand.Domain.Orders;-using Grand.Domain.Shipping;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests++namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class OrderStatusCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandlerTests.csindex 4d4307f69..186b09144 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandlerTests.cs@@ -1,16 +1,15 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;+using Grand.Business.Core.Interfaces.Checkout.Payments;+using Grand.Business.Core.Queries.Checkout.Orders;using Grand.Domain.Orders;using Grand.Domain.Payments;using MediatR;+using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-using Grand.Business.Core.Interfaces.Checkout.Payments;-using Grand.Business.Core.Interfaces.Common.Logging;-using Grand.Business.Core.Queries.Checkout.Orders;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class PartiallyPaidOfflineCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundCommandHandlerTests.csindex 66e9a9cc3..7e842271f 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundCommandHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Commands.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Payments;using Grand.Business.Core.Interfaces.Common.Logging;@@ -11,7 +12,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class PartiallyRefundCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandlerTests.csindex ddd794959..80566eeb5 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Commands.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Payments;using Grand.Business.Core.Interfaces.Messages;@@ -9,7 +10,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class PartiallyRefundOfflineCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PrepareOrderCodeCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PrepareOrderCodeCommandHandlerTests.csindex e86b7e62c..65c49c4a9 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PrepareOrderCodeCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/PrepareOrderCodeCommandHandlerTests.cs@@ -1,6 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class PrepareOrderCodeCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandlerTests.csindex 6c06d4f86..a119e0f2f 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandlerTests.cs@@ -1,15 +1,16 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Business.Checkout.Commands.Handlers.Orders;using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Customers;-using MediatR;-using Moq;using Grand.Domain.Customers;using Grand.Domain.Directory;+using MediatR;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class ReduceLoyaltyPointsCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/RefundCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/RefundCommandHandlerTests.csindex 593b30636..18247bf25 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/RefundCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/RefundCommandHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Commands.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Payments;using Grand.Business.Core.Interfaces.Common.Logging;@@ -11,7 +12,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class RefundCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandlerTests.csindex 31cfe4539..2e100f513 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandlerTests.cs@@ -1,15 +1,10 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Checkout.Commands.Handlers.Orders;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Common.Localization;+using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-using Grand.Business.Core.Interfaces.Checkout.Orders;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class ReturnBackRedeemedLoyaltyPointsCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/UpdateOrderItemCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/UpdateOrderItemCommandHandlerTests.csindex 7eacb6511..b99241b9b 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/UpdateOrderItemCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/UpdateOrderItemCommandHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Commands.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;using Grand.Business.Core.Interfaces.Checkout.Orders;@@ -10,7 +11,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class UpdateOrderItemCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandlerTests.csindex 123812032..9f7426418 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandlerTests.cs@@ -1,10 +1,11 @@-using Grand.Business.Core.Interfaces.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Utilities.Catalog;using Grand.Domain.Orders;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class ValidateMinShoppingCartSubtotalAmountCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidCommandHandlerTests.csindex 1ad27af97..b55f8313c 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidCommandHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Commands.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Payments;using Grand.Business.Core.Interfaces.Common.Logging;@@ -11,7 +12,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class VoidCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidOfflineCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidOfflineCommandHandlerTests.csindex e9171daaa..3aa10f280 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidOfflineCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Orders/VoidOfflineCommandHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Commands.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Orders;+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Payments;using Grand.Business.Core.Queries.Checkout.Orders;@@ -9,7 +10,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Orders{[TestClass()]public class VoidOfflineCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/DeliveryCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/DeliveryCommandHandlerTests.csindex c8f0a71ae..97c0a2894 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/DeliveryCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/DeliveryCommandHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Interfaces.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Shipping;+using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Shipping;using Grand.Business.Core.Interfaces.Messages;using Grand.Domain.Orders;@@ -7,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Shipping.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Shipping{[TestClass()]public class DeliveryCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/ShipCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/ShipCommandHandlerTests.csindex 64d8f60fd..df1e777ad 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/ShipCommandHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Handlers/Shipping/ShipCommandHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Interfaces.Checkout.Orders;+using Grand.Business.Checkout.Commands.Handlers.Shipping;+using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Shipping;using Grand.Business.Core.Interfaces.Messages;using Grand.Domain.Orders;@@ -7,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Commands.Handlers.Shipping.Tests+namespace Grand.Business.Checkout.Tests.Commands.Handlers.Shipping{[TestClass()]public class ShipCommandHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Events/Customers/CustomerRegisteredEventHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Events/Customers/CustomerRegisteredEventHandlerTests.csindex 8323dc702..35cafe66a 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Events/Customers/CustomerRegisteredEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Events/Customers/CustomerRegisteredEventHandlerTests.cs@@ -1,9 +1,10 @@-using Grand.Business.Core.Interfaces.Checkout.Orders;+using Grand.Business.Checkout.Events.Customers;+using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Common.Localization;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Events.Customers.Tests+namespace Grand.Business.Checkout.Tests.Events.Customers{[TestClass()]public class CustomerRegisteredEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/MerchandiseReturnDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/MerchandiseReturnDeletedEventHandlerTests.csindex f4bee0491..2c3ab3984 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/MerchandiseReturnDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/MerchandiseReturnDeletedEventHandlerTests.cs@@ -1,15 +1,10 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Checkout.Events.Orders;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;+using Grand.Business.Checkout.Events.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;-using Moq;using Grand.Domain.Orders;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Checkout.Events.Orders.Tests+namespace Grand.Business.Checkout.Tests.Events.Orders{[TestClass()]public class MerchandiseReturnDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/MerchandiseReturnInsertEventHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/MerchandiseReturnInsertEventHandlerTests.csindex 4783c341a..99fdce254 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/MerchandiseReturnInsertEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/MerchandiseReturnInsertEventHandlerTests.cs@@ -1,9 +1,10 @@-using Grand.Business.Core.Interfaces.Checkout.Orders;+using Grand.Business.Checkout.Events.Orders;+using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Domain.Orders;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Events.Orders.Tests+namespace Grand.Business.Checkout.Tests.Events.Orders{[TestClass()]public class MerchandiseReturnInsertEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderDeletedEventHandlerTests.csindex 1035cbd1b..a88479910 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderDeletedEventHandlerTests.cs@@ -1,10 +1,11 @@-using Grand.Business.Core.Events.Checkout.Orders;+using Grand.Business.Checkout.Events.Orders;+using Grand.Business.Core.Events.Checkout.Orders;using Grand.Domain.Catalog;using Grand.Domain.Data;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Events.Orders.Tests+namespace Grand.Business.Checkout.Tests.Events.Orders{[TestClass()]public class OrderDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderPlacedEventHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderPlacedEventHandlerTests.csindex 69480bead..bada30f1c 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderPlacedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Events/Orders/OrderPlacedEventHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Events.Checkout.Orders;+using Grand.Business.Checkout.Events.Orders;+using Grand.Business.Core.Events.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Customers;using Grand.Domain.Catalog;@@ -7,7 +8,7 @@ using Grand.Domain.Orders;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Events.Orders.Tests+namespace Grand.Business.Checkout.Tests.Events.Orders{[TestClass()]public class OrderPlacedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Events/Shipping/ShipmentDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Events/Shipping/ShipmentDeletedEventHandlerTests.csindex 71b7c7f9e..aa9863010 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Events/Shipping/ShipmentDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Events/Shipping/ShipmentDeletedEventHandlerTests.cs@@ -1,19 +1,13 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Checkout.Events.Shipping;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Grand.Business.Core.Interfaces.Customers;-using Moq;+using Grand.Business.Checkout.Events.Shipping;+using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Shipping;-using Grand.Business.Core.Interfaces.Catalog.Products;-using Grand.Domain.Shipping;using Grand.Domain.Orders;+using Grand.Domain.Shipping;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Checkout.Events.Shipping.Tests+namespace Grand.Business.Checkout.Tests.Events.Shipping{[TestClass()]public class ShipmentDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Events/Shipping/ShipmentInsertedEventHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Events/Shipping/ShipmentInsertedEventHandlerTests.csindex 6df61bbdd..07acef846 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Events/Shipping/ShipmentInsertedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Events/Shipping/ShipmentInsertedEventHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Checkout.Events.Shipping;+using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Domain.Catalog;using Grand.Domain.Orders;@@ -6,7 +7,7 @@ using Grand.Domain.Shipping;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Events.Shipping.Tests+namespace Grand.Business.Checkout.Tests.Events.Shipping{[TestClass()]public class ShipmentInsertedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Events/ShoppingCart/CustomerLoggedInEventHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Events/ShoppingCart/CustomerLoggedInEventHandlerTests.csindex 4045b6475..587f4a45f 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Events/ShoppingCart/CustomerLoggedInEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Events/ShoppingCart/CustomerLoggedInEventHandlerTests.cs@@ -1,10 +1,11 @@-using Grand.Business.Core.Interfaces.Checkout.Orders;+using Grand.Business.Checkout.Events.ShoppingCart;+using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Domain.Customers;using Grand.Infrastructure;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Events.ShoppingCart.Tests+namespace Grand.Business.Checkout.Tests.Events.ShoppingCart{[TestClass()]public class CustomerLoggedInEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Events/ShoppingCart/ShoppingCartItemDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Events/ShoppingCart/ShoppingCartItemDeletedEventHandlerTests.csindex 08ad4eea8..559c36711 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Events/ShoppingCart/ShoppingCartItemDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Events/ShoppingCart/ShoppingCartItemDeletedEventHandlerTests.cs@@ -1,16 +1,10 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Checkout.Events.Shipping;-using Grand.Business.Checkout.Events.ShoppingCart;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;+using Grand.Business.Checkout.Events.ShoppingCart;using Grand.Business.Core.Interfaces.Catalog.Products;-using Moq;using Grand.Domain.Catalog;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Checkout.Events.Shipping.Tests+namespace Grand.Business.Checkout.Tests.Events.ShoppingCart{[TestClass()]public class ShoppingCartItemDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Queries/Handlers/Orders/HandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Queries/Handlers/Orders/HandlerTests.csindex f54a85120..3d79c8263 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Queries/Handlers/Orders/HandlerTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Queries/Handlers/Orders/HandlerTests.cs@@ -1,11 +1,12 @@-using Grand.Business.Core.Interfaces.Checkout.Payments;+using Grand.Business.Checkout.Queries.Handlers.Orders;+using Grand.Business.Core.Interfaces.Checkout.Payments;using Grand.Business.Core.Queries.Checkout.Orders;using Grand.Domain.Orders;using Grand.Domain.Payments;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Queries.Handlers.Orders.Tests+namespace Grand.Business.Checkout.Tests.Queries.Handlers.Orders{[TestClass()]public class HandlerTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.csindex 1db415dd0..aae4ca8f4 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.cs@@ -1,12 +1,12 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Checkout.Services.Orders;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;using Grand.Domain.Orders;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;--namespace Grand.Business.Checkout.Services.Orders.Tests+namespace Grand.Business.Checkout.Tests.Services.Orders{[TestClass()]public class LoyaltyPointsServiceTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/MerchandiseReturnServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/MerchandiseReturnServiceTests.csindex 7b43e1c6c..2026c15f9 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/MerchandiseReturnServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/MerchandiseReturnServiceTests.cs@@ -1,5 +1,7 @@-using Grand.Business.Core.Queries.Checkout.Orders;+using Grand.Business.Checkout.Services.Orders;+using Grand.Business.Core.Queries.Checkout.Orders;using Grand.Data.Tests.MongoDb;+using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Domain.Orders;using Grand.Infrastructure.Caching;@@ -8,7 +10,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Services.Orders.Tests+namespace Grand.Business.Checkout.Tests.Services.Orders{[TestClass()]public class MerchandiseReturnServiceTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderCalculationServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderCalculationServiceTests.csindex 5efb82de8..0111fbb77 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderCalculationServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderCalculationServiceTests.cs@@ -1,16 +1,13 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Core.Extensions;+using Grand.Business.Checkout.Services.Orders;using Grand.Business.Core.Interfaces.Catalog.Discounts;using Grand.Business.Core.Interfaces.Catalog.Prices;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Catalog.Tax;-using Grand.Business.Core.Utilities.Catalog;using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Payments;using Grand.Business.Core.Interfaces.Checkout.Shipping;-using Grand.Business.Core.Utilities.Checkout;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Domain.Catalog;using Grand.Domain.Common;@@ -19,13 +16,12 @@ using Grand.Domain.Directory;using Grand.Domain.Discounts;using Grand.Domain.Orders;using Grand.Domain.Shipping;-using Grand.Domain.Stores;using Grand.Domain.Tax;using Grand.Infrastructure;-using Grand.SharedKernel;+using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Services.Orders.Tests+namespace Grand.Business.Checkout.Tests.Services.Orders{[TestClass()]public class OrderCalculationServiceTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderTagServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderTagServiceTests.csindex 59a7ad599..8ce09848a 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderTagServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderTagServiceTests.cs@@ -1,4 +1,4 @@-using Grand.Business.Core.Queries.Checkout.Orders;+using Grand.Business.Checkout.Services.Orders;using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;using Grand.Domain.Orders;@@ -8,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Services.Orders.Tests+namespace Grand.Business.Checkout.Tests.Services.Orders{[TestClass()]public class OrderTagServiceTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/ShoppingCartServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/ShoppingCartServiceTests.csindex 7467047f9..0bb19a78a 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/ShoppingCartServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/ShoppingCartServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Checkout.Services.Orders;+using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Customers;@@ -14,7 +15,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Services.Orders.Tests+namespace Grand.Business.Checkout.Tests.Services.Orders{[TestClass()]public class ShoppingCartServiceTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShipmentServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShipmentServiceTests.csindex a4304bb69..45a10bea6 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShipmentServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShipmentServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Interfaces.Checkout.Shipping;+using Grand.Business.Checkout.Services.Shipping;+using Grand.Business.Core.Interfaces.Checkout.Shipping;using Grand.Domain.Data;using Grand.Domain.Shipping;using Grand.Infrastructure.Events;@@ -6,7 +7,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Checkout.Services.Shipping.Tests+namespace Grand.Business.Checkout.Tests.Services.Shipping{[TestClass()]public class ShipmentServiceTestsdiff --git a/src/Tests/Grand.Business.Checkout.Tests/Startup/StartupApplicationTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Startup/StartupApplicationTests.csindex 4814e382b..6d6a5acb5 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Startup/StartupApplicationTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Startup/StartupApplicationTests.cs@@ -1,8 +1,9 @@-using Microsoft.Extensions.Configuration;+using Grand.Business.Checkout.Startup;+using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Checkout.Startup.Tests+namespace Grand.Business.Checkout.Tests.Startup{[TestClass()]public class StartupApplicationTestsdiff --git a/src/Tests/Grand.Business.Cms.Tests/Services/KnowledgebaseServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/KnowledgebaseServiceTests.csindex e9537e4de..2871c2cf0 100644--- a/src/Tests/Grand.Business.Cms.Tests/Services/KnowledgebaseServiceTests.cs+++ b/src/Tests/Grand.Business.Cms.Tests/Services/KnowledgebaseServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Cms.Services;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Grand.Domain.Data;using Grand.Domain.Knowledgebase;@@ -9,7 +10,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Cms.Services.Tests+namespace Grand.Business.Cms.Tests.Services{[TestClass()]public class KnowledgebaseServiceTestsdiff --git a/src/Tests/Grand.Business.Cms.Tests/Services/NewsServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/NewsServiceTests.csindex 67db01334..44f839cf8 100644--- a/src/Tests/Grand.Business.Cms.Tests/Services/NewsServiceTests.cs+++ b/src/Tests/Grand.Business.Cms.Tests/Services/NewsServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Cms.Services;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Grand.Domain.Data;using Grand.Domain.News;@@ -7,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Cms.Services.Tests+namespace Grand.Business.Cms.Tests.Services{[TestClass()]public class NewsServiceTestsdiff --git a/src/Tests/Grand.Business.Cms.Tests/Services/PageLayoutServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/PageLayoutServiceTests.csindex 7de5d04ef..8cdb46360 100644--- a/src/Tests/Grand.Business.Cms.Tests/Services/PageLayoutServiceTests.cs+++ b/src/Tests/Grand.Business.Cms.Tests/Services/PageLayoutServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Cms.Services;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Grand.Domain.Data;using Grand.Domain.Pages;@@ -9,7 +10,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Cms.Services.Tests+namespace Grand.Business.Cms.Tests.Services{[TestClass()]public class PageLayoutServiceTestsdiff --git a/src/Tests/Grand.Business.Cms.Tests/Services/PageServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/PageServiceTests.csindex 0d88e7c0f..f986a85f9 100644--- a/src/Tests/Grand.Business.Cms.Tests/Services/PageServiceTests.cs+++ b/src/Tests/Grand.Business.Cms.Tests/Services/PageServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Business.Common.Services.Security;+using Grand.Business.Cms.Services;+using Grand.Business.Common.Services.Security;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;@@ -11,7 +12,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Cms.Services.Tests+namespace Grand.Business.Cms.Tests.Services{[TestClass()]public class PageServiceTestsdiff --git a/src/Tests/Grand.Business.Cms.Tests/Services/RobotsTxtServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/RobotsTxtServiceTests.csindex eaf18b6f4..597d43f0f 100644--- a/src/Tests/Grand.Business.Cms.Tests/Services/RobotsTxtServiceTests.cs+++ b/src/Tests/Grand.Business.Cms.Tests/Services/RobotsTxtServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Cms.Services;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Common;using Grand.Domain.Customers;using Grand.Domain.Data;@@ -9,7 +10,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Cms.Services.Tests+namespace Grand.Business.Cms.Tests.Services{[TestClass()]public class RobotsTxtServiceTestsdiff --git a/src/Tests/Grand.Business.Cms.Tests/Startup/StartupApplicationTests.cs b/src/Tests/Grand.Business.Cms.Tests/Startup/StartupApplicationTests.csindex 64b6e0d5c..d09fa4f9f 100644--- a/src/Tests/Grand.Business.Cms.Tests/Startup/StartupApplicationTests.cs+++ b/src/Tests/Grand.Business.Cms.Tests/Startup/StartupApplicationTests.cs@@ -1,8 +1,9 @@-using Microsoft.Extensions.Configuration;+using Grand.Business.Cms.Startup;+using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Cms.Startup.Tests+namespace Grand.Business.Cms.Tests.Startup{[TestClass()]public class StartupApplicationTestsdiff --git a/src/Tests/Grand.Business.Common.Tests/Events/GroupDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Common.Tests/Events/GroupDeletedEventHandlerTests.csindex 6dc45d51f..0495a6dc0 100644--- a/src/Tests/Grand.Business.Common.Tests/Events/GroupDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Events/GroupDeletedEventHandlerTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Common.Events;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Customers;using Grand.Domain.Data;@@ -8,7 +9,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Common.Events.Tests+namespace Grand.Business.Common.Tests.Events{[TestClass()]public class GroupDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Common.Tests/Events/LanguageDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Common.Tests/Events/LanguageDeletedEventHandlerTests.csindex 30c1d4782..4672776cd 100644--- a/src/Tests/Grand.Business.Common.Tests/Events/LanguageDeletedEventHandlerTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Events/LanguageDeletedEventHandlerTests.cs@@ -1,16 +1,11 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Common.Events;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Moq;-using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Common.Events;using Grand.Business.Core.Interfaces.Common.Configuration;+using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Domain.Localization;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Common.Events.Tests+namespace Grand.Business.Common.Tests.Events{[TestClass()]public class LanguageDeletedEventHandlerTestsdiff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CountryServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CountryServiceTests.csindex 80a520c8e..773415ebf 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CountryServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CountryServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Common.Services.Directory;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;using Grand.Domain.Directory;using Grand.Infrastructure.Caching;@@ -7,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Common.Services.Directory.Tests+namespace Grand.Business.Common.Tests.Services.Directory{[TestClass()]public class CountryServiceTestsdiff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/DateTimeServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/DateTimeServiceTests.csindex db04b0493..93927d3c6 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/DateTimeServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/DateTimeServiceTests.cs@@ -1,7 +1,8 @@-using Grand.Domain.Directory;+using Grand.Business.Common.Services.Directory;+using Grand.Domain.Directory;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Common.Services.Directory.Tests+namespace Grand.Business.Common.Tests.Services.Directory{[TestClass()]public class DateTimeServiceTestsdiff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/GroupServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/GroupServiceTests.csindex f49dc9f99..a94930a96 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/GroupServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/GroupServiceTests.cs@@ -2,14 +2,13 @@using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Grand.Domain.Data;-using Grand.Domain.Directory;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Tests.Caching;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Common.Services.Directory.Tests+namespace Grand.Business.Common.Tests.Services.Directory{[TestClass()]public class GroupServiceTestsdiff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/UserFieldServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/UserFieldServiceTests.csindex 62203bd46..ea26baf99 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/UserFieldServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/UserFieldServiceTests.cs@@ -1,17 +1,12 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Common.Services.Directory;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Grand.Domain.Data;-using Grand.Domain.Common;+using Grand.Business.Common.Services.Directory;using Grand.Data.Tests.MongoDb;+using Grand.Domain.Common;using Grand.Domain.Customers;+using Grand.Domain.Data;+using Microsoft.VisualStudio.TestTools.UnitTesting;using MongoDB.Bson.Serialization.Conventions;-namespace Grand.Business.Common.Services.Directory.Tests+namespace Grand.Business.Common.Tests.Services.Directory{[TestClass()]public class UserFieldServiceTestsdiff --git a/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.csindex f920051f2..8b31e1e18 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.cs@@ -1,21 +1,16 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Business.Common.Services.Directory;using Grand.Business.Common.Services.ExportImport;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;using Grand.Domain.Directory;-using Moq;-using MediatR;using Grand.Infrastructure.Caching;-using Grand.Data.Tests.MongoDb;using Grand.Infrastructure.Tests.Caching;-using Grand.Business.Common.Services.Directory;+using MediatR;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Common.Services.ExportImport.Tests+namespace Grand.Business.Common.Tests.Services.ExportImport{[TestClass()]public class CountryImportDataObjectTestsdiff --git a/src/Tests/Grand.Business.Common.Tests/Services/Localization/LanguageServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Localization/LanguageServiceTests.csindex 9135a6135..c21577e8b 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Localization/LanguageServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Localization/LanguageServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Common.Services.Localization;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;using Grand.Domain.Localization;using Grand.Infrastructure.Caching;@@ -7,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Common.Services.Localization.Tests+namespace Grand.Business.Common.Tests.Services.Localization{[TestClass()]public class LanguageServiceTestsdiff --git a/src/Tests/Grand.Business.Common.Tests/Services/Localization/TranslationServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Localization/TranslationServiceTests.csindex 8f95c3372..d0240b693 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Localization/TranslationServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Localization/TranslationServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Common.Services.Localization;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Grand.Domain.Data;using Grand.Domain.Localization;@@ -9,7 +10,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Common.Services.Localization.Tests+namespace Grand.Business.Common.Tests.Services.Localization{[TestClass()]public class TranslationServiceTestsdiff --git a/src/Tests/Grand.Business.Common.Tests/Services/Logging/CustomerActivityServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Logging/CustomerActivityServiceTests.csindex f2fd96fb9..9bf784570 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Logging/CustomerActivityServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Logging/CustomerActivityServiceTests.cs@@ -1,16 +1,14 @@-using Grand.Data.Tests.MongoDb;-using Grand.Domain.Customers;+using Grand.Business.Common.Services.Logging;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;-using Grand.Domain.Localization;using Grand.Domain.Logging;-using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Tests.Caching;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Common.Services.Logging.Tests+namespace Grand.Business.Common.Tests.Services.Logging{[TestClass()]public class CustomerActivityServiceTestsdiff --git a/src/Tests/Grand.Business.Common.Tests/Services/Logging/DefaultLoggerTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Logging/DefaultLoggerTests.csindex 42de501db..b7453b8ef 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Logging/DefaultLoggerTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Logging/DefaultLoggerTests.cs@@ -1,9 +1,10 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Common.Services.Logging;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;using Grand.Domain.Logging;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Common.Services.Logging.Tests+namespace Grand.Business.Common.Tests.Services.Logging{[TestClass()]public class DefaultLoggerTestsdiff --git a/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugServiceTests.csindex 69f73e354..aa688bfae 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Seo/SlugServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Common.Services.Seo;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Grand.Domain.Data;using Grand.Domain.Seo;@@ -8,7 +9,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Common.Services.Seo.Tests+namespace Grand.Business.Common.Tests.Services.Seo{[TestClass()]public class SlugServiceTestsdiff --git a/src/Tests/Grand.Business.Common.Tests/Startup/StartupApplicationTests.cs b/src/Tests/Grand.Business.Common.Tests/Startup/StartupApplicationTests.csindex f07b68a46..7e25e0fda 100644--- a/src/Tests/Grand.Business.Common.Tests/Startup/StartupApplicationTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Startup/StartupApplicationTests.cs@@ -1,8 +1,9 @@-using Microsoft.Extensions.Configuration;+using Grand.Business.Common.Startup;+using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Common.Startup.Tests+namespace Grand.Business.Common.Tests.Startup{[TestClass()]public class StartupApplicationTestsdiff --git a/src/Tests/Grand.Business.Customers.Tests/Queries/Handlers/GetCustomerQueryHandlerTests.cs b/src/Tests/Grand.Business.Customers.Tests/Queries/Handlers/GetCustomerQueryHandlerTests.csindex b4ddf0042..54f11eab2 100644--- a/src/Tests/Grand.Business.Customers.Tests/Queries/Handlers/GetCustomerQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Queries/Handlers/GetCustomerQueryHandlerTests.cs@@ -1,8 +1,9 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Customers.Queries.Handlers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Customers.Queries.Handlers.Tests+namespace Grand.Business.Customers.Tests.Queries.Handlers{[TestClass()]public class GetCustomerQueryHandlerTestsdiff --git a/src/Tests/Grand.Business.Customers.Tests/Queries/Handlers/GetGroupBySystemNameQueryHandlerTests.cs b/src/Tests/Grand.Business.Customers.Tests/Queries/Handlers/GetGroupBySystemNameQueryHandlerTests.csindex e8505d41b..9bd46f84b 100644--- a/src/Tests/Grand.Business.Customers.Tests/Queries/Handlers/GetGroupBySystemNameQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Queries/Handlers/GetGroupBySystemNameQueryHandlerTests.cs@@ -1,8 +1,9 @@using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Customers.Queries.Handlers;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Customers.Queries.Handlers.Tests+namespace Grand.Business.Customers.Tests.Queries.Handlers{[TestClass()]public class GetGroupBySystemNameQueryHandlerTestsdiff --git a/src/Tests/Grand.Business.Customers.Tests/Queries/Handlers/GetPasswordIsExpiredQueryHandlerTests.cs b/src/Tests/Grand.Business.Customers.Tests/Queries/Handlers/GetPasswordIsExpiredQueryHandlerTests.csindex adc97773d..df12e05b2 100644--- a/src/Tests/Grand.Business.Customers.Tests/Queries/Handlers/GetPasswordIsExpiredQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Queries/Handlers/GetPasswordIsExpiredQueryHandlerTests.cs@@ -1,9 +1,10 @@using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Customers.Queries.Handlers;using Grand.Domain.Customers;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Customers.Queries.Handlers.Tests+namespace Grand.Business.Customers.Tests.Queries.Handlers{[TestClass()]public class GetPasswordIsExpiredQueryHandlerTestsdiff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerHistoryPasswordServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerHistoryPasswordServiceTests.csindex 3be3489c6..0c759e275 100644--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerHistoryPasswordServiceTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerHistoryPasswordServiceTests.cs@@ -1,18 +1,12 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Customers.Services;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Grand.Domain.Data;+using Grand.Business.Customers.Services;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;-using Moq;+using Grand.Domain.Data;using MediatR;-using Grand.Domain.Catalog;-using Grand.Data.Tests.MongoDb;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;-namespace Grand.Business.Customers.Services.Tests+namespace Grand.Business.Customers.Tests.Services{[TestClass()]public class CustomerHistoryPasswordServiceTestsdiff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerManagerServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerManagerServiceTests.csindex c91610140..0e1fe927d 100644--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerManagerServiceTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerManagerServiceTests.cs@@ -2,13 +2,14 @@using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Interfaces.Customers;+using Grand.Business.Customers.Services;using Grand.Domain.Customers;using Grand.SharedKernel;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Customers.Services.Tests+namespace Grand.Business.Customers.Tests.Services{[TestClass()]public class CustomerManagerServiceTestsdiff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerServiceTests.csindex 0337a183a..1e299e85d 100644--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerServiceTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerServiceTests.cs@@ -1,8 +1,8 @@using Grand.Business.Common.Services.Directory;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Queries.Customers;+using Grand.Business.Customers.Services;using Grand.Data.Tests.MongoDb;-using Grand.Domain;using Grand.Domain.Common;using Grand.Domain.Customers;using Grand.Domain.Data;@@ -11,7 +11,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Customers.Services.Tests+namespace Grand.Business.Customers.Tests.Services{[TestClass()]public class CustomerServiceTestsdiff --git a/src/Tests/Grand.Business.Customers.Tests/Services/SalesEmployeeServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/SalesEmployeeServiceTests.csindex 91e9a7829..b99d9656c 100644--- a/src/Tests/Grand.Business.Customers.Tests/Services/SalesEmployeeServiceTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Services/SalesEmployeeServiceTests.cs@@ -1,5 +1,5 @@-using Grand.Data.Tests.MongoDb;-using Grand.Domain.Catalog;+using Grand.Business.Customers.Services;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Grand.Domain.Data;using Grand.Infrastructure.Caching;@@ -8,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Customers.Services.Tests+namespace Grand.Business.Customers.Tests.Services{[TestClass()]public class SalesEmployeeServiceTestsdiff --git a/src/Tests/Grand.Business.Customers.Tests/Startup/StartupApplicationTests.cs b/src/Tests/Grand.Business.Customers.Tests/Startup/StartupApplicationTests.csindex 9ab3739bd..24610c783 100644--- a/src/Tests/Grand.Business.Customers.Tests/Startup/StartupApplicationTests.cs+++ b/src/Tests/Grand.Business.Customers.Tests/Startup/StartupApplicationTests.cs@@ -1,8 +1,9 @@-using Microsoft.Extensions.Configuration;+using Grand.Business.Customers.Startup;+using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Customers.Startup.Tests+namespace Grand.Business.Customers.Tests.Startup{[TestClass()]public class StartupApplicationTestsdiff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Campaigns/CampaignServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Campaigns/CampaignServiceTests.csindex 678b54d16..6d5ce413f 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Campaigns/CampaignServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Campaigns/CampaignServiceTests.cs@@ -1,22 +1,19 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Stores;-using Grand.Business.Core.Interfaces.Marketing.Campaigns;using Grand.Business.Core.Interfaces.Messages;-using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;-using Grand.Domain;+using Grand.Business.Marketing.Services.Campaigns;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Grand.Domain.Data;+using Grand.Domain.Localization;using Grand.Domain.Messages;using Grand.Infrastructure;-using Grand.Infrastructure.Extensions;+using Grand.Infrastructure.Events;using MediatR;-using Grand.Data.Tests.MongoDb;+using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-using Grand.Infrastructure.Events;-using Grand.Domain.Localization;-namespace Grand.Business.Marketing.Services.Campaigns.Tests+namespace Grand.Business.Marketing.Tests.Services.Campaigns{[TestClass()]public class CampaignServiceTestsdiff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeParserTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeParserTests.csindex 97ed36079..a1ab314f0 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeParserTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeParserTests.cs@@ -1,5 +1,6 @@using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Marketing.Contacts;+using Grand.Business.Marketing.Services.Contacts;using Grand.Domain.Common;using Grand.Domain.Customers;using Grand.Domain.Messages;@@ -7,7 +8,7 @@ using Grand.Infrastructure;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Marketing.Services.Contacts.Tests+namespace Grand.Business.Marketing.Tests.Services.Contacts{[TestClass()]public class ContactAttributeParserTestsdiff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeServiceTests.csindex 7b51b2eac..bcc1262a0 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactAttributeServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Marketing.Services.Contacts;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Grand.Domain.Data;using Grand.Domain.Messages;@@ -9,7 +10,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Marketing.Services.Contacts.Tests+namespace Grand.Business.Marketing.Tests.Services.Contacts{[TestClass()]public class ContactAttributeServiceTestsdiff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactUsServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactUsServiceTests.csindex c7a0250dc..82a39ddbb 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactUsServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Contacts/ContactUsServiceTests.cs@@ -1,12 +1,12 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Marketing.Services.Contacts;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;using Grand.Domain.Messages;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;--namespace Grand.Business.Marketing.Services.Contacts.Tests+namespace Grand.Business.Marketing.Tests.Services.Contacts{[TestClass()]public class ContactUsServiceTestsdiff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.csindex adb3a593d..84f97d9ee 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLessonServiceTests.cs@@ -1,12 +1,12 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Marketing.Services.Courses;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Courses;using Grand.Domain.Data;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;--namespace Grand.Business.Marketing.Services.Courses.Tests+namespace Grand.Business.Marketing.Tests.Services.Courses{[TestClass()]public class CourseLessonServiceTestsdiff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLevelServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLevelServiceTests.csindex 9ece60845..3db344d06 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLevelServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseLevelServiceTests.cs@@ -1,11 +1,12 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Marketing.Services.Courses;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Courses;using Grand.Domain.Data;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Marketing.Services.Courses.Tests+namespace Grand.Business.Marketing.Tests.Services.Courses{[TestClass()]public class CourseLevelServiceTestsdiff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseSubjectServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseSubjectServiceTests.csindex 7787057b2..663814aa8 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseSubjectServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Courses/CourseSubjectServiceTests.cs@@ -1,11 +1,12 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Marketing.Services.Courses;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Courses;using Grand.Domain.Data;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Marketing.Services.Courses.Tests+namespace Grand.Business.Marketing.Tests.Services.Courses{[TestClass()]public class CourseSubjectServiceTestsdiff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerCoordinatesServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerCoordinatesServiceTests.csindex b031d45ba..cef943ffa 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerCoordinatesServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerCoordinatesServiceTests.cs@@ -1,4 +1,5 @@using Grand.Business.Core.Events.Marketing;+using Grand.Business.Marketing.Services.Customers;using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Grand.Domain.Data;@@ -7,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Marketing.Services.Customers.Tests+namespace Grand.Business.Marketing.Tests.Services.Customers{[TestClass()]public class CustomerCoordinatesServiceTestsdiff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerProductServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerProductServiceTests.csindex 586e0ea3d..de8f96d4e 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerProductServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerProductServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Marketing.Services.Customers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Grand.Domain.Data;using Grand.Infrastructure.Caching;@@ -7,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Marketing.Services.Customers.Tests+namespace Grand.Business.Marketing.Tests.Services.Customers{[TestClass()]public class CustomerProductServiceTestsdiff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.csindex 7b1463d4c..a259bcfb3 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Customers/CustomerTagServiceTests.cs@@ -1,4 +1,5 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Marketing.Services.Customers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Grand.Domain.Data;using Grand.Infrastructure.Caching;@@ -7,7 +8,7 @@ using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Business.Marketing.Services.Customers.Tests+namespace Grand.Business.Marketing.Tests.Services.Customers{[TestClass()]public class CustomerTagServiceTestsdiff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.csindex 0f0357288..ee68494dd 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Events.Marketing;using Grand.Business.Core.Interfaces.Marketing.Newsletters;-using Grand.Business.Marketing.Services.Newsteletters;+using Grand.Business.Marketing.Services.Newsletters;using Grand.Domain;using Grand.Domain.Data;using Grand.Domain.Messages;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.csindex 99808ce21..4c419e84e 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsletterCategoryServiceTests.cs@@ -1,5 +1,4 @@using Grand.Business.Marketing.Services.Newsletters;-using Grand.Business.Marketing.Services.Newsteletters;using Grand.Domain.Data;using Grand.Domain.Messages;using Grand.Infrastructure.Events;diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/PushNotifications/PushNotificationsServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/PushNotifications/PushNotificationsServiceTests.csindex e59579428..5b0975a5f 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/PushNotifications/PushNotificationsServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/PushNotifications/PushNotificationsServiceTests.cs@@ -1,5 +1,6 @@using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Logging;+using Grand.Business.Marketing.Services.PushNotifications;using Grand.Business.Marketing.Utilities;using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;@@ -12,7 +13,7 @@ using Newtonsoft.Json;using System.Net;using System.Net.Http;-namespace Grand.Business.Marketing.Services.PushNotifications.Tests+namespace Grand.Business.Marketing.Tests.Services.PushNotifications{[TestClass()]public class PushNotificationsServiceTestsdiff --git a/src/Tests/Grand.Business.Marketing.Tests/Startup/StartupApplicationTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Startup/StartupApplicationTests.csindex e85c34406..c30f9b4e1 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Startup/StartupApplicationTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Startup/StartupApplicationTests.cs@@ -1,8 +1,9 @@-using Microsoft.Extensions.Configuration;+using Grand.Business.Marketing.Startup;+using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Marketing.Startup.Tests+namespace Grand.Business.Marketing.Tests.Startup{[TestClass()]public class StartupApplicationTestsdiff --git a/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetBidsByProductIdQueryHandlerTests.cs b/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetBidsByProductIdQueryHandlerTests.csindex b2517d622..d715a998a 100644--- a/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetBidsByProductIdQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetBidsByProductIdQueryHandlerTests.cs@@ -1,8 +1,9 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Messages.Queries.Handlers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Catalog;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Messages.Queries.Handlers.Tests+namespace Grand.Business.Messages.Tests.Queries.Handlers{[TestClass()]diff --git a/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetCustomerByIdQueryHandlerTests.cs b/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetCustomerByIdQueryHandlerTests.csindex 9d9df1466..d50aa50ae 100644--- a/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetCustomerByIdQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetCustomerByIdQueryHandlerTests.cs@@ -1,8 +1,9 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Messages.Queries.Handlers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Customers;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Messages.Queries.Handlers.Tests+namespace Grand.Business.Messages.Tests.Queries.Handlers{[TestClass()]public class GetCustomerByIdQueryHandlerTestsdiff --git a/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetProductByIdQueryHandlerTests.cs b/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetProductByIdQueryHandlerTests.csindex 55c36e05e..99331b57e 100644--- a/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetProductByIdQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetProductByIdQueryHandlerTests.cs@@ -1,16 +1,9 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Messages.Queries.Handlers;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Grand.Domain.Catalog;-using Grand.Domain.Data;-using Moq;+using Grand.Business.Messages.Queries.Handlers;using Grand.Data.Tests.MongoDb;+using Grand.Domain.Catalog;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Messages.Queries.Handlers.Tests+namespace Grand.Business.Messages.Tests.Queries.Handlers{[TestClass()]public class GetProductByIdQueryHandlerTestsdiff --git a/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.cs b/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.csindex abb73e693..8a74ccd0e 100644--- a/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.cs+++ b/src/Tests/Grand.Business.Messages.Tests/Queries/Handlers/GetVendorByIdQueryHandlerTests.cs@@ -1,9 +1,10 @@-using Grand.Data.Tests.MongoDb;+using Grand.Business.Messages.Queries.Handlers;+using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;using Grand.Domain.Vendors;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Messages.Queries.Handlers.Tests+namespace Grand.Business.Messages.Tests.Queries.Handlers{[TestClass()]public class GetVendorByIdQueryHandlerTestsdiff --git a/src/Tests/Grand.Business.Messages.Tests/Services/EmailSenderTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/EmailSenderTests.csindex 9b0742fbf..997bd658a 100644--- a/src/Tests/Grand.Business.Messages.Tests/Services/EmailSenderTests.cs+++ b/src/Tests/Grand.Business.Messages.Tests/Services/EmailSenderTests.cs@@ -1,10 +1,11 @@using Grand.Business.Core.Interfaces.Messages;using Grand.Business.Core.Interfaces.Storage;+using Grand.Business.Messages.Services;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;using System.Net.Sockets;-namespace Grand.Business.Messages.Services.Tests+namespace Grand.Business.Messages.Tests.Services{[TestClass()]public class EmailSenderTestsdiff --git a/src/Tests/Grand.Business.Messages.Tests/Services/MessageTokenProviderTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/MessageTokenProviderTests.csindex 3810ecbab..94b57e3f8 100644--- a/src/Tests/Grand.Business.Messages.Tests/Services/MessageTokenProviderTests.cs+++ b/src/Tests/Grand.Business.Messages.Tests/Services/MessageTokenProviderTests.cs@@ -1,12 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Messages.Services;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;+using Grand.Business.Messages.Services;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Messages.Services.Tests+namespace Grand.Business.Messages.Tests.Services{[TestClass()]public class MessageTokenProviderTestsdiff --git a/src/Tests/Grand.Business.Messages.Tests/Startup/StartupApplicationTests.cs b/src/Tests/Grand.Business.Messages.Tests/Startup/StartupApplicationTests.csindex 361725035..8362a44b1 100644--- a/src/Tests/Grand.Business.Messages.Tests/Startup/StartupApplicationTests.cs+++ b/src/Tests/Grand.Business.Messages.Tests/Startup/StartupApplicationTests.cs@@ -1,8 +1,9 @@-using Microsoft.Extensions.Configuration;+using Grand.Business.Messages.Startup;+using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Messages.Startup.Tests+namespace Grand.Business.Messages.Tests.Startup{[TestClass()]public class StartupApplicationTestsdiff --git a/src/Tests/Grand.Business.Storage.Tests/Services/DefaultMediaFileStoreTests.cs b/src/Tests/Grand.Business.Storage.Tests/Services/DefaultMediaFileStoreTests.csindex 55bbceac3..43f1273da 100644--- a/src/Tests/Grand.Business.Storage.Tests/Services/DefaultMediaFileStoreTests.cs+++ b/src/Tests/Grand.Business.Storage.Tests/Services/DefaultMediaFileStoreTests.cs@@ -1,12 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Business.Storage.Services;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;--namespace Grand.Business.Storage.Services.Tests+using Grand.Business.Storage.Services;+using Microsoft.VisualStudio.TestTools.UnitTesting;++namespace Grand.Business.Storage.Tests.Services{[TestClass()]public class DefaultMediaFileStoreTestsdiff --git a/src/Tests/Grand.Business.Storage.Tests/Services/FileSystemStoreTests.cs b/src/Tests/Grand.Business.Storage.Tests/Services/FileSystemStoreTests.csindex 4b5cc7ddc..3c69c399e 100644--- a/src/Tests/Grand.Business.Storage.Tests/Services/FileSystemStoreTests.cs+++ b/src/Tests/Grand.Business.Storage.Tests/Services/FileSystemStoreTests.cs@@ -1,6 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Business.Storage.Services;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Storage.Services.Tests+namespace Grand.Business.Storage.Tests.Services{[TestClass()]public class FileSystemStoreTestsdiff --git a/src/Tests/Grand.Business.Storage.Tests/Startup/StartupApplicationTests.cs b/src/Tests/Grand.Business.Storage.Tests/Startup/StartupApplicationTests.csindex dbfecf439..bb2310549 100644--- a/src/Tests/Grand.Business.Storage.Tests/Startup/StartupApplicationTests.cs+++ b/src/Tests/Grand.Business.Storage.Tests/Startup/StartupApplicationTests.cs@@ -1,8 +1,9 @@-using Microsoft.Extensions.Configuration;+using Grand.Business.Storage.Startup;+using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Business.Storage.Startup.Tests+namespace Grand.Business.Storage.Tests.Startup{[TestClass()]public class StartupApplicationTestsdiff --git a/src/Tests/Grand.Domain.Tests/Blogs/BlogExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Blogs/BlogExtensionsTests.csindex 571d99d75..662389880 100644--- a/src/Tests/Grand.Domain.Tests/Blogs/BlogExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Blogs/BlogExtensionsTests.cs@@ -1,6 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Domain.Blogs;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Domain.Blogs.Tests+namespace Grand.Domain.Tests.Blogs{[TestClass()]public class BlogExtensionsTestsdiff --git a/src/Tests/Grand.Domain.Tests/Catalog/TierPriceExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Catalog/TierPriceExtensionsTests.csindex a64910c1c..77aa6eadc 100644--- a/src/Tests/Grand.Domain.Tests/Catalog/TierPriceExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Catalog/TierPriceExtensionsTests.cs@@ -1,12 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Domain.Catalog;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;+using Grand.Domain.Catalog;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Domain.Catalog.Tests+namespace Grand.Domain.Tests.Catalog{[TestClass()]public class TierPriceExtensionsTests@@ -65,7 +60,7 @@ namespace Grand.Domain.Catalog.Tests[TestMethod()]public void FilterForCustomerTest(){- var customer = new Customers.Customer();+ var customer = new Domain.Customers.Customer();customer.Groups.Add("1");customer.Groups.Add("2");Assert.AreEqual(3, _tierPrices.FilterForCustomer(customer).Count());diff --git a/src/Tests/Grand.Domain.Tests/Common/AddressAttributeExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Common/AddressAttributeExtensionsTests.csindex e6d8dbf60..f18da581d 100644--- a/src/Tests/Grand.Domain.Tests/Common/AddressAttributeExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Common/AddressAttributeExtensionsTests.cs@@ -1,7 +1,8 @@using Grand.Domain.Catalog;+using Grand.Domain.Common;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Domain.Common.Tests+namespace Grand.Domain.Tests.Common{[TestClass()]public class AddressAttributeExtensionsTestsdiff --git a/src/Tests/Grand.Domain.Tests/Common/AddressExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Common/AddressExtensionsTests.csindex 58b1ca033..bb1e386c8 100644--- a/src/Tests/Grand.Domain.Tests/Common/AddressExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Common/AddressExtensionsTests.cs@@ -1,12 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.Domain.Common;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;+using Grand.Domain.Common;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Domain.Common.Tests+namespace Grand.Domain.Tests.Common{[TestClass()]public class AddressExtensionsTestsdiff --git a/src/Tests/Grand.Domain.Tests/Common/UserFieldExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Common/UserFieldExtensionsTests.csindex 7a84bdf69..ac5b64efa 100644--- a/src/Tests/Grand.Domain.Tests/Common/UserFieldExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Common/UserFieldExtensionsTests.cs@@ -1,15 +1,16 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Domain.Common;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Domain.Common.Tests+namespace Grand.Domain.Tests.Common{[TestClass()]public class UserFieldExtensionsTests{- private Customers.Customer entity;+ private Domain.Customers.Customer entity;public UserFieldExtensionsTests(){- entity = new Customers.Customer();+ entity = new Domain.Customers.Customer();entity.UserFields.Add(new UserField() { Key = "FirstName", Value = "Sara", StoreId = "" });entity.UserFields.Add(new UserField() { Key = "LastName", Value = "Name", StoreId = "" });entity.UserFields.Add(new UserField() { Key = "Registered", Value = "1", StoreId = "1" });diff --git a/src/Tests/Grand.Domain.Tests/Customers/CustomerAttributeExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Customers/CustomerAttributeExtensionsTests.csindex e69208bf3..7694d7458 100644--- a/src/Tests/Grand.Domain.Tests/Customers/CustomerAttributeExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Customers/CustomerAttributeExtensionsTests.cs@@ -1,7 +1,8 @@using Grand.Domain.Catalog;+using Grand.Domain.Customers;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Domain.Customers.Tests+namespace Grand.Domain.Tests.Customers{[TestClass()]public class CustomerAttributeExtensionsTestsdiff --git a/src/Tests/Grand.Domain.Tests/Data/DataSettingsManagerTests.cs b/src/Tests/Grand.Domain.Tests/Data/DataSettingsManagerTests.csindex f05ae057f..34d8e9a0e 100644--- a/src/Tests/Grand.Domain.Tests/Data/DataSettingsManagerTests.cs+++ b/src/Tests/Grand.Domain.Tests/Data/DataSettingsManagerTests.cs@@ -1,7 +1,8 @@-using Grand.SharedKernel.Extensions;+using Grand.Domain.Data;+using Grand.SharedKernel.Extensions;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Domain.Data.Tests+namespace Grand.Domain.Tests.Data{[TestClass()]public class DataSettingsManagerTestsdiff --git a/src/Tests/Grand.Domain.Tests/Messages/ContactAttributeExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Messages/ContactAttributeExtensionsTests.csindex 3925f0dac..0356f910a 100644--- a/src/Tests/Grand.Domain.Tests/Messages/ContactAttributeExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Messages/ContactAttributeExtensionsTests.cs@@ -1,7 +1,8 @@using Grand.Domain.Catalog;+using Grand.Domain.Messages;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Domain.Messages.Tests+namespace Grand.Domain.Tests.Messages{[TestClass()]public class ContactAttributeExtensionsTestsdiff --git a/src/Tests/Grand.Domain.Tests/Orders/CheckoutAttributeExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Orders/CheckoutAttributeExtensionsTests.csindex 6f78e257f..5a5cedd31 100644--- a/src/Tests/Grand.Domain.Tests/Orders/CheckoutAttributeExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Orders/CheckoutAttributeExtensionsTests.cs@@ -1,7 +1,8 @@using Grand.Domain.Catalog;+using Grand.Domain.Orders;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Domain.Orders.Tests+namespace Grand.Domain.Tests.Orders{[TestClass()]public class CheckoutAttributeExtensionsTestsdiff --git a/src/Tests/Grand.Domain.Tests/Orders/GiftVoucherExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Orders/GiftVoucherExtensionsTests.csindex 1713d18f9..e7b7961cc 100644--- a/src/Tests/Grand.Domain.Tests/Orders/GiftVoucherExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Orders/GiftVoucherExtensionsTests.cs@@ -1,13 +1,8 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Domain.Common;using Grand.Domain.Orders;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;-using Grand.Domain.Common;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Domain.Orders.Tests+namespace Grand.Domain.Tests.Orders{[TestClass()]public class GiftVoucherExtensionsTests@@ -74,14 +69,14 @@ namespace Grand.Domain.Orders.Testspublic void IsGiftVoucherValidTest_ValidTo_True(){giftVoucher.ValidTo = DateTime.UtcNow.AddDays(1);- Assert.IsTrue(giftVoucher.IsGiftVoucherValid(new Directory.Currency() { CurrencyCode = "USD" }, new Stores.Store()));+ Assert.IsTrue(giftVoucher.IsGiftVoucherValid(new Directory.Currency() { CurrencyCode = "USD" }, new Domain.Stores.Store()));}[TestMethod()]public void IsGiftVoucherValidTest_False(){giftVoucher.ValidTo = DateTime.UtcNow.AddDays(-1);- Assert.IsFalse(giftVoucher.IsGiftVoucherValid(new Directory.Currency() { CurrencyCode = "USD" }, new Stores.Store()));+ Assert.IsFalse(giftVoucher.IsGiftVoucherValid(new Directory.Currency() { CurrencyCode = "USD" }, new Domain.Stores.Store()));}}}\ No newline at end of filediff --git a/src/Tests/Grand.Domain.Tests/Orders/OrderExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Orders/OrderExtensionsTests.csindex a871ab875..8ca09eaf6 100644--- a/src/Tests/Grand.Domain.Tests/Orders/OrderExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Orders/OrderExtensionsTests.cs@@ -1,7 +1,8 @@using Grand.Domain.Catalog;+using Grand.Domain.Orders;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Domain.Orders.Tests+namespace Grand.Domain.Tests.Orders{[TestClass]public class OrderExtensionsTestsdiff --git a/src/Tests/Grand.Domain.Tests/Orders/ShoppingCartExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Orders/ShoppingCartExtensionsTests.csindex b1b25508c..2827bfd97 100644--- a/src/Tests/Grand.Domain.Tests/Orders/ShoppingCartExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Orders/ShoppingCartExtensionsTests.cs@@ -1,6 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Domain.Orders;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Domain.Orders.Tests+namespace Grand.Domain.Tests.Orders{[TestClass]public class ShoppingCartExtensionsTestsdiff --git a/src/Tests/Grand.Domain.Tests/Stores/StoreExtensionsTests.cs b/src/Tests/Grand.Domain.Tests/Stores/StoreExtensionsTests.csindex 7bcade642..e10dc4fee 100644--- a/src/Tests/Grand.Domain.Tests/Stores/StoreExtensionsTests.cs+++ b/src/Tests/Grand.Domain.Tests/Stores/StoreExtensionsTests.cs@@ -1,6 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Domain.Stores;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Domain.Stores.Tests+namespace Grand.Domain.Tests.Stores{[TestClass()]public class StoreExtensionsTestsdiff --git a/src/Tests/Grand.Infrastructure.Tests/Caching/MemoryCacheBaseTests.cs b/src/Tests/Grand.Infrastructure.Tests/Caching/MemoryCacheBaseTests.csindex 55673fc38..77dfa5936 100644--- a/src/Tests/Grand.Infrastructure.Tests/Caching/MemoryCacheBaseTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/Caching/MemoryCacheBaseTests.cs@@ -1,11 +1,12 @@-using Grand.SharedKernel.Extensions;+using Grand.Infrastructure.Caching;+using Grand.SharedKernel.Extensions;using MediatR;using Microsoft.Extensions.Caching.Memory;using Microsoft.Extensions.DependencyInjection;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;-namespace Grand.Infrastructure.Caching.Tests+namespace Grand.Infrastructure.Tests.Caching{[TestClass()]public class MemoryCacheBaseTestsdiff --git a/src/Tests/Grand.Infrastructure.Tests/Extensions/CommonExtensionsTests.cs b/src/Tests/Grand.Infrastructure.Tests/Extensions/CommonExtensionsTests.csindex d197d4e31..1e4cba105 100644--- a/src/Tests/Grand.Infrastructure.Tests/Extensions/CommonExtensionsTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/Extensions/CommonExtensionsTests.cs@@ -1,8 +1,7 @@-using Grand.Domain.Common;-using Grand.Infrastructure.Extensions;+using Grand.Infrastructure.Extensions;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Infrastructure.Extensions.Tests+namespace Grand.Infrastructure.Tests.Extensions{[TestClass()]public class CommonExtensionsTestsdiff --git a/src/Tests/Grand.Infrastructure.Tests/Extensions/ProviderExtensionsTests.cs b/src/Tests/Grand.Infrastructure.Tests/Extensions/ProviderExtensionsTests.csindex a8a1cf3be..986f70c35 100644--- a/src/Tests/Grand.Infrastructure.Tests/Extensions/ProviderExtensionsTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/Extensions/ProviderExtensionsTests.cs@@ -1,7 +1,7 @@-using Grand.Infrastructure.Tests;+using Grand.Infrastructure.Extensions;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Infrastructure.Extensions.Tests+namespace Grand.Infrastructure.Tests.Extensions{[TestClass()]public class ProviderExtensionsTestsdiff --git a/src/Tests/Grand.Infrastructure.Tests/Migrations/DbVersionTests.cs b/src/Tests/Grand.Infrastructure.Tests/Migrations/DbVersionTests.csindex 44363670e..bf4b7b82c 100644--- a/src/Tests/Grand.Infrastructure.Tests/Migrations/DbVersionTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/Migrations/DbVersionTests.cs@@ -1,6 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Infrastructure.Migrations;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Infrastructure.Migrations.Tests+namespace Grand.Infrastructure.Tests.Migrations{[TestClass()]public class DbVersionTestsdiff --git a/src/Tests/Grand.Infrastructure.Tests/Migrations/MigrationManagerTests.cs b/src/Tests/Grand.Infrastructure.Tests/Migrations/MigrationManagerTests.csindex 8f2db6788..700ea8e7f 100644--- a/src/Tests/Grand.Infrastructure.Tests/Migrations/MigrationManagerTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/Migrations/MigrationManagerTests.cs@@ -1,6 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Infrastructure.Migrations;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Infrastructure.Migrations.Tests+namespace Grand.Infrastructure.Tests.Migrations{[TestClass()]public class MigrationManagerTestsdiff --git a/src/Tests/Grand.Infrastructure.Tests/Plugins/BasePluginTests.cs b/src/Tests/Grand.Infrastructure.Tests/Plugins/BasePluginTests.csindex 056fc0802..91eb11047 100644--- a/src/Tests/Grand.Infrastructure.Tests/Plugins/BasePluginTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/Plugins/BasePluginTests.cs@@ -1,8 +1,8 @@-using Grand.Infrastructure.Tests.Plugins;+using Grand.Infrastructure.Plugins;using Grand.SharedKernel.Extensions;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Infrastructure.Plugins.Tests+namespace Grand.Infrastructure.Tests.Plugins{[TestClass()]public class BasePluginTestsdiff --git a/src/Tests/Grand.Infrastructure.Tests/Plugins/PluginExtensionsTests.cs b/src/Tests/Grand.Infrastructure.Tests/Plugins/PluginExtensionsTests.csindex 2d80cbf53..1c302715b 100644--- a/src/Tests/Grand.Infrastructure.Tests/Plugins/PluginExtensionsTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/Plugins/PluginExtensionsTests.cs@@ -1,8 +1,8 @@-using Grand.Infrastructure.Tests.Plugins;+using Grand.Infrastructure.Plugins;using Grand.SharedKernel.Extensions;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Infrastructure.Plugins.Tests+namespace Grand.Infrastructure.Tests.Plugins{[TestClass()]public class PluginExtensionsTestsdiff --git a/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/BoolTypeConverterTests.cs b/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/BoolTypeConverterTests.csindex a48e1fe92..ff9e07628 100644--- a/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/BoolTypeConverterTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/BoolTypeConverterTests.cs@@ -1,6 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Infrastructure.TypeConverters.Converter;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Infrastructure.TypeConverters.Converter.Tests+namespace Grand.Infrastructure.Tests.TypeConverters.Converter{[TestClass()]public class BoolTypeConverterTestsdiff --git a/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/CaptchaInterfaceConverter.cs b/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/CaptchaInterfaceConverter.csindex 98b762110..4dc4f34bd 100644--- a/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/CaptchaInterfaceConverter.cs+++ b/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/CaptchaInterfaceConverter.cs@@ -2,7 +2,7 @@using Microsoft.VisualStudio.TestTools.UnitTesting;using System.Text.Json;-namespace Grand.Infrastructure.TypeConverters.Converter.Tests;+namespace Grand.Infrastructure.Tests.TypeConverters.Converter;[TestClass()]public class CaptchaInterfaceConverterdiff --git a/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/CustomAttributeListTypeConverterTests.cs b/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/CustomAttributeListTypeConverterTests.csindex 2f1cad02b..080d8ea9c 100644--- a/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/CustomAttributeListTypeConverterTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/CustomAttributeListTypeConverterTests.cs@@ -1,7 +1,8 @@using Grand.Domain.Common;+using Grand.Infrastructure.TypeConverters.Converter;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Infrastructure.TypeConverters.Converter.Tests+namespace Grand.Infrastructure.Tests.TypeConverters.Converter{[TestClass()]public class CustomAttributeListTypeConverterTestsdiff --git a/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/GenericListTypeConverterTests.cs b/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/GenericListTypeConverterTests.csindex 2d748edb3..3a06411f3 100644--- a/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/GenericListTypeConverterTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/GenericListTypeConverterTests.cs@@ -1,6 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;+using Grand.Infrastructure.TypeConverters.Converter;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Infrastructure.TypeConverters.Converter.Tests+namespace Grand.Infrastructure.Tests.TypeConverters.Converter{[TestClass()]public class GenericListTypeConverterTestsdiff --git a/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/RefreshTokenTypeConverterTests.cs b/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/RefreshTokenTypeConverterTests.csindex 156369312..3b27b328d 100644--- a/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/RefreshTokenTypeConverterTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/RefreshTokenTypeConverterTests.cs@@ -1,7 +1,8 @@using Grand.Domain.Security;+using Grand.Infrastructure.TypeConverters.Converter;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Infrastructure.TypeConverters.Converter.Tests+namespace Grand.Infrastructure.Tests.TypeConverters.Converter{[TestClass()]public class RefreshTokenTypeConverterTestsdiff --git a/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/ShippingOptionTypeConverterTests.cs b/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/ShippingOptionTypeConverterTests.csindex 5c2cd00be..8ecedf3a9 100644--- a/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/ShippingOptionTypeConverterTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/TypeConverters/Converter/ShippingOptionTypeConverterTests.cs@@ -1,7 +1,8 @@using Grand.Domain.Shipping;+using Grand.Infrastructure.TypeConverters.Converter;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Infrastructure.TypeConverters.Converter.Tests+namespace Grand.Infrastructure.Tests.TypeConverters.Converter{[TestClass()]public class ShippingOptionTypeConverterTestsdiff --git a/src/Tests/Grand.Infrastructure.Tests/TypeSearcher/TypeSearcherTests.cs b/src/Tests/Grand.Infrastructure.Tests/TypeSearcher/TypeSearcherTests.csindex 2be3652f0..29296a2b0 100644--- a/src/Tests/Grand.Infrastructure.Tests/TypeSearcher/TypeSearcherTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/TypeSearcher/TypeSearcherTests.cs@@ -1,17 +1,16 @@using Grand.Infrastructure.Caching;-using Grand.Infrastructure.TypeSearch;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Infrastructure.TypeSearchers.Tests+namespace Grand.Infrastructure.Tests.TypeSearcher{[TestClass()]public class TypeSearcherTests{- private TypeSearcher _typeSearcher;+ private TypeSearch.TypeSearcher _typeSearcher;public TypeSearcherTests(){- _typeSearcher = new TypeSearcher();+ _typeSearcher = new TypeSearch.TypeSearcher();}[TestMethod()]diff --git a/src/Tests/Grand.Infrastructure.Tests/Validators/FluentValidationFilterTests.cs b/src/Tests/Grand.Infrastructure.Tests/Validators/FluentValidationFilterTests.csindex acba61a4e..d4df9acc1 100644--- a/src/Tests/Grand.Infrastructure.Tests/Validators/FluentValidationFilterTests.cs+++ b/src/Tests/Grand.Infrastructure.Tests/Validators/FluentValidationFilterTests.cs@@ -1,5 +1,5 @@using FluentValidation;-using Grand.Infrastructure.Tests.Validators;+using Grand.Infrastructure.Validators;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Abstractions;@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Routing;using Microsoft.Extensions.DependencyInjection;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.Infrastructure.Validators.Tests+namespace Grand.Infrastructure.Tests.Validators{[TestClass()]public class FluentValidationFilterTestsdiff --git a/src/Tests/Grand.SharedKernel.Tests/Extensions/CommonHelperTests.cs b/src/Tests/Grand.SharedKernel.Tests/Extensions/CommonHelperTests.csindex 3d312b683..e4e61e9d7 100644--- a/src/Tests/Grand.SharedKernel.Tests/Extensions/CommonHelperTests.cs+++ b/src/Tests/Grand.SharedKernel.Tests/Extensions/CommonHelperTests.cs@@ -1,8 +1,8 @@-using Grand.SharedKernel.Tests;+using Grand.SharedKernel.Extensions;using Microsoft.VisualStudio.TestTools.UnitTesting;using System.Globalization;-namespace Grand.SharedKernel.Extensions.Tests+namespace Grand.SharedKernel.Tests.Extensions{[TestClass()]public class CommonHelperTestsdiff --git a/src/Tests/Grand.SharedKernel.Tests/Extensions/CommonPathTests.cs b/src/Tests/Grand.SharedKernel.Tests/Extensions/CommonPathTests.csindex 1fd4b1910..106fc1788 100644--- a/src/Tests/Grand.SharedKernel.Tests/Extensions/CommonPathTests.cs+++ b/src/Tests/Grand.SharedKernel.Tests/Extensions/CommonPathTests.cs@@ -1,7 +1,7 @@using Grand.SharedKernel.Extensions;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.SharedKernel.Extensions.Tests+namespace Grand.SharedKernel.Tests.Extensions{[TestClass()]public class CommonPathTestsdiff --git a/src/Tests/Grand.SharedKernel.Tests/Extensions/ExtendedLinqTests.cs b/src/Tests/Grand.SharedKernel.Tests/Extensions/ExtendedLinqTests.csindex 0712ce5ee..93d63f8af 100644--- a/src/Tests/Grand.SharedKernel.Tests/Extensions/ExtendedLinqTests.cs+++ b/src/Tests/Grand.SharedKernel.Tests/Extensions/ExtendedLinqTests.cs@@ -1,7 +1,7 @@-using Grand.SharedKernel.Tests;+using Grand.SharedKernel.Extensions;using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.SharedKernel.Extensions.Tests+namespace Grand.SharedKernel.Tests.Extensions{[TestClass()]public class ExtendedLinqTestsdiff --git a/src/Tests/Grand.SharedKernel.Tests/Extensions/FormatTextTests.cs b/src/Tests/Grand.SharedKernel.Tests/Extensions/FormatTextTests.csindex 2387545ba..5ad51776b 100644--- a/src/Tests/Grand.SharedKernel.Tests/Extensions/FormatTextTests.cs+++ b/src/Tests/Grand.SharedKernel.Tests/Extensions/FormatTextTests.cs@@ -1,12 +1,7 @@-using Microsoft.VisualStudio.TestTools.UnitTesting;-using Grand.SharedKernel.Extensions;-using System;-using System.Collections.Generic;-using System.Linq;-using System.Text;-using System.Threading.Tasks;+using Grand.SharedKernel.Extensions;+using Microsoft.VisualStudio.TestTools.UnitTesting;-namespace Grand.SharedKernel.Extensions.Tests+namespace Grand.SharedKernel.Tests.Extensions{[TestClass()]public class FormatTextTests