From 98e17766b203734a1817eed94338e2d25f4395f7 Mon Sep 17 00:00:00 2001 From: transtrike Date: Sat, 13 Feb 2021 16:20:18 +0200 Subject: Project Restructure P.1 --- src/Web/DevHive.Web.Tests/PostController.Tests.cs | 248 ++++++++++++++++++++++ 1 file changed, 248 insertions(+) create mode 100644 src/Web/DevHive.Web.Tests/PostController.Tests.cs (limited to 'src/Web/DevHive.Web.Tests/PostController.Tests.cs') diff --git a/src/Web/DevHive.Web.Tests/PostController.Tests.cs b/src/Web/DevHive.Web.Tests/PostController.Tests.cs new file mode 100644 index 0000000..3a4e45e --- /dev/null +++ b/src/Web/DevHive.Web.Tests/PostController.Tests.cs @@ -0,0 +1,248 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using AutoMapper; +using DevHive.Services.Interfaces; +using DevHive.Services.Models.Post; +using DevHive.Web.Controllers; +using DevHive.Web.Models.Post; +using Microsoft.AspNetCore.Mvc; +using Moq; +using NUnit.Framework; + +namespace DevHive.Web.Tests +{ + [TestFixture] + public class PostControllerTests + { + const string MESSAGE = "Gosho Trapov"; + private Mock PostServiceMock { get; set; } + private Mock MapperMock { get; set; } + private PostController PostController { get; set; } + + [SetUp] + public void SetUp() + { + this.PostServiceMock = new Mock(); + this.MapperMock = new Mock(); + this.PostController = new PostController(this.PostServiceMock.Object, this.MapperMock.Object); + } + + #region Create + [Test] + public void CreatePost_ReturnsOkObjectResult_WhenPostIsSuccessfullyCreated() + { + CreatePostWebModel createPostWebModel = new CreatePostWebModel + { + Message = MESSAGE + }; + CreatePostServiceModel createPostServiceModel = new CreatePostServiceModel + { + Message = MESSAGE + }; + Guid id = Guid.NewGuid(); + + this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createPostServiceModel); + this.PostServiceMock.Setup(p => p.CreatePost(It.IsAny())).Returns(Task.FromResult(id)); + this.PostServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + + IActionResult result = this.PostController.Create(Guid.Empty, createPostWebModel, null).Result; + + Assert.IsInstanceOf(result); + + var splitted = (result as OkObjectResult).Value + .ToString() + .Split('{', '}', '=', ' ') + .Where(x => !string.IsNullOrEmpty(x)) + .ToArray(); + + Guid resultId = Guid.Parse(splitted[1]); + + Assert.AreEqual(id, resultId); + } + + [Test] + public void CreatePost_ReturnsBadRequestObjectResult_WhenPostIsNotCreatedSuccessfully() + { + CreatePostWebModel createTechnologyWebModel = new CreatePostWebModel + { + Message = MESSAGE + }; + CreatePostServiceModel createTechnologyServiceModel = new CreatePostServiceModel + { + Message = MESSAGE + }; + Guid id = Guid.Empty; + string errorMessage = $"Could not create post!"; + + this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); + this.PostServiceMock.Setup(p => p.CreatePost(It.IsAny())).Returns(Task.FromResult(id)); + this.PostServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + + IActionResult result = this.PostController.Create(Guid.Empty, createTechnologyWebModel, null).Result; + + Assert.IsInstanceOf(result); + + BadRequestObjectResult badRequsetObjectResult = result as BadRequestObjectResult; + string resultMessage = badRequsetObjectResult.Value.ToString(); + + Assert.AreEqual(errorMessage, resultMessage); + } + + [Test] + public void CreatePost_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() + { + Guid id = Guid.NewGuid(); + CreatePostWebModel createPostWebModel = new CreatePostWebModel + { + Message = MESSAGE + }; + + this.PostServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + + IActionResult result = this.PostController.Create(Guid.NewGuid(), createPostWebModel, null).Result; + + Assert.IsInstanceOf(result); + } + #endregion + + #region Read + [Test] + public void GetById_ReturnsThePost_WhenItExists() + { + Guid id = Guid.NewGuid(); + + ReadPostServiceModel readPostServiceModel = new ReadPostServiceModel + { + Message = MESSAGE + }; + ReadPostWebModel readPostWebModel = new ReadPostWebModel + { + Message = MESSAGE + }; + + this.PostServiceMock.Setup(p => p.GetPostById(It.IsAny())).Returns(Task.FromResult(readPostServiceModel)); + this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPostWebModel); + + IActionResult result = this.PostController.GetById(id).Result; + + Assert.IsInstanceOf(result); + + OkObjectResult okObjectResult = result as OkObjectResult; + ReadPostWebModel resultModel = okObjectResult.Value as Models.Post.ReadPostWebModel; + + Assert.AreEqual(MESSAGE, resultModel.Message); + } + #endregion + + #region Update + [Test] + public void Update_ShouldReturnOkResult_WhenPostIsUpdatedSuccessfully() + { + Guid id = Guid.NewGuid(); + UpdatePostWebModel updatePostWebModel = new UpdatePostWebModel + { + NewMessage = MESSAGE + }; + UpdatePostServiceModel updatePostServiceModel = new UpdatePostServiceModel + { + NewMessage = MESSAGE + }; + + this.PostServiceMock.Setup(p => p.UpdatePost(It.IsAny())).Returns(Task.FromResult(id)); + this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updatePostServiceModel); + this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + + IActionResult result = this.PostController.Update(id, updatePostWebModel, null).Result; + + Assert.IsInstanceOf(result); + } + + [Test] + public void Update_ShouldReturnBadObjectResult_WhenPostIsNotUpdatedSuccessfully() + { + Guid id = Guid.NewGuid(); + string message = "Could not update post!"; + UpdatePostWebModel updatePostWebModel = new UpdatePostWebModel + { + NewMessage = MESSAGE + }; + UpdatePostServiceModel updatePostServiceModel = new UpdatePostServiceModel + { + NewMessage = MESSAGE + }; + + this.PostServiceMock.Setup(p => p.UpdatePost(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); + this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updatePostServiceModel); + this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + + IActionResult result = this.PostController.Update(id, updatePostWebModel, null).Result; + Assert.IsInstanceOf(result); + + BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult; + string resultModel = badRequestObjectResult.Value.ToString(); + + Assert.AreEqual(message, resultModel); + } + + [Test] + public void Update_ShouldReturnUnauthorizedResult_WhenUserIsNotAuthorized() + { + UpdatePostWebModel updatePostWebModel = new UpdatePostWebModel + { + NewMessage = MESSAGE + }; + + this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + + IActionResult result = this.PostController.Update(Guid.Empty, updatePostWebModel, null).Result; + + Assert.IsInstanceOf(result); + } + #endregion + + #region Delete + [Test] + public void Delete_ReturnsOkResult_WhenPostIsDeletedSuccessfully() + { + Guid id = Guid.NewGuid(); + + this.PostServiceMock.Setup(p => p.DeletePost(It.IsAny())).Returns(Task.FromResult(true)); + this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + + IActionResult result = this.PostController.Delete(id, null).Result; + + Assert.IsInstanceOf(result); + } + + [Test] + public void Delete_ReturnsBadRequestObjectResult_WhenPostIsNotDeletedSuccessfully() + { + string message = "Could not delete Post"; + Guid id = Guid.NewGuid(); + + this.PostServiceMock.Setup(p => p.DeletePost(It.IsAny())).Returns(Task.FromResult(false)); + this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + + IActionResult result = this.PostController.Delete(id, null).Result; + + Assert.IsInstanceOf(result); + + BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult; + string resultModel = badRequestObjectResult.Value.ToString(); + + Assert.AreEqual(message, resultModel); + } + + [Test] + public void DeletePost_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() + { + this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + + IActionResult result = this.PostController.Delete(Guid.Empty, null).Result; + + Assert.IsInstanceOf(result); + } + #endregion + } +} -- cgit v1.2.3 From 018e9d303c38407589f06ec37a4a72dc4ce8e3b4 Mon Sep 17 00:00:00 2001 From: transtrike Date: Sat, 13 Feb 2021 18:36:25 +0200 Subject: Merged New Project Structure; Fixed Kamen's Formatting Issues --- src/Data/DevHive.Data.Models/ProfilePicture.cs | 2 +- .../DevHive.Data/Repositories/CommentRepository.cs | 5 ++-- .../DevHive.Data/Repositories/FeedRepository.cs | 8 +++---- .../Repositories/LanguageRepository.cs | 4 ++-- .../DevHive.Data/Repositories/PostRepository.cs | 10 ++++---- .../Repositories/TechnologyRepository.cs | 4 ++-- src/DevHive.code-workspace | 1 - .../DevHive.Services/Interfaces/IPostService.cs | 2 +- .../DevHive.Services/Services/FeedService.cs | 4 ++-- .../DevHive.Services/Services/PostService.cs | 22 ++++++++--------- .../DevHive.Services/Services/UserService.cs | 28 +++++++++++----------- src/Web/DevHive.Web.Tests/PostController.Tests.cs | 2 +- src/Web/DevHive.Web.Tests/RoleController.Tests.cs | 2 +- src/Web/DevHive.Web.Tests/UserController.Tests.cs | 2 +- 14 files changed, 47 insertions(+), 49 deletions(-) (limited to 'src/Web/DevHive.Web.Tests/PostController.Tests.cs') diff --git a/src/Data/DevHive.Data.Models/ProfilePicture.cs b/src/Data/DevHive.Data.Models/ProfilePicture.cs index c5dec68..c502654 100644 --- a/src/Data/DevHive.Data.Models/ProfilePicture.cs +++ b/src/Data/DevHive.Data.Models/ProfilePicture.cs @@ -3,7 +3,7 @@ using DevHive.Data.Models.Interfaces; namespace DevHive.Data.Models { - public class ProfilePicture: IProfilePicture + public class ProfilePicture : IProfilePicture { public Guid Id { get; set; } diff --git a/src/Data/DevHive.Data/Repositories/CommentRepository.cs b/src/Data/DevHive.Data/Repositories/CommentRepository.cs index c63fe65..9364776 100644 --- a/src/Data/DevHive.Data/Repositories/CommentRepository.cs +++ b/src/Data/DevHive.Data/Repositories/CommentRepository.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Linq; using System.Threading.Tasks; using DevHive.Data.Interfaces; @@ -29,8 +28,8 @@ namespace DevHive.Data.Repositories } /// - /// This method returns the comment that is made at exactly the given time and by the given creator - /// + /// This method returns the comment that is made at exactly the given time and by the given creator + /// public async Task GetCommentByIssuerAndTimeCreatedAsync(Guid issuerId, DateTime timeCreated) { return await this._context.Comments diff --git a/src/Data/DevHive.Data/Repositories/FeedRepository.cs b/src/Data/DevHive.Data/Repositories/FeedRepository.cs index 8899675..d3312d7 100644 --- a/src/Data/DevHive.Data/Repositories/FeedRepository.cs +++ b/src/Data/DevHive.Data/Repositories/FeedRepository.cs @@ -19,14 +19,14 @@ namespace DevHive.Data.Repositories } /// - /// This returns a given amount of posts of all given friends, created before "firstRequestIssued", + /// This returns a given amount of posts of all given friends, created before "firstRequestIssued", /// ordered from latest to oldest (time created). /// PageSize specifies how many posts to get, and pageNumber specifices how many posts to skip (pageNumber * pageSize). /// /// This method is used in the feed page. /// Posts from friends are meant to be gotten in chunks, meaning you get X posts, and then get another amount of posts, /// that are after the first X posts. - /// + /// public async Task> GetFriendsPosts(List friendsList, DateTime firstRequestIssued, int pageNumber, int pageSize) { List friendsIds = friendsList.Select(f => f.Id).ToList(); @@ -49,14 +49,14 @@ namespace DevHive.Data.Repositories } /// - /// This returns a given amount of posts, that a user has made, created before "firstRequestIssued", + /// This returns a given amount of posts, that a user has made, created before "firstRequestIssued", /// ordered from latest to oldest (time created). /// PageSize specifies how many posts to get, and pageNumber specifices how many posts to skip (pageNumber * pageSize). /// /// This method is used in the profile page. /// Posts from friends are meant to be gotten in chunks, meaning you get X posts, and then get another amount of posts, /// that are after the first X posts. - /// + /// public async Task> GetUsersPosts(User user, DateTime firstRequestIssued, int pageNumber, int pageSize) { List posts = await this._context.Posts diff --git a/src/Data/DevHive.Data/Repositories/LanguageRepository.cs b/src/Data/DevHive.Data/Repositories/LanguageRepository.cs index 61f4792..3528ea8 100644 --- a/src/Data/DevHive.Data/Repositories/LanguageRepository.cs +++ b/src/Data/DevHive.Data/Repositories/LanguageRepository.cs @@ -26,8 +26,8 @@ namespace DevHive.Data.Repositories } /// - /// Returns all technologies that exist in the database - /// + /// Returns all technologies that exist in the database + /// public HashSet GetLanguages() { return this._context.Languages.ToHashSet(); diff --git a/src/Data/DevHive.Data/Repositories/PostRepository.cs b/src/Data/DevHive.Data/Repositories/PostRepository.cs index d35c475..b6c5e37 100644 --- a/src/Data/DevHive.Data/Repositories/PostRepository.cs +++ b/src/Data/DevHive.Data/Repositories/PostRepository.cs @@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore; namespace DevHive.Data.Repositories { - public class PostRepository : BaseRepository, IPostRepository + public class PostRepository : BaseRepository, IPostRepository { private readonly DevHiveContext _context; private readonly IUserRepository _userRepository; @@ -41,8 +41,8 @@ namespace DevHive.Data.Repositories } /// - /// This method returns the post that is made at exactly the given time and by the given creator - /// + /// This method returns the post that is made at exactly the given time and by the given creator + /// public async Task GetPostByCreatorAndTimeCreatedAsync(Guid creatorId, DateTime timeCreated) { return await this._context.Posts @@ -68,12 +68,12 @@ namespace DevHive.Data.Repositories .SetValues(newEntity); List postAttachments = new(); - foreach(var attachment in newEntity.Attachments) + foreach (var attachment in newEntity.Attachments) postAttachments.Add(attachment); post.Attachments = postAttachments; post.Comments.Clear(); - foreach(var comment in newEntity.Comments) + foreach (var comment in newEntity.Comments) post.Comments.Add(comment); // post.Rating.Id = ratingId; diff --git a/src/Data/DevHive.Data/Repositories/TechnologyRepository.cs b/src/Data/DevHive.Data/Repositories/TechnologyRepository.cs index 8cb7da1..d0d1f3f 100644 --- a/src/Data/DevHive.Data/Repositories/TechnologyRepository.cs +++ b/src/Data/DevHive.Data/Repositories/TechnologyRepository.cs @@ -26,8 +26,8 @@ namespace DevHive.Data.Repositories } /// - /// Returns all technologies that exist in the database - /// + /// Returns all technologies that exist in the database + /// public HashSet GetTechnologies() { return this._context.Technologies.ToHashSet(); diff --git a/src/DevHive.code-workspace b/src/DevHive.code-workspace index 36e1700..8511609 100644 --- a/src/DevHive.code-workspace +++ b/src/DevHive.code-workspace @@ -31,7 +31,6 @@ "omnisharp.enableEditorConfigSupport": true, "omnisharp.enableRoslynAnalyzers": true, "prettier.useEditorConfig": true, - "workbench.editor.labelFormat": "short" }, "launch": { "configurations": [ diff --git a/src/Services/DevHive.Services/Interfaces/IPostService.cs b/src/Services/DevHive.Services/Interfaces/IPostService.cs index d35acfd..5ccecff 100644 --- a/src/Services/DevHive.Services/Interfaces/IPostService.cs +++ b/src/Services/DevHive.Services/Interfaces/IPostService.cs @@ -4,7 +4,7 @@ using DevHive.Services.Models.Post; namespace DevHive.Services.Interfaces { - public interface IPostService + public interface IPostService { Task CreatePost(CreatePostServiceModel createPostServiceModel); diff --git a/src/Services/DevHive.Services/Services/FeedService.cs b/src/Services/DevHive.Services/Services/FeedService.cs index a0f1f1b..5feef6e 100644 --- a/src/Services/DevHive.Services/Services/FeedService.cs +++ b/src/Services/DevHive.Services/Services/FeedService.cs @@ -27,7 +27,7 @@ namespace DevHive.Services.Services /// /// This method is used in the feed page. /// See the FeedRepository "GetFriendsPosts" menthod for more information on how it works. - /// + /// public async Task GetPage(GetPageServiceModel model) { User user = null; @@ -58,7 +58,7 @@ namespace DevHive.Services.Services /// /// This method is used in the profile pages. /// See the FeedRepository "GetUsersPosts" menthod for more information on how it works. - /// + /// public async Task GetUserPage(GetPageServiceModel model) { User user = null; diff --git a/src/Services/DevHive.Services/Services/PostService.cs b/src/Services/DevHive.Services/Services/PostService.cs index c368ce6..0becd9f 100644 --- a/src/Services/DevHive.Services/Services/PostService.cs +++ b/src/Services/DevHive.Services/Services/PostService.cs @@ -13,7 +13,7 @@ using DevHive.Data.Models.Relational; namespace DevHive.Services.Services { - public class PostService : IPostService + public class PostService : IPostService { private readonly ICloudService _cloudService; private readonly IUserRepository _userRepository; @@ -144,8 +144,8 @@ namespace DevHive.Services.Services #region Validations /// - /// Checks whether the user Id in the token and the given user Id match - /// + /// Checks whether the user Id in the token and the given user Id match + /// public async Task ValidateJwtForCreating(Guid userId, string rawTokenData) { User user = await this.GetUserForValidation(rawTokenData); @@ -154,10 +154,10 @@ namespace DevHive.Services.Services } /// - /// Checks whether the post, gotten with the postId, + /// Checks whether the post, gotten with the postId, /// is made by the user in the token /// or if the user in the token is an admin - /// + /// public async Task ValidateJwtForPost(Guid postId, string rawTokenData) { Post post = await this._postRepository.GetByIdAsync(postId) ?? @@ -175,10 +175,10 @@ namespace DevHive.Services.Services } /// - /// Checks whether the comment, gotten with the commentId, + /// Checks whether the comment, gotten with the commentId, /// is made by the user in the token /// or if the user in the token is an admin - /// + /// public async Task ValidateJwtForComment(Guid commentId, string rawTokenData) { Comment comment = await this._commentRepository.GetByIdAsync(commentId) ?? @@ -196,8 +196,8 @@ namespace DevHive.Services.Services } /// - /// Returns the user, via their Id in the token - /// + /// Returns the user, via their Id in the token + /// private async Task GetUserForValidation(string rawTokenData) { JwtSecurityToken jwt = new JwtSecurityTokenHandler().ReadJwtToken(rawTokenData.Remove(0, 7)); @@ -212,8 +212,8 @@ namespace DevHive.Services.Services } /// - /// Returns all values from a given claim type - /// + /// Returns all values from a given claim type + /// private List GetClaimTypeValues(string type, IEnumerable claims) { List toReturn = new(); diff --git a/src/Services/DevHive.Services/Services/UserService.cs b/src/Services/DevHive.Services/Services/UserService.cs index f2c5a5b..9a63853 100644 --- a/src/Services/DevHive.Services/Services/UserService.cs +++ b/src/Services/DevHive.Services/Services/UserService.cs @@ -54,9 +54,9 @@ namespace DevHive.Services.Services #region Authentication /// - /// Adds a new user to the database with the values from the given model. + /// Adds a new user to the database with the values from the given model. /// Returns a JSON Web Token (that can be used for authorization) - /// + /// public async Task LoginUser(LoginServiceModel loginModel) { if (!await this._userRepository.DoesUsernameExistAsync(loginModel.UserName)) @@ -71,8 +71,8 @@ namespace DevHive.Services.Services } /// - /// Returns a new JSON Web Token (that can be used for authorization) for the given user - /// + /// Returns a new JSON Web Token (that can be used for authorization) for the given user + /// public async Task RegisterUser(RegisterServiceModel registerModel) { if (await this._userRepository.DoesUsernameExistAsync(registerModel.UserName)) @@ -143,8 +143,8 @@ namespace DevHive.Services.Services } /// - /// Uploads the given picture and assigns it's link to the user in the database - /// + /// Uploads the given picture and assigns it's link to the user in the database + /// public async Task UpdateProfilePicture(UpdateProfilePictureServiceModel updateProfilePictureServiceModel) { User user = await this._userRepository.GetByIdAsync(updateProfilePictureServiceModel.UserId); @@ -183,10 +183,10 @@ namespace DevHive.Services.Services #region Validations /// - /// Checks whether the given user, gotten by the "id" property, + /// Checks whether the given user, gotten by the "id" property, /// is the same user as the one in the token (uness the user in the token has the admin role) /// and the roles in the token are the same as those in the user, gotten by the id in the token - /// + /// public async Task ValidJWT(Guid id, string rawTokenData) { // There is authorization name in the beginning, i.e. "Bearer eyJh..." @@ -220,8 +220,8 @@ namespace DevHive.Services.Services } /// - /// Returns all values from a given claim type - /// + /// Returns all values from a given claim type + /// private List GetClaimTypeValues(string type, IEnumerable claims) { List toReturn = new(); @@ -234,10 +234,10 @@ namespace DevHive.Services.Services } /// - /// Checks whether the user in the model exists + /// Checks whether the user in the model exists /// and whether the username in the model is already taken. /// If the check fails (is false), it throws an exception, otherwise nothing happens - /// + /// private async Task ValidateUserOnUpdate(UpdateUserServiceModel updateUserServiceModel) { if (!await this._userRepository.DoesUserExistAsync(updateUserServiceModel.Id)) @@ -259,9 +259,9 @@ namespace DevHive.Services.Services } /// - /// Return a new JSON Web Token, containing the user id, username and roles. + /// Return a new JSON Web Token, containing the user id, username and roles. /// Tokens have an expiration time of 7 days. - /// + /// private string WriteJWTSecurityToken(Guid userId, string username, HashSet roles) { byte[] signingKey = Encoding.ASCII.GetBytes(_jwtOptions.Secret); diff --git a/src/Web/DevHive.Web.Tests/PostController.Tests.cs b/src/Web/DevHive.Web.Tests/PostController.Tests.cs index 3a4e45e..96b0356 100644 --- a/src/Web/DevHive.Web.Tests/PostController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/PostController.Tests.cs @@ -12,7 +12,7 @@ using NUnit.Framework; namespace DevHive.Web.Tests { - [TestFixture] + [TestFixture] public class PostControllerTests { const string MESSAGE = "Gosho Trapov"; diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs index 8e33bee..64e3f11 100644 --- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs @@ -12,7 +12,7 @@ using NUnit.Framework; namespace DevHive.Web.Tests { - [TestFixture] + [TestFixture] public class RoleControllerTests { const string NAME = "Gosho Trapov"; diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs index efdfdbb..7457ad7 100644 --- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs @@ -12,7 +12,7 @@ using NUnit.Framework; namespace DevHive.Web.Tests { - [TestFixture] + [TestFixture] public class UserControllerTests { const string USERNAME = "Gosho Trapov"; -- cgit v1.2.3 From 4c03712af14c37718b7be5b23fcadeb86f2a2191 Mon Sep 17 00:00:00 2001 From: transtrike Date: Mon, 15 Feb 2021 19:06:14 +0200 Subject: Code Analyzer added to all csproj; Removed unnessessary code; Fixed formatting --- .../DevHive.Common.Models/DevHive.Common.csproj | 1 + .../DevHive.Data.Models/DevHive.Data.Models.csproj | 1 + .../DevHive.Data.Tests/DevHive.Data.Tests.csproj | 13 +++--- src/Data/DevHive.Data/DevHive.Data.csproj | 1 + .../DevHive.Services.Models.csproj | 9 ++-- .../DevHive.Services.Tests.csproj | 13 +++--- .../DevHive.Services.Tests/UserService.Tests.cs | 8 ++-- .../Configurations/Mapping/PostMappings.cs | 1 - .../Configurations/Mapping/RatingMappings.cs | 2 - .../DevHive.Services/DevHive.Services.csproj | 17 +++---- .../DevHive.Services/Interfaces/ICloudService.cs | 2 - .../DevHive.Services/Interfaces/IRoleService.cs | 2 +- .../DevHive.Services/Options/JWTOptions.cs | 14 ------ .../DevHive.Services/Options/JwtOptions.cs | 14 ++++++ .../DevHive.Services/Services/FeedService.cs | 2 +- .../DevHive.Services/Services/PostService.cs | 15 +++--- .../DevHive.Services/Services/RateService.cs | 2 +- .../DevHive.Services/Services/RoleService.cs | 9 ++-- .../DevHive.Services/Services/UserService.cs | 15 +++--- .../Attributes/GoodPasswordAttribute.cs | 23 +++++++++ .../Attributes/GoodPasswordModelValidation.cs | 24 ---------- .../Attributes/OnlyLettersModelValidation.cs | 4 +- .../DevHive.Web.Models/DevHive.Web.Models.csproj | 8 ++-- .../DevHive.Web.Models/Post/ReadPostWebModel.cs | 1 - .../DevHive.Web.Tests/CommentController.Tests.cs | 35 +++++++------- src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj | 11 +++-- .../DevHive.Web.Tests/LanguageController.Tests.cs | 4 +- src/Web/DevHive.Web.Tests/PostController.Tests.cs | 29 ++++++------ src/Web/DevHive.Web.Tests/RoleController.Tests.cs | 4 +- .../TechnologyController.Tests.cs | 4 +- src/Web/DevHive.Web.Tests/UserController.Tests.cs | 46 ++++++++---------- .../Extensions/ConfigureAutoMapper.cs | 5 +- .../ConfigureExceptionHandlerMiddleware.cs | 2 - .../Configurations/Extensions/ConfigureJWT.cs | 54 ---------------------- .../Configurations/Extensions/ConfigureJwt.cs | 54 ++++++++++++++++++++++ src/Web/DevHive.Web/DevHive.Web.csproj | 21 +++++---- .../DevHive.Web/Middleware/ExceptionMiddleware.cs | 14 ++---- 37 files changed, 229 insertions(+), 255 deletions(-) delete mode 100644 src/Services/DevHive.Services/Options/JWTOptions.cs create mode 100644 src/Services/DevHive.Services/Options/JwtOptions.cs create mode 100644 src/Web/DevHive.Web.Models/Attributes/GoodPasswordAttribute.cs delete mode 100644 src/Web/DevHive.Web.Models/Attributes/GoodPasswordModelValidation.cs delete mode 100644 src/Web/DevHive.Web/Configurations/Extensions/ConfigureJWT.cs create mode 100644 src/Web/DevHive.Web/Configurations/Extensions/ConfigureJwt.cs (limited to 'src/Web/DevHive.Web.Tests/PostController.Tests.cs') diff --git a/src/Common/DevHive.Common.Models/DevHive.Common.csproj b/src/Common/DevHive.Common.Models/DevHive.Common.csproj index 4829c80..f6d662c 100644 --- a/src/Common/DevHive.Common.Models/DevHive.Common.csproj +++ b/src/Common/DevHive.Common.Models/DevHive.Common.csproj @@ -4,6 +4,7 @@ + true diff --git a/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj b/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj index e58a6d8..e9dc644 100644 --- a/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj +++ b/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj @@ -5,5 +5,6 @@ + \ No newline at end of file diff --git a/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj b/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj index 568edda..2af369f 100644 --- a/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj +++ b/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj @@ -4,14 +4,15 @@ false - - - - - + + + + + + - + true diff --git a/src/Data/DevHive.Data/DevHive.Data.csproj b/src/Data/DevHive.Data/DevHive.Data.csproj index fac1581..46928c6 100644 --- a/src/Data/DevHive.Data/DevHive.Data.csproj +++ b/src/Data/DevHive.Data/DevHive.Data.csproj @@ -12,6 +12,7 @@ + diff --git a/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj b/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj index 3f0eadf..914efe0 100644 --- a/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj +++ b/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj @@ -2,12 +2,11 @@ net5.0 - - + + - - + - + \ No newline at end of file diff --git a/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj b/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj index eb33d07..bdfb2bb 100644 --- a/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj +++ b/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj @@ -4,14 +4,15 @@ false - - - - - + + + + + + - + true diff --git a/src/Services/DevHive.Services.Tests/UserService.Tests.cs b/src/Services/DevHive.Services.Tests/UserService.Tests.cs index 8fddce7..ce997c1 100644 --- a/src/Services/DevHive.Services.Tests/UserService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/UserService.Tests.cs @@ -29,7 +29,7 @@ namespace DevHive.Services.Tests private Mock LanguageRepositoryMock { get; set; } private Mock TechnologyRepositoryMock { get; set; } private Mock MapperMock { get; set; } - private JWTOptions JWTOptions { get; set; } + private JwtOptions JwtOptions { get; set; } private UserService UserService { get; set; } #region SetUps @@ -41,10 +41,10 @@ namespace DevHive.Services.Tests this.CloudServiceMock = new Mock(); this.LanguageRepositoryMock = new Mock(); this.TechnologyRepositoryMock = new Mock(); - this.JWTOptions = new JWTOptions("gXfQlU6qpDleFWyimscjYcT3tgFsQg3yoFjcvSLxG56n1Vu2yptdIUq254wlJWjm"); + this.JwtOptions = new JwtOptions("gXfQlU6qpDleFWyimscjYcT3tgFsQg3yoFjcvSLxG56n1Vu2yptdIUq254wlJWjm"); this.MapperMock = new Mock(); // TODO: give actual UserManager and RoleManager to UserService - this.UserService = new UserService(this.UserRepositoryMock.Object, this.LanguageRepositoryMock.Object, this.RoleRepositoryMock.Object, this.TechnologyRepositoryMock.Object, null, null, this.MapperMock.Object, this.JWTOptions, this.CloudServiceMock.Object); + this.UserService = new UserService(this.UserRepositoryMock.Object, this.LanguageRepositoryMock.Object, this.RoleRepositoryMock.Object, this.TechnologyRepositoryMock.Object, null, null, this.MapperMock.Object, this.JwtOptions, this.CloudServiceMock.Object); } #endregion @@ -364,7 +364,7 @@ namespace DevHive.Services.Tests #region HelperMethods private string WriteJWTSecurityToken(Guid userId, string username, HashSet roles) { - byte[] signingKey = Encoding.ASCII.GetBytes(this.JWTOptions.Secret); + byte[] signingKey = Encoding.ASCII.GetBytes(this.JwtOptions.Secret); HashSet claims = new() { new Claim("ID", $"{userId}"), diff --git a/src/Services/DevHive.Services/Configurations/Mapping/PostMappings.cs b/src/Services/DevHive.Services/Configurations/Mapping/PostMappings.cs index 9362f90..1d7d88b 100644 --- a/src/Services/DevHive.Services/Configurations/Mapping/PostMappings.cs +++ b/src/Services/DevHive.Services/Configurations/Mapping/PostMappings.cs @@ -12,7 +12,6 @@ namespace DevHive.Services.Configurations.Mapping public PostMappings() { CreateMap(); - // .ForMember(dest => dest.Files, src => src.Ignore()); CreateMap() .ForMember(dest => dest.Id, src => src.MapFrom(p => p.PostId)) // .ForMember(dest => dest.Files, src => src.Ignore()) diff --git a/src/Services/DevHive.Services/Configurations/Mapping/RatingMappings.cs b/src/Services/DevHive.Services/Configurations/Mapping/RatingMappings.cs index 1dbb7b4..fefa6d8 100644 --- a/src/Services/DevHive.Services/Configurations/Mapping/RatingMappings.cs +++ b/src/Services/DevHive.Services/Configurations/Mapping/RatingMappings.cs @@ -8,8 +8,6 @@ namespace DevHive.Services.Configurations.Mapping { public RatingMappings() { - // CreateMap() - // .ForMember(dest => dest.PostId, src => src.MapFrom(p => p.Post.Id)); } } } diff --git a/src/Services/DevHive.Services/DevHive.Services.csproj b/src/Services/DevHive.Services/DevHive.Services.csproj index b09c46d..650a304 100644 --- a/src/Services/DevHive.Services/DevHive.Services.csproj +++ b/src/Services/DevHive.Services/DevHive.Services.csproj @@ -3,22 +3,23 @@ net5.0 - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - + + + + + - - + + true latest - + \ No newline at end of file diff --git a/src/Services/DevHive.Services/Interfaces/ICloudService.cs b/src/Services/DevHive.Services/Interfaces/ICloudService.cs index 3ae7a24..040729f 100644 --- a/src/Services/DevHive.Services/Interfaces/ICloudService.cs +++ b/src/Services/DevHive.Services/Interfaces/ICloudService.cs @@ -9,8 +9,6 @@ namespace DevHive.Services.Interfaces { Task> UploadFilesToCloud(List formFiles); - // Task> GetFilesFromCloud(List fileUrls); - Task RemoveFilesFromCloud(List fileUrls); } } diff --git a/src/Services/DevHive.Services/Interfaces/IRoleService.cs b/src/Services/DevHive.Services/Interfaces/IRoleService.cs index 2c31b06..05df917 100644 --- a/src/Services/DevHive.Services/Interfaces/IRoleService.cs +++ b/src/Services/DevHive.Services/Interfaces/IRoleService.cs @@ -6,7 +6,7 @@ namespace DevHive.Services.Interfaces { public interface IRoleService { - Task CreateRole(CreateRoleServiceModel roleServiceModel); + Task CreateRole(CreateRoleServiceModel createRoleServiceModel); Task GetRoleById(Guid id); diff --git a/src/Services/DevHive.Services/Options/JWTOptions.cs b/src/Services/DevHive.Services/Options/JWTOptions.cs deleted file mode 100644 index 95458f5..0000000 --- a/src/Services/DevHive.Services/Options/JWTOptions.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Microsoft.Extensions.Options; - -namespace DevHive.Services.Options -{ - public class JWTOptions - { - public JWTOptions(string secret) - { - this.Secret = secret; - } - - public string Secret { get; init; } - } -} diff --git a/src/Services/DevHive.Services/Options/JwtOptions.cs b/src/Services/DevHive.Services/Options/JwtOptions.cs new file mode 100644 index 0000000..d973f45 --- /dev/null +++ b/src/Services/DevHive.Services/Options/JwtOptions.cs @@ -0,0 +1,14 @@ +using Microsoft.Extensions.Options; + +namespace DevHive.Services.Options +{ + public class JwtOptions + { + public JwtOptions(string secret) + { + this.Secret = secret; + } + + public string Secret { get; init; } + } +} diff --git a/src/Services/DevHive.Services/Services/FeedService.cs b/src/Services/DevHive.Services/Services/FeedService.cs index 5feef6e..17cc43f 100644 --- a/src/Services/DevHive.Services/Services/FeedService.cs +++ b/src/Services/DevHive.Services/Services/FeedService.cs @@ -57,7 +57,7 @@ namespace DevHive.Services.Services /// /// This method is used in the profile pages. - /// See the FeedRepository "GetUsersPosts" menthod for more information on how it works. + /// See the FeedRepository "GetUsersPosts" method for more information on how it works. /// public async Task GetUserPage(GetPageServiceModel model) { diff --git a/src/Services/DevHive.Services/Services/PostService.cs b/src/Services/DevHive.Services/Services/PostService.cs index 0becd9f..a3d5117 100644 --- a/src/Services/DevHive.Services/Services/PostService.cs +++ b/src/Services/DevHive.Services/Services/PostService.cs @@ -41,7 +41,7 @@ namespace DevHive.Services.Services if (createPostServiceModel.Files.Count != 0) { List fileUrls = await _cloudService.UploadFilesToCloud(createPostServiceModel.Files); - post.Attachments = this.GetPostAttachmentsFromUrls(post, fileUrls); + post.Attachments = GetPostAttachmentsFromUrls(post, fileUrls); } post.Creator = await this._userRepository.GetByIdAsync(createPostServiceModel.CreatorId); @@ -105,8 +105,8 @@ namespace DevHive.Services.Services } List fileUrls = await _cloudService.UploadFilesToCloud(updatePostServiceModel.Files) ?? - throw new ArgumentNullException("Unable to upload images to cloud"); - post.Attachments = this.GetPostAttachmentsFromUrls(post, fileUrls); + throw new ArgumentException("Unable to upload images to cloud!"); + post.Attachments = GetPostAttachmentsFromUrls(post, fileUrls); } post.Creator = await this._userRepository.GetByIdAsync(updatePostServiceModel.CreatorId); @@ -202,8 +202,7 @@ namespace DevHive.Services.Services { JwtSecurityToken jwt = new JwtSecurityTokenHandler().ReadJwtToken(rawTokenData.Remove(0, 7)); - Guid jwtUserId = Guid.Parse(this.GetClaimTypeValues("ID", jwt.Claims).First()); - //HashSet jwtRoleNames = this.GetClaimTypeValues("role", jwt.Claims); + Guid jwtUserId = Guid.Parse(GetClaimTypeValues("ID", jwt.Claims).First()); User user = await this._userRepository.GetByIdAsync(jwtUserId) ?? throw new ArgumentException("User does not exist!"); @@ -214,7 +213,7 @@ namespace DevHive.Services.Services /// /// Returns all values from a given claim type /// - private List GetClaimTypeValues(string type, IEnumerable claims) + private static List GetClaimTypeValues(string type, IEnumerable claims) { List toReturn = new(); @@ -227,9 +226,9 @@ namespace DevHive.Services.Services #endregion #region Misc - private List GetPostAttachmentsFromUrls(Post post, List fileUrls) + private static List GetPostAttachmentsFromUrls(Post post, List fileUrls) { - List postAttachments = new List(); + List postAttachments = new(); foreach (string url in fileUrls) postAttachments.Add(new PostAttachments { Post = post, FileUrl = url }); return postAttachments; diff --git a/src/Services/DevHive.Services/Services/RateService.cs b/src/Services/DevHive.Services/Services/RateService.cs index d423d8c..5e924ab 100644 --- a/src/Services/DevHive.Services/Services/RateService.cs +++ b/src/Services/DevHive.Services/Services/RateService.cs @@ -28,7 +28,7 @@ namespace DevHive.Services.Services { throw new NotImplementedException(); // if (!await this._postRepository.DoesPostExist(ratePostServiceModel.PostId)) - // throw new ArgumentException("Post does not exist!"); + // throw new ArgumentException("Post does not exist!"); // if (!await this._userRepository.DoesUserExistAsync(ratePostServiceModel.UserId)) // throw new ArgumentException("User does not exist!"); diff --git a/src/Services/DevHive.Services/Services/RoleService.cs b/src/Services/DevHive.Services/Services/RoleService.cs index 5472e44..1285421 100644 --- a/src/Services/DevHive.Services/Services/RoleService.cs +++ b/src/Services/DevHive.Services/Services/RoleService.cs @@ -5,7 +5,6 @@ using DevHive.Data.Interfaces; using DevHive.Data.Models; using DevHive.Services.Interfaces; using DevHive.Services.Models.Role; -using DevHive.Services.Models.Language; namespace DevHive.Services.Services { @@ -20,17 +19,17 @@ namespace DevHive.Services.Services this._roleMapper = mapper; } - public async Task CreateRole(CreateRoleServiceModel roleServiceModel) + public async Task CreateRole(CreateRoleServiceModel createRoleServiceModel) { - if (await this._roleRepository.DoesNameExist(roleServiceModel.Name)) + if (await this._roleRepository.DoesNameExist(createRoleServiceModel.Name)) throw new ArgumentException("Role already exists!"); - Role role = this._roleMapper.Map(roleServiceModel); + Role role = this._roleMapper.Map(createRoleServiceModel); bool success = await this._roleRepository.AddAsync(role); if (success) { - Role newRole = await this._roleRepository.GetByNameAsync(roleServiceModel.Name); + Role newRole = await this._roleRepository.GetByNameAsync(createRoleServiceModel.Name); return newRole.Id; } else diff --git a/src/Services/DevHive.Services/Services/UserService.cs b/src/Services/DevHive.Services/Services/UserService.cs index 9a63853..e31eb8d 100644 --- a/src/Services/DevHive.Services/Services/UserService.cs +++ b/src/Services/DevHive.Services/Services/UserService.cs @@ -28,7 +28,7 @@ namespace DevHive.Services.Services private readonly UserManager _userManager; private readonly RoleManager _roleManager; private readonly IMapper _userMapper; - private readonly JWTOptions _jwtOptions; + private readonly JwtOptions _jwtOptions; private readonly ICloudService _cloudService; public UserService(IUserRepository userRepository, @@ -38,7 +38,7 @@ namespace DevHive.Services.Services UserManager userManager, RoleManager roleManager, IMapper mapper, - JWTOptions jwtOptions, + JwtOptions jwtOptions, ICloudService cloudService) { this._userRepository = userRepository; @@ -128,7 +128,7 @@ namespace DevHive.Services.Services User currentUser = await this._userRepository.GetByIdAsync(updateUserServiceModel.Id); await this.PopulateUserModel(currentUser, updateUserServiceModel); - if (updateUserServiceModel.Friends.Count() > 0) + if (updateUserServiceModel.Friends.Count > 0) await this.CreateRelationToFriends(currentUser, updateUserServiceModel.Friends.ToList()); else currentUser.Friends.Clear(); @@ -157,7 +157,7 @@ namespace DevHive.Services.Services } string fileUrl = (await this._cloudService.UploadFilesToCloud(new List { updateProfilePictureServiceModel.Picture }))[0] ?? - throw new ArgumentNullException("Unable to upload profile picture to cloud"); + throw new ArgumentException("Unable to upload profile picture to cloud"); bool successful = await this._userRepository.UpdateProfilePicture(updateProfilePictureServiceModel.UserId, fileUrl); @@ -201,16 +201,13 @@ namespace DevHive.Services.Services /* Check if user is trying to do something to himself, unless he's an admin */ /* Check roles */ - if (!jwtRoleNames.Contains(Role.AdminRole)) - if (user.Id != id) - return false; + if (!jwtRoleNames.Contains(Role.AdminRole) && user.Id != id) + return false; // Check if jwt contains all user roles (if it doesn't, jwt is either old or tampered with) foreach (var role in user.Roles) - { if (!jwtRoleNames.Contains(role.Name)) return false; - } // Check if jwt contains only roles of user if (jwtRoleNames.Count != user.Roles.Count) diff --git a/src/Web/DevHive.Web.Models/Attributes/GoodPasswordAttribute.cs b/src/Web/DevHive.Web.Models/Attributes/GoodPasswordAttribute.cs new file mode 100644 index 0000000..c452499 --- /dev/null +++ b/src/Web/DevHive.Web.Models/Attributes/GoodPasswordAttribute.cs @@ -0,0 +1,23 @@ +using System.ComponentModel.DataAnnotations; + +namespace DevHive.Web.Models.Attributes +{ + public class GoodPasswordAttribute : ValidationAttribute + { + public override bool IsValid(object value) + { + var stringValue = (string)value; + + for (int i = 0; i < stringValue.Length; i++) + { + if (char.IsDigit(stringValue[i])) + { + base.ErrorMessage = "Password must be atleast 5 characters long!"; + return stringValue.Length >= 5; + } + } + base.ErrorMessage = "Password must contain atleast 1 digit!"; + return false; + } + } +} diff --git a/src/Web/DevHive.Web.Models/Attributes/GoodPasswordModelValidation.cs b/src/Web/DevHive.Web.Models/Attributes/GoodPasswordModelValidation.cs deleted file mode 100644 index 5ecb41a..0000000 --- a/src/Web/DevHive.Web.Models/Attributes/GoodPasswordModelValidation.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; - -namespace DevHive.Web.Models.Attributes -{ - public class GoodPassword : ValidationAttribute - { - public override bool IsValid(object value) - { - var stringValue = (string)value; - - for (int i = 0; i < stringValue.Length; i++) - { - if (Char.IsDigit(stringValue[i])) - { - base.ErrorMessage = "Password must be atleast 5 characters long!"; - return stringValue.Length >= 5; - } - } - base.ErrorMessage = "Password must contain atleast 1 digit!"; - return false; - } - } -} diff --git a/src/Web/DevHive.Web.Models/Attributes/OnlyLettersModelValidation.cs b/src/Web/DevHive.Web.Models/Attributes/OnlyLettersModelValidation.cs index 0f6adb1..faaeee4 100644 --- a/src/Web/DevHive.Web.Models/Attributes/OnlyLettersModelValidation.cs +++ b/src/Web/DevHive.Web.Models/Attributes/OnlyLettersModelValidation.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations; namespace DevHive.Web.Models.Attributes { - public class OnlyLetters : ValidationAttribute + public class OnlyLettersAttribute : ValidationAttribute { public override bool IsValid(object value) { @@ -11,7 +11,7 @@ namespace DevHive.Web.Models.Attributes foreach (char ch in stringValue) { - if (!Char.IsLetter(ch)) + if (!char.IsLetter(ch)) return false; } return true; diff --git a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj index ca49b8c..64d0bd0 100644 --- a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj +++ b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj @@ -3,10 +3,10 @@ net5.0 - + - - + + - + \ No newline at end of file diff --git a/src/Web/DevHive.Web.Models/Post/ReadPostWebModel.cs b/src/Web/DevHive.Web.Models/Post/ReadPostWebModel.cs index 8238f47..3ae93aa 100644 --- a/src/Web/DevHive.Web.Models/Post/ReadPostWebModel.cs +++ b/src/Web/DevHive.Web.Models/Post/ReadPostWebModel.cs @@ -21,6 +21,5 @@ namespace DevHive.Web.Models.Post public List Comments { get; set; } public List FileUrls { get; set; } - // public List Files { get; set; } } } diff --git a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs index 3a03f1a..98397e7 100644 --- a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs @@ -35,11 +35,11 @@ namespace DevHive.Web.Tests public void AddComment_ReturnsOkObjectResult_WhenCommentIsSuccessfullyCreated() { Guid id = Guid.NewGuid(); - CreateCommentWebModel createCommentWebModel = new CreateCommentWebModel + CreateCommentWebModel createCommentWebModel = new() { Message = MESSAGE }; - CreateCommentServiceModel createCommentServiceModel = new CreateCommentServiceModel + CreateCommentServiceModel createCommentServiceModel = new() { Message = MESSAGE }; @@ -67,11 +67,11 @@ namespace DevHive.Web.Tests public void AddComment_ReturnsBadRequestObjectResult_WhenCommentIsNotCreatedSuccessfully() { Guid id = Guid.NewGuid(); - CreateCommentWebModel createCommentWebModel = new CreateCommentWebModel + CreateCommentWebModel createCommentWebModel = new() { Message = MESSAGE }; - CreateCommentServiceModel createCommentServiceModel = new CreateCommentServiceModel + CreateCommentServiceModel createCommentServiceModel = new() { Message = MESSAGE }; @@ -86,8 +86,8 @@ namespace DevHive.Web.Tests Assert.IsInstanceOf(result); - BadRequestObjectResult badRequsetObjectResult = result as BadRequestObjectResult; - string resultMessage = badRequsetObjectResult.Value.ToString(); + BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult; + string resultMessage = badRequestObjectResult.Value.ToString(); Assert.AreEqual(errorMessage, resultMessage); } @@ -95,8 +95,7 @@ namespace DevHive.Web.Tests [Test] public void AddComment_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() { - Guid id = Guid.NewGuid(); - CreateCommentWebModel createCommentWebModel = new CreateCommentWebModel + CreateCommentWebModel createCommentWebModel = new() { Message = MESSAGE }; @@ -115,11 +114,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - ReadCommentServiceModel readCommentServiceModel = new ReadCommentServiceModel + ReadCommentServiceModel readCommentServiceModel = new() { Message = MESSAGE }; - ReadCommentWebModel readCommentWebModel = new ReadCommentWebModel + ReadCommentWebModel readCommentWebModel = new() { Message = MESSAGE }; @@ -132,7 +131,7 @@ namespace DevHive.Web.Tests Assert.IsInstanceOf(result); OkObjectResult okObjectResult = result as OkObjectResult; - ReadCommentWebModel resultModel = okObjectResult.Value as Models.Comment.ReadCommentWebModel; + ReadCommentWebModel resultModel = okObjectResult.Value as ReadCommentWebModel; Assert.AreEqual(MESSAGE, resultModel.Message); } @@ -143,11 +142,11 @@ namespace DevHive.Web.Tests public void Update_ShouldReturnOkResult_WhenCommentIsUpdatedSuccessfully() { Guid id = Guid.NewGuid(); - UpdateCommentWebModel updateCommentWebModel = new UpdateCommentWebModel + UpdateCommentWebModel updateCommentWebModel = new() { NewMessage = MESSAGE }; - UpdateCommentServiceModel updateCommentServiceModel = new UpdateCommentServiceModel + UpdateCommentServiceModel updateCommentServiceModel = new() { NewMessage = MESSAGE }; @@ -171,11 +170,11 @@ namespace DevHive.Web.Tests public void Update_ShouldReturnBadObjectResult_WhenCommentIsNotUpdatedSuccessfully() { string message = "Unable to update comment!"; - UpdateCommentWebModel updateCommentWebModel = new UpdateCommentWebModel + UpdateCommentWebModel updateCommentWebModel = new() { NewMessage = MESSAGE }; - UpdateCommentServiceModel updateCommentServiceModel = new UpdateCommentServiceModel + UpdateCommentServiceModel updateCommentServiceModel = new() { NewMessage = MESSAGE }; @@ -196,7 +195,7 @@ namespace DevHive.Web.Tests [Test] public void Update_ShouldReturnUnauthorizedResult_WhenUserIsNotAuthorized() { - UpdateCommentWebModel updateCommentWebModel = new UpdateCommentWebModel + UpdateCommentWebModel updateCommentWebModel = new() { NewMessage = MESSAGE }; @@ -224,7 +223,7 @@ namespace DevHive.Web.Tests } [Test] - public void DeletComment_ReturnsBadRequestObjectResult_WhenCommentIsNotDeletedSuccessfully() + public void DeleteComment_ReturnsBadRequestObjectResult_WhenCommentIsNotDeletedSuccessfully() { string message = "Could not delete Comment"; Guid id = Guid.NewGuid(); @@ -243,7 +242,7 @@ namespace DevHive.Web.Tests } [Test] - public void DeletComment_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() + public void DeleteComment_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() { this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); diff --git a/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj b/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj index f8390de..465698c 100644 --- a/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj +++ b/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj @@ -4,13 +4,14 @@ false - - - - + + + + + - + true diff --git a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs index 7c8d64e..af4672a 100644 --- a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs @@ -81,8 +81,8 @@ namespace DevHive.Web.Tests Assert.IsInstanceOf(result); - BadRequestObjectResult badRequsetObjectResult = result as BadRequestObjectResult; - string resultMessage = badRequsetObjectResult.Value.ToString(); + BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult; + string resultMessage = badRequestObjectResult.Value.ToString(); Assert.AreEqual(errorMessage, resultMessage); } diff --git a/src/Web/DevHive.Web.Tests/PostController.Tests.cs b/src/Web/DevHive.Web.Tests/PostController.Tests.cs index 96b0356..f10f8dd 100644 --- a/src/Web/DevHive.Web.Tests/PostController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/PostController.Tests.cs @@ -32,11 +32,11 @@ namespace DevHive.Web.Tests [Test] public void CreatePost_ReturnsOkObjectResult_WhenPostIsSuccessfullyCreated() { - CreatePostWebModel createPostWebModel = new CreatePostWebModel + CreatePostWebModel createPostWebModel = new() { Message = MESSAGE }; - CreatePostServiceModel createPostServiceModel = new CreatePostServiceModel + CreatePostServiceModel createPostServiceModel = new() { Message = MESSAGE }; @@ -64,11 +64,11 @@ namespace DevHive.Web.Tests [Test] public void CreatePost_ReturnsBadRequestObjectResult_WhenPostIsNotCreatedSuccessfully() { - CreatePostWebModel createTechnologyWebModel = new CreatePostWebModel + CreatePostWebModel createTechnologyWebModel = new() { Message = MESSAGE }; - CreatePostServiceModel createTechnologyServiceModel = new CreatePostServiceModel + CreatePostServiceModel createTechnologyServiceModel = new() { Message = MESSAGE }; @@ -83,8 +83,8 @@ namespace DevHive.Web.Tests Assert.IsInstanceOf(result); - BadRequestObjectResult badRequsetObjectResult = result as BadRequestObjectResult; - string resultMessage = badRequsetObjectResult.Value.ToString(); + BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult; + string resultMessage = badRequestObjectResult.Value.ToString(); Assert.AreEqual(errorMessage, resultMessage); } @@ -92,8 +92,7 @@ namespace DevHive.Web.Tests [Test] public void CreatePost_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() { - Guid id = Guid.NewGuid(); - CreatePostWebModel createPostWebModel = new CreatePostWebModel + CreatePostWebModel createPostWebModel = new() { Message = MESSAGE }; @@ -112,11 +111,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - ReadPostServiceModel readPostServiceModel = new ReadPostServiceModel + ReadPostServiceModel readPostServiceModel = new() { Message = MESSAGE }; - ReadPostWebModel readPostWebModel = new ReadPostWebModel + ReadPostWebModel readPostWebModel = new() { Message = MESSAGE }; @@ -140,11 +139,11 @@ namespace DevHive.Web.Tests public void Update_ShouldReturnOkResult_WhenPostIsUpdatedSuccessfully() { Guid id = Guid.NewGuid(); - UpdatePostWebModel updatePostWebModel = new UpdatePostWebModel + UpdatePostWebModel updatePostWebModel = new() { NewMessage = MESSAGE }; - UpdatePostServiceModel updatePostServiceModel = new UpdatePostServiceModel + UpdatePostServiceModel updatePostServiceModel = new() { NewMessage = MESSAGE }; @@ -163,11 +162,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); string message = "Could not update post!"; - UpdatePostWebModel updatePostWebModel = new UpdatePostWebModel + UpdatePostWebModel updatePostWebModel = new() { NewMessage = MESSAGE }; - UpdatePostServiceModel updatePostServiceModel = new UpdatePostServiceModel + UpdatePostServiceModel updatePostServiceModel = new() { NewMessage = MESSAGE }; @@ -188,7 +187,7 @@ namespace DevHive.Web.Tests [Test] public void Update_ShouldReturnUnauthorizedResult_WhenUserIsNotAuthorized() { - UpdatePostWebModel updatePostWebModel = new UpdatePostWebModel + UpdatePostWebModel updatePostWebModel = new() { NewMessage = MESSAGE }; diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs index 64e3f11..ff80dc0 100644 --- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs @@ -81,8 +81,8 @@ namespace DevHive.Web.Tests Assert.IsInstanceOf(result); - BadRequestObjectResult badRequsetObjectResult = result as BadRequestObjectResult; - string resultMessage = badRequsetObjectResult.Value.ToString(); + BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult; + string resultMessage = badRequestObjectResult.Value.ToString(); Assert.AreEqual(errorMessage, resultMessage); } diff --git a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs index 164bcbf..a00f1db 100644 --- a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs @@ -84,8 +84,8 @@ namespace DevHive.Web.Tests Assert.IsInstanceOf(result); - BadRequestObjectResult badRequsetObjectResult = result as BadRequestObjectResult; - string resultMessage = badRequsetObjectResult.Value.ToString(); + BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult; + string resultMessage = badRequestObjectResult.Value.ToString(); Assert.AreEqual(errorMessage, resultMessage); } diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs index 7457ad7..13f618e 100644 --- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs @@ -33,17 +33,17 @@ namespace DevHive.Web.Tests public void LoginUser_ReturnsOkObjectResult_WhenUserIsSuccessfullyLoggedIn() { Guid id = Guid.NewGuid(); - LoginWebModel loginWebModel = new LoginWebModel + LoginWebModel loginWebModel = new() { UserName = USERNAME }; - LoginServiceModel loginServiceModel = new LoginServiceModel + LoginServiceModel loginServiceModel = new() { UserName = USERNAME }; string token = "goshotrapov"; - TokenModel tokenModel = new TokenModel(token); - TokenWebModel tokenWebModel = new TokenWebModel(token); + TokenModel tokenModel = new(token); + TokenWebModel tokenWebModel = new(token); this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(loginServiceModel); this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(tokenWebModel); @@ -61,18 +61,17 @@ namespace DevHive.Web.Tests [Test] public void RegisterUser_ReturnsOkObjectResult_WhenUserIsSuccessfullyRegistered() { - Guid id = Guid.NewGuid(); - RegisterWebModel registerWebModel = new RegisterWebModel + RegisterWebModel registerWebModel = new() { UserName = USERNAME }; - RegisterServiceModel registerServiceModel = new RegisterServiceModel + RegisterServiceModel registerServiceModel = new() { UserName = USERNAME }; string token = "goshotrapov"; - TokenModel tokenModel = new TokenModel(token); - TokenWebModel tokenWebModel = new TokenWebModel(token); + TokenModel tokenModel = new(token); + TokenWebModel tokenWebModel = new(token); this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(registerServiceModel); this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(tokenWebModel); @@ -95,11 +94,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - UserServiceModel userServiceModel = new UserServiceModel + UserServiceModel userServiceModel = new() { UserName = USERNAME }; - UserWebModel userWebModel = new UserWebModel + UserWebModel userWebModel = new() { UserName = USERNAME }; @@ -121,12 +120,6 @@ namespace DevHive.Web.Tests [Test] public void GetById_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() { - Guid id = Guid.NewGuid(); - UserWebModel userWebModel = new UserWebModel - { - UserName = USERNAME - }; - this.UserServiceMock.Setup(p => p.ValidJWT(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); IActionResult result = this.UserController.GetById(Guid.NewGuid(), null).Result; @@ -137,12 +130,11 @@ namespace DevHive.Web.Tests [Test] public void GetUser_ReturnsTheUser_WhenItExists() { - Guid id = Guid.NewGuid(); - UserWebModel userWebModel = new UserWebModel + UserWebModel userWebModel = new() { UserName = USERNAME }; - UserServiceModel userServiceModel = new UserServiceModel + UserServiceModel userServiceModel = new() { UserName = USERNAME }; @@ -166,15 +158,15 @@ namespace DevHive.Web.Tests public void Update_ShouldReturnOkResult_WhenUserIsUpdatedSuccessfully() { Guid id = Guid.NewGuid(); - UpdateUserWebModel updateUserWebModel = new UpdateUserWebModel + UpdateUserWebModel updateUserWebModel = new() { UserName = USERNAME }; - UpdateUserServiceModel updateUserServiceModel = new UpdateUserServiceModel + UpdateUserServiceModel updateUserServiceModel = new() { UserName = USERNAME }; - UserServiceModel userServiceModel = new UserServiceModel + UserServiceModel userServiceModel = new() { UserName = USERNAME }; @@ -192,13 +184,13 @@ namespace DevHive.Web.Tests public void UpdateProfilePicture_ShouldReturnOkObjectResult_WhenProfilePictureIsUpdatedSuccessfully() { string profilePictureURL = "goshotrapov"; - UpdateProfilePictureWebModel updateProfilePictureWebModel = new UpdateProfilePictureWebModel(); - UpdateProfilePictureServiceModel updateProfilePictureServiceModel = new UpdateProfilePictureServiceModel(); - ProfilePictureServiceModel profilePictureServiceModel = new ProfilePictureServiceModel + UpdateProfilePictureWebModel updateProfilePictureWebModel = new(); + UpdateProfilePictureServiceModel updateProfilePictureServiceModel = new(); + ProfilePictureServiceModel profilePictureServiceModel = new() { ProfilePictureURL = profilePictureURL }; - ProfilePictureWebModel profilePictureWebModel = new ProfilePictureWebModel + ProfilePictureWebModel profilePictureWebModel = new() { ProfilePictureURL = profilePictureURL }; diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureAutoMapper.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureAutoMapper.cs index 8b7d657..0b8194e 100644 --- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureAutoMapper.cs +++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureAutoMapper.cs @@ -1,6 +1,5 @@ using System; using AutoMapper; -//using AutoMapper.Configuration; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; @@ -15,10 +14,10 @@ namespace DevHive.Web.Configurations.Extensions public static void UseAutoMapperConfiguration(this IApplicationBuilder app) { - var config = new MapperConfiguration(cfg => + _ = new MapperConfiguration(cfg => { cfg.AllowNullCollections = true; }); } } -} \ No newline at end of file +} diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureExceptionHandlerMiddleware.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureExceptionHandlerMiddleware.cs index 286727f..c017a8c 100644 --- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureExceptionHandlerMiddleware.cs +++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureExceptionHandlerMiddleware.cs @@ -6,8 +6,6 @@ namespace DevHive.Web.Configurations.Extensions { public static class ConfigureExceptionHandlerMiddleware { - public static void ExceptionHandlerMiddlewareConfiguration(this IServiceCollection services) { } - public static void UseExceptionHandlerMiddlewareConfiguration(this IApplicationBuilder app) { app.UseMiddleware(); diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureJWT.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureJWT.cs deleted file mode 100644 index d422bc8..0000000 --- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureJWT.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System.Text; -using System.Threading.Tasks; -using DevHive.Services.Options; -using Microsoft.AspNetCore.Authentication.JwtBearer; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.IdentityModel.Tokens; - -namespace DevHive.Web.Configurations.Extensions -{ - public static class JWTExtensions - { - public static void JWTConfiguration(this IServiceCollection services, IConfiguration configuration) - { - services.AddSingleton(new JWTOptions(configuration - .GetSection("AppSettings") - .GetSection("Secret") - .Value)); - - // Get key from appsettings.json - var key = Encoding.ASCII.GetBytes(configuration - .GetSection("AppSettings") - .GetSection("Secret") - .Value); - - // Setup Jwt Authentication - services.AddAuthentication(x => - { - x.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; - x.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; - }) - .AddJwtBearer(x => - { - x.Events = new JwtBearerEvents - { - OnTokenValidated = context => - { - // TODO: add more authentication - return Task.CompletedTask; - } - }; - x.RequireHttpsMetadata = false; - x.SaveToken = true; - x.TokenValidationParameters = new TokenValidationParameters - { - //ValidateIssuerSigningKey = false, - IssuerSigningKey = new SymmetricSecurityKey(key), - ValidateIssuer = false, - ValidateAudience = false - }; - }); - } - } -} \ No newline at end of file diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureJwt.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureJwt.cs new file mode 100644 index 0000000..03d4b11 --- /dev/null +++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureJwt.cs @@ -0,0 +1,54 @@ +using System.Text; +using System.Threading.Tasks; +using DevHive.Services.Options; +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Tokens; + +namespace DevHive.Web.Configurations.Extensions +{ + public static class ConfigureJwt + { + public static void JWTConfiguration(this IServiceCollection services, IConfiguration configuration) + { + services.AddSingleton(new JwtOptions(configuration + .GetSection("AppSettings") + .GetSection("Secret") + .Value)); + + // Get key from appsettings.json + var key = Encoding.ASCII.GetBytes(configuration + .GetSection("AppSettings") + .GetSection("Secret") + .Value); + + // Setup Jwt Authentication + services.AddAuthentication(x => + { + x.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; + x.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; + }) + .AddJwtBearer(x => + { + x.Events = new JwtBearerEvents + { + OnTokenValidated = context => + { + // TODO: add more authentication + return Task.CompletedTask; + } + }; + x.RequireHttpsMetadata = false; + x.SaveToken = true; + x.TokenValidationParameters = new TokenValidationParameters + { + //ValidateIssuerSigningKey = false, + IssuerSigningKey = new SymmetricSecurityKey(key), + ValidateIssuer = false, + ValidateAudience = false + }; + }); + } + } +} diff --git a/src/Web/DevHive.Web/DevHive.Web.csproj b/src/Web/DevHive.Web/DevHive.Web.csproj index 6f78b69..6511c37 100644 --- a/src/Web/DevHive.Web/DevHive.Web.csproj +++ b/src/Web/DevHive.Web/DevHive.Web.csproj @@ -7,21 +7,22 @@ latest - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - + + + + + + + - - + + \ No newline at end of file diff --git a/src/Web/DevHive.Web/Middleware/ExceptionMiddleware.cs b/src/Web/DevHive.Web/Middleware/ExceptionMiddleware.cs index cb6d4ca..f159b69 100644 --- a/src/Web/DevHive.Web/Middleware/ExceptionMiddleware.cs +++ b/src/Web/DevHive.Web/Middleware/ExceptionMiddleware.cs @@ -9,18 +9,11 @@ namespace DevHive.Web.Middleware public class ExceptionMiddleware { private readonly RequestDelegate _next; - // private readonly ILogger _logger; public ExceptionMiddleware(RequestDelegate next) { this._next = next; - // this._logger = logger; } - // public ExceptionMiddleware(RequestDelegate next, ILogger logger) - // { - // this._logger = logger; - // this._next = next; - // } public async Task InvokeAsync(HttpContext httpContext) { @@ -30,20 +23,19 @@ namespace DevHive.Web.Middleware } catch (Exception ex) { - // this._logger.LogError($"Something went wrong: {ex}"); await HandleExceptionAsync(httpContext, ex); } } - private Task HandleExceptionAsync(HttpContext context, Exception exception) + private static Task HandleExceptionAsync(HttpContext context, Exception exception) { context.Response.ContentType = "application/json"; context.Response.StatusCode = (int)HttpStatusCode.BadRequest; return context.Response.WriteAsync(new { - StatusCode = context.Response.StatusCode, - Message = exception.Message + context.Response.StatusCode, + exception.Message }.ToString()); } } -- cgit v1.2.3 From f14ed20bf06cdeee8ce71ee39756360c43c29df1 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 13 Mar 2021 15:53:48 +0200 Subject: Updated controller tests to mock jwt service, removed profile picture tests from user controller, as that is in it's own layer --- .../DevHive.Web.Tests/CommentController.Tests.cs | 19 +++++++-- src/Web/DevHive.Web.Tests/PostController.Tests.cs | 11 +++++- src/Web/DevHive.Web.Tests/UserController.Tests.cs | 46 +++++----------------- 3 files changed, 35 insertions(+), 41 deletions(-) (limited to 'src/Web/DevHive.Web.Tests/PostController.Tests.cs') diff --git a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs index 7860f3c..7a15d37 100644 --- a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs @@ -2,6 +2,7 @@ using System; using System.Linq; using System.Threading.Tasks; using AutoMapper; +using DevHive.Common.Jwt.Interfaces; using DevHive.Services.Interfaces; using DevHive.Services.Models.Comment; using DevHive.Web.Controllers; @@ -12,12 +13,13 @@ using NUnit.Framework; namespace DevHive.Web.Tests { - [TestFixture] + [TestFixture] public class CommentControllerTests { const string MESSAGE = "Gosho Trapov"; private Mock CommentServiceMock { get; set; } private Mock MapperMock { get; set; } + private Mock JwtServiceMock { get; set; } private CommentController CommentController { get; set; } #region Setup @@ -26,7 +28,8 @@ namespace DevHive.Web.Tests { this.CommentServiceMock = new Mock(); this.MapperMock = new Mock(); - this.CommentController = new CommentController(this.CommentServiceMock.Object, this.MapperMock.Object); + this.JwtServiceMock = new Mock(); + this.CommentController = new CommentController(this.CommentServiceMock.Object, this.MapperMock.Object, this.JwtServiceMock.Object); } #endregion @@ -46,6 +49,7 @@ namespace DevHive.Web.Tests this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createCommentServiceModel); this.CommentServiceMock.Setup(p => p.AddComment(It.IsAny())).Returns(Task.FromResult(id)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.CommentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); IActionResult result = this.CommentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; @@ -79,6 +83,7 @@ namespace DevHive.Web.Tests this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createCommentServiceModel); this.CommentServiceMock.Setup(p => p.AddComment(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.CommentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); IActionResult result = this.CommentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; @@ -99,6 +104,7 @@ namespace DevHive.Web.Tests Message = MESSAGE }; + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.CommentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); IActionResult result = this.CommentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; @@ -121,6 +127,7 @@ namespace DevHive.Web.Tests Message = MESSAGE }; + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.CommentServiceMock.Setup(p => p.GetCommentById(It.IsAny())).Returns(Task.FromResult(readCommentServiceModel)); this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readCommentWebModel); @@ -150,6 +157,7 @@ namespace DevHive.Web.Tests }; this.CommentServiceMock.Setup(p => p.UpdateComment(It.IsAny())).Returns(Task.FromResult(id)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateCommentServiceModel); @@ -178,6 +186,7 @@ namespace DevHive.Web.Tests }; this.CommentServiceMock.Setup(p => p.UpdateComment(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateCommentServiceModel); @@ -198,7 +207,8 @@ namespace DevHive.Web.Tests NewMessage = MESSAGE }; - this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(false); + // this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); IActionResult result = this.CommentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result; @@ -213,6 +223,7 @@ namespace DevHive.Web.Tests Guid id = Guid.NewGuid(); this.CommentServiceMock.Setup(p => p.DeleteComment(It.IsAny())).Returns(Task.FromResult(true)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); IActionResult result = this.CommentController.DeleteComment(id, null).Result; @@ -227,6 +238,7 @@ namespace DevHive.Web.Tests Guid id = Guid.NewGuid(); this.CommentServiceMock.Setup(p => p.DeleteComment(It.IsAny())).Returns(Task.FromResult(false)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); IActionResult result = this.CommentController.DeleteComment(id, null).Result; @@ -242,6 +254,7 @@ namespace DevHive.Web.Tests [Test] public void DeleteComment_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() { + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); IActionResult result = this.CommentController.DeleteComment(Guid.Empty, null).Result; diff --git a/src/Web/DevHive.Web.Tests/PostController.Tests.cs b/src/Web/DevHive.Web.Tests/PostController.Tests.cs index f10f8dd..438eb80 100644 --- a/src/Web/DevHive.Web.Tests/PostController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/PostController.Tests.cs @@ -2,6 +2,7 @@ using System; using System.Linq; using System.Threading.Tasks; using AutoMapper; +using DevHive.Common.Jwt.Interfaces; using DevHive.Services.Interfaces; using DevHive.Services.Models.Post; using DevHive.Web.Controllers; @@ -18,6 +19,7 @@ namespace DevHive.Web.Tests const string MESSAGE = "Gosho Trapov"; private Mock PostServiceMock { get; set; } private Mock MapperMock { get; set; } + private Mock JwtServiceMock { get; set; } private PostController PostController { get; set; } [SetUp] @@ -25,7 +27,8 @@ namespace DevHive.Web.Tests { this.PostServiceMock = new Mock(); this.MapperMock = new Mock(); - this.PostController = new PostController(this.PostServiceMock.Object, this.MapperMock.Object); + this.JwtServiceMock = new Mock(); + this.PostController = new PostController(this.PostServiceMock.Object, this.MapperMock.Object, this.JwtServiceMock.Object); } #region Create @@ -44,6 +47,7 @@ namespace DevHive.Web.Tests this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createPostServiceModel); this.PostServiceMock.Setup(p => p.CreatePost(It.IsAny())).Returns(Task.FromResult(id)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.PostServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); IActionResult result = this.PostController.Create(Guid.Empty, createPostWebModel, null).Result; @@ -77,6 +81,7 @@ namespace DevHive.Web.Tests this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); this.PostServiceMock.Setup(p => p.CreatePost(It.IsAny())).Returns(Task.FromResult(id)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.PostServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); IActionResult result = this.PostController.Create(Guid.Empty, createTechnologyWebModel, null).Result; @@ -150,6 +155,7 @@ namespace DevHive.Web.Tests this.PostServiceMock.Setup(p => p.UpdatePost(It.IsAny())).Returns(Task.FromResult(id)); this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updatePostServiceModel); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); IActionResult result = this.PostController.Update(id, updatePostWebModel, null).Result; @@ -173,6 +179,7 @@ namespace DevHive.Web.Tests this.PostServiceMock.Setup(p => p.UpdatePost(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updatePostServiceModel); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); IActionResult result = this.PostController.Update(id, updatePostWebModel, null).Result; @@ -207,6 +214,7 @@ namespace DevHive.Web.Tests Guid id = Guid.NewGuid(); this.PostServiceMock.Setup(p => p.DeletePost(It.IsAny())).Returns(Task.FromResult(true)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); IActionResult result = this.PostController.Delete(id, null).Result; @@ -221,6 +229,7 @@ namespace DevHive.Web.Tests Guid id = Guid.NewGuid(); this.PostServiceMock.Setup(p => p.DeletePost(It.IsAny())).Returns(Task.FromResult(false)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); IActionResult result = this.PostController.Delete(id, null).Result; diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs index e12738e..ee08d88 100644 --- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using AutoMapper; +using DevHive.Common.Jwt.Interfaces; using DevHive.Common.Models.Identity; using DevHive.Services.Interfaces; using DevHive.Services.Models.User; @@ -18,6 +19,7 @@ namespace DevHive.Web.Tests const string USERNAME = "Gosho Trapov"; private Mock UserServiceMock { get; set; } private Mock MapperMock { get; set; } + private Mock JwtServiceMock { get; set; } private UserController UserController { get; set; } [SetUp] @@ -25,7 +27,8 @@ namespace DevHive.Web.Tests { this.UserServiceMock = new Mock(); this.MapperMock = new Mock(); - this.UserController = new UserController(this.UserServiceMock.Object, this.MapperMock.Object); + this.JwtServiceMock = new Mock(); + this.UserController = new UserController(this.UserServiceMock.Object, this.MapperMock.Object, this.JwtServiceMock.Object); } #region Create @@ -103,7 +106,7 @@ namespace DevHive.Web.Tests }; this.UserServiceMock.Setup(p => p.GetUserById(It.IsAny())).Returns(Task.FromResult(userServiceModel)); - this.UserServiceMock.Setup(p => p.ValidJWT(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(userWebModel); IActionResult result = this.UserController.GetById(id, null).Result; @@ -119,7 +122,7 @@ namespace DevHive.Web.Tests [Test] public void GetById_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() { - this.UserServiceMock.Setup(p => p.ValidJWT(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(false); IActionResult result = this.UserController.GetById(Guid.NewGuid(), null).Result; @@ -171,44 +174,13 @@ namespace DevHive.Web.Tests }; this.UserServiceMock.Setup(p => p.UpdateUser(It.IsAny())).Returns(Task.FromResult(userServiceModel)); - this.UserServiceMock.Setup(p => p.ValidJWT(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateUserServiceModel); IActionResult result = this.UserController.Update(id, updateUserWebModel, null).Result; Assert.IsInstanceOf(result); } - - [Test] - public void UpdateProfilePicture_ShouldReturnOkObjectResult_WhenProfilePictureIsUpdatedSuccessfully() - { - string profilePictureURL = "goshotrapov"; - UpdateProfilePictureWebModel updateProfilePictureWebModel = new(); - UpdateProfilePictureServiceModel updateProfilePictureServiceModel = new(); - ProfilePictureServiceModel profilePictureServiceModel = new() - { - ProfilePictureURL = profilePictureURL - }; - ProfilePictureWebModel profilePictureWebModel = new() - { - ProfilePictureURL = profilePictureURL - }; - - this.UserServiceMock.Setup(p => p.ValidJWT(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateProfilePictureServiceModel); - this.UserServiceMock.Setup(p => p.UpdateProfilePicture(It.IsAny())).Returns(Task.FromResult(profilePictureServiceModel)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(profilePictureWebModel); - - - IActionResult result = this.UserController.UpdateProfilePicture(Guid.Empty, updateProfilePictureWebModel, null).Result; - - Assert.IsInstanceOf(result); - - AcceptedResult acceptedResult = result as AcceptedResult; - ProfilePictureWebModel resultModel = acceptedResult.Value as ProfilePictureWebModel; - - Assert.AreEqual(profilePictureURL, resultModel.ProfilePictureURL); - } #endregion #region Delete @@ -217,7 +189,7 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this.UserServiceMock.Setup(p => p.ValidJWT(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.UserServiceMock.Setup(p => p.DeleteUser(It.IsAny())).Returns(Task.FromResult(true)); IActionResult result = this.UserController.Delete(id, null).Result; @@ -231,7 +203,7 @@ namespace DevHive.Web.Tests string message = "Could not delete User"; Guid id = Guid.NewGuid(); - this.UserServiceMock.Setup(p => p.ValidJWT(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); this.UserServiceMock.Setup(p => p.DeleteUser(It.IsAny())).Returns(Task.FromResult(false)); IActionResult result = this.UserController.Delete(id, null).Result; -- cgit v1.2.3 From af2a9b9886b429489e4ef4c2467d0e9e40520c12 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 14 Mar 2021 10:59:12 +0200 Subject: Made properties into variables in Web layer tests --- .../DevHive.Web.Tests/CommentController.Tests.cs | 96 +++++++++++----------- src/Web/DevHive.Web.Tests/FeedController.Tests.cs | 28 +++---- .../DevHive.Web.Tests/LanguageController.Tests.cs | 50 +++++------ src/Web/DevHive.Web.Tests/PostController.Tests.cs | 90 ++++++++++---------- src/Web/DevHive.Web.Tests/RoleController.Tests.cs | 50 +++++------ .../TechnologyController.Tests.cs | 51 ++++++------ src/Web/DevHive.Web.Tests/UserController.Tests.cs | 70 ++++++++-------- 7 files changed, 217 insertions(+), 218 deletions(-) (limited to 'src/Web/DevHive.Web.Tests/PostController.Tests.cs') diff --git a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs index 7a15d37..3b7f0a9 100644 --- a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs @@ -17,19 +17,19 @@ namespace DevHive.Web.Tests public class CommentControllerTests { const string MESSAGE = "Gosho Trapov"; - private Mock CommentServiceMock { get; set; } - private Mock MapperMock { get; set; } - private Mock JwtServiceMock { get; set; } - private CommentController CommentController { get; set; } + private Mock _commentServiceMock; + private Mock _mapperMock; + private Mock _jwtServiceMock; + private CommentController _commentController; #region Setup [SetUp] public void SetUp() { - this.CommentServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.JwtServiceMock = new Mock(); - this.CommentController = new CommentController(this.CommentServiceMock.Object, this.MapperMock.Object, this.JwtServiceMock.Object); + this._commentServiceMock = new Mock(); + this._mapperMock = new Mock(); + this._jwtServiceMock = new Mock(); + this._commentController = new CommentController(this._commentServiceMock.Object, this._mapperMock.Object, this._jwtServiceMock.Object); } #endregion @@ -47,12 +47,12 @@ namespace DevHive.Web.Tests Message = MESSAGE }; - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createCommentServiceModel); - this.CommentServiceMock.Setup(p => p.AddComment(It.IsAny())).Returns(Task.FromResult(id)); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.CommentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createCommentServiceModel); + this._commentServiceMock.Setup(p => p.AddComment(It.IsAny())).Returns(Task.FromResult(id)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._commentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.CommentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; + IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; Assert.IsInstanceOf(result); @@ -81,12 +81,12 @@ namespace DevHive.Web.Tests string errorMessage = $"Could not create comment!"; - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createCommentServiceModel); - this.CommentServiceMock.Setup(p => p.AddComment(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.CommentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createCommentServiceModel); + this._commentServiceMock.Setup(p => p.AddComment(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._commentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.CommentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; + IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; Assert.IsInstanceOf(result); @@ -104,10 +104,10 @@ namespace DevHive.Web.Tests Message = MESSAGE }; - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.CommentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._commentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - IActionResult result = this.CommentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; + IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; Assert.IsInstanceOf(result); } @@ -127,11 +127,11 @@ namespace DevHive.Web.Tests Message = MESSAGE }; - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.CommentServiceMock.Setup(p => p.GetCommentById(It.IsAny())).Returns(Task.FromResult(readCommentServiceModel)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readCommentWebModel); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._commentServiceMock.Setup(p => p.GetCommentById(It.IsAny())).Returns(Task.FromResult(readCommentServiceModel)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readCommentWebModel); - IActionResult result = this.CommentController.GetCommentById(id).Result; + IActionResult result = this._commentController.GetCommentById(id).Result; Assert.IsInstanceOf(result); @@ -156,12 +156,12 @@ namespace DevHive.Web.Tests NewMessage = MESSAGE }; - this.CommentServiceMock.Setup(p => p.UpdateComment(It.IsAny())).Returns(Task.FromResult(id)); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateCommentServiceModel); + this._commentServiceMock.Setup(p => p.UpdateComment(It.IsAny())).Returns(Task.FromResult(id)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateCommentServiceModel); - IActionResult result = this.CommentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result; + IActionResult result = this._commentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result; Assert.IsInstanceOf(result); @@ -185,12 +185,12 @@ namespace DevHive.Web.Tests NewMessage = MESSAGE }; - this.CommentServiceMock.Setup(p => p.UpdateComment(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateCommentServiceModel); + this._commentServiceMock.Setup(p => p.UpdateComment(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateCommentServiceModel); - IActionResult result = this.CommentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result; + IActionResult result = this._commentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result; Assert.IsInstanceOf(result); BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult; @@ -207,10 +207,10 @@ namespace DevHive.Web.Tests NewMessage = MESSAGE }; - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(false); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(false); // this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - IActionResult result = this.CommentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result; + IActionResult result = this._commentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result; Assert.IsInstanceOf(result); } @@ -222,11 +222,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this.CommentServiceMock.Setup(p => p.DeleteComment(It.IsAny())).Returns(Task.FromResult(true)); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._commentServiceMock.Setup(p => p.DeleteComment(It.IsAny())).Returns(Task.FromResult(true)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.CommentController.DeleteComment(id, null).Result; + IActionResult result = this._commentController.DeleteComment(id, null).Result; Assert.IsInstanceOf(result); } @@ -237,11 +237,11 @@ namespace DevHive.Web.Tests string message = "Could not delete Comment"; Guid id = Guid.NewGuid(); - this.CommentServiceMock.Setup(p => p.DeleteComment(It.IsAny())).Returns(Task.FromResult(false)); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._commentServiceMock.Setup(p => p.DeleteComment(It.IsAny())).Returns(Task.FromResult(false)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.CommentController.DeleteComment(id, null).Result; + IActionResult result = this._commentController.DeleteComment(id, null).Result; Assert.IsInstanceOf(result); @@ -254,10 +254,10 @@ namespace DevHive.Web.Tests [Test] public void DeleteComment_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() { - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - IActionResult result = this.CommentController.DeleteComment(Guid.Empty, null).Result; + IActionResult result = this._commentController.DeleteComment(Guid.Empty, null).Result; Assert.IsInstanceOf(result); } diff --git a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs index 01f67e5..80a2a14 100644 --- a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs @@ -17,17 +17,17 @@ namespace DevHive.Web.Tests [TestFixture] public class FeedControllerTests { - private Mock FeedServiceMock { get; set; } - private Mock MapperMock { get; set; } - private FeedController FeedController { get; set; } + private Mock _feedServiceMock; + private Mock _mapperMock; + private FeedController _feedController; #region SetUp [SetUp] public void SetUp() { - this.FeedServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.FeedController = new FeedController(this.FeedServiceMock.Object, this.MapperMock.Object); + this._feedServiceMock = new Mock(); + this._mapperMock = new Mock(); + this._feedController = new FeedController(this._feedServiceMock.Object, this._mapperMock.Object); } #endregion @@ -48,11 +48,11 @@ namespace DevHive.Web.Tests } }; - this.FeedServiceMock.Setup(p => p.GetPage(It.IsAny())).Returns(Task.FromResult(readPageServiceModel)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(getPageServiceModel); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPageWebModel); + this._feedServiceMock.Setup(p => p.GetPage(It.IsAny())).Returns(Task.FromResult(readPageServiceModel)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(getPageServiceModel); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPageWebModel); - IActionResult result = await this.FeedController.GetPosts(Guid.Empty, getPageWebModel); + IActionResult result = await this._feedController.GetPosts(Guid.Empty, getPageWebModel); Assert.IsInstanceOf(result); @@ -80,11 +80,11 @@ namespace DevHive.Web.Tests } }; - this.FeedServiceMock.Setup(p => p.GetUserPage(It.IsAny())).Returns(Task.FromResult(readPageServiceModel)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(getPageServiceModel); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPageWebModel); + this._feedServiceMock.Setup(p => p.GetUserPage(It.IsAny())).Returns(Task.FromResult(readPageServiceModel)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(getPageServiceModel); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPageWebModel); - IActionResult result = await this.FeedController.GetUserPosts(null, getPageWebModel); + IActionResult result = await this._feedController.GetUserPosts(null, getPageWebModel); Assert.IsInstanceOf(result); diff --git a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs index af4672a..f11e1a1 100644 --- a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs @@ -16,16 +16,16 @@ namespace DevHive.Web.Tests public class LanguageControllerTests { const string NAME = "Gosho Trapov"; - private Mock LanguageServiceMock { get; set; } - private Mock MapperMock { get; set; } - private LanguageController LanguageController { get; set; } + private Mock _languageServiceMock; + private Mock _mapperMock; + private LanguageController _languageController; [SetUp] public void SetUp() { - this.LanguageServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.LanguageController = new LanguageController(this.LanguageServiceMock.Object, this.MapperMock.Object); + this._languageServiceMock = new Mock(); + this._mapperMock = new Mock(); + this._languageController = new LanguageController(this._languageServiceMock.Object, this._mapperMock.Object); } #region Create @@ -42,10 +42,10 @@ namespace DevHive.Web.Tests }; Guid id = Guid.NewGuid(); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createLanguageServiceModel); - this.LanguageServiceMock.Setup(p => p.CreateLanguage(It.IsAny())).Returns(Task.FromResult(id)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createLanguageServiceModel); + this._languageServiceMock.Setup(p => p.CreateLanguage(It.IsAny())).Returns(Task.FromResult(id)); - IActionResult result = this.LanguageController.Create(createLanguageWebModel).Result; + IActionResult result = this._languageController.Create(createLanguageWebModel).Result; Assert.IsInstanceOf(result); @@ -74,10 +74,10 @@ namespace DevHive.Web.Tests Guid id = Guid.Empty; string errorMessage = $"Could not create language {NAME}"; - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); - this.LanguageServiceMock.Setup(p => p.CreateLanguage(It.IsAny())).Returns(Task.FromResult(id)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); + this._languageServiceMock.Setup(p => p.CreateLanguage(It.IsAny())).Returns(Task.FromResult(id)); - IActionResult result = this.LanguageController.Create(createTechnologyWebModel).Result; + IActionResult result = this._languageController.Create(createTechnologyWebModel).Result; Assert.IsInstanceOf(result); @@ -103,10 +103,10 @@ namespace DevHive.Web.Tests Name = NAME }; - this.LanguageServiceMock.Setup(p => p.GetLanguageById(It.IsAny())).Returns(Task.FromResult(readLanguageServiceModel)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readLanguageWebModel); + this._languageServiceMock.Setup(p => p.GetLanguageById(It.IsAny())).Returns(Task.FromResult(readLanguageServiceModel)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readLanguageWebModel); - IActionResult result = this.LanguageController.GetById(id).Result; + IActionResult result = this._languageController.GetById(id).Result; Assert.IsInstanceOf(result); @@ -131,10 +131,10 @@ namespace DevHive.Web.Tests Name = NAME }; - this.LanguageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny())).Returns(Task.FromResult(true)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateLanguageServiceModel); + this._languageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateLanguageServiceModel); - IActionResult result = this.LanguageController.Update(id, updateLanguageWebModel).Result; + IActionResult result = this._languageController.Update(id, updateLanguageWebModel).Result; Assert.IsInstanceOf(result); } @@ -153,10 +153,10 @@ namespace DevHive.Web.Tests Name = NAME }; - this.LanguageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny())).Returns(Task.FromResult(false)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateLanguageServiceModel); + this._languageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny())).Returns(Task.FromResult(false)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateLanguageServiceModel); - IActionResult result = this.LanguageController.Update(id, updateLanguageWebModel).Result; + IActionResult result = this._languageController.Update(id, updateLanguageWebModel).Result; Assert.IsInstanceOf(result); BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult; @@ -172,9 +172,9 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this.LanguageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny())).Returns(Task.FromResult(true)); + this._languageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.LanguageController.Delete(id).Result; + IActionResult result = this._languageController.Delete(id).Result; Assert.IsInstanceOf(result); } @@ -185,9 +185,9 @@ namespace DevHive.Web.Tests string message = "Could not delete Language"; Guid id = Guid.NewGuid(); - this.LanguageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny())).Returns(Task.FromResult(false)); + this._languageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny())).Returns(Task.FromResult(false)); - IActionResult result = this.LanguageController.Delete(id).Result; + IActionResult result = this._languageController.Delete(id).Result; Assert.IsInstanceOf(result); diff --git a/src/Web/DevHive.Web.Tests/PostController.Tests.cs b/src/Web/DevHive.Web.Tests/PostController.Tests.cs index 438eb80..c2c2fbc 100644 --- a/src/Web/DevHive.Web.Tests/PostController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/PostController.Tests.cs @@ -17,18 +17,18 @@ namespace DevHive.Web.Tests public class PostControllerTests { const string MESSAGE = "Gosho Trapov"; - private Mock PostServiceMock { get; set; } - private Mock MapperMock { get; set; } - private Mock JwtServiceMock { get; set; } - private PostController PostController { get; set; } + private Mock _postServiceMock; + private Mock _mapperMock; + private Mock _jwtServiceMock; + private PostController _postController; [SetUp] public void SetUp() { - this.PostServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.JwtServiceMock = new Mock(); - this.PostController = new PostController(this.PostServiceMock.Object, this.MapperMock.Object, this.JwtServiceMock.Object); + this._postServiceMock = new Mock(); + this._mapperMock = new Mock(); + this._jwtServiceMock = new Mock(); + this._postController = new PostController(this._postServiceMock.Object, this._mapperMock.Object, this._jwtServiceMock.Object); } #region Create @@ -45,12 +45,12 @@ namespace DevHive.Web.Tests }; Guid id = Guid.NewGuid(); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createPostServiceModel); - this.PostServiceMock.Setup(p => p.CreatePost(It.IsAny())).Returns(Task.FromResult(id)); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.PostServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createPostServiceModel); + this._postServiceMock.Setup(p => p.CreatePost(It.IsAny())).Returns(Task.FromResult(id)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._postServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.PostController.Create(Guid.Empty, createPostWebModel, null).Result; + IActionResult result = this._postController.Create(Guid.Empty, createPostWebModel, null).Result; Assert.IsInstanceOf(result); @@ -79,12 +79,12 @@ namespace DevHive.Web.Tests Guid id = Guid.Empty; string errorMessage = $"Could not create post!"; - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); - this.PostServiceMock.Setup(p => p.CreatePost(It.IsAny())).Returns(Task.FromResult(id)); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.PostServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); + this._postServiceMock.Setup(p => p.CreatePost(It.IsAny())).Returns(Task.FromResult(id)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._postServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.PostController.Create(Guid.Empty, createTechnologyWebModel, null).Result; + IActionResult result = this._postController.Create(Guid.Empty, createTechnologyWebModel, null).Result; Assert.IsInstanceOf(result); @@ -102,9 +102,9 @@ namespace DevHive.Web.Tests Message = MESSAGE }; - this.PostServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this._postServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - IActionResult result = this.PostController.Create(Guid.NewGuid(), createPostWebModel, null).Result; + IActionResult result = this._postController.Create(Guid.NewGuid(), createPostWebModel, null).Result; Assert.IsInstanceOf(result); } @@ -125,10 +125,10 @@ namespace DevHive.Web.Tests Message = MESSAGE }; - this.PostServiceMock.Setup(p => p.GetPostById(It.IsAny())).Returns(Task.FromResult(readPostServiceModel)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPostWebModel); + this._postServiceMock.Setup(p => p.GetPostById(It.IsAny())).Returns(Task.FromResult(readPostServiceModel)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPostWebModel); - IActionResult result = this.PostController.GetById(id).Result; + IActionResult result = this._postController.GetById(id).Result; Assert.IsInstanceOf(result); @@ -153,12 +153,12 @@ namespace DevHive.Web.Tests NewMessage = MESSAGE }; - this.PostServiceMock.Setup(p => p.UpdatePost(It.IsAny())).Returns(Task.FromResult(id)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updatePostServiceModel); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._postServiceMock.Setup(p => p.UpdatePost(It.IsAny())).Returns(Task.FromResult(id)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updatePostServiceModel); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.PostController.Update(id, updatePostWebModel, null).Result; + IActionResult result = this._postController.Update(id, updatePostWebModel, null).Result; Assert.IsInstanceOf(result); } @@ -177,12 +177,12 @@ namespace DevHive.Web.Tests NewMessage = MESSAGE }; - this.PostServiceMock.Setup(p => p.UpdatePost(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updatePostServiceModel); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._postServiceMock.Setup(p => p.UpdatePost(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updatePostServiceModel); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.PostController.Update(id, updatePostWebModel, null).Result; + IActionResult result = this._postController.Update(id, updatePostWebModel, null).Result; Assert.IsInstanceOf(result); BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult; @@ -199,9 +199,9 @@ namespace DevHive.Web.Tests NewMessage = MESSAGE }; - this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - IActionResult result = this.PostController.Update(Guid.Empty, updatePostWebModel, null).Result; + IActionResult result = this._postController.Update(Guid.Empty, updatePostWebModel, null).Result; Assert.IsInstanceOf(result); } @@ -213,11 +213,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this.PostServiceMock.Setup(p => p.DeletePost(It.IsAny())).Returns(Task.FromResult(true)); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._postServiceMock.Setup(p => p.DeletePost(It.IsAny())).Returns(Task.FromResult(true)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.PostController.Delete(id, null).Result; + IActionResult result = this._postController.Delete(id, null).Result; Assert.IsInstanceOf(result); } @@ -228,11 +228,11 @@ namespace DevHive.Web.Tests string message = "Could not delete Post"; Guid id = Guid.NewGuid(); - this.PostServiceMock.Setup(p => p.DeletePost(It.IsAny())).Returns(Task.FromResult(false)); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._postServiceMock.Setup(p => p.DeletePost(It.IsAny())).Returns(Task.FromResult(false)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.PostController.Delete(id, null).Result; + IActionResult result = this._postController.Delete(id, null).Result; Assert.IsInstanceOf(result); @@ -245,9 +245,9 @@ namespace DevHive.Web.Tests [Test] public void DeletePost_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() { - this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - IActionResult result = this.PostController.Delete(Guid.Empty, null).Result; + IActionResult result = this._postController.Delete(Guid.Empty, null).Result; Assert.IsInstanceOf(result); } diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs index ff80dc0..83358a0 100644 --- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs @@ -16,16 +16,16 @@ namespace DevHive.Web.Tests public class RoleControllerTests { const string NAME = "Gosho Trapov"; - private Mock RoleServiceMock { get; set; } - private Mock MapperMock { get; set; } - private RoleController RoleController { get; set; } + private Mock _roleServiceMock; + private Mock _mapperMock; + private RoleController _roleController; [SetUp] public void SetUp() { - this.RoleServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.RoleController = new RoleController(this.RoleServiceMock.Object, this.MapperMock.Object); + this._roleServiceMock = new Mock(); + this._mapperMock = new Mock(); + this._roleController = new RoleController(this._roleServiceMock.Object, this._mapperMock.Object); } #region Create @@ -42,10 +42,10 @@ namespace DevHive.Web.Tests }; Guid id = Guid.NewGuid(); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createRoleServiceModel); - this.RoleServiceMock.Setup(p => p.CreateRole(It.IsAny())).Returns(Task.FromResult(id)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createRoleServiceModel); + this._roleServiceMock.Setup(p => p.CreateRole(It.IsAny())).Returns(Task.FromResult(id)); - IActionResult result = this.RoleController.Create(createRoleWebModel).Result; + IActionResult result = this._roleController.Create(createRoleWebModel).Result; Assert.IsInstanceOf(result); @@ -74,10 +74,10 @@ namespace DevHive.Web.Tests Guid id = Guid.Empty; string errorMessage = $"Could not create role {NAME}"; - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); - this.RoleServiceMock.Setup(p => p.CreateRole(It.IsAny())).Returns(Task.FromResult(id)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); + this._roleServiceMock.Setup(p => p.CreateRole(It.IsAny())).Returns(Task.FromResult(id)); - IActionResult result = this.RoleController.Create(createTechnologyWebModel).Result; + IActionResult result = this._roleController.Create(createTechnologyWebModel).Result; Assert.IsInstanceOf(result); @@ -103,10 +103,10 @@ namespace DevHive.Web.Tests Name = NAME }; - this.RoleServiceMock.Setup(p => p.GetRoleById(It.IsAny())).Returns(Task.FromResult(roleServiceModel)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(roleWebModel); + this._roleServiceMock.Setup(p => p.GetRoleById(It.IsAny())).Returns(Task.FromResult(roleServiceModel)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(roleWebModel); - IActionResult result = this.RoleController.GetById(id).Result; + IActionResult result = this._roleController.GetById(id).Result; Assert.IsInstanceOf(result); @@ -131,10 +131,10 @@ namespace DevHive.Web.Tests Name = NAME }; - this.RoleServiceMock.Setup(p => p.UpdateRole(It.IsAny())).Returns(Task.FromResult(true)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateRoleServiceModel); + this._roleServiceMock.Setup(p => p.UpdateRole(It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateRoleServiceModel); - IActionResult result = this.RoleController.Update(id, updateRoleWebModel).Result; + IActionResult result = this._roleController.Update(id, updateRoleWebModel).Result; Assert.IsInstanceOf(result); } @@ -153,10 +153,10 @@ namespace DevHive.Web.Tests Name = NAME }; - this.RoleServiceMock.Setup(p => p.UpdateRole(It.IsAny())).Returns(Task.FromResult(false)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateRoleServiceModel); + this._roleServiceMock.Setup(p => p.UpdateRole(It.IsAny())).Returns(Task.FromResult(false)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateRoleServiceModel); - IActionResult result = this.RoleController.Update(id, updateRoleWebModel).Result; + IActionResult result = this._roleController.Update(id, updateRoleWebModel).Result; Assert.IsInstanceOf(result); BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult; @@ -172,9 +172,9 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this.RoleServiceMock.Setup(p => p.DeleteRole(It.IsAny())).Returns(Task.FromResult(true)); + this._roleServiceMock.Setup(p => p.DeleteRole(It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.RoleController.Delete(id).Result; + IActionResult result = this._roleController.Delete(id).Result; Assert.IsInstanceOf(result); } @@ -185,9 +185,9 @@ namespace DevHive.Web.Tests string message = "Could not delete role!"; Guid id = Guid.NewGuid(); - this.RoleServiceMock.Setup(p => p.DeleteRole(It.IsAny())).Returns(Task.FromResult(false)); + this._roleServiceMock.Setup(p => p.DeleteRole(It.IsAny())).Returns(Task.FromResult(false)); - IActionResult result = this.RoleController.Delete(id).Result; + IActionResult result = this._roleController.Delete(id).Result; Assert.IsInstanceOf(result); diff --git a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs index a00f1db..64b128c 100644 --- a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs @@ -1,5 +1,4 @@ using AutoMapper; -using DevHive.Common.Models.Misc; using DevHive.Services.Interfaces; using DevHive.Services.Models.Technology; using DevHive.Web.Controllers; @@ -17,17 +16,17 @@ namespace DevHive.Web.Tests public class TechnologyControllerTests { const string NAME = "Gosho Trapov"; - private Mock TechnologyServiceMock { get; set; } - private Mock MapperMock { get; set; } - private TechnologyController TechnologyController { get; set; } + private Mock _technologyServiceMock; + private Mock _mapperMock; + private TechnologyController _technologyController; #region SetUp [SetUp] public void SetUp() { - this.TechnologyServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.TechnologyController = new TechnologyController(this.TechnologyServiceMock.Object, this.MapperMock.Object); + this._technologyServiceMock = new Mock(); + this._mapperMock = new Mock(); + this._technologyController = new TechnologyController(this._technologyServiceMock.Object, this._mapperMock.Object); } #endregion @@ -45,10 +44,10 @@ namespace DevHive.Web.Tests }; Guid id = Guid.NewGuid(); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); - this.TechnologyServiceMock.Setup(p => p.CreateTechnology(It.IsAny())).Returns(Task.FromResult(id)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); + this._technologyServiceMock.Setup(p => p.CreateTechnology(It.IsAny())).Returns(Task.FromResult(id)); - IActionResult result = this.TechnologyController.Create(createTechnologyWebModel).Result; + IActionResult result = this._technologyController.Create(createTechnologyWebModel).Result; Assert.IsInstanceOf(result); @@ -77,10 +76,10 @@ namespace DevHive.Web.Tests Guid id = Guid.Empty; string errorMessage = $"Could not create technology {NAME}"; - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); - this.TechnologyServiceMock.Setup(p => p.CreateTechnology(It.IsAny())).Returns(Task.FromResult(id)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); + this._technologyServiceMock.Setup(p => p.CreateTechnology(It.IsAny())).Returns(Task.FromResult(id)); - IActionResult result = this.TechnologyController.Create(createTechnologyWebModel).Result; + IActionResult result = this._technologyController.Create(createTechnologyWebModel).Result; Assert.IsInstanceOf(result); @@ -106,10 +105,10 @@ namespace DevHive.Web.Tests Name = NAME }; - this.TechnologyServiceMock.Setup(p => p.GetTechnologyById(It.IsAny())).Returns(Task.FromResult(readTechnologyServiceModel)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readTechnologyWebModel); + this._technologyServiceMock.Setup(p => p.GetTechnologyById(It.IsAny())).Returns(Task.FromResult(readTechnologyServiceModel)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readTechnologyWebModel); - IActionResult result = this.TechnologyController.GetById(id).Result; + IActionResult result = this._technologyController.GetById(id).Result; Assert.IsInstanceOf(result); @@ -134,10 +133,10 @@ namespace DevHive.Web.Tests Name = NAME }; - this.TechnologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny())).Returns(Task.FromResult(true)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateTechnologyServiceModel); + this._technologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateTechnologyServiceModel); - IActionResult result = this.TechnologyController.Update(id, updateTechnologyWebModel).Result; + IActionResult result = this._technologyController.Update(id, updateTechnologyWebModel).Result; Assert.IsInstanceOf(result); } @@ -156,10 +155,10 @@ namespace DevHive.Web.Tests Name = NAME }; - this.TechnologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny())).Returns(Task.FromResult(false)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateTechnologyServiceModel); + this._technologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny())).Returns(Task.FromResult(false)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateTechnologyServiceModel); - IActionResult result = this.TechnologyController.Update(id, updateTechnologyWebModel).Result; + IActionResult result = this._technologyController.Update(id, updateTechnologyWebModel).Result; Assert.IsInstanceOf(result); BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult; @@ -175,9 +174,9 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this.TechnologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny())).Returns(Task.FromResult(true)); + this._technologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.TechnologyController.Delete(id).Result; + IActionResult result = this._technologyController.Delete(id).Result; Assert.IsInstanceOf(result); } @@ -188,9 +187,9 @@ namespace DevHive.Web.Tests string message = "Could not delete Technology"; Guid id = Guid.NewGuid(); - this.TechnologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny())).Returns(Task.FromResult(false)); + this._technologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny())).Returns(Task.FromResult(false)); - IActionResult result = this.TechnologyController.Delete(id).Result; + IActionResult result = this._technologyController.Delete(id).Result; Assert.IsInstanceOf(result); diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs index ee08d88..89e5fc9 100644 --- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs @@ -17,18 +17,18 @@ namespace DevHive.Web.Tests public class UserControllerTests { const string USERNAME = "Gosho Trapov"; - private Mock UserServiceMock { get; set; } - private Mock MapperMock { get; set; } - private Mock JwtServiceMock { get; set; } - private UserController UserController { get; set; } + private Mock _userServiceMock; + private Mock _mapperMock; + private Mock _jwtServiceMock; + private UserController _userController; [SetUp] public void SetUp() { - this.UserServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.JwtServiceMock = new Mock(); - this.UserController = new UserController(this.UserServiceMock.Object, this.MapperMock.Object, this.JwtServiceMock.Object); + this._userServiceMock = new Mock(); + this._mapperMock = new Mock(); + this._jwtServiceMock = new Mock(); + this._userController = new UserController(this._userServiceMock.Object, this._mapperMock.Object, this._jwtServiceMock.Object); } #region Create @@ -47,11 +47,11 @@ namespace DevHive.Web.Tests TokenModel tokenModel = new(token); TokenWebModel tokenWebModel = new(token); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(loginServiceModel); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(tokenWebModel); - this.UserServiceMock.Setup(p => p.LoginUser(It.IsAny())).Returns(Task.FromResult(tokenModel)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(loginServiceModel); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(tokenWebModel); + this._userServiceMock.Setup(p => p.LoginUser(It.IsAny())).Returns(Task.FromResult(tokenModel)); - IActionResult result = this.UserController.Login(loginWebModel).Result; + IActionResult result = this._userController.Login(loginWebModel).Result; Assert.IsInstanceOf(result); @@ -75,11 +75,11 @@ namespace DevHive.Web.Tests TokenModel tokenModel = new(token); TokenWebModel tokenWebModel = new(token); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(registerServiceModel); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(tokenWebModel); - this.UserServiceMock.Setup(p => p.RegisterUser(It.IsAny())).Returns(Task.FromResult(tokenModel)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(registerServiceModel); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(tokenWebModel); + this._userServiceMock.Setup(p => p.RegisterUser(It.IsAny())).Returns(Task.FromResult(tokenModel)); - IActionResult result = this.UserController.Register(registerWebModel).Result; + IActionResult result = this._userController.Register(registerWebModel).Result; Assert.IsInstanceOf(result); @@ -105,11 +105,11 @@ namespace DevHive.Web.Tests UserName = USERNAME }; - this.UserServiceMock.Setup(p => p.GetUserById(It.IsAny())).Returns(Task.FromResult(userServiceModel)); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(userWebModel); + this._userServiceMock.Setup(p => p.GetUserById(It.IsAny())).Returns(Task.FromResult(userServiceModel)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(userWebModel); - IActionResult result = this.UserController.GetById(id, null).Result; + IActionResult result = this._userController.GetById(id, null).Result; Assert.IsInstanceOf(result); @@ -122,9 +122,9 @@ namespace DevHive.Web.Tests [Test] public void GetById_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() { - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(false); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(false); - IActionResult result = this.UserController.GetById(Guid.NewGuid(), null).Result; + IActionResult result = this._userController.GetById(Guid.NewGuid(), null).Result; Assert.IsInstanceOf(result); } @@ -141,10 +141,10 @@ namespace DevHive.Web.Tests UserName = USERNAME }; - this.UserServiceMock.Setup(p => p.GetUserByUsername(It.IsAny())).Returns(Task.FromResult(userServiceModel)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(userWebModel); + this._userServiceMock.Setup(p => p.GetUserByUsername(It.IsAny())).Returns(Task.FromResult(userServiceModel)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(userWebModel); - IActionResult result = this.UserController.GetUser(null).Result; + IActionResult result = this._userController.GetUser(null).Result; Assert.IsInstanceOf(result); @@ -173,11 +173,11 @@ namespace DevHive.Web.Tests UserName = USERNAME }; - this.UserServiceMock.Setup(p => p.UpdateUser(It.IsAny())).Returns(Task.FromResult(userServiceModel)); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateUserServiceModel); + this._userServiceMock.Setup(p => p.UpdateUser(It.IsAny())).Returns(Task.FromResult(userServiceModel)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateUserServiceModel); - IActionResult result = this.UserController.Update(id, updateUserWebModel, null).Result; + IActionResult result = this._userController.Update(id, updateUserWebModel, null).Result; Assert.IsInstanceOf(result); } @@ -189,10 +189,10 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.UserServiceMock.Setup(p => p.DeleteUser(It.IsAny())).Returns(Task.FromResult(true)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._userServiceMock.Setup(p => p.DeleteUser(It.IsAny())).Returns(Task.FromResult(true)); - IActionResult result = this.UserController.Delete(id, null).Result; + IActionResult result = this._userController.Delete(id, null).Result; Assert.IsInstanceOf(result); } @@ -203,10 +203,10 @@ namespace DevHive.Web.Tests string message = "Could not delete User"; Guid id = Guid.NewGuid(); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.UserServiceMock.Setup(p => p.DeleteUser(It.IsAny())).Returns(Task.FromResult(false)); + this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); + this._userServiceMock.Setup(p => p.DeleteUser(It.IsAny())).Returns(Task.FromResult(false)); - IActionResult result = this.UserController.Delete(id, null).Result; + IActionResult result = this._userController.Delete(id, null).Result; Assert.IsInstanceOf(result); -- cgit v1.2.3 From a2dde73b37ad311213a6787fb5aeb5cb4103968c Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 14 Mar 2021 11:23:35 +0200 Subject: Updated code style of mock setups in Web layer tests --- .../DevHive.Web.Tests/CommentController.Tests.cs | 120 +++++++++++++++------ src/Web/DevHive.Web.Tests/FeedController.Tests.cs | 24 +++-- .../DevHive.Web.Tests/LanguageController.Tests.cs | 48 ++++++--- src/Web/DevHive.Web.Tests/PostController.Tests.cs | 108 ++++++++++++++----- src/Web/DevHive.Web.Tests/RoleController.Tests.cs | 50 ++++++--- .../TechnologyController.Tests.cs | 48 ++++++--- src/Web/DevHive.Web.Tests/UserController.Tests.cs | 76 +++++++++---- 7 files changed, 355 insertions(+), 119 deletions(-) (limited to 'src/Web/DevHive.Web.Tests/PostController.Tests.cs') diff --git a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs index 3b7f0a9..4e1715c 100644 --- a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs @@ -47,10 +47,18 @@ namespace DevHive.Web.Tests Message = MESSAGE }; - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createCommentServiceModel); - this._commentServiceMock.Setup(p => p.AddComment(It.IsAny())).Returns(Task.FromResult(id)); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._commentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(createCommentServiceModel); + this._commentServiceMock + .Setup(p => p.AddComment(It.IsAny())) + .Returns(Task.FromResult(id)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._commentServiceMock + .Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; @@ -81,10 +89,18 @@ namespace DevHive.Web.Tests string errorMessage = $"Could not create comment!"; - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createCommentServiceModel); - this._commentServiceMock.Setup(p => p.AddComment(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._commentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(createCommentServiceModel); + this._commentServiceMock + .Setup(p => p.AddComment(It.IsAny())) + .Returns(Task.FromResult(Guid.Empty)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._commentServiceMock + .Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; @@ -104,8 +120,12 @@ namespace DevHive.Web.Tests Message = MESSAGE }; - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._commentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._commentServiceMock + .Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(false)); IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; @@ -127,9 +147,15 @@ namespace DevHive.Web.Tests Message = MESSAGE }; - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._commentServiceMock.Setup(p => p.GetCommentById(It.IsAny())).Returns(Task.FromResult(readCommentServiceModel)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readCommentWebModel); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._commentServiceMock + .Setup(p => p.GetCommentById(It.IsAny())) + .Returns(Task.FromResult(readCommentServiceModel)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readCommentWebModel); IActionResult result = this._commentController.GetCommentById(id).Result; @@ -156,10 +182,18 @@ namespace DevHive.Web.Tests NewMessage = MESSAGE }; - this._commentServiceMock.Setup(p => p.UpdateComment(It.IsAny())).Returns(Task.FromResult(id)); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateCommentServiceModel); + this._commentServiceMock + .Setup(p => p.UpdateComment(It.IsAny())) + .Returns(Task.FromResult(id)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._commentServiceMock + .Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(updateCommentServiceModel); IActionResult result = this._commentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result; @@ -185,10 +219,18 @@ namespace DevHive.Web.Tests NewMessage = MESSAGE }; - this._commentServiceMock.Setup(p => p.UpdateComment(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateCommentServiceModel); + this._commentServiceMock + .Setup(p => p.UpdateComment(It.IsAny())) + .Returns(Task.FromResult(Guid.Empty)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._commentServiceMock + .Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(updateCommentServiceModel); IActionResult result = this._commentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result; Assert.IsInstanceOf(result); @@ -207,7 +249,9 @@ namespace DevHive.Web.Tests NewMessage = MESSAGE }; - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(false); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(false); // this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); IActionResult result = this._commentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result; @@ -222,9 +266,15 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this._commentServiceMock.Setup(p => p.DeleteComment(It.IsAny())).Returns(Task.FromResult(true)); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._commentServiceMock + .Setup(p => p.DeleteComment(It.IsAny())) + .Returns(Task.FromResult(true)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._commentServiceMock + .Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._commentController.DeleteComment(id, null).Result; @@ -237,9 +287,15 @@ namespace DevHive.Web.Tests string message = "Could not delete Comment"; Guid id = Guid.NewGuid(); - this._commentServiceMock.Setup(p => p.DeleteComment(It.IsAny())).Returns(Task.FromResult(false)); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._commentServiceMock + .Setup(p => p.DeleteComment(It.IsAny())) + .Returns(Task.FromResult(false)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._commentServiceMock + .Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._commentController.DeleteComment(id, null).Result; @@ -254,8 +310,12 @@ namespace DevHive.Web.Tests [Test] public void DeleteComment_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() { - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._commentServiceMock + .Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(false)); IActionResult result = this._commentController.DeleteComment(Guid.Empty, null).Result; diff --git a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs index 80a2a14..7a7fd8d 100644 --- a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs @@ -48,9 +48,15 @@ namespace DevHive.Web.Tests } }; - this._feedServiceMock.Setup(p => p.GetPage(It.IsAny())).Returns(Task.FromResult(readPageServiceModel)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(getPageServiceModel); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPageWebModel); + this._feedServiceMock + .Setup(p => p.GetPage(It.IsAny())) + .Returns(Task.FromResult(readPageServiceModel)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(getPageServiceModel); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readPageWebModel); IActionResult result = await this._feedController.GetPosts(Guid.Empty, getPageWebModel); @@ -80,9 +86,15 @@ namespace DevHive.Web.Tests } }; - this._feedServiceMock.Setup(p => p.GetUserPage(It.IsAny())).Returns(Task.FromResult(readPageServiceModel)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(getPageServiceModel); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPageWebModel); + this._feedServiceMock + .Setup(p => p.GetUserPage(It.IsAny())) + .Returns(Task.FromResult(readPageServiceModel)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(getPageServiceModel); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readPageWebModel); IActionResult result = await this._feedController.GetUserPosts(null, getPageWebModel); diff --git a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs index f11e1a1..de882fc 100644 --- a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs @@ -42,8 +42,12 @@ namespace DevHive.Web.Tests }; Guid id = Guid.NewGuid(); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createLanguageServiceModel); - this._languageServiceMock.Setup(p => p.CreateLanguage(It.IsAny())).Returns(Task.FromResult(id)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(createLanguageServiceModel); + this._languageServiceMock + .Setup(p => p.CreateLanguage(It.IsAny())) + .Returns(Task.FromResult(id)); IActionResult result = this._languageController.Create(createLanguageWebModel).Result; @@ -74,8 +78,12 @@ namespace DevHive.Web.Tests Guid id = Guid.Empty; string errorMessage = $"Could not create language {NAME}"; - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); - this._languageServiceMock.Setup(p => p.CreateLanguage(It.IsAny())).Returns(Task.FromResult(id)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(createTechnologyServiceModel); + this._languageServiceMock + .Setup(p => p.CreateLanguage(It.IsAny())) + .Returns(Task.FromResult(id)); IActionResult result = this._languageController.Create(createTechnologyWebModel).Result; @@ -103,8 +111,12 @@ namespace DevHive.Web.Tests Name = NAME }; - this._languageServiceMock.Setup(p => p.GetLanguageById(It.IsAny())).Returns(Task.FromResult(readLanguageServiceModel)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readLanguageWebModel); + this._languageServiceMock + .Setup(p => p.GetLanguageById(It.IsAny())) + .Returns(Task.FromResult(readLanguageServiceModel)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readLanguageWebModel); IActionResult result = this._languageController.GetById(id).Result; @@ -131,8 +143,12 @@ namespace DevHive.Web.Tests Name = NAME }; - this._languageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny())).Returns(Task.FromResult(true)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateLanguageServiceModel); + this._languageServiceMock + .Setup(p => p.UpdateLanguage(It.IsAny())) + .Returns(Task.FromResult(true)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(updateLanguageServiceModel); IActionResult result = this._languageController.Update(id, updateLanguageWebModel).Result; @@ -153,8 +169,12 @@ namespace DevHive.Web.Tests Name = NAME }; - this._languageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny())).Returns(Task.FromResult(false)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateLanguageServiceModel); + this._languageServiceMock + .Setup(p => p.UpdateLanguage(It.IsAny())) + .Returns(Task.FromResult(false)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(updateLanguageServiceModel); IActionResult result = this._languageController.Update(id, updateLanguageWebModel).Result; Assert.IsInstanceOf(result); @@ -172,7 +192,9 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this._languageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny())).Returns(Task.FromResult(true)); + this._languageServiceMock + .Setup(p => p.DeleteLanguage(It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._languageController.Delete(id).Result; @@ -185,7 +207,9 @@ namespace DevHive.Web.Tests string message = "Could not delete Language"; Guid id = Guid.NewGuid(); - this._languageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny())).Returns(Task.FromResult(false)); + this._languageServiceMock + .Setup(p => p.DeleteLanguage(It.IsAny())) + .Returns(Task.FromResult(false)); IActionResult result = this._languageController.Delete(id).Result; diff --git a/src/Web/DevHive.Web.Tests/PostController.Tests.cs b/src/Web/DevHive.Web.Tests/PostController.Tests.cs index c2c2fbc..384a92a 100644 --- a/src/Web/DevHive.Web.Tests/PostController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/PostController.Tests.cs @@ -45,10 +45,18 @@ namespace DevHive.Web.Tests }; Guid id = Guid.NewGuid(); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createPostServiceModel); - this._postServiceMock.Setup(p => p.CreatePost(It.IsAny())).Returns(Task.FromResult(id)); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._postServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(createPostServiceModel); + this._postServiceMock + .Setup(p => p.CreatePost(It.IsAny())) + .Returns(Task.FromResult(id)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._postServiceMock + .Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._postController.Create(Guid.Empty, createPostWebModel, null).Result; @@ -79,10 +87,18 @@ namespace DevHive.Web.Tests Guid id = Guid.Empty; string errorMessage = $"Could not create post!"; - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); - this._postServiceMock.Setup(p => p.CreatePost(It.IsAny())).Returns(Task.FromResult(id)); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._postServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(createTechnologyServiceModel); + this._postServiceMock + .Setup(p => p.CreatePost(It.IsAny())) + .Returns(Task.FromResult(id)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._postServiceMock + .Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._postController.Create(Guid.Empty, createTechnologyWebModel, null).Result; @@ -102,7 +118,9 @@ namespace DevHive.Web.Tests Message = MESSAGE }; - this._postServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this._postServiceMock + .Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(false)); IActionResult result = this._postController.Create(Guid.NewGuid(), createPostWebModel, null).Result; @@ -125,8 +143,12 @@ namespace DevHive.Web.Tests Message = MESSAGE }; - this._postServiceMock.Setup(p => p.GetPostById(It.IsAny())).Returns(Task.FromResult(readPostServiceModel)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPostWebModel); + this._postServiceMock + .Setup(p => p.GetPostById(It.IsAny())) + .Returns(Task.FromResult(readPostServiceModel)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readPostWebModel); IActionResult result = this._postController.GetById(id).Result; @@ -153,10 +175,18 @@ namespace DevHive.Web.Tests NewMessage = MESSAGE }; - this._postServiceMock.Setup(p => p.UpdatePost(It.IsAny())).Returns(Task.FromResult(id)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updatePostServiceModel); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._postServiceMock + .Setup(p => p.UpdatePost(It.IsAny())) + .Returns(Task.FromResult(id)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(updatePostServiceModel); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._postServiceMock + .Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._postController.Update(id, updatePostWebModel, null).Result; @@ -177,10 +207,18 @@ namespace DevHive.Web.Tests NewMessage = MESSAGE }; - this._postServiceMock.Setup(p => p.UpdatePost(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updatePostServiceModel); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._postServiceMock + .Setup(p => p.UpdatePost(It.IsAny())) + .Returns(Task.FromResult(Guid.Empty)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(updatePostServiceModel); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._postServiceMock + .Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._postController.Update(id, updatePostWebModel, null).Result; Assert.IsInstanceOf(result); @@ -199,7 +237,9 @@ namespace DevHive.Web.Tests NewMessage = MESSAGE }; - this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this._postServiceMock + .Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(false)); IActionResult result = this._postController.Update(Guid.Empty, updatePostWebModel, null).Result; @@ -213,9 +253,15 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this._postServiceMock.Setup(p => p.DeletePost(It.IsAny())).Returns(Task.FromResult(true)); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._postServiceMock + .Setup(p => p.DeletePost(It.IsAny())) + .Returns(Task.FromResult(true)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._postServiceMock + .Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._postController.Delete(id, null).Result; @@ -228,9 +274,15 @@ namespace DevHive.Web.Tests string message = "Could not delete Post"; Guid id = Guid.NewGuid(); - this._postServiceMock.Setup(p => p.DeletePost(It.IsAny())).Returns(Task.FromResult(false)); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._postServiceMock + .Setup(p => p.DeletePost(It.IsAny())) + .Returns(Task.FromResult(false)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._postServiceMock + .Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._postController.Delete(id, null).Result; @@ -245,7 +297,9 @@ namespace DevHive.Web.Tests [Test] public void DeletePost_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() { - this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this._postServiceMock + .Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(false)); IActionResult result = this._postController.Delete(Guid.Empty, null).Result; diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs index 83358a0..0f835c1 100644 --- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs @@ -42,8 +42,12 @@ namespace DevHive.Web.Tests }; Guid id = Guid.NewGuid(); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createRoleServiceModel); - this._roleServiceMock.Setup(p => p.CreateRole(It.IsAny())).Returns(Task.FromResult(id)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(createRoleServiceModel); + this._roleServiceMock + .Setup(p => p.CreateRole(It.IsAny())) + .Returns(Task.FromResult(id)); IActionResult result = this._roleController.Create(createRoleWebModel).Result; @@ -74,8 +78,12 @@ namespace DevHive.Web.Tests Guid id = Guid.Empty; string errorMessage = $"Could not create role {NAME}"; - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); - this._roleServiceMock.Setup(p => p.CreateRole(It.IsAny())).Returns(Task.FromResult(id)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(createTechnologyServiceModel); + this._roleServiceMock + .Setup(p => p.CreateRole(It.IsAny())) + .Returns(Task.FromResult(id)); IActionResult result = this._roleController.Create(createTechnologyWebModel).Result; @@ -103,8 +111,12 @@ namespace DevHive.Web.Tests Name = NAME }; - this._roleServiceMock.Setup(p => p.GetRoleById(It.IsAny())).Returns(Task.FromResult(roleServiceModel)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(roleWebModel); + this._roleServiceMock + .Setup(p => p.GetRoleById(It.IsAny())) + .Returns(Task.FromResult(roleServiceModel)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(roleWebModel); IActionResult result = this._roleController.GetById(id).Result; @@ -131,8 +143,12 @@ namespace DevHive.Web.Tests Name = NAME }; - this._roleServiceMock.Setup(p => p.UpdateRole(It.IsAny())).Returns(Task.FromResult(true)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateRoleServiceModel); + this._roleServiceMock + .Setup(p => p.UpdateRole(It.IsAny())) + .Returns(Task.FromResult(true)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(updateRoleServiceModel); IActionResult result = this._roleController.Update(id, updateRoleWebModel).Result; @@ -153,8 +169,12 @@ namespace DevHive.Web.Tests Name = NAME }; - this._roleServiceMock.Setup(p => p.UpdateRole(It.IsAny())).Returns(Task.FromResult(false)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateRoleServiceModel); + this._roleServiceMock + .Setup(p => p.UpdateRole(It.IsAny())) + .Returns(Task.FromResult(false)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(updateRoleServiceModel); IActionResult result = this._roleController.Update(id, updateRoleWebModel).Result; Assert.IsInstanceOf(result); @@ -172,7 +192,9 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this._roleServiceMock.Setup(p => p.DeleteRole(It.IsAny())).Returns(Task.FromResult(true)); + this._roleServiceMock + .Setup(p => p.DeleteRole(It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._roleController.Delete(id).Result; @@ -180,12 +202,14 @@ namespace DevHive.Web.Tests } [Test] - public void Delet_ReturnsBadRequestObjectResult_WhenRoleIsNotDeletedSuccessfully() + public void Delete_ReturnsBadRequestObjectResult_WhenRoleIsNotDeletedSuccessfully() { string message = "Could not delete role!"; Guid id = Guid.NewGuid(); - this._roleServiceMock.Setup(p => p.DeleteRole(It.IsAny())).Returns(Task.FromResult(false)); + this._roleServiceMock + .Setup(p => p.DeleteRole(It.IsAny())) + .Returns(Task.FromResult(false)); IActionResult result = this._roleController.Delete(id).Result; diff --git a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs index 64b128c..76d291d 100644 --- a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs @@ -44,8 +44,12 @@ namespace DevHive.Web.Tests }; Guid id = Guid.NewGuid(); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); - this._technologyServiceMock.Setup(p => p.CreateTechnology(It.IsAny())).Returns(Task.FromResult(id)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(createTechnologyServiceModel); + this._technologyServiceMock + .Setup(p => p.CreateTechnology(It.IsAny())) + .Returns(Task.FromResult(id)); IActionResult result = this._technologyController.Create(createTechnologyWebModel).Result; @@ -76,8 +80,12 @@ namespace DevHive.Web.Tests Guid id = Guid.Empty; string errorMessage = $"Could not create technology {NAME}"; - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(createTechnologyServiceModel); - this._technologyServiceMock.Setup(p => p.CreateTechnology(It.IsAny())).Returns(Task.FromResult(id)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(createTechnologyServiceModel); + this._technologyServiceMock + .Setup(p => p.CreateTechnology(It.IsAny())) + .Returns(Task.FromResult(id)); IActionResult result = this._technologyController.Create(createTechnologyWebModel).Result; @@ -105,8 +113,12 @@ namespace DevHive.Web.Tests Name = NAME }; - this._technologyServiceMock.Setup(p => p.GetTechnologyById(It.IsAny())).Returns(Task.FromResult(readTechnologyServiceModel)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readTechnologyWebModel); + this._technologyServiceMock + .Setup(p => p.GetTechnologyById(It.IsAny())) + .Returns(Task.FromResult(readTechnologyServiceModel)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readTechnologyWebModel); IActionResult result = this._technologyController.GetById(id).Result; @@ -133,8 +145,12 @@ namespace DevHive.Web.Tests Name = NAME }; - this._technologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny())).Returns(Task.FromResult(true)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateTechnologyServiceModel); + this._technologyServiceMock + .Setup(p => p.UpdateTechnology(It.IsAny())) + .Returns(Task.FromResult(true)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(updateTechnologyServiceModel); IActionResult result = this._technologyController.Update(id, updateTechnologyWebModel).Result; @@ -155,8 +171,12 @@ namespace DevHive.Web.Tests Name = NAME }; - this._technologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny())).Returns(Task.FromResult(false)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateTechnologyServiceModel); + this._technologyServiceMock + .Setup(p => p.UpdateTechnology(It.IsAny())) + .Returns(Task.FromResult(false)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(updateTechnologyServiceModel); IActionResult result = this._technologyController.Update(id, updateTechnologyWebModel).Result; Assert.IsInstanceOf(result); @@ -174,7 +194,9 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this._technologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny())).Returns(Task.FromResult(true)); + this._technologyServiceMock + .Setup(p => p.DeleteTechnology(It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._technologyController.Delete(id).Result; @@ -187,7 +209,9 @@ namespace DevHive.Web.Tests string message = "Could not delete Technology"; Guid id = Guid.NewGuid(); - this._technologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny())).Returns(Task.FromResult(false)); + this._technologyServiceMock + .Setup(p => p.DeleteTechnology(It.IsAny())) + .Returns(Task.FromResult(false)); IActionResult result = this._technologyController.Delete(id).Result; diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs index 89e5fc9..ad7bdd9 100644 --- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs @@ -47,9 +47,15 @@ namespace DevHive.Web.Tests TokenModel tokenModel = new(token); TokenWebModel tokenWebModel = new(token); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(loginServiceModel); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(tokenWebModel); - this._userServiceMock.Setup(p => p.LoginUser(It.IsAny())).Returns(Task.FromResult(tokenModel)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(loginServiceModel); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(tokenWebModel); + this._userServiceMock + .Setup(p => p.LoginUser(It.IsAny())) + .Returns(Task.FromResult(tokenModel)); IActionResult result = this._userController.Login(loginWebModel).Result; @@ -75,9 +81,15 @@ namespace DevHive.Web.Tests TokenModel tokenModel = new(token); TokenWebModel tokenWebModel = new(token); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(registerServiceModel); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(tokenWebModel); - this._userServiceMock.Setup(p => p.RegisterUser(It.IsAny())).Returns(Task.FromResult(tokenModel)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(registerServiceModel); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(tokenWebModel); + this._userServiceMock + .Setup(p => p.RegisterUser(It.IsAny())) + .Returns(Task.FromResult(tokenModel)); IActionResult result = this._userController.Register(registerWebModel).Result; @@ -105,9 +117,15 @@ namespace DevHive.Web.Tests UserName = USERNAME }; - this._userServiceMock.Setup(p => p.GetUserById(It.IsAny())).Returns(Task.FromResult(userServiceModel)); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(userWebModel); + this._userServiceMock + .Setup(p => p.GetUserById(It.IsAny())) + .Returns(Task.FromResult(userServiceModel)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(userWebModel); IActionResult result = this._userController.GetById(id, null).Result; @@ -122,7 +140,9 @@ namespace DevHive.Web.Tests [Test] public void GetById_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized() { - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(false); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(false); IActionResult result = this._userController.GetById(Guid.NewGuid(), null).Result; @@ -141,8 +161,12 @@ namespace DevHive.Web.Tests UserName = USERNAME }; - this._userServiceMock.Setup(p => p.GetUserByUsername(It.IsAny())).Returns(Task.FromResult(userServiceModel)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(userWebModel); + this._userServiceMock + .Setup(p => p.GetUserByUsername(It.IsAny())) + .Returns(Task.FromResult(userServiceModel)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(userWebModel); IActionResult result = this._userController.GetUser(null).Result; @@ -173,9 +197,15 @@ namespace DevHive.Web.Tests UserName = USERNAME }; - this._userServiceMock.Setup(p => p.UpdateUser(It.IsAny())).Returns(Task.FromResult(userServiceModel)); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateUserServiceModel); + this._userServiceMock + .Setup(p => p.UpdateUser(It.IsAny())) + .Returns(Task.FromResult(userServiceModel)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(updateUserServiceModel); IActionResult result = this._userController.Update(id, updateUserWebModel, null).Result; @@ -189,8 +219,12 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._userServiceMock.Setup(p => p.DeleteUser(It.IsAny())).Returns(Task.FromResult(true)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._userServiceMock + .Setup(p => p.DeleteUser(It.IsAny())) + .Returns(Task.FromResult(true)); IActionResult result = this._userController.Delete(id, null).Result; @@ -203,8 +237,12 @@ namespace DevHive.Web.Tests string message = "Could not delete User"; Guid id = Guid.NewGuid(); - this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this._userServiceMock.Setup(p => p.DeleteUser(It.IsAny())).Returns(Task.FromResult(false)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._userServiceMock + .Setup(p => p.DeleteUser(It.IsAny())) + .Returns(Task.FromResult(false)); IActionResult result = this._userController.Delete(id, null).Result; -- cgit v1.2.3 From dec1f686cdd1bdd2b1b9a2fe0925369624f46aba Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 14 Mar 2021 11:54:47 +0200 Subject: Made all Returns(Task.FromResult) into ReturnsAsync in Web layer tests --- .../DevHive.Web.Tests/CommentController.Tests.cs | 33 ++++++++++---------- src/Web/DevHive.Web.Tests/FeedController.Tests.cs | 4 +-- .../DevHive.Web.Tests/LanguageController.Tests.cs | 17 +++++------ src/Web/DevHive.Web.Tests/PostController.Tests.cs | 35 +++++++++++----------- src/Web/DevHive.Web.Tests/RoleController.Tests.cs | 17 +++++------ .../TechnologyController.Tests.cs | 17 +++++------ src/Web/DevHive.Web.Tests/UserController.Tests.cs | 17 +++++------ 7 files changed, 67 insertions(+), 73 deletions(-) (limited to 'src/Web/DevHive.Web.Tests/PostController.Tests.cs') diff --git a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs index 4e1715c..830677e 100644 --- a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Threading.Tasks; using AutoMapper; using DevHive.Common.Jwt.Interfaces; using DevHive.Services.Interfaces; @@ -52,13 +51,13 @@ namespace DevHive.Web.Tests .Returns(createCommentServiceModel); this._commentServiceMock .Setup(p => p.AddComment(It.IsAny())) - .Returns(Task.FromResult(id)); + .ReturnsAsync(id); this._jwtServiceMock .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) .Returns(true); this._commentServiceMock .Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; @@ -94,13 +93,13 @@ namespace DevHive.Web.Tests .Returns(createCommentServiceModel); this._commentServiceMock .Setup(p => p.AddComment(It.IsAny())) - .Returns(Task.FromResult(Guid.Empty)); + .ReturnsAsync(Guid.Empty); this._jwtServiceMock .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) .Returns(true); this._commentServiceMock .Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; @@ -125,7 +124,7 @@ namespace DevHive.Web.Tests .Returns(true); this._commentServiceMock .Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result; @@ -152,7 +151,7 @@ namespace DevHive.Web.Tests .Returns(true); this._commentServiceMock .Setup(p => p.GetCommentById(It.IsAny())) - .Returns(Task.FromResult(readCommentServiceModel)); + .ReturnsAsync(readCommentServiceModel); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(readCommentWebModel); @@ -184,13 +183,13 @@ namespace DevHive.Web.Tests this._commentServiceMock .Setup(p => p.UpdateComment(It.IsAny())) - .Returns(Task.FromResult(id)); + .ReturnsAsync(id); this._jwtServiceMock .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) .Returns(true); this._commentServiceMock .Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(updateCommentServiceModel); @@ -221,13 +220,13 @@ namespace DevHive.Web.Tests this._commentServiceMock .Setup(p => p.UpdateComment(It.IsAny())) - .Returns(Task.FromResult(Guid.Empty)); + .ReturnsAsync(Guid.Empty); this._jwtServiceMock .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) .Returns(true); this._commentServiceMock .Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(updateCommentServiceModel); @@ -252,7 +251,7 @@ namespace DevHive.Web.Tests this._jwtServiceMock .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) .Returns(false); - // this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + // this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())).ReturnsAsync(false)); IActionResult result = this._commentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result; @@ -268,13 +267,13 @@ namespace DevHive.Web.Tests this._commentServiceMock .Setup(p => p.DeleteComment(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._jwtServiceMock .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) .Returns(true); this._commentServiceMock .Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._commentController.DeleteComment(id, null).Result; @@ -289,13 +288,13 @@ namespace DevHive.Web.Tests this._commentServiceMock .Setup(p => p.DeleteComment(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._jwtServiceMock .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) .Returns(true); this._commentServiceMock .Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._commentController.DeleteComment(id, null).Result; @@ -315,7 +314,7 @@ namespace DevHive.Web.Tests .Returns(true); this._commentServiceMock .Setup(p => p.ValidateJwtForComment(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); IActionResult result = this._commentController.DeleteComment(Guid.Empty, null).Result; diff --git a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs index 7a7fd8d..3af2b48 100644 --- a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs @@ -50,7 +50,7 @@ namespace DevHive.Web.Tests this._feedServiceMock .Setup(p => p.GetPage(It.IsAny())) - .Returns(Task.FromResult(readPageServiceModel)); + .ReturnsAsync(readPageServiceModel); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(getPageServiceModel); @@ -88,7 +88,7 @@ namespace DevHive.Web.Tests this._feedServiceMock .Setup(p => p.GetUserPage(It.IsAny())) - .Returns(Task.FromResult(readPageServiceModel)); + .ReturnsAsync(readPageServiceModel); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(getPageServiceModel); diff --git a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs index de882fc..34f1fc5 100644 --- a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Threading.Tasks; using AutoMapper; using DevHive.Services.Interfaces; using DevHive.Services.Models.Language; @@ -12,7 +11,7 @@ using NUnit.Framework; namespace DevHive.Web.Tests { - [TestFixture] + [TestFixture] public class LanguageControllerTests { const string NAME = "Gosho Trapov"; @@ -47,7 +46,7 @@ namespace DevHive.Web.Tests .Returns(createLanguageServiceModel); this._languageServiceMock .Setup(p => p.CreateLanguage(It.IsAny())) - .Returns(Task.FromResult(id)); + .ReturnsAsync(id); IActionResult result = this._languageController.Create(createLanguageWebModel).Result; @@ -83,7 +82,7 @@ namespace DevHive.Web.Tests .Returns(createTechnologyServiceModel); this._languageServiceMock .Setup(p => p.CreateLanguage(It.IsAny())) - .Returns(Task.FromResult(id)); + .ReturnsAsync(id); IActionResult result = this._languageController.Create(createTechnologyWebModel).Result; @@ -113,7 +112,7 @@ namespace DevHive.Web.Tests this._languageServiceMock .Setup(p => p.GetLanguageById(It.IsAny())) - .Returns(Task.FromResult(readLanguageServiceModel)); + .ReturnsAsync(readLanguageServiceModel); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(readLanguageWebModel); @@ -145,7 +144,7 @@ namespace DevHive.Web.Tests this._languageServiceMock .Setup(p => p.UpdateLanguage(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(updateLanguageServiceModel); @@ -171,7 +170,7 @@ namespace DevHive.Web.Tests this._languageServiceMock .Setup(p => p.UpdateLanguage(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(updateLanguageServiceModel); @@ -194,7 +193,7 @@ namespace DevHive.Web.Tests this._languageServiceMock .Setup(p => p.DeleteLanguage(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._languageController.Delete(id).Result; @@ -209,7 +208,7 @@ namespace DevHive.Web.Tests this._languageServiceMock .Setup(p => p.DeleteLanguage(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); IActionResult result = this._languageController.Delete(id).Result; diff --git a/src/Web/DevHive.Web.Tests/PostController.Tests.cs b/src/Web/DevHive.Web.Tests/PostController.Tests.cs index 384a92a..93cce1d 100644 --- a/src/Web/DevHive.Web.Tests/PostController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/PostController.Tests.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Threading.Tasks; using AutoMapper; using DevHive.Common.Jwt.Interfaces; using DevHive.Services.Interfaces; @@ -13,7 +12,7 @@ using NUnit.Framework; namespace DevHive.Web.Tests { - [TestFixture] + [TestFixture] public class PostControllerTests { const string MESSAGE = "Gosho Trapov"; @@ -50,13 +49,13 @@ namespace DevHive.Web.Tests .Returns(createPostServiceModel); this._postServiceMock .Setup(p => p.CreatePost(It.IsAny())) - .Returns(Task.FromResult(id)); + .ReturnsAsync(id); this._jwtServiceMock .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) .Returns(true); this._postServiceMock .Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._postController.Create(Guid.Empty, createPostWebModel, null).Result; @@ -92,13 +91,13 @@ namespace DevHive.Web.Tests .Returns(createTechnologyServiceModel); this._postServiceMock .Setup(p => p.CreatePost(It.IsAny())) - .Returns(Task.FromResult(id)); + .ReturnsAsync(id); this._jwtServiceMock .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) .Returns(true); this._postServiceMock .Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._postController.Create(Guid.Empty, createTechnologyWebModel, null).Result; @@ -120,7 +119,7 @@ namespace DevHive.Web.Tests this._postServiceMock .Setup(p => p.ValidateJwtForCreating(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); IActionResult result = this._postController.Create(Guid.NewGuid(), createPostWebModel, null).Result; @@ -145,7 +144,7 @@ namespace DevHive.Web.Tests this._postServiceMock .Setup(p => p.GetPostById(It.IsAny())) - .Returns(Task.FromResult(readPostServiceModel)); + .ReturnsAsync(readPostServiceModel); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(readPostWebModel); @@ -177,7 +176,7 @@ namespace DevHive.Web.Tests this._postServiceMock .Setup(p => p.UpdatePost(It.IsAny())) - .Returns(Task.FromResult(id)); + .ReturnsAsync(id); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(updatePostServiceModel); @@ -186,7 +185,7 @@ namespace DevHive.Web.Tests .Returns(true); this._postServiceMock .Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._postController.Update(id, updatePostWebModel, null).Result; @@ -209,7 +208,7 @@ namespace DevHive.Web.Tests this._postServiceMock .Setup(p => p.UpdatePost(It.IsAny())) - .Returns(Task.FromResult(Guid.Empty)); + .ReturnsAsync(Guid.Empty); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(updatePostServiceModel); @@ -218,7 +217,7 @@ namespace DevHive.Web.Tests .Returns(true); this._postServiceMock .Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._postController.Update(id, updatePostWebModel, null).Result; Assert.IsInstanceOf(result); @@ -239,7 +238,7 @@ namespace DevHive.Web.Tests this._postServiceMock .Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); IActionResult result = this._postController.Update(Guid.Empty, updatePostWebModel, null).Result; @@ -255,13 +254,13 @@ namespace DevHive.Web.Tests this._postServiceMock .Setup(p => p.DeletePost(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._jwtServiceMock .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) .Returns(true); this._postServiceMock .Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._postController.Delete(id, null).Result; @@ -276,13 +275,13 @@ namespace DevHive.Web.Tests this._postServiceMock .Setup(p => p.DeletePost(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._jwtServiceMock .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) .Returns(true); this._postServiceMock .Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._postController.Delete(id, null).Result; @@ -299,7 +298,7 @@ namespace DevHive.Web.Tests { this._postServiceMock .Setup(p => p.ValidateJwtForPost(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); IActionResult result = this._postController.Delete(Guid.Empty, null).Result; diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs index 0f835c1..0e19221 100644 --- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Threading.Tasks; using AutoMapper; using DevHive.Services.Interfaces; using DevHive.Services.Models.Role; @@ -12,7 +11,7 @@ using NUnit.Framework; namespace DevHive.Web.Tests { - [TestFixture] + [TestFixture] public class RoleControllerTests { const string NAME = "Gosho Trapov"; @@ -47,7 +46,7 @@ namespace DevHive.Web.Tests .Returns(createRoleServiceModel); this._roleServiceMock .Setup(p => p.CreateRole(It.IsAny())) - .Returns(Task.FromResult(id)); + .ReturnsAsync(id); IActionResult result = this._roleController.Create(createRoleWebModel).Result; @@ -83,7 +82,7 @@ namespace DevHive.Web.Tests .Returns(createTechnologyServiceModel); this._roleServiceMock .Setup(p => p.CreateRole(It.IsAny())) - .Returns(Task.FromResult(id)); + .ReturnsAsync(id); IActionResult result = this._roleController.Create(createTechnologyWebModel).Result; @@ -113,7 +112,7 @@ namespace DevHive.Web.Tests this._roleServiceMock .Setup(p => p.GetRoleById(It.IsAny())) - .Returns(Task.FromResult(roleServiceModel)); + .ReturnsAsync(roleServiceModel); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(roleWebModel); @@ -145,7 +144,7 @@ namespace DevHive.Web.Tests this._roleServiceMock .Setup(p => p.UpdateRole(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(updateRoleServiceModel); @@ -171,7 +170,7 @@ namespace DevHive.Web.Tests this._roleServiceMock .Setup(p => p.UpdateRole(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(updateRoleServiceModel); @@ -194,7 +193,7 @@ namespace DevHive.Web.Tests this._roleServiceMock .Setup(p => p.DeleteRole(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._roleController.Delete(id).Result; @@ -209,7 +208,7 @@ namespace DevHive.Web.Tests this._roleServiceMock .Setup(p => p.DeleteRole(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); IActionResult result = this._roleController.Delete(id).Result; diff --git a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs index 76d291d..06e1ea2 100644 --- a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs @@ -8,11 +8,10 @@ using Moq; using NUnit.Framework; using System; using System.Linq; -using System.Threading.Tasks; namespace DevHive.Web.Tests { - [TestFixture] + [TestFixture] public class TechnologyControllerTests { const string NAME = "Gosho Trapov"; @@ -49,7 +48,7 @@ namespace DevHive.Web.Tests .Returns(createTechnologyServiceModel); this._technologyServiceMock .Setup(p => p.CreateTechnology(It.IsAny())) - .Returns(Task.FromResult(id)); + .ReturnsAsync(id); IActionResult result = this._technologyController.Create(createTechnologyWebModel).Result; @@ -85,7 +84,7 @@ namespace DevHive.Web.Tests .Returns(createTechnologyServiceModel); this._technologyServiceMock .Setup(p => p.CreateTechnology(It.IsAny())) - .Returns(Task.FromResult(id)); + .ReturnsAsync(id); IActionResult result = this._technologyController.Create(createTechnologyWebModel).Result; @@ -115,7 +114,7 @@ namespace DevHive.Web.Tests this._technologyServiceMock .Setup(p => p.GetTechnologyById(It.IsAny())) - .Returns(Task.FromResult(readTechnologyServiceModel)); + .ReturnsAsync(readTechnologyServiceModel); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(readTechnologyWebModel); @@ -147,7 +146,7 @@ namespace DevHive.Web.Tests this._technologyServiceMock .Setup(p => p.UpdateTechnology(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(updateTechnologyServiceModel); @@ -173,7 +172,7 @@ namespace DevHive.Web.Tests this._technologyServiceMock .Setup(p => p.UpdateTechnology(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(updateTechnologyServiceModel); @@ -196,7 +195,7 @@ namespace DevHive.Web.Tests this._technologyServiceMock .Setup(p => p.DeleteTechnology(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._technologyController.Delete(id).Result; @@ -211,7 +210,7 @@ namespace DevHive.Web.Tests this._technologyServiceMock .Setup(p => p.DeleteTechnology(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); IActionResult result = this._technologyController.Delete(id).Result; diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs index ad7bdd9..10d3c6b 100644 --- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs @@ -1,5 +1,4 @@ using System; -using System.Threading.Tasks; using AutoMapper; using DevHive.Common.Jwt.Interfaces; using DevHive.Common.Models.Identity; @@ -13,7 +12,7 @@ using NUnit.Framework; namespace DevHive.Web.Tests { - [TestFixture] + [TestFixture] public class UserControllerTests { const string USERNAME = "Gosho Trapov"; @@ -55,7 +54,7 @@ namespace DevHive.Web.Tests .Returns(tokenWebModel); this._userServiceMock .Setup(p => p.LoginUser(It.IsAny())) - .Returns(Task.FromResult(tokenModel)); + .ReturnsAsync(tokenModel); IActionResult result = this._userController.Login(loginWebModel).Result; @@ -89,7 +88,7 @@ namespace DevHive.Web.Tests .Returns(tokenWebModel); this._userServiceMock .Setup(p => p.RegisterUser(It.IsAny())) - .Returns(Task.FromResult(tokenModel)); + .ReturnsAsync(tokenModel); IActionResult result = this._userController.Register(registerWebModel).Result; @@ -119,7 +118,7 @@ namespace DevHive.Web.Tests this._userServiceMock .Setup(p => p.GetUserById(It.IsAny())) - .Returns(Task.FromResult(userServiceModel)); + .ReturnsAsync(userServiceModel); this._jwtServiceMock .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) .Returns(true); @@ -163,7 +162,7 @@ namespace DevHive.Web.Tests this._userServiceMock .Setup(p => p.GetUserByUsername(It.IsAny())) - .Returns(Task.FromResult(userServiceModel)); + .ReturnsAsync(userServiceModel); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(userWebModel); @@ -199,7 +198,7 @@ namespace DevHive.Web.Tests this._userServiceMock .Setup(p => p.UpdateUser(It.IsAny())) - .Returns(Task.FromResult(userServiceModel)); + .ReturnsAsync(userServiceModel); this._jwtServiceMock .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) .Returns(true); @@ -224,7 +223,7 @@ namespace DevHive.Web.Tests .Returns(true); this._userServiceMock .Setup(p => p.DeleteUser(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); IActionResult result = this._userController.Delete(id, null).Result; @@ -242,7 +241,7 @@ namespace DevHive.Web.Tests .Returns(true); this._userServiceMock .Setup(p => p.DeleteUser(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); IActionResult result = this._userController.Delete(id, null).Result; -- cgit v1.2.3 From e3b5757b5a5db2f7874b0924cdd4a22b1a9e1ee2 Mon Sep 17 00:00:00 2001 From: transtrike Date: Mon, 15 Mar 2021 09:23:25 +0200 Subject: Fixed to new() where possible and readable --- .../DevHive.Web.Tests/CommentController.Tests.cs | 6 ++--- src/Web/DevHive.Web.Tests/FeedController.Tests.cs | 26 +++++++++++----------- .../DevHive.Web.Tests/LanguageController.Tests.cs | 26 +++++++++++----------- src/Web/DevHive.Web.Tests/PostController.Tests.cs | 6 ++--- src/Web/DevHive.Web.Tests/RoleController.Tests.cs | 26 +++++++++++----------- .../TechnologyController.Tests.cs | 26 +++++++++++----------- src/Web/DevHive.Web.Tests/UserController.Tests.cs | 6 ++--- .../Configurations/Extensions/ConfigureSwagger.cs | 4 ++-- 8 files changed, 63 insertions(+), 63 deletions(-) (limited to 'src/Web/DevHive.Web.Tests/PostController.Tests.cs') diff --git a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs index 7860f3c..d5ba5a3 100644 --- a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs @@ -24,9 +24,9 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.CommentServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.CommentController = new CommentController(this.CommentServiceMock.Object, this.MapperMock.Object); + this.CommentServiceMock = new(); + this.MapperMock = new(); + this.CommentController = new(this.CommentServiceMock.Object, this.MapperMock.Object); } #endregion diff --git a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs index 01f67e5..646ad93 100644 --- a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs @@ -25,9 +25,9 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.FeedServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.FeedController = new FeedController(this.FeedServiceMock.Object, this.MapperMock.Object); + this.FeedServiceMock = new(); + this.MapperMock = new(); + this.FeedController = new(this.FeedServiceMock.Object, this.MapperMock.Object); } #endregion @@ -35,12 +35,12 @@ namespace DevHive.Web.Tests [Test] public async Task GetPosts_ReturnsOkObjectResultWithCorrectReadPageWebModel_WhenPostsExist() { - GetPageWebModel getPageWebModel = new GetPageWebModel { }; - GetPageServiceModel getPageServiceModel = new GetPageServiceModel { }; - ReadPageServiceModel readPageServiceModel = new ReadPageServiceModel { }; - ReadPageWebModel readPageWebModel = new ReadPageWebModel + GetPageWebModel getPageWebModel = new(); + GetPageServiceModel getPageServiceModel = new(); + ReadPageServiceModel readPageServiceModel = new(); + ReadPageWebModel readPageWebModel = new() { - Posts = new List + Posts = new() { new ReadPostWebModel(), new ReadPostWebModel(), @@ -67,12 +67,12 @@ namespace DevHive.Web.Tests [Test] public async Task GetUserPosts_GetsPostsOfUser_WhenTheyExist() { - GetPageWebModel getPageWebModel = new GetPageWebModel { }; - GetPageServiceModel getPageServiceModel = new GetPageServiceModel { }; - ReadPageServiceModel readPageServiceModel = new ReadPageServiceModel { }; - ReadPageWebModel readPageWebModel = new ReadPageWebModel + GetPageWebModel getPageWebModel = new(); + GetPageServiceModel getPageServiceModel = new(); + ReadPageServiceModel readPageServiceModel = new(); + ReadPageWebModel readPageWebModel = new() { - Posts = new List + Posts = new() { new ReadPostWebModel(), new ReadPostWebModel(), diff --git a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs index af4672a..8724d1a 100644 --- a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs @@ -23,20 +23,20 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.LanguageServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.LanguageController = new LanguageController(this.LanguageServiceMock.Object, this.MapperMock.Object); + this.LanguageServiceMock = new(); + this.MapperMock = new(); + this.LanguageController = new(this.LanguageServiceMock.Object, this.MapperMock.Object); } #region Create [Test] public void CreateLanguage_ReturnsOkObjectResult_WhenLanguageIsSuccessfullyCreated() { - CreateLanguageWebModel createLanguageWebModel = new CreateLanguageWebModel + CreateLanguageWebModel createLanguageWebModel = new() { Name = NAME }; - CreateLanguageServiceModel createLanguageServiceModel = new CreateLanguageServiceModel + CreateLanguageServiceModel createLanguageServiceModel = new() { Name = NAME }; @@ -63,11 +63,11 @@ namespace DevHive.Web.Tests [Test] public void CreateLanguage_ReturnsBadRequestObjectResult_WhenLanguageIsNotCreatedSuccessfully() { - CreateLanguageWebModel createTechnologyWebModel = new CreateLanguageWebModel + CreateLanguageWebModel createTechnologyWebModel = new() { Name = NAME }; - CreateLanguageServiceModel createTechnologyServiceModel = new CreateLanguageServiceModel + CreateLanguageServiceModel createTechnologyServiceModel = new() { Name = NAME }; @@ -94,11 +94,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - ReadLanguageServiceModel readLanguageServiceModel = new ReadLanguageServiceModel + ReadLanguageServiceModel readLanguageServiceModel = new() { Name = NAME }; - ReadLanguageWebModel readLanguageWebModel = new ReadLanguageWebModel + ReadLanguageWebModel readLanguageWebModel = new() { Name = NAME }; @@ -122,11 +122,11 @@ namespace DevHive.Web.Tests public void Update_ShouldReturnOkResult_WhenLanguageIsUpdatedSuccessfully() { Guid id = Guid.NewGuid(); - UpdateLanguageWebModel updateLanguageWebModel = new UpdateLanguageWebModel + UpdateLanguageWebModel updateLanguageWebModel = new() { Name = NAME }; - UpdateLanguageServiceModel updateLanguageServiceModel = new UpdateLanguageServiceModel + UpdateLanguageServiceModel updateLanguageServiceModel = new() { Name = NAME }; @@ -144,11 +144,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); string message = "Could not update Language"; - UpdateLanguageWebModel updateLanguageWebModel = new UpdateLanguageWebModel + UpdateLanguageWebModel updateLanguageWebModel = new() { Name = NAME }; - UpdateLanguageServiceModel updateLanguageServiceModel = new UpdateLanguageServiceModel + UpdateLanguageServiceModel updateLanguageServiceModel = new() { Name = NAME }; diff --git a/src/Web/DevHive.Web.Tests/PostController.Tests.cs b/src/Web/DevHive.Web.Tests/PostController.Tests.cs index f10f8dd..d2107af 100644 --- a/src/Web/DevHive.Web.Tests/PostController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/PostController.Tests.cs @@ -23,9 +23,9 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.PostServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.PostController = new PostController(this.PostServiceMock.Object, this.MapperMock.Object); + this.PostServiceMock = new(); + this.MapperMock = new(); + this.PostController = new(this.PostServiceMock.Object, this.MapperMock.Object); } #region Create diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs index ff80dc0..1eaf0c5 100644 --- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs @@ -23,20 +23,20 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.RoleServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.RoleController = new RoleController(this.RoleServiceMock.Object, this.MapperMock.Object); + this.RoleServiceMock = new(); + this.MapperMock = new(); + this.RoleController = new(this.RoleServiceMock.Object, this.MapperMock.Object); } #region Create [Test] public void CreateRole_ReturnsOkObjectResult_WhenRoleIsSuccessfullyCreated() { - CreateRoleWebModel createRoleWebModel = new CreateRoleWebModel + CreateRoleWebModel createRoleWebModel = new() { Name = NAME }; - CreateRoleServiceModel createRoleServiceModel = new CreateRoleServiceModel + CreateRoleServiceModel createRoleServiceModel = new() { Name = NAME }; @@ -63,11 +63,11 @@ namespace DevHive.Web.Tests [Test] public void CreateRole_ReturnsBadRequestObjectResult_WhenRoleIsNotCreatedSuccessfully() { - CreateRoleWebModel createTechnologyWebModel = new CreateRoleWebModel + CreateRoleWebModel createTechnologyWebModel = new() { Name = NAME }; - CreateRoleServiceModel createTechnologyServiceModel = new CreateRoleServiceModel + CreateRoleServiceModel createTechnologyServiceModel = new() { Name = NAME }; @@ -94,11 +94,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - RoleServiceModel roleServiceModel = new RoleServiceModel + RoleServiceModel roleServiceModel = new() { Name = NAME }; - RoleWebModel roleWebModel = new RoleWebModel + RoleWebModel roleWebModel = new() { Name = NAME }; @@ -122,11 +122,11 @@ namespace DevHive.Web.Tests public void Update_ShouldReturnOkResult_WhenRoleIsUpdatedSuccessfully() { Guid id = Guid.NewGuid(); - UpdateRoleWebModel updateRoleWebModel = new UpdateRoleWebModel + UpdateRoleWebModel updateRoleWebModel = new() { Name = NAME }; - UpdateRoleServiceModel updateRoleServiceModel = new UpdateRoleServiceModel + UpdateRoleServiceModel updateRoleServiceModel = new() { Name = NAME }; @@ -144,11 +144,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); string message = "Could not update role!"; - UpdateRoleWebModel updateRoleWebModel = new UpdateRoleWebModel + UpdateRoleWebModel updateRoleWebModel = new() { Name = NAME }; - UpdateRoleServiceModel updateRoleServiceModel = new UpdateRoleServiceModel + UpdateRoleServiceModel updateRoleServiceModel = new() { Name = NAME }; diff --git a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs index a00f1db..d276951 100644 --- a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs @@ -25,9 +25,9 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.TechnologyServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.TechnologyController = new TechnologyController(this.TechnologyServiceMock.Object, this.MapperMock.Object); + this.TechnologyServiceMock = new(); + this.MapperMock = new(); + this.TechnologyController = new(this.TechnologyServiceMock.Object, this.MapperMock.Object); } #endregion @@ -35,11 +35,11 @@ namespace DevHive.Web.Tests [Test] public void Create_ReturnsOkObjectResult_WhenTechnologyIsSuccessfullyCreated() { - CreateTechnologyWebModel createTechnologyWebModel = new CreateTechnologyWebModel + CreateTechnologyWebModel createTechnologyWebModel = new() { Name = NAME }; - CreateTechnologyServiceModel createTechnologyServiceModel = new CreateTechnologyServiceModel + CreateTechnologyServiceModel createTechnologyServiceModel = new() { Name = NAME }; @@ -66,11 +66,11 @@ namespace DevHive.Web.Tests [Test] public void Create_ReturnsBadRequestObjectResult_WhenTechnologyIsNotCreatedSuccessfully() { - CreateTechnologyWebModel createTechnologyWebModel = new CreateTechnologyWebModel + CreateTechnologyWebModel createTechnologyWebModel = new() { Name = NAME }; - CreateTechnologyServiceModel createTechnologyServiceModel = new CreateTechnologyServiceModel + CreateTechnologyServiceModel createTechnologyServiceModel = new() { Name = NAME }; @@ -97,11 +97,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - ReadTechnologyWebModel readTechnologyWebModel = new ReadTechnologyWebModel + ReadTechnologyWebModel readTechnologyWebModel = new() { Name = NAME }; - ReadTechnologyServiceModel readTechnologyServiceModel = new ReadTechnologyServiceModel + ReadTechnologyServiceModel readTechnologyServiceModel = new() { Name = NAME }; @@ -125,11 +125,11 @@ namespace DevHive.Web.Tests public void Update_ShouldReturnOkResult_WhenTechnologyIsUpdatedSuccessfully() { Guid id = Guid.NewGuid(); - UpdateTechnologyWebModel updateTechnologyWebModel = new UpdateTechnologyWebModel + UpdateTechnologyWebModel updateTechnologyWebModel = new() { Name = NAME }; - UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel + UpdateTechnologyServiceModel updateTechnologyServiceModel = new() { Name = NAME }; @@ -147,11 +147,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); string message = "Could not update Technology"; - UpdateTechnologyWebModel updateTechnologyWebModel = new UpdateTechnologyWebModel + UpdateTechnologyWebModel updateTechnologyWebModel = new() { Name = NAME }; - UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel + UpdateTechnologyServiceModel updateTechnologyServiceModel = new() { Name = NAME }; diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs index e12738e..3dfcfa3 100644 --- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs @@ -23,9 +23,9 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.UserServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.UserController = new UserController(this.UserServiceMock.Object, this.MapperMock.Object); + this.UserServiceMock = new(); + this.MapperMock = new(); + this.UserController = new(this.UserServiceMock.Object, this.MapperMock.Object); } #region Create diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs index 9387561..1b7182c 100644 --- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs +++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs @@ -30,14 +30,14 @@ namespace DevHive.Web.Configurations.Extensions doc.Info.Title = "API"; doc.Info.Description = "DevHive Social Media's first official API release"; doc.Info.TermsOfService = TermsOfServiceUri; - doc.Info.License = new NSwag.OpenApiLicense + doc.Info.License = new() { Name = LicenseName, Url = LicenseUri }; }; - c.AddSecurity("Bearer", Enumerable.Empty(), new OpenApiSecurityScheme + c.AddSecurity("Bearer", Enumerable.Empty(), new() { Type = OpenApiSecuritySchemeType.ApiKey, Name = "Authorization", -- cgit v1.2.3