Updates the Application.FunctionalTests project to .NET 6.0 (#1781)

* Included globalusing in Application.FunctionalTests project

* Included file scoped namespace

src/Tests/Services/Application.FunctionalTests/Extensions/HttpClientExtensions.cs

@@ -1,9 +1,5 @@
-using Microsoft.AspNetCore.TestHost;
+namespace FunctionalTests.Extensions;
-using System;
-using System.Net.Http;
 
-namespace FunctionalTests.Extensions
-{
 static class HttpClientExtensions
 {
     public static HttpClient CreateIdempotentClient(this TestServer server)
@@ -13,4 +9,3 @@ namespace FunctionalTests.Extensions
         return client;
     }
 }
-}

src/Tests/Services/Application.FunctionalTests/GlobalUsings.cs

@@ -0,0 +1,35 @@
+global using Microsoft.AspNetCore.TestHost;
+global using System;
+global using System.Net.Http;
+global using Microsoft.AspNetCore.Http;
+global using System.Security.Claims;
+global using System.Threading.Tasks;
+global using Microsoft.AspNetCore.Hosting;
+global using Microsoft.Extensions.Configuration;
+global using System.IO;
+global using System.Reflection;
+global using FunctionalTests.Middleware;
+global using Microsoft.AspNetCore.Builder;
+global using Microsoft.eShopOnContainers.Services.Basket.API;
+global using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF;
+global using Microsoft.eShopOnContainers.Services.Catalog.API;
+global using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
+global using Microsoft.Extensions.Options;
+global using FunctionalTests.Extensions;
+global using FunctionalTests.Services.Basket;
+global using Microsoft.eShopOnContainers.Services.Basket.API.Model;
+global using Microsoft.eShopOnContainers.WebMVC.ViewModels;
+global using System.Text.Json;
+global using System.Collections.Generic;
+global using System.Linq;
+global using System.Text;
+global using WebMVC.Services.ModelDTOs;
+global using Xunit;
+global using Microsoft.eShopOnContainers.Services.Ordering.API;
+global using Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure;
+global using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
+global using FunctionalTests.Services.Catalog;
+global using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
+global using Microsoft.eShopOnContainers.Services.Catalog.API.ViewModel;

src/Tests/Services/Application.FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs

@@ -1,9 +1,5 @@
-using Microsoft.AspNetCore.Http;
+namespace FunctionalTests.Middleware;
-using System.Security.Claims;
-using System.Threading.Tasks;
 
-namespace FunctionalTests.Middleware
-{
 class AutoAuthorizeMiddleware
 {
     public const string IDENTITY_ID = "9e3163b9-1ae6-4652-9dc6-7898ab7b7a00";
@@ -28,4 +24,3 @@ namespace FunctionalTests.Middleware
         await _next.Invoke(httpContext);
     }
 }
-}

src/Tests/Services/Application.FunctionalTests/Services/Basket/BasketScenariosBase.cs

@@ -1,11 +1,5 @@
-using Microsoft.AspNetCore.Hosting;
+namespace FunctionalTests.Services.Basket;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.Configuration;
-using System.IO;
-using System.Reflection;
 
-namespace FunctionalTests.Services.Basket
-{
 public class BasketScenariosBase
 {
     private const string ApiUrlBase = "api/v1/basket";
@@ -46,4 +40,3 @@ namespace FunctionalTests.Services.Basket
         public static string CheckoutOrder = $"{ApiUrlBase}/checkout";
     }
 }
-}

src/Tests/Services/Application.FunctionalTests/Services/Basket/BasketTestsStartup.cs

@@ -1,10 +1,5 @@
-using FunctionalTests.Middleware;
+namespace FunctionalTests.Services.Basket;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.eShopOnContainers.Services.Basket.API;
-using Microsoft.Extensions.Configuration;
-
-namespace FunctionalTests.Services.Basket
-{
 class BasketTestsStartup : Startup
 {
     public BasketTestsStartup(IConfiguration env) : base(env)
@@ -24,4 +19,3 @@ namespace FunctionalTests.Services.Basket
         }
     }
 }
-}

src/Tests/Services/Application.FunctionalTests/Services/Catalog/CatalogScenariosBase.cs

@@ -1,17 +1,6 @@
-using Microsoft.AspNetCore.Hosting;
+namespace FunctionalTests.Services.Catalog;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF;
 using Microsoft.eShopOnContainers.Services.Catalog.API;
-using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using System.IO;
-using System.Reflection;
 
-namespace FunctionalTests.Services.Catalog
-{
 public class CatalogScenariosBase
 {
     public TestServer CreateServer()
@@ -62,4 +51,3 @@ namespace FunctionalTests.Services.Catalog
         public static string UpdateCatalogProduct = "api/v1/catalog/items";
     }
 }
-}

src/Tests/Services/Application.FunctionalTests/Services/IntegrationEventsScenarios.cs

@@ -1,19 +1,8 @@
-using FunctionalTests.Services.Basket;
+namespace FunctionalTests.Services;
-using FunctionalTests.Services.Catalog;
 using Microsoft.eShopOnContainers.Services.Basket.API.Model;
 using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
 using Microsoft.eShopOnContainers.Services.Catalog.API.ViewModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-using Xunit;
 
-namespace FunctionalTests.Services
-{
 public class IntegrationEventsScenarios
 {
     [Fact]
@@ -131,4 +120,3 @@ namespace FunctionalTests.Services
         return basket;
     }
 }
-}

src/Tests/Services/Application.FunctionalTests/Services/Ordering/OrderingScenarios.cs

@@ -1,19 +1,5 @@
-using FunctionalTests.Extensions;
+namespace FunctionalTests.Services.Ordering;
-using FunctionalTests.Services.Basket;
-using Microsoft.eShopOnContainers.Services.Basket.API.Model;
-using Microsoft.eShopOnContainers.WebMVC.ViewModels;
-using System;
-using System.Text.Json;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-using WebMVC.Services.ModelDTOs;
-using Xunit;
 
-namespace FunctionalTests.Services.Ordering
-{
 public class OrderingScenarios : OrderingScenariosBase
 {
     [Fact]
@@ -153,4 +139,3 @@ namespace FunctionalTests.Services.Ordering
         return JsonSerializer.Serialize(checkoutBasket);
     }
 }
-}

src/Tests/Services/Application.FunctionalTests/Services/Ordering/OrderingScenariosBase.cs

@@ -1,18 +1,5 @@
-using Microsoft.AspNetCore.Hosting;
+namespace FunctionalTests.Services.Ordering;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF;
-using Microsoft.eShopOnContainers.Services.Ordering.API;
-using Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure;
-using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using System.IO;
-using System.Reflection;
 
-namespace FunctionalTests.Services.Ordering
-{
 public class OrderingScenariosBase
 {
     public TestServer CreateServer()
@@ -74,4 +61,3 @@ namespace FunctionalTests.Services.Ordering
         }
     }
 }
-}

src/Tests/Services/Application.FunctionalTests/Services/Ordering/OrderingTestsStartup.cs

@@ -1,10 +1,6 @@
-using FunctionalTests.Middleware;
+namespace FunctionalTests.Services.Ordering;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.eShopOnContainers.Services.Ordering.API;
-using Microsoft.Extensions.Configuration;
 
-namespace FunctionalTests.Services.Ordering
-{
 public class OrderingTestsStartup : Startup
 {
     public OrderingTestsStartup(IConfiguration env) : base(env)
@@ -24,4 +20,3 @@ namespace FunctionalTests.Services.Ordering
         }
     }
 }
-}