Use MSTest 3.9.3

Directory.Packages.props

@@ -46,9 +46,6 @@
 
     <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="$(AspnetVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.5.0" />
-
-    <PackageVersion Include="MSTest.TestFramework" Version="3.8.2" />
-    <PackageVersion Include="MSTest.TestAdapter" Version="3.8.2" />
     <!-- Version together with EF -->
     <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4" />
@@ -82,7 +79,7 @@
     <PackageVersion Include="Duende.IdentityServer.EntityFramework.Storage" Version="$(DuendeVersion)" />
     <PackageVersion Include="Duende.IdentityServer.Storage" Version="$(DuendeVersion)" />
     <!-- VS Test -->
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <!-- Scaffolding -->
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0-rc.1.23461.3" />
     <!-- Grpc -->
@@ -96,6 +93,7 @@
     <PackageVersion Include="Google.Protobuf" Version="3.30.2" />
     <PackageVersion Include="MediatR" Version="12.4.1" />
     <PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
+    <PackageVersion Include="MSTest" Version="3.9.3" />
     <PackageVersion Include="Polly.Core" Version="8.5.2" />
     <PackageVersion Include="System.Reflection.TypeExtensions" Version="4.7.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />

tests/Basket.UnitTests/Basket.UnitTests.csproj

@@ -11,9 +11,7 @@
     <PackageReference Include="MediatR" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
     <PackageReference Include="Microsoft.Extensions.Identity.Stores" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="MSTest.TestAdapter" />
-    <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Include="MSTest" />
     <PackageReference Include="NSubstitute" />
     <PackageReference Include="NSubstitute.Analyzers.CSharp">
       <PrivateAssets>all</PrivateAssets>

tests/Basket.UnitTests/BasketServiceTests.cs

@@ -22,7 +22,7 @@ public async Task GetBasketReturnsEmptyForNoUser()
         var response = await service.GetBasket(new GetBasketRequest(), serverCallContext);
 
         Assert.IsInstanceOfType<CustomerBasketResponse>(response);
-        Assert.AreEqual(response.Items.Count(), 0);
+        Assert.AreEqual(0, response.Items.Count());
     }
 
     [TestMethod]
@@ -40,7 +40,7 @@ public async Task GetBasketReturnsItemsForValidUserId()
         var response = await service.GetBasket(new GetBasketRequest(), serverCallContext);
 
         Assert.IsInstanceOfType<CustomerBasketResponse>(response);
-        Assert.AreEqual(response.Items.Count(), 1);
+        Assert.AreEqual(1, response.Items.Count());
     }
 
     [TestMethod]
@@ -57,6 +57,6 @@ public async Task GetBasketReturnsEmptyForInvalidUserId()
         var response = await service.GetBasket(new GetBasketRequest(), serverCallContext);
 
         Assert.IsInstanceOfType<CustomerBasketResponse>(response);
-        Assert.AreEqual(response.Items.Count(), 0);
+        Assert.AreEqual(0, response.Items.Count());
     }
 }

tests/ClientApp.UnitTests/ClientApp.UnitTests.csproj

@@ -16,16 +16,12 @@
     <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.40" />
     <PackageReference Include="Microsoft.Maui.Controls.Maps" Version="9.0.40" />
 
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-
     <PackageReference Include="coverlet.collector" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
 
-    <PackageReference Include="MSTest.TestAdapter" Version="3.8.2" />
-
-    <PackageReference Include="MSTest.TestFramework" Version="3.8.2" />
+    <PackageReference Include="MSTest" Version="3.9.3" />
   </ItemGroup>
 
   <ItemGroup>

tests/ClientApp.UnitTests/Services/BasketServiceTests.cs

@@ -8,6 +8,6 @@ public async Task GetFakeBasketTest()
     {
         var catalogMockService = new CatalogMockService();
         var result = await catalogMockService.GetCatalogAsync();
-        Assert.AreNotEqual(result.Count(), 0);
+        Assert.AreNotEqual(0, result.Count());
     }
 }

