From 61f7504e66a39bab0aaa973d312246d1b9204c77 Mon Sep 17 00:00:00 2001 From: csimonapastore Date: Sun, 23 Mar 2025 19:34:32 +0100 Subject: [PATCH] Fixing coverage --- .../Services/RoleService_Tests.cs | 4 + .../Services/UserService_Tests.cs | 223 +++--------------- 2 files changed, 35 insertions(+), 192 deletions(-) diff --git a/MainProject.Tests/Services/RoleService_Tests.cs b/MainProject.Tests/Services/RoleService_Tests.cs index ef60e3e..be620cb 100644 --- a/MainProject.Tests/Services/RoleService_Tests.cs +++ b/MainProject.Tests/Services/RoleService_Tests.cs @@ -64,6 +64,7 @@ public class RoleService_Tests { try { + var _roleService = TestUtils.CreateRoleService(); CreateRoleRequestData data = new CreateRoleRequestData() { Name = _expectedRole?.Name ?? String.Empty, @@ -144,6 +145,7 @@ public class RoleService_Tests { try { + var _roleService = TestUtils.CreateRoleService(); if (_roleService != null) { var role = await _roleService.GetRoleByIdAsync(_role?.Id ?? 0); @@ -167,6 +169,7 @@ public class RoleService_Tests { try { + var _roleService = TestUtils.CreateRoleService(); if (_roleService != null) { var role = await _roleService.GetRoleByGuidAsync(_role?.Guid ?? String.Empty); @@ -190,6 +193,7 @@ public class RoleService_Tests { try { + var _roleService = TestUtils.CreateRoleService(); if (_roleService != null) { var role = await _roleService.GetRoleByGuidAsync(_role?.Guid ?? String.Empty); diff --git a/MainProject.Tests/Services/UserService_Tests.cs b/MainProject.Tests/Services/UserService_Tests.cs index b56dda2..8e18d0f 100644 --- a/MainProject.Tests/Services/UserService_Tests.cs +++ b/MainProject.Tests/Services/UserService_Tests.cs @@ -9,9 +9,6 @@ namespace BasicDotnetTemplate.MainProject.Tests; [TestClass] public class UserService_Tests { - private static User _user = ModelsInit.CreateUser(); - private static Role _role = ModelsInit.CreateRole(); - [TestMethod] public void Inizialize() { @@ -34,35 +31,6 @@ public class UserService_Tests } } - // [TestInitialize] - // public void Setup() - // { - // _expectedUser = ModelsInit.CreateUser(); - // _expectedRole = ModelsInit.CreateRole(); - // _roleService = TestUtils.CreateRoleService(); - // _userService = TestUtils.CreateUserService(); - // } - - // [TestMethod] - // public void Inizialize() - // { - // try - // { - // if (_userService != null) - // { - // Assert.IsInstanceOfType(_userService, typeof(UserService)); - // } - // else - // { - // Assert.Fail($"UserService is null"); - // } - // } - // catch (Exception ex) - // { - // Console.WriteLine(ex.InnerException); - // Assert.Fail($"An exception was thrown: {ex}"); - // } - // } [TestMethod] public async Task GetUserByUsernameAndPassword_Null() @@ -88,41 +56,16 @@ public class UserService_Tests } } - // // TODO - // // [TestMethod] - // public async Task GetUserByUsernameAndPassword_Success() - // { - // try - // { - // var testEmail = "test@email.it"; - // var testPassword = "password"; - // if (_userService != null) - // { - // var user = await _userService.GetUserByUsernameAndPassword(testEmail, testPassword); - // Assert.IsTrue(user != null); - // Assert.IsTrue(user.Email == testEmail); - // } - // else - // { - // Assert.Fail($"UserService is null"); - // } - // } - // catch (Exception ex) - // { - // Console.WriteLine(ex.InnerException); - // Assert.Fail($"An exception was thrown: {ex}"); - // } - // } - [TestMethod] public async Task CheckIfEmailIsValid_EmailNotExists() { try { var userService = TestUtils.CreateUserService(); + var user = ModelsInit.CreateUser(); if (userService != null) { - var valid = await userService.CheckIfEmailIsValid(_user.Email ?? String.Empty); + var valid = await userService.CheckIfEmailIsValid(user.Email); Assert.IsTrue(valid); } else @@ -143,6 +86,7 @@ public class UserService_Tests try { var userService = TestUtils.CreateUserService(); + var roleService = TestUtils.CreateRoleService(); var expectedUser = ModelsInit.CreateUser(); CreateUserRequestData data = new CreateUserRequestData() @@ -166,9 +110,35 @@ public class UserService_Tests Assert.IsTrue(expectedUser.LastName == user.LastName); Assert.IsTrue(expectedUser.Email == user.Email); Assert.IsTrue(expectedUser.Role?.Name == user.Role?.Name); - _user = user; - _role = user.Role; + User realUser = user!; + Role realRole = user!.Role!; + + // CheckIfEmailIsValid_CurrentUser + var valid = await userService.CheckIfEmailIsValid(realUser.Email, realUser.Guid); + Assert.IsTrue(valid); + + // CheckIfEmailIsValid_EmailAlreadyExists + valid = await userService.CheckIfEmailIsValid(realUser.Email); + Assert.IsFalse(valid); + + //GetUserByIdAsync + var getUserById = await userService.GetUserByIdAsync(realUser.Id); + Assert.IsNotNull(getUserById); + Assert.IsTrue(getUserById.Id == realUser?.Id); + + //GetUserByGuidAsync + var getUserByGuid = await userService.GetUserByGuidAsync(realUser.Guid); + Assert.IsNotNull(getUserByGuid); + Assert.IsTrue(getUserByGuid.Guid == realUser?.Guid); + + //DeleteUserAsync + var deleted = await userService.DeleteUserAsync(realUser); + Assert.IsTrue(deleted); + + //DeleteRoleAsync + deleted = await roleService.DeleteRoleAsync(realRole); + Assert.IsTrue(deleted); } catch (Exception ex) { @@ -177,137 +147,6 @@ public class UserService_Tests } } - [TestMethod] - public async Task CheckIfEmailIsValid_EmailCurrentUser() - { - try - { - var userService = TestUtils.CreateUserService(); - if (userService != null) - { - var valid = await userService.CheckIfEmailIsValid(_user.Email ?? String.Empty, _user.Guid ?? String.Empty); - Assert.IsTrue(valid); - } - else - { - Assert.Fail($"UserService is null"); - } - } - catch (Exception ex) - { - Console.WriteLine(ex.InnerException); - Assert.Fail($"An exception was thrown: {ex}"); - } - } - - [TestMethod] - public async Task CheckIfEmailIsValid_EmailAlreadyExists() - { - try - { - var userService = TestUtils.CreateUserService(); - if (userService != null) - { - var valid = await userService.CheckIfEmailIsValid(_user.Email ?? String.Empty); - Assert.IsFalse(valid); - } - else - { - Assert.Fail($"UserService is null"); - } - } - catch (Exception ex) - { - Console.WriteLine(ex.InnerException); - Assert.Fail($"An exception was thrown: {ex}"); - } - } - - [TestMethod] - public async Task GetUserByIdAsync() - { - try - { - var userService = TestUtils.CreateUserService(); - if (userService != null) - { - var user = await userService.GetUserByIdAsync(_user.Id); - Assert.IsNotNull(user); - Assert.IsTrue(user.Id == _user?.Id); - } - else - { - Assert.Fail($"UserService is null"); - } - } - catch (Exception ex) - { - Console.WriteLine(ex.InnerException); - Assert.Fail($"An exception was thrown: {ex}"); - } - } - - [TestMethod] - public async Task GetUserByGuidAsync() - { - try - { - var userService = TestUtils.CreateUserService(); - if (userService != null) - { - var user = await userService.GetUserByGuidAsync(_user.Guid ?? String.Empty); - Assert.IsNotNull(user); - Assert.IsTrue(user.Guid == _user?.Guid); - } - else - { - Assert.Fail($"UserService is null"); - } - } - catch (Exception ex) - { - Console.WriteLine(ex.InnerException); - Assert.Fail($"An exception was thrown: {ex}"); - } - } - - [TestMethod] - public async Task DeleteUser() - { - try - { - var userService = TestUtils.CreateUserService(); - if (userService != null) - { - var user = await userService.GetUserByGuidAsync(_user.Guid ?? String.Empty); - Assert.IsNotNull(user); - var deleted = await userService.DeleteUserAsync(user); - Assert.IsTrue(deleted); - } - else - { - Assert.Fail($"UserService is null"); - } - } - catch (Exception ex) - { - Console.WriteLine(ex.InnerException); - Assert.Fail($"An exception was thrown: {ex}"); - } - } - - - - [TestMethod] - 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); - Assert.IsTrue(deleted); - } - }