From fdf97c7c42933f1bf3c6f2dd94a14bddcb4026de Mon Sep 17 00:00:00 2001
From: csimonapastore <c.simona.pastore@gmail.com>
Date: Tue, 18 Mar 2025 00:11:18 +0100
Subject: [PATCH] Fixing tests

---
 .../Services/RoleService_Tests.cs             |  2 +-
 .../Services/UserService_Tests.cs             | 49 ++++++++++++++-----
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/MainProject.Tests/Services/RoleService_Tests.cs b/MainProject.Tests/Services/RoleService_Tests.cs
index a0f6c7b..aeedc47 100644
--- a/MainProject.Tests/Services/RoleService_Tests.cs
+++ b/MainProject.Tests/Services/RoleService_Tests.cs
@@ -187,7 +187,7 @@ public class RoleService_Tests
     }
 
     [TestMethod]
-    public async Task DeleteRole()
+    public async Task DeleteRoleAsync()
     {
         try
         {
diff --git a/MainProject.Tests/Services/UserService_Tests.cs b/MainProject.Tests/Services/UserService_Tests.cs
index 53c340e..2f48a53 100644
--- a/MainProject.Tests/Services/UserService_Tests.cs
+++ b/MainProject.Tests/Services/UserService_Tests.cs
@@ -9,29 +9,20 @@ namespace BasicDotnetTemplate.MainProject.Tests;
 [TestClass]
 public class UserService_Tests
 {
-    private static User? _expectedUser;
     private static User? _user;
     private static Role? _role;
-    private static UserService? _userService;
-    private static RoleService? _roleService;
 
-    [TestInitialize]
-    public void Setup()
-    {
-        _expectedUser = ModelsInit.CreateUser();
-        _userService = TestUtils.CreateUserService();
-        _roleService = TestUtils.CreateRoleService();
-    }
 
     [TestMethod]
     public void Inizialize()
     {
         try
         {
+            var _userService = TestUtils.CreateUserService();
+
             if (_userService != null)
             {
                 Assert.IsInstanceOfType(_userService, typeof(UserService));
-
             }
             else
             {
@@ -50,6 +41,10 @@ public class UserService_Tests
     {
         try
         {
+            var _expectedUser = ModelsInit.CreateUser();
+            var _userService = TestUtils.CreateUserService();
+            var _roleService = TestUtils.CreateRoleService();
+
             var testString = "test";
             if (_userService != null)
             {
@@ -74,6 +69,9 @@ public class UserService_Tests
     {
         try
         {
+            var _expectedUser = ModelsInit.CreateUser();
+            var _userService = TestUtils.CreateUserService();
+            var _roleService = TestUtils.CreateRoleService();
 
             var testEmail = "test@email.it";
             var testPassword = "password";
@@ -100,6 +98,10 @@ public class UserService_Tests
     {
         try
         {
+            var _expectedUser = ModelsInit.CreateUser();
+            var _userService = TestUtils.CreateUserService();
+            var _roleService = TestUtils.CreateRoleService();
+
             if (_userService != null)
             {
                 var valid = await _userService.CheckIfEmailIsValid(_expectedUser?.Email ?? String.Empty);
@@ -122,6 +124,10 @@ public class UserService_Tests
     {
         try
         {
+            var _expectedUser = ModelsInit.CreateUser();
+            var _userService = TestUtils.CreateUserService();
+            var _roleService = TestUtils.CreateRoleService();
+
             CreateUserRequestData data = new CreateUserRequestData()
             {
                 FirstName = _expectedUser?.FirstName ?? String.Empty,
@@ -165,6 +171,10 @@ public class UserService_Tests
     {
         try
         {
+            var _expectedUser = ModelsInit.CreateUser();
+            var _userService = TestUtils.CreateUserService();
+            var _roleService = TestUtils.CreateRoleService();
+
             if (_userService != null)
             {
                 var valid = await _userService.CheckIfEmailIsValid(_expectedUser?.Email ?? String.Empty, _user?.Guid ?? String.Empty);
@@ -187,6 +197,10 @@ public class UserService_Tests
     {
         try
         {
+            var _expectedUser = ModelsInit.CreateUser();
+            var _userService = TestUtils.CreateUserService();
+            var _roleService = TestUtils.CreateRoleService();
+
             if (_userService != null)
             {
                 var valid = await _userService.CheckIfEmailIsValid(_expectedUser?.Email ?? String.Empty);
@@ -209,6 +223,10 @@ public class UserService_Tests
     {
         try
         {
+            var _expectedUser = ModelsInit.CreateUser();
+            var _userService = TestUtils.CreateUserService();
+            var _roleService = TestUtils.CreateRoleService();
+
             if (_userService != null)
             {
                 var user = await _userService.GetUserByIdAsync(_user?.Id ?? 0);
@@ -232,6 +250,10 @@ public class UserService_Tests
     {
         try
         {
+            var _expectedUser = ModelsInit.CreateUser();
+            var _userService = TestUtils.CreateUserService();
+            var _roleService = TestUtils.CreateRoleService();
+
             if (_userService != null)
             {
                 var user = await _userService.GetUserByGuidAsync(_user?.Guid ?? String.Empty);
@@ -255,6 +277,10 @@ public class UserService_Tests
     {
         try
         {
+            var _expectedUser = ModelsInit.CreateUser();
+            var _userService = TestUtils.CreateUserService();
+            var _roleService = TestUtils.CreateRoleService();
+
             if (_userService != null)
             {
                 var user = await _userService.GetUserByGuidAsync(_user?.Guid ?? String.Empty);
@@ -279,6 +305,7 @@ public class UserService_Tests
     [TestCleanup]
     public static async Task CleanupAsync()
     {
+        var _roleService = TestUtils.CreateRoleService();
         var role = await _roleService?.GetRoleByGuidAsync(_role?.Guid ?? String.Empty);
         Assert.IsNotNull(role);
         var deleted = await _roleService?.DeleteRoleAsync(role);