tests/ClientApp.UnitTests/Services/CatalogServiceTests.cs

@@ -9,7 +9,7 @@ public async Task GetFakeCatalogTest()
         var catalogMockService = new CatalogMockService();
         var catalog = await catalogMockService.GetCatalogAsync();
 
-        Assert.AreNotEqual(catalog.Count(), 0);
+        Assert.AreNotEqual(0, catalog.Count());
     }
 
     [TestMethod]
@@ -18,7 +18,7 @@ public async Task GetFakeCatalogBrandTest()
         var catalogMockService = new CatalogMockService();
         var catalogBrand = await catalogMockService.GetCatalogBrandAsync();
 
-        Assert.AreNotEqual(catalogBrand.Count(), 0);
+        Assert.AreNotEqual(0, catalogBrand.Count());
     }
 
     [TestMethod]
@@ -27,6 +27,6 @@ public async Task GetFakeCatalogTypeTest()
         var catalogMockService = new CatalogMockService();
         var catalogType = await catalogMockService.GetCatalogTypeAsync();
 
-        Assert.AreNotEqual(catalogType.Count(), 0);
+        Assert.AreNotEqual(0, catalogType.Count());
     }
 }

tests/ClientApp.UnitTests/Services/OrdersServiceTests.cs

@@ -27,6 +27,6 @@ public async Task GetFakeOrdersTest()
         var ordersMockService = new OrderMockService();
         var result = await ordersMockService.GetOrdersAsync();
 
-        Assert.AreNotEqual(result.Count(), 0);
+        Assert.AreNotEqual(0, result.Count());
     }
 }

tests/ClientApp.UnitTests/ViewModels/CatalogViewModelTests.cs

@@ -46,14 +46,14 @@ public void ClearFilterCommandIsNotNullTest()
     public void ProductsPropertyIsEmptyWhenViewModelInstantiatedTest()
     {
         var catalogViewModel = new CatalogViewModel(_appEnvironmentService, _navigationService);
-        Assert.AreEqual(catalogViewModel.Products.Count,0);
+        Assert.AreEqual(0, catalogViewModel.Products.Count);
     }
 
     [TestMethod]
     public void BrandsPropertyIsEmptyWhenViewModelInstantiatedTest()
     {
         var catalogViewModel = new CatalogViewModel(_appEnvironmentService, _navigationService);
-        Assert.AreEqual(catalogViewModel.Brands.Count, 0);
+        Assert.AreEqual(0, catalogViewModel.Brands.Count);
     }
 
     [TestMethod]
@@ -67,7 +67,7 @@ public void BrandPropertyIsNullWhenViewModelInstantiatedTest()
     public void TypesPropertyIsEmptyWhenViewModelInstantiatedTest()
     {
         var catalogViewModel = new CatalogViewModel(_appEnvironmentService, _navigationService);
-        Assert.AreEqual(catalogViewModel.Types.Count, 0);
+        Assert.AreEqual(0, catalogViewModel.Types.Count);
     }
 
     [TestMethod]

tests/ClientApp.UnitTests/ViewModels/MockViewModelTests.cs

@@ -24,8 +24,8 @@ public void CheckValidationFailsWhenPropertiesAreEmptyTest()
         Assert.IsNull(mockViewModel.Surname.Value);
         Assert.IsFalse(mockViewModel.Forename.IsValid);
         Assert.IsFalse(mockViewModel.Surname.IsValid);
-        Assert.AreNotEqual(mockViewModel.Forename.Errors.Count(), 0);
-        Assert.AreNotEqual(mockViewModel.Surname.Errors.Count(), 0);
+        Assert.AreNotEqual(0, mockViewModel.Forename.Errors.Count());
+        Assert.AreNotEqual(0, mockViewModel.Surname.Errors.Count());
     }
 
     [TestMethod]
