From d9f05fa139f393b6a0be84844e014f95297a65c9 Mon Sep 17 00:00:00 2001 From: masapountz Date: Sat, 16 Mar 2024 11:12:32 +0100 Subject: [PATCH] Refactor des noms entre le merge de UnitTests et master --- .../API/Controllers/InquiriesController.cs | 8 +-- .../API/Controllers/LessonsController.cs | 8 +-- .../API/Controllers/ParagraphsController.cs | 8 +-- .../API/Controllers/SuccessesController.cs | 8 +-- API_SQLuedo/API/Controllers/UserController.cs | 8 +-- API_SQLuedo/Dto/InquiryDTO.cs | 6 +- API_SQLuedo/Dto/LessonDTO.cs | 6 +- API_SQLuedo/Dto/ParagraphDTO.cs | 6 +- API_SQLuedo/Dto/SuccessDTO.cs | 6 +- API_SQLuedo/Dto/UserDTO.cs | 6 +- .../Extensions/InquiryDto.EqualityComparer.cs | 6 +- .../Extensions/LessonsDto.EqualityComparer.cs | 6 +- .../ParagraphDto.EqualityComparer.cs | 6 +- .../Extensions/SuccessDto.EqualityComparer.cs | 6 +- .../Extensions/UserDto.EqualityComparer.cs | 6 +- API_SQLuedo/TestAPI/InquiryUnitTest.cs | 48 ++++++++-------- API_SQLuedo/TestAPI/LessonUnitTest.cs | 48 ++++++++-------- API_SQLuedo/TestAPI/ParagraphsUnitTest.cs | 48 ++++++++-------- API_SQLuedo/TestAPI/SuccessesUnitTest.cs | 56 +++++++++---------- API_SQLuedo/TestAPI/UserUnitTest.cs | 48 ++++++++-------- 20 files changed, 174 insertions(+), 174 deletions(-) diff --git a/API_SQLuedo/API/Controllers/InquiriesController.cs b/API_SQLuedo/API/Controllers/InquiriesController.cs index 14ad6fc..0b412bc 100644 --- a/API_SQLuedo/API/Controllers/InquiriesController.cs +++ b/API_SQLuedo/API/Controllers/InquiriesController.cs @@ -112,9 +112,9 @@ namespace API.Controllers [ProducesResponseType(typeof(InquiryDto), 200)] [ProducesResponseType(typeof(string), 400)] [ProducesResponseType(typeof(string), 404)] - public IActionResult UpdateInquiry(int id, [FromBody] InquiryDto inquiryDTO) + public IActionResult UpdateInquiry(int id, [FromBody] InquiryDto InquiryDto) { - if (id != inquiryDTO.Id) + if (id != InquiryDto.Id) { _logger.LogError("[ERREUR] Problème ID - La mise à jour de l'enquête avec l'id {id} a échouée.", id); return BadRequest(); @@ -127,10 +127,10 @@ namespace API.Controllers return BadRequest(); } - if (inquiryDTO != null) + if (InquiryDto != null) { _logger.LogInformation("[INFORMATION] La mise à jour de l'enquête avec l'id {id} a été effectuée", id); - return Ok(_inquiryDataService.UpdateInquiry(id, inquiryDTO)); + return Ok(_inquiryDataService.UpdateInquiry(id, InquiryDto)); } _logger.LogError("[ERREUR] Aucune enquête trouvée avec l'id {id}.", id); diff --git a/API_SQLuedo/API/Controllers/LessonsController.cs b/API_SQLuedo/API/Controllers/LessonsController.cs index 827db2f..57404aa 100644 --- a/API_SQLuedo/API/Controllers/LessonsController.cs +++ b/API_SQLuedo/API/Controllers/LessonsController.cs @@ -112,9 +112,9 @@ namespace API.Controllers [ProducesResponseType(typeof(LessonDto), 200)] [ProducesResponseType(typeof(string), 400)] [ProducesResponseType(typeof(string), 404)] - public IActionResult UpdateLesson(int id, [FromBody] LessonDto lessonDTO) + public IActionResult UpdateLesson(int id, [FromBody] LessonDto LessonDto) { - if (id != lessonDTO.Id) + if (id != LessonDto.Id) { _logger.LogError("[ERREUR] Problème ID - La mise à jour de la leçon avec l'id {id} a échouée.", id); return BadRequest(); @@ -127,10 +127,10 @@ namespace API.Controllers return BadRequest(); } - if (lessonDTO != null) + if (LessonDto != null) { _logger.LogInformation("[INFORMATION] La mise à jour de la leçon avec l'id {id} a été effectuée", id); - return Ok(_lessonDataService.UpdateLesson(id, lessonDTO)); + return Ok(_lessonDataService.UpdateLesson(id, LessonDto)); } _logger.LogError("[ERREUR] Aucune leçon trouvée avec l'id {id}.", id); diff --git a/API_SQLuedo/API/Controllers/ParagraphsController.cs b/API_SQLuedo/API/Controllers/ParagraphsController.cs index 5d934cc..9d2557f 100644 --- a/API_SQLuedo/API/Controllers/ParagraphsController.cs +++ b/API_SQLuedo/API/Controllers/ParagraphsController.cs @@ -115,9 +115,9 @@ namespace API.Controllers [ProducesResponseType(typeof(ParagraphDto), 200)] [ProducesResponseType(typeof(string), 400)] [ProducesResponseType(typeof(string), 404)] - public IActionResult UpdateParagraph(int id, [FromBody] ParagraphDto paragraphDTO) + public IActionResult UpdateParagraph(int id, [FromBody] ParagraphDto ParagraphDto) { - if (id != paragraphDTO.Id) + if (id != ParagraphDto.Id) { _logger.LogError("[ERREUR] Problème ID - La mise à jour du paragraphe avec l'id {id} a échouée.", id); return BadRequest(); @@ -130,10 +130,10 @@ namespace API.Controllers return BadRequest(); } - if (paragraphDTO != null) + if (ParagraphDto != null) { _logger.LogInformation("[INFORMATION] La mise à jour du paragraphe avec l'id {id} a été effectuée", id); - return Ok(_paragraphDataService.UpdateParagraph(id, paragraphDTO)); + return Ok(_paragraphDataService.UpdateParagraph(id, ParagraphDto)); } _logger.LogError("[ERREUR] Aucun paragraphe trouvé avec l'id {id}.", id); diff --git a/API_SQLuedo/API/Controllers/SuccessesController.cs b/API_SQLuedo/API/Controllers/SuccessesController.cs index 25c6371..939793d 100644 --- a/API_SQLuedo/API/Controllers/SuccessesController.cs +++ b/API_SQLuedo/API/Controllers/SuccessesController.cs @@ -112,9 +112,9 @@ namespace API.Controllers [ProducesResponseType(typeof(SuccessDto), 200)] [ProducesResponseType(typeof(string), 400)] [ProducesResponseType(typeof(string), 404)] - public IActionResult UpdateSuccess(int idUser, int idInquiry, [FromBody] SuccessDto successDTO) + public IActionResult UpdateSuccess(int idUser, int idInquiry, [FromBody] SuccessDto SuccessDto) { - if (idUser != successDTO.UserId || idInquiry != successDTO.InquiryId) + if (idUser != SuccessDto.UserId || idInquiry != SuccessDto.InquiryId) { _logger.LogError( "[ERREUR] Problème ID - La mise à jour du succès avec l'id de l'utilisateur {id} a échouée.", idUser); @@ -128,11 +128,11 @@ namespace API.Controllers return BadRequest(); } - if (successDTO != null) + if (SuccessDto != null) { _logger.LogInformation( "[INFORMATION] La mise à jour du succès avec l'id de l'utilisateur {id} a été effectuée", idUser); - return Ok(_successDataService.UpdateSuccess(idUser,idInquiry, successDTO)); + return Ok(_successDataService.UpdateSuccess(idUser,idInquiry, SuccessDto)); } _logger.LogError("[ERREUR] Aucun succès trouvé avec l'id de l'utilisateur {id}.", idUser); diff --git a/API_SQLuedo/API/Controllers/UserController.cs b/API_SQLuedo/API/Controllers/UserController.cs index 8a76b34..fb57815 100644 --- a/API_SQLuedo/API/Controllers/UserController.cs +++ b/API_SQLuedo/API/Controllers/UserController.cs @@ -103,9 +103,9 @@ namespace API.Controllers [ProducesResponseType(typeof(UserDto), 200)] [ProducesResponseType(typeof(string), 400)] [ProducesResponseType(typeof(string), 404)] - public IActionResult UpdateUser(int id, [FromBody] UserDto userDto) + public IActionResult UpdateUser(int id, [FromBody] UserDto UserDto) { - if (id != userDto.Id) + if (id != UserDto.Id) { logger.LogError("[ERREUR] Problème ID - La mise à jour de l'utilisateur avec l'id {id} a échouée.", id); return BadRequest(); @@ -118,11 +118,11 @@ namespace API.Controllers return BadRequest(); } - if (userDto != null) + if (UserDto != null) { logger.LogInformation("[INFORMATION] La mise à jour de l'utilisateur avec l'id {id} a été effectuée", id); - return Ok(userService.UpdateUser(id, userDto)); + return Ok(userService.UpdateUser(id, UserDto)); } logger.LogError("[ERREUR] Aucun utilisateur trouvé avec l'id {id}.", id); diff --git a/API_SQLuedo/Dto/InquiryDTO.cs b/API_SQLuedo/Dto/InquiryDTO.cs index 031721e..1de1adf 100644 --- a/API_SQLuedo/Dto/InquiryDTO.cs +++ b/API_SQLuedo/Dto/InquiryDTO.cs @@ -1,6 +1,6 @@ namespace Dto; -public class InquiryDTO : IEquatable +public class InquiryDto : IEquatable { public int Id { get; } @@ -48,10 +48,10 @@ public class InquiryDTO : IEquatable return false; } - return this.Equals(right as InquiryDTO); + return this.Equals(right as InquiryDto); } - public bool Equals(InquiryDTO other) + public bool Equals(InquiryDto other) { return (this.Id == other.Id); } diff --git a/API_SQLuedo/Dto/LessonDTO.cs b/API_SQLuedo/Dto/LessonDTO.cs index 8ee5fb9..00ac9a3 100644 --- a/API_SQLuedo/Dto/LessonDTO.cs +++ b/API_SQLuedo/Dto/LessonDTO.cs @@ -1,6 +1,6 @@ namespace Dto; -public class LessonDTO : IEquatable +public class LessonDto : IEquatable { public int Id { get; } public string? Title { get; set; } @@ -49,9 +49,9 @@ public class LessonDTO : IEquatable return false; } - return this.Equals(right as LessonDTO); + return this.Equals(right as LessonDto); } - public bool Equals(LessonDTO other) + public bool Equals(LessonDto other) { return (this.Id == other.Id); } diff --git a/API_SQLuedo/Dto/ParagraphDTO.cs b/API_SQLuedo/Dto/ParagraphDTO.cs index 2c5f1de..847ffa2 100644 --- a/API_SQLuedo/Dto/ParagraphDTO.cs +++ b/API_SQLuedo/Dto/ParagraphDTO.cs @@ -1,6 +1,6 @@ namespace Dto; -public class ParagraphDTO : ContentLessonDTO, IEquatable +public class ParagraphDto : ContentLessonDto, IEquatable { public string Title { get; set; } public string Content { get; set; } @@ -57,9 +57,9 @@ public class ParagraphDTO : ContentLessonDTO, IEquatable return false; } - return this.Equals(right as ParagraphDTO); + return this.Equals(right as ParagraphDto); } - public bool Equals(ParagraphDTO other) + public bool Equals(ParagraphDto other) { return (this.Id == other.Id); } diff --git a/API_SQLuedo/Dto/SuccessDTO.cs b/API_SQLuedo/Dto/SuccessDTO.cs index 39310ea..3608e1e 100644 --- a/API_SQLuedo/Dto/SuccessDTO.cs +++ b/API_SQLuedo/Dto/SuccessDTO.cs @@ -1,6 +1,6 @@ namespace Dto; -public class SuccessDTO : IEquatable +public class SuccessDto : IEquatable { public int UserId { get; set; } public int InquiryId { get; set; } @@ -39,9 +39,9 @@ public class SuccessDTO : IEquatable return false; } - return this.Equals(right as SuccessDTO); + return this.Equals(right as SuccessDto); } - public bool Equals(SuccessDTO other) + public bool Equals(SuccessDto other) { return (this.UserId == other.UserId && this.InquiryId == other.InquiryId); } diff --git a/API_SQLuedo/Dto/UserDTO.cs b/API_SQLuedo/Dto/UserDTO.cs index 85f1cbf..09df9e4 100644 --- a/API_SQLuedo/Dto/UserDTO.cs +++ b/API_SQLuedo/Dto/UserDTO.cs @@ -1,6 +1,6 @@ namespace Dto { - public class UserDTO : IEquatable + public class UserDto : IEquatable { public int Id { get; set; } public string Username { get; set; } @@ -51,9 +51,9 @@ return false; } - return this.Equals(right as UserDTO); + return this.Equals(right as UserDto); } - public bool Equals(UserDTO other) + public bool Equals(UserDto other) { return (this.Id == other.Id); } diff --git a/API_SQLuedo/TestAPI/Extensions/InquiryDto.EqualityComparer.cs b/API_SQLuedo/TestAPI/Extensions/InquiryDto.EqualityComparer.cs index dc2bccf..39572f9 100644 --- a/API_SQLuedo/TestAPI/Extensions/InquiryDto.EqualityComparer.cs +++ b/API_SQLuedo/TestAPI/Extensions/InquiryDto.EqualityComparer.cs @@ -7,14 +7,14 @@ using System.Threading.Tasks; namespace TestAPI.Extensions { - class InquiryIdEqualityComparer : EqualityComparer + class InquiryIdEqualityComparer : EqualityComparer { - public override bool Equals(InquiryDTO x, InquiryDTO y) + public override bool Equals(InquiryDto x, InquiryDto y) { return x.Id == y.Id; } - public override int GetHashCode(InquiryDTO obj) + public override int GetHashCode(InquiryDto obj) { return obj.Id; } diff --git a/API_SQLuedo/TestAPI/Extensions/LessonsDto.EqualityComparer.cs b/API_SQLuedo/TestAPI/Extensions/LessonsDto.EqualityComparer.cs index c042f13..6356a5e 100644 --- a/API_SQLuedo/TestAPI/Extensions/LessonsDto.EqualityComparer.cs +++ b/API_SQLuedo/TestAPI/Extensions/LessonsDto.EqualityComparer.cs @@ -7,14 +7,14 @@ using System.Threading.Tasks; namespace TestAPI.Extensions { - class LessonIdEqualityComparer : EqualityComparer + class LessonIdEqualityComparer : EqualityComparer { - public override bool Equals(LessonDTO x, LessonDTO y) + public override bool Equals(LessonDto x, LessonDto y) { return x.Id == y.Id; } - public override int GetHashCode(LessonDTO obj) + public override int GetHashCode(LessonDto obj) { return obj.Id; } diff --git a/API_SQLuedo/TestAPI/Extensions/ParagraphDto.EqualityComparer.cs b/API_SQLuedo/TestAPI/Extensions/ParagraphDto.EqualityComparer.cs index a590d5a..42e9c15 100644 --- a/API_SQLuedo/TestAPI/Extensions/ParagraphDto.EqualityComparer.cs +++ b/API_SQLuedo/TestAPI/Extensions/ParagraphDto.EqualityComparer.cs @@ -7,14 +7,14 @@ using System.Threading.Tasks; namespace TestAPI.Extensions { - class ParagraphIdEqualityComparer : EqualityComparer + class ParagraphIdEqualityComparer : EqualityComparer { - public override bool Equals(ParagraphDTO x, ParagraphDTO y) + public override bool Equals(ParagraphDto x, ParagraphDto y) { return x.Id == y.Id; } - public override int GetHashCode(ParagraphDTO obj) + public override int GetHashCode(ParagraphDto obj) { return obj.Id; } diff --git a/API_SQLuedo/TestAPI/Extensions/SuccessDto.EqualityComparer.cs b/API_SQLuedo/TestAPI/Extensions/SuccessDto.EqualityComparer.cs index 9516419..4acb0b1 100644 --- a/API_SQLuedo/TestAPI/Extensions/SuccessDto.EqualityComparer.cs +++ b/API_SQLuedo/TestAPI/Extensions/SuccessDto.EqualityComparer.cs @@ -7,14 +7,14 @@ using System.Threading.Tasks; namespace TestAPI.Extensions { - class SuccessIdEqualityComparer : EqualityComparer + class SuccessIdEqualityComparer : EqualityComparer { - public override bool Equals(SuccessDTO x, SuccessDTO y) + public override bool Equals(SuccessDto x, SuccessDto y) { return x.UserId == y.UserId && x.InquiryId == y.InquiryId; } - public override int GetHashCode(SuccessDTO obj) + public override int GetHashCode(SuccessDto obj) { return obj.UserId * obj.InquiryId; } diff --git a/API_SQLuedo/TestAPI/Extensions/UserDto.EqualityComparer.cs b/API_SQLuedo/TestAPI/Extensions/UserDto.EqualityComparer.cs index 33b34a2..f1c81e4 100644 --- a/API_SQLuedo/TestAPI/Extensions/UserDto.EqualityComparer.cs +++ b/API_SQLuedo/TestAPI/Extensions/UserDto.EqualityComparer.cs @@ -7,14 +7,14 @@ using Dto; namespace TestAPI.Extensions { - class UserIdEqualityComparer : EqualityComparer + class UserIdEqualityComparer : EqualityComparer { - public override bool Equals(UserDTO x, UserDTO y) + public override bool Equals(UserDto x, UserDto y) { return x.Id == y.Id; } - public override int GetHashCode(UserDTO obj) + public override int GetHashCode(UserDto obj) { return obj.Id; } diff --git a/API_SQLuedo/TestAPI/InquiryUnitTest.cs b/API_SQLuedo/TestAPI/InquiryUnitTest.cs index 8b7a9e3..ac2bd41 100644 --- a/API_SQLuedo/TestAPI/InquiryUnitTest.cs +++ b/API_SQLuedo/TestAPI/InquiryUnitTest.cs @@ -16,10 +16,10 @@ namespace TestAPI { public class InquiryUnitTest { - private readonly Mock> inquiryService; + private readonly Mock> inquiryService; public InquiryUnitTest() { - inquiryService = new Mock>(); + inquiryService = new Mock>(); } @@ -39,7 +39,7 @@ namespace TestAPI Assert.NotNull(valeur); Assert.Equal(GetInquiriesData().ToString(), valeur.ToString()); - Assert.True(inquiryList.SequenceEqual(valeur as IEnumerable, new InquiryIdEqualityComparer())); + Assert.True(inquiryList.SequenceEqual(valeur as IEnumerable, new InquiryIdEqualityComparer())); } @@ -49,7 +49,7 @@ namespace TestAPI public void GetInquiresListFail() { inquiryService.Setup(x => x.GetInquiries(1, 4, 0)) - .Returns(new List()); + .Returns(new List()); var InquiryController = new InquiriesController(inquiryService.Object, new NullLogger()); var inquiriesResult = InquiryController.GetInquiries(2, 3, 0); @@ -79,7 +79,7 @@ namespace TestAPI var inquiryResult = InquiriesController.GetInquiryById(1); if (inquiryResult is OkObjectResult okObjectResult) { - InquiryDTO valeur = okObjectResult.Value as InquiryDTO; + InquiryDto valeur = okObjectResult.Value as InquiryDto; Assert.NotNull(valeur); Assert.Equal("titre 2", valeur.Title); @@ -88,7 +88,7 @@ namespace TestAPI Assert.Equal(valeur.GetHashCode(), inquiryList[1].GetHashCode()); Assert.True(valeur.Equals(inquiryList[1])); Assert.False(valeur.Equals(new object())); - Assert.IsType(valeur); + Assert.IsType(valeur); Assert.Contains(valeur, inquiryList); } @@ -108,7 +108,7 @@ namespace TestAPI var valeur = NFObjectResult.Value; Assert.NotNull(valeur); - Assert.IsNotType(valeur); + Assert.IsNotType(valeur); Assert.DoesNotContain(valeur, inquiryList); } @@ -127,10 +127,10 @@ namespace TestAPI var inquiriesResult = InquiriesController.GetInquiryByTitle("ZUDZU"); if (inquiriesResult is OkObjectResult okObjectResult) { - InquiryDTO valeur = okObjectResult.Value as InquiryDTO; + InquiryDto valeur = okObjectResult.Value as InquiryDto; Assert.NotNull(valeur); - Assert.IsType(valeur); + Assert.IsType(valeur); Assert.Contains(valeur, inquiryList); Assert.Equal("ZUDZU", valeur.Title); Assert.Equal("OUHHHH", valeur.Description); @@ -156,7 +156,7 @@ namespace TestAPI var valeur = NFObjectResult.Value; Assert.NotNull(valeur); - Assert.IsNotType(valeur); + Assert.IsNotType(valeur); Assert.DoesNotContain(valeur, inquiryList); Assert.False(inquiryList == valeur); } @@ -205,13 +205,13 @@ namespace TestAPI public void CreateInquirySuccess() { inquiryService.Setup(x => x.CreateInquiry("Titros","description",false)) - .Returns(new InquiryDTO(4,"Titros","description",false)); + .Returns(new InquiryDto(4,"Titros","description",false)); var InquiriesController = new InquiriesController( inquiryService.Object,new NullLogger()); - var inquiriesResult = InquiriesController.CreateInquiry(new InquiryDTO("Titros", "description", false)); + var inquiriesResult = InquiriesController.CreateInquiry(new InquiryDto("Titros", "description", false)); if (inquiriesResult is CreatedResult createdObjectResult) { - InquiryDTO valeur = createdObjectResult.Value as InquiryDTO; + InquiryDto valeur = createdObjectResult.Value as InquiryDto; Assert.NotNull(valeur); Assert.Equal(4, valeur.Id); @@ -226,10 +226,10 @@ namespace TestAPI public void CreateInquiryFail() { inquiryService.Setup(x => x.CreateInquiry("Titros", "description", false)) - .Returns(new InquiryDTO(4, "Titros", "description", false)); + .Returns(new InquiryDto(4, "Titros", "description", false)); var InquiriesController = new InquiriesController(inquiryService.Object, new NullLogger()); - var inquiriesResult = InquiriesController.CreateInquiry(new InquiryDTO(4, null, "heudfk@hdye.com", true)); + var inquiriesResult = InquiriesController.CreateInquiry(new InquiryDto(4, null, "heudfk@hdye.com", true)); if (inquiriesResult is BadRequestResult BDObjectResult) { @@ -242,14 +242,14 @@ namespace TestAPI [Fact] public void UpdateInquirySuccess() { - inquiryService.Setup(x => x.UpdateInquiry(1, new InquiryDTO(1, "Passssss", "heudfk@hdye.com", true))) - .Returns(new InquiryDTO(1, "Passssss", "heudfk@hdye.com", true)); + inquiryService.Setup(x => x.UpdateInquiry(1, new InquiryDto(1, "Passssss", "heudfk@hdye.com", true))) + .Returns(new InquiryDto(1, "Passssss", "heudfk@hdye.com", true)); var InquiriesController = new InquiriesController(inquiryService.Object, new NullLogger()); - var inquiriesResult = InquiriesController.UpdateInquiry(1, new InquiryDTO(1, "Passssss", "heudfk@hdye.com", true)); + var inquiriesResult = InquiriesController.UpdateInquiry(1, new InquiryDto(1, "Passssss", "heudfk@hdye.com", true)); if (inquiriesResult is OkObjectResult okObjectResult) { - InquiryDTO valeur = okObjectResult.Value as InquiryDTO; + InquiryDto valeur = okObjectResult.Value as InquiryDto; Assert.NotNull(valeur); Assert.Equal("Passssss", valeur.Title); @@ -262,11 +262,11 @@ namespace TestAPI [Fact] public void UpdateInquiryFail() { - inquiryService.Setup(x => x.UpdateInquiry(1, new InquiryDTO(1, "Passssss", "heudfk@hdye.com", true))) - .Returns(new InquiryDTO(1, "Passssss", "heudfk@hdye.com", true)); + inquiryService.Setup(x => x.UpdateInquiry(1, new InquiryDto(1, "Passssss", "heudfk@hdye.com", true))) + .Returns(new InquiryDto(1, "Passssss", "heudfk@hdye.com", true)); var InquiriesController = new InquiriesController(inquiryService.Object, new NullLogger()); - var inquiriesResult = InquiriesController.UpdateInquiry(1, new InquiryDTO(2, "Passssss", "heudfk@hdye.com", true)); + var inquiriesResult = InquiriesController.UpdateInquiry(1, new InquiryDto(2, "Passssss", "heudfk@hdye.com", true)); if (inquiriesResult is BadRequestResult BDObjectResult) { @@ -284,9 +284,9 @@ namespace TestAPI - private List GetInquiriesData() + private List GetInquiriesData() { - List inquiriesData = new List(4) + List inquiriesData = new List(4) { new (0,"titre 1","La desc",false), new (1,"titre 2","Description",true), diff --git a/API_SQLuedo/TestAPI/LessonUnitTest.cs b/API_SQLuedo/TestAPI/LessonUnitTest.cs index b7444e2..b42c9c8 100644 --- a/API_SQLuedo/TestAPI/LessonUnitTest.cs +++ b/API_SQLuedo/TestAPI/LessonUnitTest.cs @@ -15,11 +15,11 @@ namespace TestAPI { public class LessonUnitTest { - private readonly Mock> lessonService; + private readonly Mock> lessonService; public LessonUnitTest() { - lessonService = new Mock>(); + lessonService = new Mock>(); } [Fact] @@ -38,7 +38,7 @@ namespace TestAPI Assert.NotNull(valeur); Assert.Equal(GetLessonsData().ToString(), valeur.ToString()); - Assert.True(lessonList.SequenceEqual(valeur as IEnumerable, new LessonIdEqualityComparer())); + Assert.True(lessonList.SequenceEqual(valeur as IEnumerable, new LessonIdEqualityComparer())); } @@ -48,7 +48,7 @@ namespace TestAPI public void GetLessonsListFail() { lessonService.Setup(x => x.GetLessons(1, 4, 0)) - .Returns(new List()); + .Returns(new List()); var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); var lessonsResult = LessonsController.GetLessons(2, 3, 0); @@ -74,7 +74,7 @@ namespace TestAPI var lessonsResult = LessonsController.GetLessonById(1); if (lessonsResult is OkObjectResult okObjectResult) { - LessonDTO valeur = okObjectResult.Value as LessonDTO; + LessonDto valeur = okObjectResult.Value as LessonDto; Assert.NotNull(valeur); Assert.Equal("Le titre", valeur.Title); @@ -87,7 +87,7 @@ namespace TestAPI Assert.True(valeur.Equals(lessonList[0])); Assert.False(valeur.Equals(new object())); Assert.True(valeur.Equals(valeur)); - Assert.IsType(valeur); + Assert.IsType(valeur); Assert.Contains(valeur, lessonList); } @@ -107,7 +107,7 @@ namespace TestAPI var valeur = NFObjectResult.Value; Assert.NotNull(valeur); - Assert.IsNotType(valeur); + Assert.IsNotType(valeur); Assert.DoesNotContain(valeur, lessonList); } @@ -125,14 +125,14 @@ namespace TestAPI var lessonsResult = LessonsController.GetLessonByTitle("Chiant la"); if (lessonsResult is OkObjectResult okObjectResult) { - LessonDTO valeur = okObjectResult.Value as LessonDTO; + LessonDto valeur = okObjectResult.Value as LessonDto; Assert.NotNull(valeur); Assert.Equal("Chiant la", valeur.Title); Assert.Equal("Une personne", valeur.LastPublisher); Assert.Equal(new DateOnly(2012, 12, 25), valeur.LastEdit); Assert.Equal(3, valeur.Id); - Assert.IsType(valeur); + Assert.IsType(valeur); Assert.Contains(valeur, lessonList); } @@ -154,7 +154,7 @@ namespace TestAPI var valeur = NFObjectResult.Value; Assert.NotNull(valeur); - Assert.IsNotType(valeur); + Assert.IsNotType(valeur); Assert.DoesNotContain(valeur, lessonList); Assert.False(lessonList == valeur); } @@ -198,13 +198,13 @@ namespace TestAPI public void CreateLessonSuccess() { lessonService.Setup(x => x.CreateLesson("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024,03,16))) - .Returns(new LessonDTO("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))); + .Returns(new LessonDto("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))); var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - var lessonsResult = LessonsController.CreateLesson(new LessonDTO("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))); + var lessonsResult = LessonsController.CreateLesson(new LessonDto("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))); if (lessonsResult is CreatedResult createdObjectResult) { - LessonDTO valeur = createdObjectResult.Value as LessonDTO; + LessonDto valeur = createdObjectResult.Value as LessonDto; Assert.NotNull(valeur); Assert.Equal("Le nouveau titre", valeur.Title); @@ -218,10 +218,10 @@ namespace TestAPI public void CreateLessonFail() { lessonService.Setup(x => x.CreateLesson("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))) - .Returns(new LessonDTO("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))); + .Returns(new LessonDto("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))); var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - var lessonsResult = LessonsController.CreateLesson(new LessonDTO(null, "Le nouvel éditeur", new DateOnly(2024, 03, 16))); + var lessonsResult = LessonsController.CreateLesson(new LessonDto(null, "Le nouvel éditeur", new DateOnly(2024, 03, 16))); if (lessonsResult is BadRequestResult BDObjectResult) { @@ -234,14 +234,14 @@ namespace TestAPI [Fact] public void UpdateLessonSuccess() { - lessonService.Setup(x => x.UpdateLesson(1,new LessonDTO(1,"Titre update","Le dernier publisher",new DateOnly(2022,02,02)))) - .Returns(new LessonDTO(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); + lessonService.Setup(x => x.UpdateLesson(1,new LessonDto(1,"Titre update","Le dernier publisher",new DateOnly(2022,02,02)))) + .Returns(new LessonDto(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - var lessonsResult = LessonsController.UpdateLesson(1, new LessonDTO(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); + var lessonsResult = LessonsController.UpdateLesson(1, new LessonDto(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); if (lessonsResult is OkObjectResult okObjectResult) { - LessonDTO valeur = okObjectResult.Value as LessonDTO; + LessonDto valeur = okObjectResult.Value as LessonDto; Assert.NotNull(valeur); Assert.Equal("Titre update", valeur.Title); @@ -255,11 +255,11 @@ namespace TestAPI [Fact] public void UpdateLessonFail() { - lessonService.Setup(x => x.UpdateLesson(1, new LessonDTO(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02)))) - .Returns(new LessonDTO(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); + lessonService.Setup(x => x.UpdateLesson(1, new LessonDto(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02)))) + .Returns(new LessonDto(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - var lessonsResult = LessonsController.UpdateLesson(1, new LessonDTO(2, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); + var lessonsResult = LessonsController.UpdateLesson(1, new LessonDto(2, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); if (lessonsResult is BadRequestResult BDObjectResult) { @@ -297,9 +297,9 @@ namespace TestAPI - private List GetLessonsData() + private List GetLessonsData() { - List lessonsData = new List(4) + List lessonsData = new List(4) { new (1,"Le titre", "Clément",new DateOnly(2024,03,10)), new (2,"Pas titre", "Erwan",new DateOnly(2024,02,11)), diff --git a/API_SQLuedo/TestAPI/ParagraphsUnitTest.cs b/API_SQLuedo/TestAPI/ParagraphsUnitTest.cs index f3379c4..ec16679 100644 --- a/API_SQLuedo/TestAPI/ParagraphsUnitTest.cs +++ b/API_SQLuedo/TestAPI/ParagraphsUnitTest.cs @@ -16,11 +16,11 @@ namespace TestAPI public class ParagraphsUnitTest { - private readonly Mock> paragraphService; + private readonly Mock> paragraphService; public ParagraphsUnitTest() { - paragraphService = new Mock>(); + paragraphService = new Mock>(); } [Fact] @@ -39,7 +39,7 @@ namespace TestAPI Assert.NotNull(valeur); Assert.Equal(GetParagraphsData().ToString(), valeur.ToString()); - Assert.True(paragraphsList.SequenceEqual(valeur as IEnumerable, new ParagraphIdEqualityComparer())); + Assert.True(paragraphsList.SequenceEqual(valeur as IEnumerable, new ParagraphIdEqualityComparer())); } @@ -49,7 +49,7 @@ namespace TestAPI public void GetParagraphsListFail() { paragraphService.Setup(x => x.GetParagraphs(1, 4, 0)) - .Returns(new List()); + .Returns(new List()); var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); var paragraphsResult = ParagraphsController.GetParagraphs(1, 4, 0); @@ -76,7 +76,7 @@ namespace TestAPI var paragraphsResult = ParagraphsController.GetParagraphById(1); if (paragraphsResult is OkObjectResult okObjectResult) { - ParagraphDTO valeur = okObjectResult.Value as ParagraphDTO; + ParagraphDto valeur = okObjectResult.Value as ParagraphDto; Assert.NotNull(valeur); Assert.Equal("Le titre", valeur.Title); @@ -91,7 +91,7 @@ namespace TestAPI Assert.True(valeur.Equals(paragraphsList[1])); Assert.False(valeur.Equals(new object())); Assert.True(valeur.Equals(valeur)); - Assert.IsType(valeur); + Assert.IsType(valeur); Assert.Contains(valeur, paragraphsList); } @@ -111,7 +111,7 @@ namespace TestAPI var valeur = NFObjectResult.Value; Assert.NotNull(valeur); - Assert.IsNotType(valeur); + Assert.IsNotType(valeur); Assert.DoesNotContain(valeur, paragraphsList); } @@ -129,7 +129,7 @@ namespace TestAPI var paragraphsResult = ParagraphsController.GetParagraphByTitle("Title"); if (paragraphsResult is OkObjectResult okObjectResult) { - ParagraphDTO valeur = okObjectResult.Value as ParagraphDTO; + ParagraphDto valeur = okObjectResult.Value as ParagraphDto; Assert.NotNull(valeur); Assert.Equal("Title", valeur.Title); @@ -138,7 +138,7 @@ namespace TestAPI Assert.Equal("Select select from select", valeur.Query); Assert.Equal("Mais qui est ce commentaire", valeur.Comment); Assert.Equal(3, valeur.LessonId); - Assert.IsType(valeur); + Assert.IsType(valeur); Assert.Contains(valeur, paragraphsList); } @@ -160,7 +160,7 @@ namespace TestAPI var valeur = NFObjectResult.Value; Assert.NotNull(valeur); - Assert.IsNotType(valeur); + Assert.IsNotType(valeur); Assert.DoesNotContain(valeur, paragraphsList); Assert.False(paragraphsList == valeur); } @@ -205,13 +205,13 @@ namespace TestAPI public void CreateParagraphSuccess() { paragraphService.Setup(x => x.CreateParagraph("Le nouveau titre","Le nouveau content","Les infos","La requête requêtante","Commentaires",2)) - .Returns(new ParagraphDTO("Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); + .Returns(new ParagraphDto("Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - var paragraphsResult = ParagraphsController.CreateParagraph(new ParagraphDTO("Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); + var paragraphsResult = ParagraphsController.CreateParagraph(new ParagraphDto("Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); if (paragraphsResult is CreatedResult createdObjectResult) { - ParagraphDTO valeur = createdObjectResult.Value as ParagraphDTO; + ParagraphDto valeur = createdObjectResult.Value as ParagraphDto; Assert.NotNull(valeur); Assert.Equal("Le nouveau titre", valeur.Title); @@ -228,10 +228,10 @@ namespace TestAPI public void CreateParagraphFail() { paragraphService.Setup(x => x.CreateParagraph("Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)) - .Returns(new ParagraphDTO("Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); + .Returns(new ParagraphDto("Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - var paragraphsResult = ParagraphsController.CreateParagraph(new ParagraphDTO(null, "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); + var paragraphsResult = ParagraphsController.CreateParagraph(new ParagraphDto(null, "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); if (paragraphsResult is BadRequestResult BDObjectResult) { @@ -244,14 +244,14 @@ namespace TestAPI [Fact] public void UpdateParagraphSuccess() { - paragraphService.Setup(x => x.UpdateParagraph(1,new ParagraphDTO(1,"Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2))) - .Returns(new ParagraphDTO(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); + paragraphService.Setup(x => x.UpdateParagraph(1,new ParagraphDto(1,"Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2))) + .Returns(new ParagraphDto(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - var paragraphsResult = ParagraphsController.UpdateParagraph(1, new ParagraphDTO(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); + var paragraphsResult = ParagraphsController.UpdateParagraph(1, new ParagraphDto(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); if (paragraphsResult is OkObjectResult okObjectResult) { - ParagraphDTO valeur = okObjectResult.Value as ParagraphDTO; + ParagraphDto valeur = okObjectResult.Value as ParagraphDto; Assert.NotNull(valeur); Assert.Equal("Le nouveau titre", valeur.Title); @@ -267,11 +267,11 @@ namespace TestAPI [Fact] public void UpdateParagraphFail() { - paragraphService.Setup(x => x.UpdateParagraph(1, new ParagraphDTO(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2))) - .Returns(new ParagraphDTO(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); + paragraphService.Setup(x => x.UpdateParagraph(1, new ParagraphDto(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2))) + .Returns(new ParagraphDto(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - var paragraphsResult = ParagraphsController.UpdateParagraph(1, new ParagraphDTO(2, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); + var paragraphsResult = ParagraphsController.UpdateParagraph(1, new ParagraphDto(2, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); if (paragraphsResult is BadRequestResult BDObjectResult) { @@ -279,9 +279,9 @@ namespace TestAPI Assert.Equal(400, BDObjectResult.StatusCode); } } - private List GetParagraphsData() + private List GetParagraphsData() { - List paragraphsData = new List(4) + List paragraphsData = new List(4) { new (0,"Titre 1","Le contenu","Les infos de ce paragraphes sont ","Select * from C#","Le commentaire",1), new (1,"Le titre","pas contenu","Pas d'infos ici","Delete * from Earth","Miam",2), diff --git a/API_SQLuedo/TestAPI/SuccessesUnitTest.cs b/API_SQLuedo/TestAPI/SuccessesUnitTest.cs index 1422c57..553ddc4 100644 --- a/API_SQLuedo/TestAPI/SuccessesUnitTest.cs +++ b/API_SQLuedo/TestAPI/SuccessesUnitTest.cs @@ -15,10 +15,10 @@ namespace TestAPI { public class SuccessesUnitTest { - private readonly Mock> successService; + private readonly Mock> successService; public SuccessesUnitTest() { - successService = new Mock>(); + successService = new Mock>(); } @@ -38,7 +38,7 @@ namespace TestAPI Assert.NotNull(valeur); Assert.Equal(GetSuccessesData().ToString(), valeur.ToString()); - Assert.True(successesList.SequenceEqual(valeur as IEnumerable, new SuccessIdEqualityComparer())); + Assert.True(successesList.SequenceEqual(valeur as IEnumerable, new SuccessIdEqualityComparer())); } @@ -48,7 +48,7 @@ namespace TestAPI public void GetSuccessesListFail() { successService.Setup(x => x.GetSuccesses(1, 4, 0)) - .Returns(new List()); + .Returns(new List()); var successesController = new SuccessesController(successService.Object, new NullLogger()); var successesResult = successesController.GetSuccesses(2, 3, 0); @@ -68,13 +68,13 @@ namespace TestAPI { var successesList = GetSuccessesData(); successService.Setup(x => x.GetSuccessesByInquiryId(1)) - .Returns(new List { successesList[0], successesList[1] }); + .Returns(new List { successesList[0], successesList[1] }); var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); var sucessesResult = SuccessesController.GetSuccessByInquiryId(1); if (sucessesResult is OkObjectResult okObjectResult) { - List valeur = okObjectResult.Value as List; + List valeur = okObjectResult.Value as List; Assert.NotNull(valeur); Assert.Equal(0, valeur[0].UserId); @@ -90,7 +90,7 @@ namespace TestAPI Assert.False(valeur.Equals(new object())); Assert.False(valeur.Equals(null)); Assert.True(valeur.Equals(valeur)); - Assert.IsType(valeur[0]); + Assert.IsType(valeur[0]); Assert.Contains(valeur[1], successesList); } @@ -101,7 +101,7 @@ namespace TestAPI { var successesList = GetSuccessesData(); successService.Setup(x => x.GetSuccessesByInquiryId(1)) - .Returns(new List { successesList[0], successesList[1] }); + .Returns(new List { successesList[0], successesList[1] }); var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); var sucessesResult = SuccessesController.GetSuccessByInquiryId(100); @@ -110,7 +110,7 @@ namespace TestAPI var valeur = NFObjectResult.Value; Assert.NotNull(valeur); - Assert.IsNotType(valeur); + Assert.IsNotType(valeur); Assert.DoesNotContain(valeur, successesList); } @@ -122,13 +122,13 @@ namespace TestAPI { var successesList = GetSuccessesData(); successService.Setup(x => x.GetSuccessesByUserId(2)) - .Returns(new List { successesList[2], successesList[3] }); + .Returns(new List { successesList[2], successesList[3] }); var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); var sucessesResult = SuccessesController.GetSuccessByUserId(2); if (sucessesResult is OkObjectResult okObjectResult) { - List valeur = okObjectResult.Value as List; + List valeur = okObjectResult.Value as List; Assert.NotNull(valeur); Assert.Equal(2, valeur[0].UserId); @@ -142,7 +142,7 @@ namespace TestAPI Assert.Equal(valeur[1].GetHashCode(), successesList[3].GetHashCode()); Assert.True(valeur[1].Equals(successesList[3])); Assert.False(valeur.Equals(new object())); - Assert.IsType(valeur[0]); + Assert.IsType(valeur[0]); Assert.Contains(valeur[1], successesList); } @@ -153,7 +153,7 @@ namespace TestAPI { var successesList = GetSuccessesData(); successService.Setup(x => x.GetSuccessesByUserId(2)) - .Returns(new List { successesList[2], successesList[3] }); + .Returns(new List { successesList[2], successesList[3] }); var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); var sucessesResult = SuccessesController.GetSuccessByUserId(200); @@ -162,7 +162,7 @@ namespace TestAPI var valeur = NFObjectResult.Value; Assert.NotNull(valeur); - Assert.IsNotType(valeur); + Assert.IsNotType(valeur); Assert.DoesNotContain(valeur, successesList); } @@ -208,13 +208,13 @@ namespace TestAPI public void CreateSuccessSuccess() { successService.Setup(x => x.CreateSuccess(8,8,true)) - .Returns(new SuccessDTO(8,8,true)); + .Returns(new SuccessDto(8,8,true)); var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - var successesResult = SuccessesController.CreateSuccess(new SuccessDTO(8,8,true)); + var successesResult = SuccessesController.CreateSuccess(new SuccessDto(8,8,true)); if (successesResult is CreatedResult createdObjectResult) { - SuccessDTO valeur = createdObjectResult.Value as SuccessDTO; + SuccessDto valeur = createdObjectResult.Value as SuccessDto; Assert.NotNull(valeur); Assert.Equal(8, valeur.UserId); @@ -228,10 +228,10 @@ namespace TestAPI public void CreateSuccessFail() { successService.Setup(x => x.CreateSuccess(8, 8, true)) - .Returns(new SuccessDTO(8, 8, true)); + .Returns(new SuccessDto(8, 8, true)); var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - var successesResult = SuccessesController.CreateSuccess(new SuccessDTO(882, 818, true)); + var successesResult = SuccessesController.CreateSuccess(new SuccessDto(882, 818, true)); if (successesResult is BadRequestResult BDObjectResult) { @@ -245,14 +245,14 @@ namespace TestAPI [Fact] public void UpdateSuccessSuccess() { - successService.Setup(x => x.UpdateSuccess(1,1,new SuccessDTO(1,1,true))) - .Returns(new SuccessDTO(1, 1, true)); + successService.Setup(x => x.UpdateSuccess(1,1,new SuccessDto(1,1,true))) + .Returns(new SuccessDto(1, 1, true)); var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - var successesResult = SuccessesController.UpdateSuccess(1, 1, new SuccessDTO(1, 1, true)); + var successesResult = SuccessesController.UpdateSuccess(1, 1, new SuccessDto(1, 1, true)); if (successesResult is OkObjectResult okObjectResult) { - SuccessDTO valeur = okObjectResult.Value as SuccessDTO; + SuccessDto valeur = okObjectResult.Value as SuccessDto; Assert.NotNull(valeur); Assert.Equal(1, valeur.UserId); @@ -265,11 +265,11 @@ namespace TestAPI [Fact] public void UpdateSuccessFail() { - successService.Setup(x => x.UpdateSuccess(1, 1, new SuccessDTO(1, 2, true))) - .Returns(new SuccessDTO(1, 2, true)); + successService.Setup(x => x.UpdateSuccess(1, 1, new SuccessDto(1, 2, true))) + .Returns(new SuccessDto(1, 2, true)); var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - var successesResult = SuccessesController.UpdateSuccess(1, 1, new SuccessDTO(1, 2, true)); + var successesResult = SuccessesController.UpdateSuccess(1, 1, new SuccessDto(1, 2, true)); if (successesResult is BadRequestResult BDObjectResult) { @@ -281,9 +281,9 @@ namespace TestAPI - private List GetSuccessesData() + private List GetSuccessesData() { - List successesData = new List(4) + List successesData = new List(4) { new (0,1,true), new (1,1,true), diff --git a/API_SQLuedo/TestAPI/UserUnitTest.cs b/API_SQLuedo/TestAPI/UserUnitTest.cs index c4e8311..18ef7b0 100644 --- a/API_SQLuedo/TestAPI/UserUnitTest.cs +++ b/API_SQLuedo/TestAPI/UserUnitTest.cs @@ -16,10 +16,10 @@ namespace TestAPI { public class UserUnitTest { - private readonly Mock> userService; + private readonly Mock> userService; public UserUnitTest() { - userService = new Mock>(); + userService = new Mock>(); } [Fact] @@ -38,7 +38,7 @@ namespace TestAPI Assert.NotNull(valeur); Assert.Equal(GetUsersData().ToString(), valeur.ToString()); - Assert.True(userList.SequenceEqual(valeur as IEnumerable,new UserIdEqualityComparer())); + Assert.True(userList.SequenceEqual(valeur as IEnumerable,new UserIdEqualityComparer())); } @@ -48,7 +48,7 @@ namespace TestAPI public void GetUserListFail() { userService.Setup(x => x.GetUsers(1, 4,0)) - .Returns(new List()); + .Returns(new List()); var UsersController = new UsersController(new NullLogger(), userService.Object); var userResult = UsersController.GetUsers(2,3, 0); @@ -74,13 +74,13 @@ namespace TestAPI var userResult = UsersController.GetUserById(1); if (userResult is OkObjectResult okObjectResult) { - UserDTO valeur = okObjectResult.Value as UserDTO; + UserDto valeur = okObjectResult.Value as UserDto; Assert.NotNull(valeur); Assert.Equal("Leuser",valeur.Username); Assert.Equal("motdepasse", valeur.Password); Assert.Equal("deuxadresse@gmail.com", valeur.Email); - Assert.IsType(valeur); + Assert.IsType(valeur); Assert.Contains(valeur, userList); } @@ -100,7 +100,7 @@ namespace TestAPI var valeur = NFObjectResult.Value; Assert.NotNull(valeur); - Assert.IsNotType(valeur); + Assert.IsNotType(valeur); Assert.DoesNotContain(valeur, userList); } @@ -118,10 +118,10 @@ namespace TestAPI var userResult = UsersController.GetUserByUsername("Useruser"); if (userResult is OkObjectResult okObjectResult) { - UserDTO valeur = okObjectResult.Value as UserDTO; + UserDto valeur = okObjectResult.Value as UserDto; Assert.NotNull(valeur); - Assert.IsType(valeur); + Assert.IsType(valeur); Assert.Contains(valeur, userList); Assert.Equal("adressemail@gmail.com", valeur.Email); Assert.Equal("Useruser", valeur.Username); @@ -147,7 +147,7 @@ namespace TestAPI var valeur = NFObjectResult.Value; Assert.NotNull(valeur); - Assert.IsNotType(valeur); + Assert.IsNotType(valeur); Assert.DoesNotContain(valeur, userList); Assert.False(userList == valeur); } @@ -196,13 +196,13 @@ namespace TestAPI public void CreateUserSuccess() { userService.Setup(x => x.CreateUser("Nom","Passssss","heudfk@hdye.com",true)) - .Returns(new UserDTO("Nom","Passssss", "heudfk@hdye.com",true)); + .Returns(new UserDto("Nom","Passssss", "heudfk@hdye.com",true)); var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = UsersController.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; + UserDto valeur = createdObjectResult.Value as UserDto; Assert.NotNull(valeur); Assert.Equal("Nom", valeur.Username); @@ -218,10 +218,10 @@ 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)); + .Returns(new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = UsersController.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) { @@ -234,14 +234,14 @@ namespace TestAPI [Fact] public void UpdateUserSuccess() { - userService.Setup(x => x.UpdateUser(1, new UserDTO("Nom", "Passssss", "heudfk@hdye.com", true))) - .Returns(new UserDTO("Nom", "Passssss", "heudfk@hdye.com", true)); + userService.Setup(x => x.UpdateUser(1, new UserDto("Nom", "Passssss", "heudfk@hdye.com", true))) + .Returns(new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = UsersController.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; + UserDto valeur = okObjectResult.Value as UserDto; Assert.NotNull(valeur); Assert.Equal("Nom", valeur.Username); @@ -255,11 +255,11 @@ namespace TestAPI [Fact] public void UpdateUserFail() { - userService.Setup(x => x.UpdateUser(1, new UserDTO(1,"Nom", "Passssss", "heudfk@hdye.com", true))) - .Returns(new UserDTO("Nom", "Passssss", "heudfk@hdye.com", true)); + userService.Setup(x => x.UpdateUser(1, new UserDto(1,"Nom", "Passssss", "heudfk@hdye.com", true))) + .Returns(new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); var UsersController = new UsersController(new NullLogger(), userService.Object); - var userResult = UsersController.UpdateUser(1, new UserDTO(2,"Nom", "Passssss", "heudfk@hdye.com", true)); + var userResult = UsersController.UpdateUser(1, new UserDto(2,"Nom", "Passssss", "heudfk@hdye.com", true)); if (userResult is BadRequestResult BDObjectResult) { @@ -274,9 +274,9 @@ namespace TestAPI - private List GetUsersData() + private List GetUsersData() { - List usersData = new List(4) + List usersData = new List(4) { new ( 0,