diff --git a/API_SQLuedo/Dto/InquiryDTO.cs b/API_SQLuedo/Dto/InquiryDTO.cs index 5a436ed..980f9a7 100644 --- a/API_SQLuedo/Dto/InquiryDTO.cs +++ b/API_SQLuedo/Dto/InquiryDTO.cs @@ -1,8 +1,8 @@ namespace Dto; -public class InquiryDTO +public class InquiryDTO : IEquatable { - public int Id { get;} + public int Id { get; } public string Title { get; set; } @@ -24,4 +24,39 @@ public class InquiryDTO Description = description; IsUser = isUser; } + + public override string ToString() + { + return $"{Id}\t{Title}\t{Description}\t{IsUser}"; + } + + public override bool Equals(object right) + { + if (object.ReferenceEquals(right, null)) + { + return false; + } + + if (object.ReferenceEquals(this, right)) + { + return true; + } + + if (this.GetType() != right.GetType()) + { + return false; + } + + return this.Equals(right as InquiryDTO); + } + + public bool Equals(InquiryDTO other) + { + return (this.Id == other.Id); + } + + public override int GetHashCode() + { + return Id; + } } \ No newline at end of file diff --git a/API_SQLuedo/TestAPI/Extensions/InquiryDto.EqualityComparer.cs b/API_SQLuedo/TestAPI/Extensions/InquiryDto.EqualityComparer.cs new file mode 100644 index 0000000..dc2bccf --- /dev/null +++ b/API_SQLuedo/TestAPI/Extensions/InquiryDto.EqualityComparer.cs @@ -0,0 +1,22 @@ +using Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TestAPI.Extensions +{ + class InquiryIdEqualityComparer : EqualityComparer + { + public override bool Equals(InquiryDTO x, InquiryDTO y) + { + return x.Id == y.Id; + } + + public override int GetHashCode(InquiryDTO obj) + { + return obj.Id; + } + } +} diff --git a/API_SQLuedo/TestAPI/Extensions/UserDto.EqualityComparer.cs b/API_SQLuedo/TestAPI/Extensions/UserDto.EqualityComparer.cs index 0a77cc4..33b34a2 100644 --- a/API_SQLuedo/TestAPI/Extensions/UserDto.EqualityComparer.cs +++ b/API_SQLuedo/TestAPI/Extensions/UserDto.EqualityComparer.cs @@ -7,7 +7,7 @@ using Dto; namespace TestAPI.Extensions { - class IdEqualityComparer : EqualityComparer + class UserIdEqualityComparer : EqualityComparer { public override bool Equals(UserDTO x, UserDTO y) { diff --git a/API_SQLuedo/TestAPI/InquiryUnitTest.cs b/API_SQLuedo/TestAPI/InquiryUnitTest.cs new file mode 100644 index 0000000..f5b3285 --- /dev/null +++ b/API_SQLuedo/TestAPI/InquiryUnitTest.cs @@ -0,0 +1,101 @@ +using Dto; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging.Abstractions; +using Moq; +using Shared; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using API.Controllers; +using TestAPI.Extensions; + +namespace TestAPI +{ + public class InquiryUnitTest + { + private readonly Mock> inquiryService; + public InquiryUnitTest() + { + inquiryService = new Mock>(); + } + + + [Fact] + public void GetInquiriesListSuccess() + { + var inquiryList = GetInquiriesData(); + inquiryService.Setup(x => x.GetInquiries(1, 4, 0)) + .Returns(inquiryList); + var InquiryController = new InquiriesController(inquiryService.Object, new NullLogger()); + + var inquiriesResult = InquiryController.GetInquiries(1, 4, 0); + + if (inquiriesResult is OkObjectResult okObjectResult) + { + var valeur = okObjectResult.Value; + + Assert.NotNull(valeur); + Assert.Equal(GetInquiriesData().ToString(), valeur.ToString()); + Assert.True(inquiryList.SequenceEqual(valeur as IEnumerable, new InquiryIdEqualityComparer())); + + } + + } + + [Fact] + public void GetinquiryListFail() + { + var inquiriesList = GetInquiriesData(); + inquiryService.Setup(x => x.GetInquiries(1, 3, 0)) + .Returns(new List()); + var InquiryController = new InquiriesController(inquiryService.Object, new NullLogger()); + + var inquiriesResult = InquiryController.GetInquiries(2, 3, 0); + + if (inquiriesResult is StatusCodeResult statusCodeResult && statusCodeResult.StatusCode == 204) + + { + + Assert.IsNotType(inquiriesResult); + } + + } + + + + + + + + + + + + + + + + + + + + + + + private List GetInquiriesData() + { + List inquiriesData = new List(4) + { + new (0,"titre 1","La desc",false), + new (1,"titre 2","Description",true), + new (2,"ZUDZU ","OUHHHH",false), + new ("titre premium","Ascendant",true), + }; + return inquiriesData; + } + + + } +} diff --git a/API_SQLuedo/TestAPI/StatusCodeUserUnitTest.cs b/API_SQLuedo/TestAPI/StatusCodeUserUnitTest.cs deleted file mode 100644 index 1afc3f2..0000000 --- a/API_SQLuedo/TestAPI/StatusCodeUserUnitTest.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using API.Controllers; -using API.Service; -using DbContextLib; -using DbDataManager.Service; -using Dto; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Infrastructure; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; -using Npgsql.Internal; -using StubbedContextLib; -using Moq; - -namespace TestAPI -{ - public class StatusCodeUserUnitTest - { - - - - } -} diff --git a/API_SQLuedo/TestAPI/UserUnitTest.cs b/API_SQLuedo/TestAPI/UserUnitTest.cs index 4f3ba71..8c45592 100644 --- a/API_SQLuedo/TestAPI/UserUnitTest.cs +++ b/API_SQLuedo/TestAPI/UserUnitTest.cs @@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging.Abstractions; -using ModelToEntities.Business; using Moq; using Shared; using TestAPI.Extensions; @@ -27,11 +26,11 @@ namespace TestAPI public void GetUserListSuccess() { var userList = GetUsersData(); - userService.Setup(x => x.GetUsers(1 ,3)) + userService.Setup(x => x.GetUsers(1 ,4,0)) .Returns(userList); - var userController = new UserController(new NullLogger(), userService.Object); + var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = userController.GetUsers(1,3); + var userResult = UsersController.GetUsers(1,4, 0); if (userResult is OkObjectResult okObjectResult) { @@ -39,7 +38,7 @@ namespace TestAPI Assert.NotNull(valeur); Assert.Equal(GetUsersData().ToString(), valeur.ToString()); - Assert.True(userList.SequenceEqual(valeur as IEnumerable,new IdEqualityComparer())); + Assert.True(userList.SequenceEqual(valeur as IEnumerable,new UserIdEqualityComparer())); } @@ -49,11 +48,11 @@ namespace TestAPI public void GetUserListFail() { var userList = GetUsersData(); - userService.Setup(x => x.GetUsers(1, 3)) + userService.Setup(x => x.GetUsers(1, 4,0)) .Returns(new List()); - var userController = new UserController(new NullLogger(), userService.Object); + var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = userController.GetUsers(2,3); + var userResult = UsersController.GetUsers(2,3, 0); if (userResult is StatusCodeResult statusCodeResult && statusCodeResult.StatusCode == 204) @@ -71,9 +70,9 @@ namespace TestAPI var userList = GetUsersData(); userService.Setup(x => x.GetUserById(1)) .Returns(userList[1]); - var userController = new UserController(new NullLogger(), userService.Object); + var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = userController.GetUserById(1); + var userResult = UsersController.GetUserById(1); if (userResult is OkObjectResult okObjectResult) { UserDTO valeur = okObjectResult.Value as UserDTO; @@ -94,9 +93,9 @@ namespace TestAPI var userList = GetUsersData(); userService.Setup(x => x.GetUserById(1)) .Returns(userList[1]); - var userController = new UserController(new NullLogger(), userService.Object); + var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = userController.GetUserById(100); + var userResult = UsersController.GetUserById(100); if (userResult is NotFoundObjectResult NFObjectResult) { var valeur = NFObjectResult.Value; @@ -115,9 +114,9 @@ namespace TestAPI var userList = GetUsersData(); userService.Setup(x => x.GetUserByUsername("Useruser")) .Returns(userList[0]); - var userController = new UserController(new NullLogger(), userService.Object); + var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = userController.GetUserByUsername("Useruser"); + var userResult = UsersController.GetUserByUsername("Useruser"); if (userResult is OkObjectResult okObjectResult) { UserDTO valeur = okObjectResult.Value as UserDTO; @@ -140,9 +139,9 @@ namespace TestAPI var userList = GetUsersData(); userService.Setup(x => x.GetUserByUsername("Useruser")) .Returns(userList[0]); - var userController = new UserController(new NullLogger(), userService.Object); + var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = userController.GetUserByUsername("GYIIieihhh"); + var userResult = UsersController.GetUserByUsername("GYIIieihhh"); if (userResult is NotFoundObjectResult NFObjectResult) { @@ -165,9 +164,9 @@ namespace TestAPI { userService.Setup(x => x.DeleteUser(1)) .Returns(true); - var userController = new UserController(new NullLogger(), userService.Object); + var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = userController.DeleteUser(1); + var userResult = UsersController.DeleteUser(1); if (userResult is OkObjectResult okObjectResult) { bool valeur = (bool)okObjectResult.Value; @@ -184,9 +183,9 @@ namespace TestAPI var userList = GetUsersData(); userService.Setup(x => x.DeleteUser(1)) .Returns(true); - var userController = new UserController(new NullLogger(), userService.Object); + var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = userController.DeleteUser(100); + var userResult = UsersController.DeleteUser(100); if (userResult is OkObjectResult okObjectResult) { Assert.Null(okObjectResult.Value); @@ -200,9 +199,9 @@ namespace TestAPI { userService.Setup(x => x.CreateUser("Nom","Passssss","heudfk@hdye.com",true)) .Returns(new UserDTO("Nom","Passssss", "heudfk@hdye.com",true)); - var userController = new UserController(new NullLogger(), userService.Object); + var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = userController.CreateUser(new UserDTO("Nom", "Passssss", "heudfk@hdye.com", true)); + var userResult = UsersController.CreateUser(new UserDTO("Nom", "Passssss", "heudfk@hdye.com", true)); if (userResult is CreatedResult createdObjectResult) { UserDTO valeur = createdObjectResult.Value as UserDTO; @@ -222,9 +221,9 @@ namespace TestAPI var userList = GetUsersData(); userService.Setup(x => x.CreateUser("Nom", "Passssss", "heudfk@hdye.com", true)) .Returns(new UserDTO("Nom", "Passssss", "heudfk@hdye.com", true)); - var userController = new UserController(new NullLogger(), userService.Object); + var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = userController.CreateUser(new UserDTO(null, "Passssss", "heudfk@hdye.com", true)); + var userResult = UsersController.CreateUser(new UserDTO(null, "Passssss", "heudfk@hdye.com", true)); if (userResult is BadRequestResult BDObjectResult) { @@ -239,9 +238,9 @@ namespace TestAPI { userService.Setup(x => x.UpdateUser(1, new UserDTO("Nom", "Passssss", "heudfk@hdye.com", true))) .Returns(new UserDTO("Nom", "Passssss", "heudfk@hdye.com", true)); - var userController = new UserController(new NullLogger(), userService.Object); + var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = userController.UpdateUser(1, new UserDTO("Nom", "Passssss", "heudfk@hdye.com", true)); + var userResult = UsersController.UpdateUser(1, new UserDTO("Nom", "Passssss", "heudfk@hdye.com", true)); if (userResult is OkObjectResult okObjectResult) { UserDTO valeur = okObjectResult.Value as UserDTO; @@ -260,9 +259,9 @@ namespace TestAPI { userService.Setup(x => x.UpdateUser(1, new UserDTO(2,"Nom", "Passssss", "heudfk@hdye.com", true))) .Returns(new UserDTO("Nom", "Passssss", "heudfk@hdye.com", true)); - var userController = new UserController(new NullLogger(), userService.Object); + var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = userController.UpdateUser(1, new UserDTO("Nom", "Passssss", "heudfk@hdye.com", true)); + var userResult = UsersController.UpdateUser(1, new UserDTO("Nom", "Passssss", "heudfk@hdye.com", true)); if (userResult is BadRequestResult BDObjectResult) {