[Test] Update testing framework to MSTest

grandnode · Mar 24, 2024 · f86529f · f86529f
1 parent 9b9338a
commit f86529f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 56 deletions.
diff --git a/src/Tests/Grand.Web.Admin.Tests/Grand.Web.Admin.Tests.csproj b/src/Tests/Grand.Web.Admin.Tests/Grand.Web.Admin.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\..\Build\Grand.Common.props" />
     <PropertyGroup>

diff --git a/src/Tests/Grand.Web.Admin.Tests/MenuViewModelServiceTests.cs b/src/Tests/Grand.Web.Admin.Tests/MenuViewModelServiceTests.cs
@@ -5,20 +5,20 @@
 using Grand.Web.Admin.Mapper;
 using Grand.Web.Admin.Models.Menu;
 using Grand.Web.Admin.Services;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using NUnit.Framework;
 using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
 
 namespace Grand.Web.Admin.Tests;
 
-    [TestFixture]
+    [TestClass]
     public class MenuViewModelServiceTests
     {
         private MenuViewModelService _menuViewModelService;
         private Mock<IAdminSiteMapService> _adminSiteMapServiceMock;
         private IMapper _mapper;
 
-        [SetUp]
+        [TestInitialize]
         public void SetUp()
         {
             _adminSiteMapServiceMock = new Mock<IAdminSiteMapService>();
@@ -31,7 +31,7 @@ public void SetUp()
             AutoMapperConfig.Init(mapperConfig);
         }
 
-        [Test]
+        [TestMethod]
         public async Task MenuItems_ReturnsMenuItems()
         {
             // Arrange
@@ -56,7 +56,7 @@ public async Task MenuItems_ReturnsMenuItems()
             Assert.AreEqual(2, result[1].DisplayOrder);
         }
 
-        [Test]
+        [TestMethod]
         public async Task GetMenuById_ReturnsMenuById()
         {
             // Arrange
@@ -75,7 +75,7 @@ public async Task GetMenuById_ReturnsMenuById()
             Assert.AreEqual("2", result.Id);
             Assert.AreEqual("Item 2", result.SystemName);
         }
-        [Test]
+        [TestMethod]
         public async Task InsertMenuModel_AddsNewMenuModel()
         {
             // Arrange
@@ -95,7 +95,7 @@ public async Task InsertMenuModel_AddsNewMenuModel()
             Assert.AreEqual(1, parentEntity.ChildNodes.Count);
         }
 
-        [Test]
+        [TestMethod]
         public async Task UpdateMenuModel_UpdatesMenuModel()
         {
             // Arrange
@@ -116,7 +116,7 @@ public async Task UpdateMenuModel_UpdatesMenuModel()
             Assert.AreEqual("2", result.Id);
             Assert.AreEqual("Updated Item 2", result.SystemName);
         }
-        [Test]
+        [TestMethod]
         public async Task UpdateMenuModel_UpdatesSubMenuModel()
         {
             // Arrange
@@ -138,7 +138,7 @@ public async Task UpdateMenuModel_UpdatesSubMenuModel()
             Assert.AreEqual("3", result.Id);
             Assert.AreEqual("Updated Item 3", result.SystemName);
         }
-        [Test]
+        [TestMethod]
         public async Task DeleteMenu_CallsDeleteSiteMap()
         {
             // Arrange
@@ -157,7 +157,7 @@ public async Task DeleteMenu_CallsDeleteSiteMap()
             // Assert
             _adminSiteMapServiceMock.Verify(x => x.DeleteSiteMap(It.IsAny<AdminSiteMap>()), Times.Once);
         }
-        [Test]
+        [TestMethod]
         public async Task DeleteMenu_CallsUpdate()
         {
             // Arrange

diff --git a/src/Tests/Grand.Web.Admin.Tests/Properties/launchSettings.json b/src/Tests/Grand.Web.Admin.Tests/Properties/launchSettings.json
diff --git a/src/Tests/Grand.Web.Common.Tests/AuthorizeMenuAttributeTests.cs b/src/Tests/Grand.Web.Common.Tests/AuthorizeMenuAttributeTests.cs
@@ -13,12 +13,12 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Routing;
 using Moq;
-using NUnit.Framework;
 using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Grand.Web.Common.Tests;
 
-[TestFixture]
+[TestClass]
 public class AuthorizeMenuAttributeTests
 {
     private Mock<IPermissionService> _mockPermissionService;
@@ -27,7 +27,7 @@ public class AuthorizeMenuAttributeTests
     private SecurityConfig _securityConfig;
     private AuthorizationFilterContext _mockFilterContext;
 
-    [SetUp]
+    [TestInitialize]
     public void Setup()
     {
         CommonPath.BaseDirectory = "";
@@ -75,7 +75,7 @@ private AuthorizationFilterContext GetMockedAuthorizationFilterContext()
 
         return authorizationFilterContext;
     }
-    [Test]
+    [TestMethod]
     public async Task TestAuthorizeMenuAttribute_WithoutIgnoreFilter_DatabaseNotInstalled()
     {
         // Arrange
@@ -96,7 +96,7 @@ public async Task TestAuthorizeMenuAttribute_WithoutIgnoreFilter_DatabaseNotInst
         Assert.IsNull(_mockFilterContext.Result);
     }
 
-    [Test]
+    [TestMethod]
     public async Task TestAuthorizeMenuAttribute_WithoutIgnoreFilter_AuthorizeAdminMenuDisabled()
     {
         // Arrange
@@ -118,7 +118,7 @@ public async Task TestAuthorizeMenuAttribute_WithoutIgnoreFilter_AuthorizeAdminM
         Assert.IsNull(_mockFilterContext.Result);
     }
 
-    [Test]
+    [TestMethod]
     public async Task TestAuthorizeMenuAttribute_WithValidSiteMap_AllPermissions()
     {
         // Arrange
@@ -142,7 +142,7 @@ public async Task TestAuthorizeMenuAttribute_WithValidSiteMap_AllPermissions()
         Assert.IsInstanceOfType(_mockFilterContext.Result, typeof(ForbidResult));
     }
 
-    [Test]
+    [TestMethod]
     public async Task TestAuthorizeMenuAttribute_NoPermissionsInSiteMap()
     {
         // Arrange
@@ -168,7 +168,7 @@ public async Task TestAuthorizeMenuAttribute_NoPermissionsInSiteMap()
         Assert.IsNull(_mockFilterContext.Result);
     }
 
-    [Test]
+    [TestMethod]
     public async Task TestAuthorizeMenuAttribute_WithoutAllPermissions_Authorized()
     {
         // Arrange
@@ -194,7 +194,7 @@ public async Task TestAuthorizeMenuAttribute_WithoutAllPermissions_Authorized()
         Assert.IsNull(_mockFilterContext.Result);
     }
 
-    [Test]
+    [TestMethod]
     public async Task TestAuthorizeMenuAttribute_WithoutAllPermissions_NotAuthorized()
     {
         // Arrange

diff --git a/src/Tests/Grand.Web.Common.Tests/Grand.Web.Common.Tests.csproj b/src/Tests/Grand.Web.Common.Tests/Grand.Web.Common.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\..\Build\Grand.Common.props" />
     <PropertyGroup>
@@ -21,15 +21,5 @@
         <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" />
         <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj" />
     </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="Properties\" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <None Remove="Properties\launchSettings.json" />
-      <None Update="App_Data\index.txt">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
-    </ItemGroup>
+
 </Project>
diff --git a/src/Tests/Grand.Web.Common.Tests/Properties/launchSettings.json b/src/Tests/Grand.Web.Common.Tests/Properties/launchSettings.json