@@ -41,8 +41,8 @@ public void CheckValidationFailsWhenOnlyForenameHasDataTest()
         Assert.IsNull(mockViewModel.Surname.Value);
         Assert.IsTrue(mockViewModel.Forename.IsValid);
         Assert.IsFalse(mockViewModel.Surname.IsValid);
-        Assert.AreEqual(mockViewModel.Forename.Errors.Count(), 0);
-        Assert.AreNotEqual(mockViewModel.Surname.Errors.Count(), 0);
+        Assert.AreEqual(0, mockViewModel.Forename.Errors.Count());
+        Assert.AreNotEqual(0, mockViewModel.Surname.Errors.Count());
     }
 
     [TestMethod]
@@ -58,8 +58,8 @@ public void CheckValidationPassesWhenOnlySurnameHasDataTest()
         Assert.IsNotNull(mockViewModel.Surname.Value);
         Assert.IsFalse(mockViewModel.Forename.IsValid);
         Assert.IsTrue(mockViewModel.Surname.IsValid);
-        Assert.AreNotEqual(mockViewModel.Forename.Errors.Count(), 0);
-        Assert.AreEqual(mockViewModel.Surname.Errors.Count(), 0);
+        Assert.AreNotEqual(0, mockViewModel.Forename.Errors.Count());
+        Assert.AreEqual(0, mockViewModel.Surname.Errors.Count());
     }
 
     [TestMethod]
@@ -76,8 +76,8 @@ public void CheckValidationPassesWhenBothPropertiesHaveDataTest()
         Assert.IsNotNull(mockViewModel.Surname.Value);
         Assert.IsTrue(mockViewModel.Forename.IsValid);
         Assert.IsTrue(mockViewModel.Surname.IsValid);
-        Assert.AreEqual(mockViewModel.Forename.Errors.Count(), 0);
-        Assert.AreEqual(mockViewModel.Surname.Errors.Count(), 0);
+        Assert.AreEqual(0, mockViewModel.Forename.Errors.Count());
+        Assert.AreEqual(0, mockViewModel.Surname.Errors.Count());
     }
 
     [TestMethod]

tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs

@@ -50,7 +50,7 @@ public async Task Handle_return_false_if_order_is_not_persisted()
     public void Handle_throws_exception_when_no_buyerId()
     {
         //Assert
-        Assert.ThrowsException<ArgumentNullException>(() => new Buyer(string.Empty, string.Empty));
+        Assert.ThrowsExactly<ArgumentNullException>(() => new Buyer(string.Empty, string.Empty));
     }
 
     private Buyer FakeBuyer()

tests/Ordering.UnitTests/Domain/BuyerAggregateTest.cs

@@ -28,7 +28,7 @@ public void Create_buyer_item_fail()
         var name = "fakeUser";
 
         //Act - Assert
-        Assert.ThrowsException<ArgumentNullException>(() => new Buyer(identity, name));
+        Assert.ThrowsExactly<ArgumentNullException>(() => new Buyer(identity, name));
     }
 
     [TestMethod]
@@ -84,7 +84,7 @@ public void create_payment_method_expiration_fail()
         var expiration = DateTime.UtcNow.AddYears(-1);
 
         //Act - Assert
-        Assert.ThrowsException<OrderingDomainException>(() => new PaymentMethod(cardTypeId, alias, cardNumber, securityNumber, cardHolderName, expiration));
+        Assert.ThrowsExactly<OrderingDomainException>(() => new PaymentMethod(cardTypeId, alias, cardNumber, securityNumber, cardHolderName, expiration));
     }
 
     [TestMethod]
@@ -125,6 +125,6 @@ public void Add_new_PaymentMethod_raises_new_event()
         fakeBuyer.VerifyOrAddPaymentMethod(cardTypeId, alias, cardNumber, cardSecurityNumber, cardHolderName, cardExpiration, orderId);
 
         //Assert
-        Assert.AreEqual(fakeBuyer.DomainEvents.Count, expectedResult);
+        Assert.AreEqual(expectedResult, fakeBuyer.DomainEvents.Count);
     }
 }

tests/Ordering.UnitTests/Domain/OrderAggregateTest.cs

@@ -39,7 +39,7 @@ public void Invalid_number_of_units()
         var units = -1;
 
         //Act - Assert
-        Assert.ThrowsException<OrderingDomainException>(() => new OrderItem(productId, productName, unitPrice, discount, pictureUrl, units));
+        Assert.ThrowsExactly<OrderingDomainException>(() => new OrderItem(productId, productName, unitPrice, discount, pictureUrl, units));
     }
 
     [TestMethod]
@@ -54,7 +54,7 @@ public void Invalid_total_of_order_item_lower_than_discount_applied()
         var units = 1;
 
         //Act - Assert
-        Assert.ThrowsException<OrderingDomainException>(() => new OrderItem(productId, productName, unitPrice, discount, pictureUrl, units));       
+        Assert.ThrowsExactly<OrderingDomainException>(() => new OrderItem(productId, productName, unitPrice, discount, pictureUrl, units));       
     }
 
     [TestMethod]
@@ -72,7 +72,7 @@ public void Invalid_discount_setting()
         var fakeOrderItem = new OrderItem(productId, productName, unitPrice, discount, pictureUrl, units);
 
         //Assert
-        Assert.ThrowsException<OrderingDomainException>(() => fakeOrderItem.SetNewDiscount(-1));
+        Assert.ThrowsExactly<OrderingDomainException>(() => fakeOrderItem.SetNewDiscount(-1));
     }
 
     [TestMethod]
@@ -90,7 +90,7 @@ public void Invalid_units_setting()
         var fakeOrderItem = new OrderItem(productId, productName, unitPrice, discount, pictureUrl, units);
 
         //Assert
-        Assert.ThrowsException<OrderingDomainException>(() => fakeOrderItem.AddUnits(-1));
+        Assert.ThrowsExactly<OrderingDomainException>(() => fakeOrderItem.AddUnits(-1));
     }
 
     [TestMethod]
@@ -125,7 +125,7 @@ public void Add_new_Order_raises_new_event()
         var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), cardTypeId, cardNumber, cardSecurityNumber, cardHolderName, cardExpiration);
 
         //Assert
-        Assert.AreEqual(fakeOrder.DomainEvents.Count, expectedResult);
+        Assert.AreEqual(expectedResult, fakeOrder.DomainEvents.Count);
     }
 
     [TestMethod]
@@ -148,7 +148,7 @@ public void Add_event_Order_explicitly_raises_new_event()
         var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), cardTypeId, cardNumber, cardSecurityNumber, cardHolderName, cardExpiration);
         fakeOrder.AddDomainEvent(new OrderStartedDomainEvent(fakeOrder, "fakeName", "1", cardTypeId, cardNumber, cardSecurityNumber, cardHolderName, cardExpiration));
         //Assert
-        Assert.AreEqual(fakeOrder.DomainEvents.Count, expectedResult);
+        Assert.AreEqual(expectedResult, fakeOrder.DomainEvents.Count);
     }
 
     [TestMethod]
@@ -173,6 +173,6 @@ public void Remove_event_Order_explicitly()
         fakeOrder.AddDomainEvent(@fakeEvent);
         fakeOrder.RemoveDomainEvent(@fakeEvent);
         //Assert
-        Assert.AreEqual(fakeOrder.DomainEvents.Count, expectedResult);
+        Assert.AreEqual(expectedResult, fakeOrder.DomainEvents.Count);
     }
 }

tests/Ordering.UnitTests/Ordering.UnitTests.csproj

@@ -8,9 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="MSTest.TestAdapter" />
-    <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Include="MSTest" />
     <PackageReference Include="NSubstitute" />
     <PackageReference Include="NSubstitute.Analyzers.CSharp">
       <PrivateAssets>all</PrivateAssets>