From 503a23c04355624b133161c9356b139f2e4500f6 Mon Sep 17 00:00:00 2001 From: transtrike Date: Mon, 22 Feb 2021 21:51:41 +0200 Subject: Code cleanup of UserTests --- .../DevHive.Services.Tests/CommentService.Tests.cs | 100 +++--- .../DevHive.Services.Tests/UserService.Tests.cs | 393 ++++++++++++--------- 2 files changed, 273 insertions(+), 220 deletions(-) (limited to 'src/Services') diff --git a/src/Services/DevHive.Services.Tests/CommentService.Tests.cs b/src/Services/DevHive.Services.Tests/CommentService.Tests.cs index d511739..d843375 100644 --- a/src/Services/DevHive.Services.Tests/CommentService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/CommentService.Tests.cs @@ -37,22 +37,22 @@ namespace DevHive.Services.Tests public async Task AddComment_ReturnsNonEmptyGuid_WhenEntityIsAddedSuccessfully() { Guid id = Guid.NewGuid(); - User creator = new User { Id = Guid.NewGuid() }; - CreateCommentServiceModel createCommentServiceModel = new CreateCommentServiceModel + User creator = new() { Id = Guid.NewGuid() }; + CreateCommentServiceModel createCommentServiceModel = new() { Message = MESSAGE }; - Comment comment = new Comment + Comment comment = new() { Message = MESSAGE, Id = id, }; - this.CommentRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.CommentRepositoryMock.Setup(p => p.GetCommentByIssuerAndTimeCreatedAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(comment)); - this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(creator)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); + _ = this.CommentRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); + _ = this.CommentRepositoryMock.Setup(p => p.GetCommentByIssuerAndTimeCreatedAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(comment)); + _ = this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); + _ = this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(creator)); + _ = this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); Guid result = await this.CommentService.AddComment(createCommentServiceModel); @@ -62,18 +62,18 @@ namespace DevHive.Services.Tests [Test] public async Task AddComment_ReturnsEmptyGuid_WhenEntityIsNotAddedSuccessfully() { - CreateCommentServiceModel createCommentServiceModel = new CreateCommentServiceModel + CreateCommentServiceModel createCommentServiceModel = new() { Message = MESSAGE }; - Comment comment = new Comment + Comment comment = new() { Message = MESSAGE, }; - this.CommentRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); - this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); + _ = this.CommentRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); + _ = this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); + _ = this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); Guid result = await this.CommentService.AddComment(createCommentServiceModel); @@ -85,7 +85,7 @@ namespace DevHive.Services.Tests { const string EXCEPTION_MESSAGE = "Post does not exist!"; - CreateCommentServiceModel createCommentServiceModel = new CreateCommentServiceModel + CreateCommentServiceModel createCommentServiceModel = new() { Message = MESSAGE }; @@ -100,25 +100,25 @@ namespace DevHive.Services.Tests [Test] public async Task GetCommentById_ReturnsTheComment_WhenItExists() { - Guid creatorId = new Guid(); - User creator = new User { Id = creatorId }; - Comment comment = new Comment + Guid creatorId = new(); + User creator = new() { Id = creatorId }; + Comment comment = new() { Message = MESSAGE, Creator = creator }; - ReadCommentServiceModel commentServiceModel = new ReadCommentServiceModel + ReadCommentServiceModel commentServiceModel = new() { Message = MESSAGE }; - User user = new User + User user = new() { Id = creatorId, }; - this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); - this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(commentServiceModel); + _ = this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); + _ = this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); + _ = this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(commentServiceModel); ReadCommentServiceModel result = await this.CommentService.GetCommentById(new Guid()); @@ -129,15 +129,15 @@ namespace DevHive.Services.Tests public void GetCommentById_ThorwsException_WhenTheUserDoesNotExist() { const string EXCEPTION_MESSAGE = "The user does not exist"; - Guid creatorId = new Guid(); - User creator = new User { Id = creatorId }; - Comment comment = new Comment + Guid creatorId = new(); + User creator = new() { Id = creatorId }; + Comment comment = new() { Message = MESSAGE, Creator = creator }; - this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); + _ = this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); Exception ex = Assert.ThrowsAsync(() => this.CommentService.GetCommentById(new Guid()), "GetCommentById does not throw exception when the user does not exist"); @@ -148,14 +148,14 @@ namespace DevHive.Services.Tests public void GetCommentById_ThrowsException_WhenCommentDoesNotExist() { string exceptionMessage = "The comment does not exist"; - Guid creatorId = new Guid(); - User user = new User + Guid creatorId = new(); + User user = new() { Id = creatorId, }; - this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); - this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); + _ = this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + _ = this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); Exception ex = Assert.ThrowsAsync(() => this.CommentService.GetCommentById(new Guid())); @@ -168,21 +168,21 @@ namespace DevHive.Services.Tests public async Task UpdateComment_ReturnsTheIdOfTheComment_WhenUpdatedSuccessfully() { Guid id = Guid.NewGuid(); - Comment comment = new Comment + Comment comment = new() { Id = id, Message = MESSAGE }; - UpdateCommentServiceModel updateCommentServiceModel = new UpdateCommentServiceModel + UpdateCommentServiceModel updateCommentServiceModel = new() { CommentId = id, NewMessage = MESSAGE }; - this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); - this.CommentRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); + _ = this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); + _ = this.CommentRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + _ = this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); + _ = this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); Guid result = await this.CommentService.UpdateComment(updateCommentServiceModel); @@ -192,19 +192,19 @@ namespace DevHive.Services.Tests [Test] public async Task UpdateComment_ReturnsEmptyId_WhenTheCommentIsNotUpdatedSuccessfully() { - Comment comment = new Comment + Comment comment = new() { Message = MESSAGE }; - UpdateCommentServiceModel updateCommentServiceModel = new UpdateCommentServiceModel + UpdateCommentServiceModel updateCommentServiceModel = new() { CommentId = Guid.NewGuid(), NewMessage = MESSAGE }; - this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); - this.CommentRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); + _ = this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); + _ = this.CommentRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + _ = this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); Guid result = await this.CommentService.UpdateComment(updateCommentServiceModel); @@ -215,11 +215,11 @@ namespace DevHive.Services.Tests public void UpdateComment_ThrowsArgumentException_WhenCommentDoesNotExist() { string exceptionMessage = "Comment does not exist!"; - UpdateCommentServiceModel updateCommentServiceModel = new UpdateCommentServiceModel + UpdateCommentServiceModel updateCommentServiceModel = new() { }; - this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(false)); + _ = this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this.CommentService.UpdateComment(updateCommentServiceModel)); @@ -233,12 +233,12 @@ namespace DevHive.Services.Tests [TestCase(false)] public async Task DeleteComment_ShouldReturnIfDeletionIsSuccessfull_WhenCommentExists(bool shouldPass) { - Guid id = new Guid(); - Comment comment = new Comment(); + Guid id = new(); + Comment comment = new(); - this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); - this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); - this.CommentRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); + _ = this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); + _ = this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); + _ = this.CommentRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); bool result = await this.CommentService.DeleteComment(id); @@ -249,9 +249,9 @@ namespace DevHive.Services.Tests public void DeleteComment_ThrowsException_WhenCommentDoesNotExist() { string exceptionMessage = "Comment does not exist!"; - Guid id = new Guid(); + Guid id = new(); - this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(false)); + _ = this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this.CommentService.DeleteComment(id)); diff --git a/src/Services/DevHive.Services.Tests/UserService.Tests.cs b/src/Services/DevHive.Services.Tests/UserService.Tests.cs index 550106f..8642733 100644 --- a/src/Services/DevHive.Services.Tests/UserService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/UserService.Tests.cs @@ -20,31 +20,37 @@ using NUnit.Framework; namespace DevHive.Services.Tests { - [TestFixture] + [TestFixture] public class UserServiceTests { - private Mock CloudServiceMock { get; set; } - private Mock UserRepositoryMock { get; set; } - private Mock RoleRepositoryMock { get; set; } - private Mock LanguageRepositoryMock { get; set; } - private Mock TechnologyRepositoryMock { get; set; } - private Mock MapperMock { get; set; } - private JwtOptions JwtOptions { get; set; } - private UserService UserService { get; set; } + private Mock _cloudServiceMock; + private Mock _userRepositoryMock; + private Mock _roleRepositoryMock; + private Mock _languageRepositoryMock; + private Mock _technologyRepositoryMock; + private Mock _mapperMock; + private JwtOptions _jwtOptions; + private UserService _userService; #region SetUps [SetUp] public void Setup() { - this.UserRepositoryMock = new Mock(); - this.RoleRepositoryMock = new Mock(); - this.CloudServiceMock = new Mock(); - this.LanguageRepositoryMock = new Mock(); - this.TechnologyRepositoryMock = new Mock(); - 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._userRepositoryMock = new Mock(); + this._roleRepositoryMock = new Mock(); + this._cloudServiceMock = new Mock(); + this._languageRepositoryMock = new Mock(); + this._technologyRepositoryMock = new Mock(); + this._jwtOptions = new JwtOptions("gXfQlU6qpDleFWyimscjYcT3tgFsQg3yoFjcvSLxG56n1Vu2yptdIUq254wlJWjm"); + this._mapperMock = new Mock(); + this._userService = new UserService( + this._userRepositoryMock.Object, + this._languageRepositoryMock.Object, + this._roleRepositoryMock.Object, + this._technologyRepositoryMock.Object, + this._mapperMock.Object, + this._jwtOptions, + this._cloudServiceMock.Object); } #endregion @@ -52,132 +58,149 @@ namespace DevHive.Services.Tests [Test] public async Task LoginUser_ReturnsTokenModel_WhenLoggingUserIn() { - string somePassword = "GoshoTrapovImaGolemChep"; - const string name = "GoshoTrapov"; - string hashedPassword = PasswordModifications.GeneratePasswordHash(somePassword); - LoginServiceModel loginServiceModel = new LoginServiceModel + string somePassword = "I'm_Nigga"; + + LoginServiceModel loginServiceModel = new() { Password = somePassword }; - User user = new User + User user = new() { Id = Guid.NewGuid(), - PasswordHash = hashedPassword, - UserName = name + PasswordHash = somePassword, + UserName = "g_trapov" }; - this.UserRepositoryMock.Setup(p => p.DoesUsernameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.UserRepositoryMock.Setup(p => p.GetByUsernameAsync(It.IsAny())).Returns(Task.FromResult(user)); - - string JWTSecurityToken = this.WriteJWTSecurityToken(user.Id, user.UserName, user.Roles); + this._userRepositoryMock.Setup(p => + p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._userRepositoryMock.Setup(p => + p.GetByUsernameAsync(It.IsAny())) + .Returns(Task.FromResult(user)); - TokenModel tokenModel = await this.UserService.LoginUser(loginServiceModel); + string jwtSecurityToken = this.WriteJWTSecurityToken(user.Id, user.UserName, user.Roles); + TokenModel tokenModel = await this._userService.LoginUser(loginServiceModel); - Assert.AreEqual(JWTSecurityToken, tokenModel.Token, "LoginUser does not return the correct token"); + Assert.AreEqual(jwtSecurityToken, tokenModel.Token, "LoginUser does not return the correct token"); } [Test] public void LoginUser_ThrowsException_WhenUserNameDoesNotExist() { - const string EXCEPTION_MESSAGE = "Invalid username!"; - LoginServiceModel loginServiceModel = new LoginServiceModel - { - }; + LoginServiceModel loginServiceModel = new(); - this.UserRepositoryMock.Setup(p => p.DoesUsernameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._userRepositoryMock.Setup(p => + p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); - Exception ex = Assert.ThrowsAsync(() => this.UserService.LoginUser(loginServiceModel)); + Exception ex = Assert.ThrowsAsync( + () => this._userService.LoginUser(loginServiceModel)); - Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message, "Incorect Exception message"); + Assert.AreEqual("Invalid username!", ex.Message, "Incorrect Exception message"); } [Test] - public void LoginUser_ThroiwsException_WhenPasswordIsIncorect() + public void LoginUser_ThrowsException_WhenPasswordIsIncorrect() { - const string EXCEPTION_MESSAGE = "Incorrect password!"; - string somePassword = "GoshoTrapovImaGolemChep"; - LoginServiceModel loginServiceModel = new LoginServiceModel + string somePassword = "I'm_Nigga"; + + LoginServiceModel loginServiceModel = new() { Password = somePassword }; - User user = new User + User user = new() { Id = Guid.NewGuid(), - PasswordHash = "InvalidPasswordHas" }; - this.UserRepositoryMock.Setup(p => p.DoesUsernameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.UserRepositoryMock.Setup(p => p.GetByUsernameAsync(It.IsAny())).Returns(Task.FromResult(user)); + this._userRepositoryMock.Setup(p => + p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._userRepositoryMock.Setup(p => + p.GetByUsernameAsync(It.IsAny())) + .Returns(Task.FromResult(user)); - Exception ex = Assert.ThrowsAsync(() => this.UserService.LoginUser(loginServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._userService.LoginUser(loginServiceModel)); - Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message, "Incorect Exception message"); + Assert.AreEqual("Incorrect password!", ex.Message, "Incorrect Exception message"); } #endregion #region RegisterUser - // [Test] - // public async Task RegisterUser_ReturnsTokenModel_WhenUserIsSuccessfull() - // { - // string somePassword = "GoshoTrapovImaGolemChep"; - // const string name = "GoshoTrapov"; - // RegisterServiceModel registerServiceModel = new RegisterServiceModel - // { - // Password = somePassword - // }; - // User user = new User - // { - // Id = Guid.NewGuid(), - // UserName = name - // }; - // Role role = new Role { Name = Role.DefaultRole }; - // HashSet roles = new HashSet { role }; - // - // this.UserRepositoryMock.Setup(p => p.DoesUsernameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - // this.UserRepositoryMock.Setup(p => p.DoesEmailExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - // this.RoleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(true)); - // this.RoleRepositoryMock.Setup(p => p.GetByNameAsync(It.IsAny())).Returns(Task.FromResult(role)); - // this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(user); - // this.UserRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Verifiable(); - // - // string JWTSecurityToken = this.WriteJWTSecurityToken(user.Id, user.UserName, roles); - // - // TokenModel tokenModel = await this.UserService.RegisterUser(registerServiceModel); - // - // Mock.Verify(); - // Assert.AreEqual(JWTSecurityToken, tokenModel.Token, "RegisterUser does not return the correct token"); - // } + [Test] + public async Task RegisterUser_ReturnsTokenModel_WhenUserIsSuccessfull() + { + Guid userId = Guid.NewGuid(); + RegisterServiceModel registerServiceModel = new() + { + Password = "ImNigga" + }; + User user = new() + { + Id = userId, + UserName = "g_trapov" + }; + Role role = new() { Name = Role.DefaultRole }; + HashSet roles = new() { role }; + + this._userRepositoryMock.Setup(p => + p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._userRepositoryMock.Setup(p => + p.DoesEmailExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._userRepositoryMock.Setup(p => + p.AddAsync(It.IsAny())) + .ReturnsAsync(true); + + this._roleRepositoryMock.Setup(p => + p.DoesNameExist(It.IsAny())) + .Returns(Task.FromResult(true)); + this._roleRepositoryMock.Setup(p => + p.GetByNameAsync(It.IsAny())) + .Returns(Task.FromResult(role)); + + this._mapperMock.Setup(p => + p.Map(It.IsAny())) + .Returns(user); + + string jwtSecurityToken = this.WriteJWTSecurityToken(user.Id, user.UserName, roles); + TokenModel tokenModel = await this._userService.RegisterUser(registerServiceModel); + + Assert.AreEqual(jwtSecurityToken, tokenModel.Token, "RegisterUser does not return the correct token"); + } [Test] public void RegisterUser_ThrowsException_WhenUsernameAlreadyExists() { const string EXCEPTION_MESSAGE = "Username already exists!"; - RegisterServiceModel registerServiceModel = new RegisterServiceModel - { - }; + RegisterServiceModel registerServiceModel = new(); - this.UserRepositoryMock.Setup(p => p.DoesUsernameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._userRepositoryMock.Setup(p => + p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); - Exception ex = Assert.ThrowsAsync(() => this.UserService.RegisterUser(registerServiceModel)); + Exception ex = Assert.ThrowsAsync( + () => this._userService.RegisterUser(registerServiceModel)); - Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message, "Incorect Exception message"); + Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message, "Incorrect Exception message"); } [Test] public void RegisterUser_ThrowsException_WhenEmailAlreadyExists() { - const string EXCEPTION_MESSAGE = "Email already exists!"; - - RegisterServiceModel registerServiceModel = new RegisterServiceModel - { - }; + RegisterServiceModel registerServiceModel = new(); - this.UserRepositoryMock.Setup(p => p.DoesUsernameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - this.UserRepositoryMock.Setup(p => p.DoesEmailExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._userRepositoryMock.Setup(p => + p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._userRepositoryMock.Setup(p => + p.DoesEmailExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); - Exception ex = Assert.ThrowsAsync(() => this.UserService.RegisterUser(registerServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._userService.RegisterUser(registerServiceModel)); - Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message, "Incorect Exception message"); + Assert.AreEqual("Email already exists!", ex.Message, "Incorrect Exception message"); } #endregion @@ -185,34 +208,37 @@ namespace DevHive.Services.Tests [Test] public async Task GetUserById_ReturnsTheUser_WhenItExists() { - Guid id = new Guid(); - string name = "Gosho Trapov"; - User user = new() - { - }; - UserServiceModel userServiceModel = new UserServiceModel + Guid id = new(); + string username = "g_trapov"; + User user = new(); + UserServiceModel userServiceModel = new() { - UserName = name + UserName = username }; - this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(userServiceModel); + this._userRepositoryMock.Setup(p => + p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(user)); + this._mapperMock.Setup(p => + p.Map(It.IsAny())) + .Returns(userServiceModel); - UserServiceModel result = await this.UserService.GetUserById(id); + UserServiceModel result = await this._userService.GetUserById(id); - Assert.AreEqual(name, result.UserName); + Assert.AreEqual(username, result.UserName); } [Test] public void GetTechnologyById_ThrowsException_WhenTechnologyDoesNotExist() { - const string EXCEPTION_MESSEGE = "User does not exist!"; - Guid id = new Guid(); - this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + Guid id = new(); + this._userRepositoryMock.Setup(p => + p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(null)); - Exception ex = Assert.ThrowsAsync(() => this.UserService.GetUserById(id)); + Exception ex = Assert.ThrowsAsync(() => this._userService.GetUserById(id)); - Assert.AreEqual(EXCEPTION_MESSEGE, ex.Message, "Incorecct exception message"); + Assert.AreEqual("User does not exist!", ex.Message, "Incorrect exception message"); } #endregion @@ -220,32 +246,37 @@ namespace DevHive.Services.Tests [Test] public async Task GetUserByUsername_ReturnsTheCorrectUser_IfItExists() { - string username = "Gosho Trapov"; - User user = new User(); - UserServiceModel userServiceModel = new UserServiceModel + string username = "g_trapov"; + User user = new(); + UserServiceModel userServiceModel = new() { UserName = username }; - this.UserRepositoryMock.Setup(p => p.GetByUsernameAsync(It.IsAny())).Returns(Task.FromResult(user)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(userServiceModel); + this._userRepositoryMock.Setup(p => + p.GetByUsernameAsync(It.IsAny())) + .Returns(Task.FromResult(user)); + this._mapperMock.Setup(p => + p.Map(It.IsAny())) + .Returns(userServiceModel); - UserServiceModel result = await this.UserService.GetUserByUsername(username); + UserServiceModel result = await this._userService.GetUserByUsername(username); Assert.AreEqual(username, result.UserName, "GetUserByUsername does not return the correct user"); } [Test] - public async Task GetUserByUsername_ThrowsException_IfUserDoesNotExist() + public void GetUserByUsername_ThrowsException_IfUserDoesNotExist() { - string username = "Gosho Trapov"; - const string EXCEPTION_MESSEGE = "User does not exist!"; + string username = "g_trapov"; - this.UserRepositoryMock.Setup(p => p.GetByUsernameAsync(It.IsAny())).Returns(Task.FromResult(null)); + this._userRepositoryMock.Setup(p => + p.GetByUsernameAsync(It.IsAny())) + .Returns(Task.FromResult(null)); - Exception ex = Assert.ThrowsAsync(() => this.UserService.GetUserByUsername(username)); + Exception ex = Assert.ThrowsAsync(() => this._userService.GetUserByUsername(username)); - Assert.AreEqual(EXCEPTION_MESSEGE, ex.Message, "Incorecct exception message"); + Assert.AreEqual("User does not exist!", ex.Message, "Incorrect exception message"); } #endregion @@ -255,76 +286,90 @@ namespace DevHive.Services.Tests // [TestCase(false)] // public async Task UpdateUser_ReturnsIfUpdateIsSuccessfull_WhenUserExistsy(bool shouldPass) // { - // string name = "Gosho Trapov"; + // string username = "g_trapov"; // Guid id = Guid.NewGuid(); // User user = new User // { - // UserName = name, + // UserName = username, // Id = id, // }; // UpdateUserServiceModel updateUserServiceModel = new UpdateUserServiceModel // { - // UserName = name, + // UserName = username, // }; // UserServiceModel userServiceModel = new UserServiceModel // { - // UserName = name, + // UserName = username, // }; // Role role = new Role { }; - // - // this.UserRepositoryMock.Setup(p => p.DoesUserExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - // this.UserRepositoryMock.Setup(p => p.DoesUsernameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - // this.UserRepositoryMock.Setup(p => p.DoesUserHaveThisUsernameAsync(It.IsAny(), It.IsAny())).Returns(true); - // this.UserRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(shouldPass)); - // this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - // this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(user); - // this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(userServiceModel); - // + // + // this._userRepositoryMock.Setup(p => + // p.DoesUserExistAsync(It.IsAny())) + // .Returns(Task.FromResult(true)); + // this._userRepositoryMock.Setup(p => + // p.DoesUsernameExistAsync(It.IsAny())) + // .Returns(Task.FromResult(false)); + // this._userRepositoryMock.Setup(p => + // p.DoesUserHaveThisUsernameAsync(It.IsAny(), It.IsAny())) + // .Returns(true); + // this._userRepositoryMock.Setup(p => + // p.EditAsync(It.IsAny(), It.IsAny())) + // .Returns(Task.FromResult(shouldPass)); + // this._userRepositoryMock.Setup(p => + // p.GetByIdAsync(It.IsAny())) + // .Returns(Task.FromResult(user)); + // this._mapperMock.Setup(p => + // p.Map(It.IsAny())) + // .Returns(user); + // this._mapperMock.Setup(p => + // p.Map(It.IsAny())) + // .Returns(userServiceModel); + // // if (shouldPass) // { - // UserServiceModel result = await this.UserService.UpdateUser(updateUserServiceModel); - // + // UserServiceModel result = await this._userService.UpdateUser(updateUserServiceModel); + // // Assert.AreEqual(updateUserServiceModel.UserName, result.UserName); // } // else // { // const string EXCEPTION_MESSAGE = "Unable to edit user!"; - // - // Exception ex = Assert.ThrowsAsync(() => this.UserService.UpdateUser(updateUserServiceModel)); - // - // Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message, "Incorecct exception message"); + // + // Exception ex = Assert.ThrowsAsync(() => this._userService.UpdateUser(updateUserServiceModel)); + // + // Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message, "Incorrect exception message"); // } // } [Test] public void UpdateUser_ThrowsException_WhenUserDoesNotExist() { - const string EXCEPTION_MESSAGE = "User does not exist!"; - UpdateUserServiceModel updateUserServiceModel = new UpdateUserServiceModel - { - }; + UpdateUserServiceModel updateUserServiceModel = new(); - this.UserRepositoryMock.Setup(p => p.DoesUserExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._userRepositoryMock.Setup(p => + p.DoesUserExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); - Exception ex = Assert.ThrowsAsync(() => this.UserService.UpdateUser(updateUserServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._userService.UpdateUser(updateUserServiceModel)); - Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message, "Incorecct exception message"); + Assert.AreEqual("User does not exist!", ex.Message, "Incorrect exception message"); } [Test] public void UpdateUser_ThrowsException_WhenUserNameAlreadyExists() { - const string EXCEPTION_MESSAGE = "Username already exists!"; - UpdateUserServiceModel updateUserServiceModel = new UpdateUserServiceModel - { - }; + UpdateUserServiceModel updateUserServiceModel = new(); - this.UserRepositoryMock.Setup(p => p.DoesUserExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.UserRepositoryMock.Setup(p => p.DoesUsernameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._userRepositoryMock.Setup(p => + p.DoesUserExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._userRepositoryMock.Setup(p => + p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); - Exception ex = Assert.ThrowsAsync(() => this.UserService.UpdateUser(updateUserServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._userService.UpdateUser(updateUserServiceModel)); - Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message, "Incorecct exception message"); + Assert.AreEqual("Username already exists!", ex.Message, "Incorrect exception message"); } #endregion @@ -337,41 +382,49 @@ namespace DevHive.Services.Tests // { // Guid id = new Guid(); // User user = new User(); - // - // this.UserRepositoryMock.Setup(p => p.DoesUserExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - // this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - // this.UserRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); - // - // bool result = await this.UserService.DeleteUser(id); - // + // + // this._userRepositoryMock.Setup(p => + // p.DoesUserExistAsync(It.IsAny())) + // .Returns(Task.FromResult(true)); + // this._userRepositoryMock.Setup(p => + // p.GetByIdAsync(It.IsAny())) + // .Returns(Task.FromResult(user)); + // this._userRepositoryMock.Setup(p => + // p.DeleteAsync(It.IsAny())) + // .Returns(Task.FromResult(shouldPass)); + // + // bool result = await this._userService.DeleteUser(id); + // // Assert.AreEqual(shouldPass, result); // } - // + // [Test] public void DeleteUser_ThrowsException_WhenUserDoesNotExist() { string exceptionMessage = "User does not exist!"; - Guid id = new Guid(); + Guid id = new(); - this.UserRepositoryMock.Setup(p => p.DoesUserExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._userRepositoryMock.Setup(p => + p.DoesUserExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); - Exception ex = Assert.ThrowsAsync(() => this.UserService.DeleteUser(id)); + Exception ex = Assert.ThrowsAsync(() => this._userService.DeleteUser(id)); - Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); + Assert.AreEqual(exceptionMessage, ex.Message, "Incorrect exception message"); } #endregion #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}"), new Claim("Username", username), }; - foreach (var role in roles) + foreach (Role role in roles) { claims.Add(new Claim(ClaimTypes.Role, role.Name)); } -- cgit v1.2.3 From f986ca67edd425c32eaec5a20fecdc5786f9d8e3 Mon Sep 17 00:00:00 2001 From: Danail Dimitrov Date: Wed, 3 Mar 2021 10:27:26 +0200 Subject: Fixing bugs in rating layer --- src/Data/DevHive.Data/Repositories/RatingRepository.cs | 4 ++++ src/Services/DevHive.Services/Interfaces/IRatingService.cs | 2 -- src/Services/DevHive.Services/Services/RatingService.cs | 8 +------- src/Web/DevHive.Web.Models/Rating/UpdateRatingWebModel.cs | 4 ---- src/Web/DevHive.Web/Controllers/RatingController.cs | 3 ++- 5 files changed, 7 insertions(+), 14 deletions(-) (limited to 'src/Services') diff --git a/src/Data/DevHive.Data/Repositories/RatingRepository.cs b/src/Data/DevHive.Data/Repositories/RatingRepository.cs index 9bb2368..1784144 100644 --- a/src/Data/DevHive.Data/Repositories/RatingRepository.cs +++ b/src/Data/DevHive.Data/Repositories/RatingRepository.cs @@ -30,6 +30,8 @@ namespace DevHive.Data.Repositories public async Task> GetRatingsByPostId(Guid postId) { return await this._context.Rating + .Include(x => x.User) + .Include(x => x.Post) .Where(x => x.Post.Id == postId).ToListAsync(); } public async Task UserRatedPost(Guid userId, Guid postId) @@ -41,6 +43,8 @@ namespace DevHive.Data.Repositories public async Task GetRatingByUserAndPostId(Guid userId, Guid postId) { return await this._context.Rating + .Include(x => x.User) + .Include(x => x.Post) .FirstOrDefaultAsync(x => x.Post.Id == postId && x.User.Id == userId); } diff --git a/src/Services/DevHive.Services/Interfaces/IRatingService.cs b/src/Services/DevHive.Services/Interfaces/IRatingService.cs index beea821..b262f45 100644 --- a/src/Services/DevHive.Services/Interfaces/IRatingService.cs +++ b/src/Services/DevHive.Services/Interfaces/IRatingService.cs @@ -16,7 +16,5 @@ namespace DevHive.Services.Interfaces Task UpdateRating(UpdateRatingServiceModel updateRatingServiceModel); Task DeleteRating(Guid ratingId); - - Task HasUserRatedThisPost(Guid userId, Guid postId); } } diff --git a/src/Services/DevHive.Services/Services/RatingService.cs b/src/Services/DevHive.Services/Services/RatingService.cs index 6ddba1c..6d0d0b9 100644 --- a/src/Services/DevHive.Services/Services/RatingService.cs +++ b/src/Services/DevHive.Services/Services/RatingService.cs @@ -81,7 +81,7 @@ namespace DevHive.Services.Services #region Update public async Task UpdateRating(UpdateRatingServiceModel updateRatingServiceModel) { - Rating rating = await this._ratingRepository.GetByIdAsync(updateRatingServiceModel.Id) ?? + Rating rating = await this._ratingRepository.GetRatingByUserAndPostId(updateRatingServiceModel.UserId, updateRatingServiceModel.PostId) ?? throw new ArgumentException("Rating does not exist!"); User user = await this._userRepository.GetByIdAsync(updateRatingServiceModel.UserId) ?? @@ -115,11 +115,5 @@ namespace DevHive.Services.Services return await this._ratingRepository.DeleteAsync(rating); } #endregion - - public async Task HasUserRatedThisPost(Guid userId, Guid postId) - { - return await this._ratingRepository - .UserRatedPost(userId, postId); - } } } diff --git a/src/Web/DevHive.Web.Models/Rating/UpdateRatingWebModel.cs b/src/Web/DevHive.Web.Models/Rating/UpdateRatingWebModel.cs index 425c3e1..176c099 100644 --- a/src/Web/DevHive.Web.Models/Rating/UpdateRatingWebModel.cs +++ b/src/Web/DevHive.Web.Models/Rating/UpdateRatingWebModel.cs @@ -8,10 +8,6 @@ namespace DevHive.Web.Models.Rating { public class UpdateRatingWebModel { - public Guid Id { get; set; } - - public Guid PostId { get; set; } - public bool IsLike { get; set; } } } diff --git a/src/Web/DevHive.Web/Controllers/RatingController.cs b/src/Web/DevHive.Web/Controllers/RatingController.cs index 5716b85..8d3ac92 100644 --- a/src/Web/DevHive.Web/Controllers/RatingController.cs +++ b/src/Web/DevHive.Web/Controllers/RatingController.cs @@ -65,7 +65,7 @@ namespace DevHive.Web.Controllers } [HttpPut] - public async Task UpdateRating(Guid userId, [FromBody] UpdateRatingWebModel updateRatingWebModel, [FromHeader] string authorization) + public async Task UpdateRating(Guid userId, Guid postId, [FromBody] UpdateRatingWebModel updateRatingWebModel, [FromHeader] string authorization) { if (!this._jwtService.ValidateToken(userId, authorization)) return new UnauthorizedResult(); @@ -73,6 +73,7 @@ namespace DevHive.Web.Controllers UpdateRatingServiceModel updateRatingServiceModel = this._mapper.Map(updateRatingWebModel); updateRatingServiceModel.UserId = userId; + updateRatingServiceModel.PostId = postId; ReadRatingServiceModel readRatingServiceModel = await this._rateService.UpdateRating(updateRatingServiceModel); -- cgit v1.2.3 From 55df3e16982c18b37d9a734215be3e00f64a8e19 Mon Sep 17 00:00:00 2001 From: Danail Dimitrov Date: Wed, 3 Mar 2021 10:43:22 +0200 Subject: Adding Post.CurrentRating functionality --- src/Services/DevHive.Services/Services/PostService.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/Services') diff --git a/src/Services/DevHive.Services/Services/PostService.cs b/src/Services/DevHive.Services/Services/PostService.cs index a3d5117..a565473 100644 --- a/src/Services/DevHive.Services/Services/PostService.cs +++ b/src/Services/DevHive.Services/Services/PostService.cs @@ -76,11 +76,21 @@ namespace DevHive.Services.Services User user = await this._userRepository.GetByIdAsync(post.Creator.Id) ?? throw new ArgumentException("The user does not exist!"); + int currentRating = 0; + foreach (Rating rating in post.Ratings) + { + if (rating.IsLike) + currentRating++; + else + currentRating--; + } + ReadPostServiceModel readPostServiceModel = this._postMapper.Map(post); readPostServiceModel.CreatorFirstName = user.FirstName; readPostServiceModel.CreatorLastName = user.LastName; readPostServiceModel.CreatorUsername = user.UserName; readPostServiceModel.FileUrls = post.Attachments.Select(x => x.FileUrl).ToList(); + readPostServiceModel.CurrentRating = currentRating; return readPostServiceModel; } -- cgit v1.2.3 From 4612913c72c3d2b4d3e28629df9f2ed97f0c29a9 Mon Sep 17 00:00:00 2001 From: Danail Dimitrov Date: Wed, 3 Mar 2021 10:55:28 +0200 Subject: Moved Rating service models outside of Post folder --- .../Post/Rating/CreateRatingServiceModel.cs | 13 ------------- .../Post/Rating/ReadRatingServiceModel.cs | 15 --------------- .../Post/Rating/UpdateRatingServiceModel.cs | 15 --------------- .../Rating/CreateRatingServiceModel.cs | 13 +++++++++++++ .../Rating/ReadRatingServiceModel.cs | 15 +++++++++++++++ .../Rating/UpdateRatingServiceModel.cs | 15 +++++++++++++++ .../Configurations/Mapping/RatingMappings.cs | 2 +- .../DevHive.Services/Interfaces/IRatingService.cs | 2 +- src/Services/DevHive.Services/Services/RatingService.cs | 2 +- .../DevHive.Web/Configurations/Mapping/RatingMappings.cs | 2 +- src/Web/DevHive.Web/Controllers/RatingController.cs | 2 +- 11 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 src/Services/DevHive.Services.Models/Post/Rating/CreateRatingServiceModel.cs delete mode 100644 src/Services/DevHive.Services.Models/Post/Rating/ReadRatingServiceModel.cs delete mode 100644 src/Services/DevHive.Services.Models/Post/Rating/UpdateRatingServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/Rating/CreateRatingServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/Rating/ReadRatingServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/Rating/UpdateRatingServiceModel.cs (limited to 'src/Services') diff --git a/src/Services/DevHive.Services.Models/Post/Rating/CreateRatingServiceModel.cs b/src/Services/DevHive.Services.Models/Post/Rating/CreateRatingServiceModel.cs deleted file mode 100644 index aaeab73..0000000 --- a/src/Services/DevHive.Services.Models/Post/Rating/CreateRatingServiceModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; - -namespace DevHive.Services.Models.Post.Rating -{ - public class CreateRatingServiceModel - { - public Guid UserId { get; set; } - - public Guid PostId { get; set; } - - public bool IsLike { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Post/Rating/ReadRatingServiceModel.cs b/src/Services/DevHive.Services.Models/Post/Rating/ReadRatingServiceModel.cs deleted file mode 100644 index 86b4957..0000000 --- a/src/Services/DevHive.Services.Models/Post/Rating/ReadRatingServiceModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace DevHive.Services.Models.Post.Rating -{ - public class ReadRatingServiceModel - { - public Guid Id { get; set; } - - public Guid PostId { get; set; } - - public Guid UserId { get; set; } - - public bool IsLike { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Post/Rating/UpdateRatingServiceModel.cs b/src/Services/DevHive.Services.Models/Post/Rating/UpdateRatingServiceModel.cs deleted file mode 100644 index 1ea8d8f..0000000 --- a/src/Services/DevHive.Services.Models/Post/Rating/UpdateRatingServiceModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace DevHive.Services.Models.Post.Rating -{ - public class UpdateRatingServiceModel - { - public Guid Id { get; set; } - - public Guid UserId { get; set; } - - public Guid PostId { get; set; } - - public bool IsLike { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Rating/CreateRatingServiceModel.cs b/src/Services/DevHive.Services.Models/Rating/CreateRatingServiceModel.cs new file mode 100644 index 0000000..486e3d2 --- /dev/null +++ b/src/Services/DevHive.Services.Models/Rating/CreateRatingServiceModel.cs @@ -0,0 +1,13 @@ +using System; + +namespace DevHive.Services.Models.Rating +{ + public class CreateRatingServiceModel + { + public Guid UserId { get; set; } + + public Guid PostId { get; set; } + + public bool IsLike { get; set; } + } +} diff --git a/src/Services/DevHive.Services.Models/Rating/ReadRatingServiceModel.cs b/src/Services/DevHive.Services.Models/Rating/ReadRatingServiceModel.cs new file mode 100644 index 0000000..56a5ab0 --- /dev/null +++ b/src/Services/DevHive.Services.Models/Rating/ReadRatingServiceModel.cs @@ -0,0 +1,15 @@ +using System; + +namespace DevHive.Services.Models.Rating +{ + public class ReadRatingServiceModel + { + public Guid Id { get; set; } + + public Guid PostId { get; set; } + + public Guid UserId { get; set; } + + public bool IsLike { get; set; } + } +} diff --git a/src/Services/DevHive.Services.Models/Rating/UpdateRatingServiceModel.cs b/src/Services/DevHive.Services.Models/Rating/UpdateRatingServiceModel.cs new file mode 100644 index 0000000..923e789 --- /dev/null +++ b/src/Services/DevHive.Services.Models/Rating/UpdateRatingServiceModel.cs @@ -0,0 +1,15 @@ +using System; + +namespace DevHive.Services.Models.Rating +{ + public class UpdateRatingServiceModel + { + public Guid Id { get; set; } + + public Guid UserId { get; set; } + + public Guid PostId { get; set; } + + public bool IsLike { get; set; } + } +} diff --git a/src/Services/DevHive.Services/Configurations/Mapping/RatingMappings.cs b/src/Services/DevHive.Services/Configurations/Mapping/RatingMappings.cs index 4534511..9ad5f25 100644 --- a/src/Services/DevHive.Services/Configurations/Mapping/RatingMappings.cs +++ b/src/Services/DevHive.Services/Configurations/Mapping/RatingMappings.cs @@ -1,6 +1,6 @@ using AutoMapper; using DevHive.Data.Models; -using DevHive.Services.Models.Post.Rating; +using DevHive.Services.Models.Rating; namespace DevHive.Services.Configurations.Mapping { diff --git a/src/Services/DevHive.Services/Interfaces/IRatingService.cs b/src/Services/DevHive.Services/Interfaces/IRatingService.cs index b262f45..be33300 100644 --- a/src/Services/DevHive.Services/Interfaces/IRatingService.cs +++ b/src/Services/DevHive.Services/Interfaces/IRatingService.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; using DevHive.Data.Models; -using DevHive.Services.Models.Post.Rating; +using DevHive.Services.Models.Rating; namespace DevHive.Services.Interfaces { diff --git a/src/Services/DevHive.Services/Services/RatingService.cs b/src/Services/DevHive.Services/Services/RatingService.cs index 6d0d0b9..1f77a6e 100644 --- a/src/Services/DevHive.Services/Services/RatingService.cs +++ b/src/Services/DevHive.Services/Services/RatingService.cs @@ -8,7 +8,7 @@ using AutoMapper; using DevHive.Data.Interfaces; using DevHive.Data.Models; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Post.Rating; +using DevHive.Services.Models.Rating; namespace DevHive.Services.Services { diff --git a/src/Web/DevHive.Web/Configurations/Mapping/RatingMappings.cs b/src/Web/DevHive.Web/Configurations/Mapping/RatingMappings.cs index 23c3eeb..1d731d8 100644 --- a/src/Web/DevHive.Web/Configurations/Mapping/RatingMappings.cs +++ b/src/Web/DevHive.Web/Configurations/Mapping/RatingMappings.cs @@ -1,5 +1,5 @@ using AutoMapper; -using DevHive.Services.Models.Post.Rating; +using DevHive.Services.Models.Rating; using DevHive.Web.Models.Rating; namespace DevHive.Web.Configurations.Mapping diff --git a/src/Web/DevHive.Web/Controllers/RatingController.cs b/src/Web/DevHive.Web/Controllers/RatingController.cs index 8d3ac92..c93a56d 100644 --- a/src/Web/DevHive.Web/Controllers/RatingController.cs +++ b/src/Web/DevHive.Web/Controllers/RatingController.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using AutoMapper; using DevHive.Common.Jwt.Interfaces; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Post.Rating; +using DevHive.Services.Models.Rating; using DevHive.Web.Models.Rating; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -- cgit v1.2.3 From e82ec81155b4230123df9706b9590af2dd4ef9eb Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 13 Mar 2021 10:03:54 +0200 Subject: Added tests for rating service --- .../DevHive.Services.Tests/RatingService.Tests.cs | 370 +++++++++++++++++++++ 1 file changed, 370 insertions(+) create mode 100644 src/Services/DevHive.Services.Tests/RatingService.Tests.cs (limited to 'src/Services') diff --git a/src/Services/DevHive.Services.Tests/RatingService.Tests.cs b/src/Services/DevHive.Services.Tests/RatingService.Tests.cs new file mode 100644 index 0000000..89c1a2e --- /dev/null +++ b/src/Services/DevHive.Services.Tests/RatingService.Tests.cs @@ -0,0 +1,370 @@ +using System; +using System.Threading.Tasks; +using AutoMapper; +using DevHive.Data.Interfaces; +using DevHive.Data.Models; +using DevHive.Services.Models.Rating; +using DevHive.Services.Services; +using Moq; +using NUnit.Framework; + +namespace DevHive.Services.Tests +{ + [TestFixture] + public class RatingServiceTests + { + private Mock PostRepositoryMock { get; set; } + private Mock RatingRepositoryMock { get; set; } + private Mock UserRepositoryMock { get; set; } + private Mock MapperMock { get; set; } + private RatingService RatingService { get; set; } + + #region SetUps + [SetUp] + public void SetUp() + { + this.PostRepositoryMock = new Mock(); + this.RatingRepositoryMock = new Mock(); + this.UserRepositoryMock = new Mock(); + this.MapperMock = new Mock(); + this.RatingService = new RatingService(this.PostRepositoryMock.Object, this.RatingRepositoryMock.Object, this.UserRepositoryMock.Object, this.MapperMock.Object); + } + #endregion + + #region Create + [Test] + public async Task RatePost_ReturnsNonEmptyGuid_WhenEntityIsAddedSuccessfully() + { + bool isLike = true; + Guid id = Guid.NewGuid(); + Guid postId = Guid.NewGuid(); + Guid userId = Guid.NewGuid(); + CreateRatingServiceModel createRatingServiceModel = new CreateRatingServiceModel + { + PostId = postId, + UserId = userId, + IsLike = isLike + }; + Rating rating = new Rating + { + Id = id, + IsLike = isLike + }; + User user = new User + { + Id = userId + }; + Post post = new Post + { + Id = postId + }; + + this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); + this.RatingRepositoryMock.Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); + this.PostRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); + this.RatingRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); + this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(rating)); + this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(rating); + + Guid result = await this.RatingService.RatePost(createRatingServiceModel); + + Assert.AreEqual(id, result); + } + + [Test] + public async Task RatePost_ReturnsEmptyGuid_WhenEntityIsNotAddedSuccessfully() + { + bool isLike = true; + Guid id = Guid.NewGuid(); + Guid postId = Guid.NewGuid(); + Guid userId = Guid.NewGuid(); + CreateRatingServiceModel createRatingServiceModel = new CreateRatingServiceModel + { + PostId = postId, + UserId = userId, + IsLike = isLike + }; + Rating rating = new Rating + { + Id = id, + IsLike = isLike + }; + User user = new User + { + Id = userId + }; + Post post = new Post + { + Id = postId + }; + + this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); + this.RatingRepositoryMock.Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); + this.PostRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); + this.RatingRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); + this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(rating); + + Guid result = await this.RatingService.RatePost(createRatingServiceModel); + + Assert.AreEqual(result, Guid.Empty); + } + #endregion + + #region Read + [Test] + public async Task GetRatingById_ReturnsTheRating_WhenItExists() + { + Guid id = Guid.NewGuid(); + bool isLike = true; + User user = new User + { + Id = Guid.NewGuid() + }; + Rating rating = new Rating + { + Id = id, + IsLike = isLike, + User = user + }; + ReadRatingServiceModel readRatingServiceModel = new ReadRatingServiceModel + { + Id = id, + IsLike = isLike + }; + + this.RatingRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(rating)); + this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readRatingServiceModel); + + ReadRatingServiceModel result = await this.RatingService.GetRatingById(id); + + Assert.AreEqual(isLike, result.IsLike); + } + + [Test] + public void GetRatingById_ThrowsException_WhenRatingDoesNotExist() + { + string exceptionMessage = "The rating does not exist"; + this.RatingRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + + Exception ex = Assert.ThrowsAsync(() => this.RatingService.GetRatingById(Guid.Empty)); + + Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); + } + + [Test] + public async Task GetRatingByPostAndUser_ReturnsTheRating_WhenItExists() + { + Guid id = Guid.NewGuid(); + bool isLike = true; + User user = new User + { + Id = Guid.NewGuid() + }; + Rating rating = new Rating + { + Id = id, + IsLike = isLike, + User = user + }; + ReadRatingServiceModel readRatingServiceModel = new ReadRatingServiceModel + { + Id = id, + IsLike = isLike + }; + + this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(rating)); + this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readRatingServiceModel); + + ReadRatingServiceModel result = await this.RatingService.GetRatingByPostAndUser(user.Id, Guid.Empty); + + Assert.AreEqual(isLike, result.IsLike); + } + + [Test] + public void GetRatingByPostAndUser_ThrowsException_WhenRatingDoesNotExist() + { + string exceptionMessage = "The rating does not exist"; + this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(null)); + + Exception ex = Assert.ThrowsAsync(() => this.RatingService.GetRatingById(Guid.Empty)); + + Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); + } + #endregion + + #region Update + [Test] + public async Task UpdateRating_ReturnsObject_WhenRatingIsUpdatedSuccessfully() + { + Guid id = Guid.NewGuid(); + bool isLike = true; + UpdateRatingServiceModel updateRatingServiceModel = new UpdateRatingServiceModel + { + Id = id, + IsLike = isLike + }; + User user = new User + { + Id = Guid.NewGuid() + }; + Rating rating = new Rating + { + Id = id, + IsLike = isLike, + User = user + }; + ReadRatingServiceModel readRatingServiceModel = new ReadRatingServiceModel + { + Id = id, + IsLike = isLike + }; + + this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(rating)); + this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); + this.RatingRepositoryMock.Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this.RatingRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readRatingServiceModel); + + ReadRatingServiceModel result = await this.RatingService.UpdateRating(updateRatingServiceModel); + + Assert.AreEqual(result, readRatingServiceModel); + } + + [Test] + public async Task UpdateRating_ReturnsNull_WhenRatingIsNotUpdatedSuccessfully() + { + Guid id = Guid.NewGuid(); + bool isLike = true; + UpdateRatingServiceModel updateRatingServiceModel = new UpdateRatingServiceModel + { + Id = id, + IsLike = isLike + }; + User user = new User + { + Id = Guid.NewGuid() + }; + Rating rating = new Rating + { + Id = id, + IsLike = isLike, + User = user + }; + ReadRatingServiceModel readRatingServiceModel = new ReadRatingServiceModel + { + Id = id, + IsLike = isLike + }; + + this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(rating)); + this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); + this.RatingRepositoryMock.Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this.RatingRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + + ReadRatingServiceModel result = await this.RatingService.UpdateRating(updateRatingServiceModel); + + Assert.IsNull(result); + } + + [Test] + public void UpdateRating_ThrowsException_WhenRatingDoesNotExists() + { + string exceptionMessage = "Rating does not exist!"; + UpdateRatingServiceModel updateRatingServiceModel = new UpdateRatingServiceModel + { + Id = Guid.Empty, + IsLike = true + }; + + this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(null)); + + Exception ex = Assert.ThrowsAsync(() => this.RatingService.UpdateRating(updateRatingServiceModel)); + + Assert.AreEqual(ex.Message, exceptionMessage); + } + + [Test] + public void UpdateRating_ThrowsException_WhenUserHasNotRatedPost() + { + string exceptionMessage = "User has not rated the post!"; + Guid id = Guid.NewGuid(); + bool isLike = true; + UpdateRatingServiceModel updateRatingServiceModel = new UpdateRatingServiceModel + { + Id = id, + IsLike = isLike + }; + User user = new User + { + Id = Guid.NewGuid() + }; + Rating rating = new Rating + { + Id = id, + IsLike = isLike, + User = user + }; + + this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(rating)); + this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); + this.RatingRepositoryMock.Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + + Exception ex = Assert.ThrowsAsync(() => this.RatingService.UpdateRating(updateRatingServiceModel)); + + Assert.AreEqual(ex.Message, exceptionMessage); + } + #endregion + + #region Delete + [Test] + public async Task DeleteRating_ReturnsTrue_WhenRatingIsDeletedSuccessfully() + { + Guid ratingId = Guid.NewGuid(); + Rating rating = new Rating + { + Id = ratingId + }; + + this.RatingRepositoryMock.Setup(p => p.DoesRatingExist(It.IsAny())).Returns(Task.FromResult(true)); + this.RatingRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + this.RatingRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(true)); + + bool result = await this.RatingService.DeleteRating(ratingId); + + Assert.IsTrue(result); + } + + [Test] + public async Task DeleteRating_ReturnsFalse_WhenRatingIsNotDeletedSuccessfully() + { + Guid ratingId = Guid.NewGuid(); + Rating rating = new Rating + { + Id = ratingId + }; + + this.RatingRepositoryMock.Setup(p => p.DoesRatingExist(It.IsAny())).Returns(Task.FromResult(true)); + this.RatingRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + this.RatingRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(false)); + + bool result = await this.RatingService.DeleteRating(ratingId); + + Assert.IsFalse(result); + } + + [Test] + public void DeleteRating_ThrowsException_WhenRatingDoesNotExist() + { + string exceptionMessage = "Rating does not exist!"; + + this.RatingRepositoryMock.Setup(p => p.DoesRatingExist(It.IsAny())).Returns(Task.FromResult(false)); + + Exception ex = Assert.ThrowsAsync(() => this.RatingService.DeleteRating(Guid.Empty)); + + Assert.AreEqual(ex.Message, exceptionMessage); + } + #endregion + } +} -- cgit v1.2.3 From e725d029bcd05f9c945312a3c931064a14d2bd5e Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 13 Mar 2021 16:10:36 +0200 Subject: Updated user service tests to use jwt service, added some missing mocks to user login and register tests --- .../DevHive.Services.Tests/UserService.Tests.cs | 66 ++++++++-------------- 1 file changed, 22 insertions(+), 44 deletions(-) (limited to 'src/Services') diff --git a/src/Services/DevHive.Services.Tests/UserService.Tests.cs b/src/Services/DevHive.Services.Tests/UserService.Tests.cs index 8642733..2554706 100644 --- a/src/Services/DevHive.Services.Tests/UserService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/UserService.Tests.cs @@ -1,26 +1,20 @@ using System; using System.Collections.Generic; -using System.IdentityModel.Tokens.Jwt; -using System.Security.Claims; -using System.Text; using System.Threading.Tasks; using AutoMapper; +using DevHive.Common.Jwt.Interfaces; using DevHive.Common.Models.Identity; -using DevHive.Common.Models.Misc; using DevHive.Data.Interfaces; using DevHive.Data.Models; using DevHive.Services.Interfaces; using DevHive.Services.Models.User; -using DevHive.Services.Options; using DevHive.Services.Services; -using Microsoft.AspNetCore.Identity; -using Microsoft.IdentityModel.Tokens; using Moq; using NUnit.Framework; namespace DevHive.Services.Tests { - [TestFixture] + [TestFixture] public class UserServiceTests { private Mock _cloudServiceMock; @@ -29,7 +23,7 @@ namespace DevHive.Services.Tests private Mock _languageRepositoryMock; private Mock _technologyRepositoryMock; private Mock _mapperMock; - private JwtOptions _jwtOptions; + private Mock _jwtServiceMock; private UserService _userService; #region SetUps @@ -41,7 +35,7 @@ namespace DevHive.Services.Tests this._cloudServiceMock = new Mock(); this._languageRepositoryMock = new Mock(); this._technologyRepositoryMock = new Mock(); - this._jwtOptions = new JwtOptions("gXfQlU6qpDleFWyimscjYcT3tgFsQg3yoFjcvSLxG56n1Vu2yptdIUq254wlJWjm"); + this._jwtServiceMock = new Mock(); this._mapperMock = new Mock(); this._userService = new UserService( this._userRepositoryMock.Object, @@ -49,8 +43,8 @@ namespace DevHive.Services.Tests this._roleRepositoryMock.Object, this._technologyRepositoryMock.Object, this._mapperMock.Object, - this._jwtOptions, - this._cloudServiceMock.Object); + this._cloudServiceMock.Object, + this._jwtServiceMock.Object); } #endregion @@ -74,11 +68,15 @@ namespace DevHive.Services.Tests this._userRepositoryMock.Setup(p => p.DoesUsernameExistAsync(It.IsAny())) .Returns(Task.FromResult(true)); + this._userRepositoryMock.Setup(p => + p.VerifyPassword(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); this._userRepositoryMock.Setup(p => p.GetByUsernameAsync(It.IsAny())) .Returns(Task.FromResult(user)); - string jwtSecurityToken = this.WriteJWTSecurityToken(user.Id, user.UserName, user.Roles); + string jwtSecurityToken = "akjdhfakndvlahdfkljahdlfkjhasldf"; + this._jwtServiceMock.Setup(p => p.GenerateJwtToken(It.IsAny(), It.IsAny(), It.IsAny>())).Returns(jwtSecurityToken); TokenModel tokenModel = await this._userService.LoginUser(loginServiceModel); Assert.AreEqual(jwtSecurityToken, tokenModel.Token, "LoginUser does not return the correct token"); @@ -146,12 +144,21 @@ namespace DevHive.Services.Tests this._userRepositoryMock.Setup(p => p.DoesUsernameExistAsync(It.IsAny())) .Returns(Task.FromResult(false)); + this._userRepositoryMock.Setup(p => + p.VerifyPassword(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); this._userRepositoryMock.Setup(p => p.DoesEmailExistAsync(It.IsAny())) .Returns(Task.FromResult(false)); this._userRepositoryMock.Setup(p => p.AddAsync(It.IsAny())) .ReturnsAsync(true); + this._userRepositoryMock.Setup(p => + p.AddRoleToUser(It.IsAny(), It.IsAny())) + .ReturnsAsync(true); + this._userRepositoryMock.Setup(p => + p.GetByUsernameAsync(It.IsAny())) + .ReturnsAsync(user); this._roleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())) @@ -164,7 +171,8 @@ namespace DevHive.Services.Tests p.Map(It.IsAny())) .Returns(user); - string jwtSecurityToken = this.WriteJWTSecurityToken(user.Id, user.UserName, roles); + string jwtSecurityToken = "akjdhfakndvlahdfkljahdlfkjhasldf"; + this._jwtServiceMock.Setup(p => p.GenerateJwtToken(It.IsAny(), It.IsAny(), It.IsAny>())).Returns(jwtSecurityToken); TokenModel tokenModel = await this._userService.RegisterUser(registerServiceModel); Assert.AreEqual(jwtSecurityToken, tokenModel.Token, "RegisterUser does not return the correct token"); @@ -413,35 +421,5 @@ namespace DevHive.Services.Tests Assert.AreEqual(exceptionMessage, ex.Message, "Incorrect exception message"); } #endregion - - #region HelperMethods - private string WriteJWTSecurityToken(Guid userId, string username, HashSet roles) - { - byte[] signingKey = Encoding.ASCII.GetBytes(this._jwtOptions.Secret); - HashSet claims = new() - { - new Claim("ID", $"{userId}"), - new Claim("Username", username), - }; - - foreach (Role role in roles) - { - claims.Add(new Claim(ClaimTypes.Role, role.Name)); - } - - SecurityTokenDescriptor tokenDescriptor = new() - { - Subject = new ClaimsIdentity(claims), - Expires = DateTime.Today.AddDays(7), - SigningCredentials = new SigningCredentials( - new SymmetricSecurityKey(signingKey), - SecurityAlgorithms.HmacSha512Signature) - }; - - JwtSecurityTokenHandler tokenHandler = new(); - SecurityToken token = tokenHandler.CreateToken(tokenDescriptor); - return tokenHandler.WriteToken(token); - } - #endregion } } -- cgit v1.2.3 From a64e1a9433a0d1ae340a38752f8b87cd7df8ad78 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 13 Mar 2021 16:14:42 +0200 Subject: Replaced all "new Guid()" with "Guid.NewGuid()" in service tests --- .../DevHive.Services.Tests/CommentService.Tests.cs | 6 +++--- .../DevHive.Services.Tests/LanguageService.Tests.cs | 8 ++++---- src/Services/DevHive.Services.Tests/PostService.Tests.cs | 16 ++++++++-------- src/Services/DevHive.Services.Tests/RoleService.Tests.cs | 8 ++++---- .../DevHive.Services.Tests/TechnologyServices.Tests.cs | 8 ++++---- src/Services/DevHive.Services.Tests/UserService.Tests.cs | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/Services') diff --git a/src/Services/DevHive.Services.Tests/CommentService.Tests.cs b/src/Services/DevHive.Services.Tests/CommentService.Tests.cs index d843375..2d3c97a 100644 --- a/src/Services/DevHive.Services.Tests/CommentService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/CommentService.Tests.cs @@ -120,7 +120,7 @@ namespace DevHive.Services.Tests _ = this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); _ = this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(commentServiceModel); - ReadCommentServiceModel result = await this.CommentService.GetCommentById(new Guid()); + ReadCommentServiceModel result = await this.CommentService.GetCommentById(Guid.NewGuid()); Assert.AreEqual(MESSAGE, result.Message); } @@ -139,7 +139,7 @@ namespace DevHive.Services.Tests _ = this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); - Exception ex = Assert.ThrowsAsync(() => this.CommentService.GetCommentById(new Guid()), "GetCommentById does not throw exception when the user does not exist"); + Exception ex = Assert.ThrowsAsync(() => this.CommentService.GetCommentById(Guid.NewGuid()), "GetCommentById does not throw exception when the user does not exist"); Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message); } @@ -157,7 +157,7 @@ namespace DevHive.Services.Tests _ = this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); _ = this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - Exception ex = Assert.ThrowsAsync(() => this.CommentService.GetCommentById(new Guid())); + Exception ex = Assert.ThrowsAsync(() => this.CommentService.GetCommentById(Guid.NewGuid())); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } diff --git a/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs b/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs index 731091c..e97ff31 100644 --- a/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs @@ -105,7 +105,7 @@ namespace DevHive.Services.Tests [Test] public async Task GetLanguageById_ReturnsTheLanguage_WhenItExists() { - Guid id = new Guid(); + Guid id = Guid.NewGuid(); string name = "Gosho Trapov"; Language language = new Language { @@ -128,7 +128,7 @@ namespace DevHive.Services.Tests public void GetLanguageById_ThrowsException_WhenLanguageDoesNotExist() { string exceptionMessage = "The language does not exist"; - Guid id = new Guid(); + Guid id = Guid.NewGuid(); this.LanguageRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); Exception ex = Assert.ThrowsAsync(() => this.LanguageService.GetLanguageById(id)); @@ -233,7 +233,7 @@ namespace DevHive.Services.Tests [TestCase(false)] public async Task DeleteLanguage_ShouldReturnIfDeletionIsSuccessfull_WhenLanguageExists(bool shouldPass) { - Guid id = new Guid(); + Guid id = Guid.NewGuid(); Language language = new Language(); this.LanguageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(true)); @@ -249,7 +249,7 @@ namespace DevHive.Services.Tests public void DeleteLanguage_ThrowsException_WhenLanguageDoesNotExist() { string exceptionMessage = "Language does not exist!"; - Guid id = new Guid(); + Guid id = Guid.NewGuid(); this.LanguageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(false)); diff --git a/src/Services/DevHive.Services.Tests/PostService.Tests.cs b/src/Services/DevHive.Services.Tests/PostService.Tests.cs index 137b8d1..b7f9a9d 100644 --- a/src/Services/DevHive.Services.Tests/PostService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/PostService.Tests.cs @@ -107,7 +107,7 @@ namespace DevHive.Services.Tests [Test] public async Task GetPostById_ReturnsThePost_WhenItExists() { - Guid creatorId = new Guid(); + Guid creatorId = Guid.NewGuid(); User creator = new User { Id = creatorId }; Post post = new Post { @@ -127,7 +127,7 @@ namespace DevHive.Services.Tests this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPostServiceModel); - ReadPostServiceModel result = await this.PostService.GetPostById(new Guid()); + ReadPostServiceModel result = await this.PostService.GetPostById(Guid.NewGuid()); Assert.AreEqual(MESSAGE, result.Message); } @@ -136,7 +136,7 @@ namespace DevHive.Services.Tests public void GetPostById_ThorwsException_WhenTheUserDoesNotExist() { const string EXCEPTION_MESSAGE = "The user does not exist!"; - Guid creatorId = new Guid(); + Guid creatorId = Guid.NewGuid(); User creator = new User { Id = creatorId }; Post post = new Post { @@ -146,7 +146,7 @@ namespace DevHive.Services.Tests this.PostRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); - Exception ex = Assert.ThrowsAsync(() => this.PostService.GetPostById(new Guid()), "GetPostById does not throw exception when the user does not exist"); + Exception ex = Assert.ThrowsAsync(() => this.PostService.GetPostById(Guid.NewGuid()), "GetPostById does not throw exception when the user does not exist"); Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message); } @@ -155,7 +155,7 @@ namespace DevHive.Services.Tests public void GetPostById_ThrowsException_WhenCommentDoesNotExist() { string exceptionMessage = "The post does not exist!"; - Guid creatorId = new Guid(); + Guid creatorId = Guid.NewGuid(); User user = new User { Id = creatorId, @@ -164,7 +164,7 @@ namespace DevHive.Services.Tests this.PostRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - Exception ex = Assert.ThrowsAsync(() => this.PostService.GetPostById(new Guid())); + Exception ex = Assert.ThrowsAsync(() => this.PostService.GetPostById(Guid.NewGuid())); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -242,7 +242,7 @@ namespace DevHive.Services.Tests [TestCase(false)] public async Task Deletepost_ShouldReturnIfDeletionIsSuccessfull_WhenPostExists(bool shouldPass) { - Guid id = new Guid(); + Guid id = Guid.NewGuid(); Post post = new Post(); this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); @@ -258,7 +258,7 @@ namespace DevHive.Services.Tests public void DeletePost_ThrowsException_WhenPostDoesNotExist() { string exceptionMessage = "Post does not exist!"; - Guid id = new Guid(); + Guid id = Guid.NewGuid(); this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(false)); diff --git a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs index 29d5df2..f12ddc5 100644 --- a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs @@ -103,7 +103,7 @@ namespace DevHive.Services.Tests [Test] public async Task GetRoleById_ReturnsTheRole_WhenItExists() { - Guid id = new Guid(); + Guid id = Guid.NewGuid(); string name = "Gosho Trapov"; Role role = new Role { @@ -126,7 +126,7 @@ namespace DevHive.Services.Tests public void GetRoleById_ThrowsException_WhenRoleDoesNotExist() { string exceptionMessage = "Role does not exist!"; - Guid id = new Guid(); + Guid id = Guid.NewGuid(); this.RoleRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); Exception ex = Assert.ThrowsAsync(() => this.RoleService.GetRoleById(id)); @@ -201,7 +201,7 @@ namespace DevHive.Services.Tests [TestCase(false)] public async Task DeleteRole_ShouldReturnIfDeletionIsSuccessfull_WhenRoleExists(bool shouldPass) { - Guid id = new Guid(); + Guid id = Guid.NewGuid(); Role role = new Role(); this.RoleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(true)); @@ -217,7 +217,7 @@ namespace DevHive.Services.Tests public void DeleteRole_ThrowsException_WhenRoleDoesNotExist() { string exceptionMessage = "Role does not exist!"; - Guid id = new Guid(); + Guid id = Guid.NewGuid(); this.RoleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(false)); diff --git a/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs b/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs index a43d4b9..b53fc03 100644 --- a/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs +++ b/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs @@ -104,7 +104,7 @@ namespace DevHive.Services.Tests [Test] public async Task GetTechnologyById_ReturnsTheTechnology_WhenItExists() { - Guid id = new Guid(); + Guid id = Guid.NewGuid(); string name = "Gosho Trapov"; Technology technology = new() { @@ -127,7 +127,7 @@ namespace DevHive.Services.Tests public void GetTechnologyById_ThrowsException_WhenTechnologyDoesNotExist() { string exceptionMessage = "The technology does not exist"; - Guid id = new Guid(); + Guid id = Guid.NewGuid(); this.TechnologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); Exception ex = Assert.ThrowsAsync(() => this.TechnologyService.GetTechnologyById(id)); @@ -233,7 +233,7 @@ namespace DevHive.Services.Tests [TestCase(false)] public async Task DeleteTechnology_ShouldReturnIfDeletionIsSuccessfull_WhenTechnologyExists(bool shouldPass) { - Guid id = new Guid(); + Guid id = Guid.NewGuid(); Technology technology = new Technology(); this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(true)); @@ -249,7 +249,7 @@ namespace DevHive.Services.Tests public void DeleteTechnology_ThrowsException_WhenTechnologyDoesNotExist() { string exceptionMessage = "Technology does not exist!"; - Guid id = new Guid(); + Guid id = Guid.NewGuid(); this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(false)); diff --git a/src/Services/DevHive.Services.Tests/UserService.Tests.cs b/src/Services/DevHive.Services.Tests/UserService.Tests.cs index 2554706..946514b 100644 --- a/src/Services/DevHive.Services.Tests/UserService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/UserService.Tests.cs @@ -388,7 +388,7 @@ namespace DevHive.Services.Tests // [TestCase(false)] // public async Task DeleteUser_ShouldReturnIfDeletionIsSuccessfull_WhenUserExists(bool shouldPass) // { - // Guid id = new Guid(); + // Guid id = Guid.NewGuid(); // User user = new User(); // // this._userRepositoryMock.Setup(p => -- cgit v1.2.3 From 25228c4a018e7d4de4efd3d11d19c99086fd46be Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 13 Mar 2021 16:16:29 +0200 Subject: Removed unused local variables in service tests --- src/Services/DevHive.Services.Tests/PostService.Tests.cs | 4 ---- src/Services/DevHive.Services.Tests/RoleService.Tests.cs | 4 ---- src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs | 4 ---- src/Services/DevHive.Services.Tests/UserService.Tests.cs | 1 - 4 files changed, 13 deletions(-) (limited to 'src/Services') diff --git a/src/Services/DevHive.Services.Tests/PostService.Tests.cs b/src/Services/DevHive.Services.Tests/PostService.Tests.cs index b7f9a9d..799824b 100644 --- a/src/Services/DevHive.Services.Tests/PostService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/PostService.Tests.cs @@ -92,10 +92,6 @@ namespace DevHive.Services.Tests CreatePostServiceModel createPostServiceModel = new CreatePostServiceModel { }; - Post post = new Post - { - Message = MESSAGE, - }; Exception ex = Assert.ThrowsAsync(() => this.PostService.CreatePost(createPostServiceModel), "CreatePost does not throw excpeion when the user does not exist"); diff --git a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs index f12ddc5..2577679 100644 --- a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs @@ -86,10 +86,6 @@ namespace DevHive.Services.Tests { Name = roleName }; - Role role = new Role - { - Name = roleName - }; this.RoleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(true)); diff --git a/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs b/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs index b53fc03..5f56f19 100644 --- a/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs +++ b/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs @@ -87,10 +87,6 @@ namespace DevHive.Services.Tests { Name = technologyName }; - Technology technology = new() - { - Name = technologyName - }; this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); diff --git a/src/Services/DevHive.Services.Tests/UserService.Tests.cs b/src/Services/DevHive.Services.Tests/UserService.Tests.cs index 946514b..58ee223 100644 --- a/src/Services/DevHive.Services.Tests/UserService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/UserService.Tests.cs @@ -139,7 +139,6 @@ namespace DevHive.Services.Tests UserName = "g_trapov" }; Role role = new() { Name = Role.DefaultRole }; - HashSet roles = new() { role }; this._userRepositoryMock.Setup(p => p.DoesUsernameExistAsync(It.IsAny())) -- cgit v1.2.3 From 97459890f8c25b1af2a17109055afea53ee0b280 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 13 Mar 2021 16:34:45 +0200 Subject: When user has no friends, returned feed is just an empty array, rather than throwing an exception --- src/Services/DevHive.Services/Services/FeedService.cs | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/Services') diff --git a/src/Services/DevHive.Services/Services/FeedService.cs b/src/Services/DevHive.Services/Services/FeedService.cs index c16ffae..0af8093 100644 --- a/src/Services/DevHive.Services/Services/FeedService.cs +++ b/src/Services/DevHive.Services/Services/FeedService.cs @@ -42,9 +42,6 @@ namespace DevHive.Services.Services if (user == null) throw new ArgumentException("User doesn't exist!"); - if (user.Friends.Count == 0) - throw new ArgumentException("User has no friends to get feed from!"); - List posts = await this._feedRepository .GetFriendsPosts(user.Friends.ToList(), getPageServiceModel.FirstRequestIssued, getPageServiceModel.PageNumber, getPageServiceModel.PageSize); -- cgit v1.2.3 From 8adb24d535c54de558cd1278d5e98632bed755e3 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 14 Mar 2021 11:03:25 +0200 Subject: Made properties into variables in Service layer tests --- .../DevHive.Services.Tests/CommentService.Tests.cs | 94 ++++++++++----------- .../LanguageService.Tests.cs | 88 +++++++++---------- .../DevHive.Services.Tests/PostService.Tests.cs | 98 +++++++++++----------- .../DevHive.Services.Tests/RoleService.Tests.cs | 76 ++++++++--------- .../TechnologyServices.Tests.cs | 88 +++++++++---------- 5 files changed, 222 insertions(+), 222 deletions(-) (limited to 'src/Services') diff --git a/src/Services/DevHive.Services.Tests/CommentService.Tests.cs b/src/Services/DevHive.Services.Tests/CommentService.Tests.cs index 2d3c97a..a73cf90 100644 --- a/src/Services/DevHive.Services.Tests/CommentService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/CommentService.Tests.cs @@ -14,21 +14,21 @@ namespace DevHive.Services.Tests public class CommentServiceTests { private const string MESSAGE = "Gosho Trapov"; - private Mock UserRepositoryMock { get; set; } - private Mock PostRepositoryMock { get; set; } - private Mock CommentRepositoryMock { get; set; } - private Mock MapperMock { get; set; } - private CommentService CommentService { get; set; } + private Mock _userRepositoryMock; + private Mock _postRepositoryMock; + private Mock _commentRepositoryMock; + private Mock _mapperMock; + private CommentService _commentService; #region Setup [SetUp] public void Setup() { - this.UserRepositoryMock = new Mock(); - this.PostRepositoryMock = new Mock(); - this.CommentRepositoryMock = new Mock(); - this.MapperMock = new Mock(); - this.CommentService = new CommentService(this.UserRepositoryMock.Object, this.PostRepositoryMock.Object, this.CommentRepositoryMock.Object, this.MapperMock.Object); + this._userRepositoryMock = new Mock(); + this._postRepositoryMock = new Mock(); + this._commentRepositoryMock = new Mock(); + this._mapperMock = new Mock(); + this._commentService = new CommentService(this._userRepositoryMock.Object, this._postRepositoryMock.Object, this._commentRepositoryMock.Object, this._mapperMock.Object); } #endregion @@ -48,13 +48,13 @@ namespace DevHive.Services.Tests Id = id, }; - _ = this.CommentRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); - _ = this.CommentRepositoryMock.Setup(p => p.GetCommentByIssuerAndTimeCreatedAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(comment)); - _ = this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - _ = this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(creator)); - _ = this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); + _ = this._commentRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); + _ = this._commentRepositoryMock.Setup(p => p.GetCommentByIssuerAndTimeCreatedAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(comment)); + _ = this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); + _ = this._userRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(creator)); + _ = this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); - Guid result = await this.CommentService.AddComment(createCommentServiceModel); + Guid result = await this._commentService.AddComment(createCommentServiceModel); Assert.AreEqual(id, result); } @@ -71,11 +71,11 @@ namespace DevHive.Services.Tests Message = MESSAGE, }; - _ = this.CommentRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); - _ = this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - _ = this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); + _ = this._commentRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); + _ = this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); + _ = this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); - Guid result = await this.CommentService.AddComment(createCommentServiceModel); + Guid result = await this._commentService.AddComment(createCommentServiceModel); Assert.IsTrue(result == Guid.Empty); } @@ -90,7 +90,7 @@ namespace DevHive.Services.Tests Message = MESSAGE }; - Exception ex = Assert.ThrowsAsync(() => this.CommentService.AddComment(createCommentServiceModel), "AddComment does not throw excpeion when the post does not exist"); + Exception ex = Assert.ThrowsAsync(() => this._commentService.AddComment(createCommentServiceModel), "AddComment does not throw excpeion when the post does not exist"); Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message, "Incorecct exception message"); } @@ -116,11 +116,11 @@ namespace DevHive.Services.Tests Id = creatorId, }; - _ = this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); - _ = this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - _ = this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(commentServiceModel); + _ = this._commentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); + _ = this._userRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); + _ = this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(commentServiceModel); - ReadCommentServiceModel result = await this.CommentService.GetCommentById(Guid.NewGuid()); + ReadCommentServiceModel result = await this._commentService.GetCommentById(Guid.NewGuid()); Assert.AreEqual(MESSAGE, result.Message); } @@ -137,9 +137,9 @@ namespace DevHive.Services.Tests Creator = creator }; - _ = this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); + _ = this._commentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); - Exception ex = Assert.ThrowsAsync(() => this.CommentService.GetCommentById(Guid.NewGuid()), "GetCommentById does not throw exception when the user does not exist"); + Exception ex = Assert.ThrowsAsync(() => this._commentService.GetCommentById(Guid.NewGuid()), "GetCommentById does not throw exception when the user does not exist"); Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message); } @@ -154,10 +154,10 @@ namespace DevHive.Services.Tests Id = creatorId, }; - _ = this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); - _ = this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); + _ = this._commentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + _ = this._userRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - Exception ex = Assert.ThrowsAsync(() => this.CommentService.GetCommentById(Guid.NewGuid())); + Exception ex = Assert.ThrowsAsync(() => this._commentService.GetCommentById(Guid.NewGuid())); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -179,12 +179,12 @@ namespace DevHive.Services.Tests NewMessage = MESSAGE }; - _ = this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); - _ = this.CommentRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - _ = this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); - _ = this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); + _ = this._commentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); + _ = this._commentRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + _ = this._commentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); + _ = this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); - Guid result = await this.CommentService.UpdateComment(updateCommentServiceModel); + Guid result = await this._commentService.UpdateComment(updateCommentServiceModel); Assert.AreEqual(updateCommentServiceModel.CommentId, result); } @@ -202,11 +202,11 @@ namespace DevHive.Services.Tests NewMessage = MESSAGE }; - _ = this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); - _ = this.CommentRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - _ = this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); + _ = this._commentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); + _ = this._commentRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + _ = this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); - Guid result = await this.CommentService.UpdateComment(updateCommentServiceModel); + Guid result = await this._commentService.UpdateComment(updateCommentServiceModel); Assert.AreEqual(Guid.Empty, result); } @@ -219,9 +219,9 @@ namespace DevHive.Services.Tests { }; - _ = this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(false)); + _ = this._commentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(false)); - Exception ex = Assert.ThrowsAsync(() => this.CommentService.UpdateComment(updateCommentServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._commentService.UpdateComment(updateCommentServiceModel)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -236,11 +236,11 @@ namespace DevHive.Services.Tests Guid id = new(); Comment comment = new(); - _ = this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); - _ = this.CommentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); - _ = this.CommentRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); + _ = this._commentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); + _ = this._commentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); + _ = this._commentRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); - bool result = await this.CommentService.DeleteComment(id); + bool result = await this._commentService.DeleteComment(id); Assert.AreEqual(shouldPass, result); } @@ -251,9 +251,9 @@ namespace DevHive.Services.Tests string exceptionMessage = "Comment does not exist!"; Guid id = new(); - _ = this.CommentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(false)); + _ = this._commentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(false)); - Exception ex = Assert.ThrowsAsync(() => this.CommentService.DeleteComment(id)); + Exception ex = Assert.ThrowsAsync(() => this._commentService.DeleteComment(id)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } diff --git a/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs b/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs index e97ff31..0b5f198 100644 --- a/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs @@ -14,17 +14,17 @@ namespace DevHive.Services.Tests [TestFixture] public class LanguageServiceTests { - private Mock LanguageRepositoryMock { get; set; } - private Mock MapperMock { get; set; } - private LanguageService LanguageService { get; set; } + private Mock _languageRepositoryMock; + private Mock _mapperMock; + private LanguageService _languageService; #region SetUps [SetUp] public void SetUp() { - this.LanguageRepositoryMock = new Mock(); - this.MapperMock = new Mock(); - this.LanguageService = new LanguageService(this.LanguageRepositoryMock.Object, this.MapperMock.Object); + this._languageRepositoryMock = new Mock(); + this._mapperMock = new Mock(); + this._languageService = new LanguageService(this._languageRepositoryMock.Object, this._mapperMock.Object); } #endregion @@ -44,12 +44,12 @@ namespace DevHive.Services.Tests Id = id }; - this.LanguageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - this.LanguageRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.LanguageRepositoryMock.Setup(p => p.GetByNameAsync(It.IsAny())).Returns(Task.FromResult(language)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(language); + this._languageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._languageRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._languageRepositoryMock.Setup(p => p.GetByNameAsync(It.IsAny())).Returns(Task.FromResult(language)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(language); - Guid result = await this.LanguageService.CreateLanguage(createLanguageServiceModel); + Guid result = await this._languageService.CreateLanguage(createLanguageServiceModel); Assert.AreEqual(id, result); } @@ -68,11 +68,11 @@ namespace DevHive.Services.Tests Name = languageName }; - this.LanguageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - this.LanguageRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(language); + this._languageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._languageRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(language); - Guid result = await this.LanguageService.CreateLanguage(createLanguageServiceModel); + Guid result = await this._languageService.CreateLanguage(createLanguageServiceModel); Assert.IsTrue(result == Guid.Empty); @@ -93,9 +93,9 @@ namespace DevHive.Services.Tests Name = languageName }; - this.LanguageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._languageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - Exception ex = Assert.ThrowsAsync(() => this.LanguageService.CreateLanguage(createLanguageServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._languageService.CreateLanguage(createLanguageServiceModel)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -116,10 +116,10 @@ namespace DevHive.Services.Tests Name = name }; - this.LanguageRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(language)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readLanguageServiceModel); + this._languageRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(language)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readLanguageServiceModel); - ReadLanguageServiceModel result = await this.LanguageService.GetLanguageById(id); + ReadLanguageServiceModel result = await this._languageService.GetLanguageById(id); Assert.AreEqual(name, result.Name); } @@ -129,9 +129,9 @@ namespace DevHive.Services.Tests { string exceptionMessage = "The language does not exist"; Guid id = Guid.NewGuid(); - this.LanguageRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + this._languageRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); - Exception ex = Assert.ThrowsAsync(() => this.LanguageService.GetLanguageById(id)); + Exception ex = Assert.ThrowsAsync(() => this._languageService.GetLanguageById(id)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -147,10 +147,10 @@ namespace DevHive.Services.Tests languges.Add(firstLanguage); languges.Add(secondLanguage); - this.LanguageRepositoryMock.Setup(p => p.GetLanguages()).Returns(new HashSet()); - this.MapperMock.Setup(p => p.Map>(It.IsAny>())).Returns(languges); + this._languageRepositoryMock.Setup(p => p.GetLanguages()).Returns(new HashSet()); + this._mapperMock.Setup(p => p.Map>(It.IsAny>())).Returns(languges); - HashSet result = this.LanguageService.GetLanguages(); + HashSet result = this._languageService.GetLanguages(); Assert.GreaterOrEqual(2, result.Count, "GetLanguages does not return all languages"); } @@ -158,10 +158,10 @@ namespace DevHive.Services.Tests [Test] public void GetLanguages_ReturnsEmptyHashSet_IfNoLanguagesExist() { - this.LanguageRepositoryMock.Setup(p => p.GetLanguages()).Returns(new HashSet()); - this.MapperMock.Setup(p => p.Map>(It.IsAny>())).Returns(new HashSet()); + this._languageRepositoryMock.Setup(p => p.GetLanguages()).Returns(new HashSet()); + this._mapperMock.Setup(p => p.Map>(It.IsAny>())).Returns(new HashSet()); - HashSet result = this.LanguageService.GetLanguages(); + HashSet result = this._languageService.GetLanguages(); Assert.IsEmpty(result, "GetLanguages does not return empty string when no languages exist"); } @@ -185,12 +185,12 @@ namespace DevHive.Services.Tests Name = name, }; - this.LanguageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.LanguageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - this.LanguageRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(shouldPass)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(language); + this._languageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._languageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._languageRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(shouldPass)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(language); - bool result = await this.LanguageService.UpdateLanguage(updateLanguageServiceModel); + bool result = await this._languageService.UpdateLanguage(updateLanguageServiceModel); Assert.AreEqual(shouldPass, result); } @@ -203,9 +203,9 @@ namespace DevHive.Services.Tests { }; - this.LanguageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._languageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - Exception ex = Assert.ThrowsAsync(() => this.LanguageService.UpdateLanguage(updateTechnologyServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._languageService.UpdateLanguage(updateTechnologyServiceModel)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -218,10 +218,10 @@ namespace DevHive.Services.Tests { }; - this.LanguageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.LanguageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._languageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._languageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - Exception ex = Assert.ThrowsAsync(() => this.LanguageService.UpdateLanguage(updateTechnologyServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._languageService.UpdateLanguage(updateTechnologyServiceModel)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -236,11 +236,11 @@ namespace DevHive.Services.Tests Guid id = Guid.NewGuid(); Language language = new Language(); - this.LanguageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.LanguageRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(language)); - this.LanguageRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); + this._languageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._languageRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(language)); + this._languageRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); - bool result = await this.LanguageService.DeleteLanguage(id); + bool result = await this._languageService.DeleteLanguage(id); Assert.AreEqual(shouldPass, result); } @@ -251,9 +251,9 @@ namespace DevHive.Services.Tests string exceptionMessage = "Language does not exist!"; Guid id = Guid.NewGuid(); - this.LanguageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._languageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - Exception ex = Assert.ThrowsAsync(() => this.LanguageService.DeleteLanguage(id)); + Exception ex = Assert.ThrowsAsync(() => this._languageService.DeleteLanguage(id)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } diff --git a/src/Services/DevHive.Services.Tests/PostService.Tests.cs b/src/Services/DevHive.Services.Tests/PostService.Tests.cs index 799824b..e51f250 100644 --- a/src/Services/DevHive.Services.Tests/PostService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/PostService.Tests.cs @@ -17,23 +17,23 @@ namespace DevHive.Services.Tests public class PostServiceTests { private const string MESSAGE = "Gosho Trapov"; - private Mock CloudServiceMock { get; set; } - private Mock PostRepositoryMock { get; set; } - private Mock CommentRepositoryMock { get; set; } - private Mock UserRepositoryMock { get; set; } - private Mock MapperMock { get; set; } - private PostService PostService { get; set; } + private Mock _cloudServiceMock; + private Mock _postRepositoryMock; + private Mock _commentRepositoryMock; + private Mock _userRepositoryMock; + private Mock _mapperMock; + private PostService _postService; #region SetUps [SetUp] public void Setup() { - this.PostRepositoryMock = new Mock(); - this.CloudServiceMock = new Mock(); - this.UserRepositoryMock = new Mock(); - this.CommentRepositoryMock = new Mock(); - this.MapperMock = new Mock(); - this.PostService = new PostService(this.CloudServiceMock.Object, this.UserRepositoryMock.Object, this.PostRepositoryMock.Object, this.CommentRepositoryMock.Object, this.MapperMock.Object); + this._postRepositoryMock = new Mock(); + this._cloudServiceMock = new Mock(); + this._userRepositoryMock = new Mock(); + this._commentRepositoryMock = new Mock(); + this._mapperMock = new Mock(); + this._postService = new PostService(this._cloudServiceMock.Object, this._userRepositoryMock.Object, this._postRepositoryMock.Object, this._commentRepositoryMock.Object, this._mapperMock.Object); } #endregion @@ -53,13 +53,13 @@ namespace DevHive.Services.Tests Id = postId, }; - this.PostRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.PostRepositoryMock.Setup(p => p.GetPostByCreatorAndTimeCreatedAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(post)); - this.UserRepositoryMock.Setup(p => p.DoesUserExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(creator)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(post); + this._postRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._postRepositoryMock.Setup(p => p.GetPostByCreatorAndTimeCreatedAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(post)); + this._userRepositoryMock.Setup(p => p.DoesUserExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._userRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(creator)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(post); - Guid result = await this.PostService.CreatePost(createPostServiceModel); + Guid result = await this._postService.CreatePost(createPostServiceModel); Assert.AreEqual(postId, result, "CreatePost does not return the correct id"); } @@ -76,11 +76,11 @@ namespace DevHive.Services.Tests Message = MESSAGE, }; - this.PostRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); - this.UserRepositoryMock.Setup(p => p.DoesUserExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(post); + this._postRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._userRepositoryMock.Setup(p => p.DoesUserExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(post); - Guid result = await this.PostService.CreatePost(createPostServiceModel); + Guid result = await this._postService.CreatePost(createPostServiceModel); Assert.AreEqual(Guid.Empty, result, "CreatePost does not return empty id"); } @@ -93,7 +93,7 @@ namespace DevHive.Services.Tests { }; - Exception ex = Assert.ThrowsAsync(() => this.PostService.CreatePost(createPostServiceModel), "CreatePost does not throw excpeion when the user does not exist"); + Exception ex = Assert.ThrowsAsync(() => this._postService.CreatePost(createPostServiceModel), "CreatePost does not throw excpeion when the user does not exist"); Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message, "Excapetion message is not correct"); } @@ -119,11 +119,11 @@ namespace DevHive.Services.Tests Id = creatorId, }; - this.PostRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); - this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPostServiceModel); + this._postRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); + this._userRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPostServiceModel); - ReadPostServiceModel result = await this.PostService.GetPostById(Guid.NewGuid()); + ReadPostServiceModel result = await this._postService.GetPostById(Guid.NewGuid()); Assert.AreEqual(MESSAGE, result.Message); } @@ -140,9 +140,9 @@ namespace DevHive.Services.Tests Creator = creator }; - this.PostRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); + this._postRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); - Exception ex = Assert.ThrowsAsync(() => this.PostService.GetPostById(Guid.NewGuid()), "GetPostById does not throw exception when the user does not exist"); + Exception ex = Assert.ThrowsAsync(() => this._postService.GetPostById(Guid.NewGuid()), "GetPostById does not throw exception when the user does not exist"); Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message); } @@ -157,10 +157,10 @@ namespace DevHive.Services.Tests Id = creatorId, }; - this.PostRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); - this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); + this._postRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + this._userRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - Exception ex = Assert.ThrowsAsync(() => this.PostService.GetPostById(Guid.NewGuid())); + Exception ex = Assert.ThrowsAsync(() => this._postService.GetPostById(Guid.NewGuid())); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -183,12 +183,12 @@ namespace DevHive.Services.Tests Files = new List() }; - this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - this.PostRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - this.PostRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(post); + this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); + this._postRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); + this._postRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(post); - Guid result = await this.PostService.UpdatePost(updatePostServiceModel); + Guid result = await this._postService.UpdatePost(updatePostServiceModel); Assert.AreEqual(updatePostServiceModel.PostId, result); } @@ -207,11 +207,11 @@ namespace DevHive.Services.Tests Files = new List() }; - this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - this.PostRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(post); + this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); + this._postRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(post); - Guid result = await this.PostService.UpdatePost(updatePostServiceModel); + Guid result = await this._postService.UpdatePost(updatePostServiceModel); Assert.AreEqual(Guid.Empty, result); } @@ -224,9 +224,9 @@ namespace DevHive.Services.Tests { }; - this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(false)); + this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(false)); - Exception ex = Assert.ThrowsAsync(() => this.PostService.UpdatePost(updatePostServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._postService.UpdatePost(updatePostServiceModel)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -241,11 +241,11 @@ namespace DevHive.Services.Tests Guid id = Guid.NewGuid(); Post post = new Post(); - this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - this.PostRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); - this.PostRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); + this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); + this._postRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); + this._postRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); - bool result = await this.PostService.DeletePost(id); + bool result = await this._postService.DeletePost(id); Assert.AreEqual(shouldPass, result); } @@ -256,9 +256,9 @@ namespace DevHive.Services.Tests string exceptionMessage = "Post does not exist!"; Guid id = Guid.NewGuid(); - this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(false)); + this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(false)); - Exception ex = Assert.ThrowsAsync(() => this.PostService.DeletePost(id)); + Exception ex = Assert.ThrowsAsync(() => this._postService.DeletePost(id)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } diff --git a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs index 2577679..6d5a333 100644 --- a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs @@ -13,17 +13,17 @@ namespace DevHive.Services.Tests [TestFixture] public class RoleServiceTests { - private Mock RoleRepositoryMock { get; set; } - private Mock MapperMock { get; set; } - private RoleService RoleService { get; set; } + private Mock _roleRepositoryMock; + private Mock _mapperMock; + private RoleService _roleService; #region SetUps [SetUp] public void Setup() { - this.RoleRepositoryMock = new Mock(); - this.MapperMock = new Mock(); - this.RoleService = new RoleService(this.RoleRepositoryMock.Object, this.MapperMock.Object); + this._roleRepositoryMock = new Mock(); + this._mapperMock = new Mock(); + this._roleService = new RoleService(this._roleRepositoryMock.Object, this._mapperMock.Object); } #endregion @@ -43,12 +43,12 @@ namespace DevHive.Services.Tests Id = id }; - this.RoleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(false)); - this.RoleRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.RoleRepositoryMock.Setup(p => p.GetByNameAsync(It.IsAny())).Returns(Task.FromResult(role)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(role); + this._roleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(false)); + this._roleRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._roleRepositoryMock.Setup(p => p.GetByNameAsync(It.IsAny())).Returns(Task.FromResult(role)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(role); - Guid result = await this.RoleService.CreateRole(createRoleServiceModel); + Guid result = await this._roleService.CreateRole(createRoleServiceModel); Assert.AreEqual(id, result); } @@ -67,11 +67,11 @@ namespace DevHive.Services.Tests Name = roleName }; - this.RoleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(false)); - this.RoleRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(role); + this._roleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(false)); + this._roleRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(role); - Guid result = await this.RoleService.CreateRole(createRoleServiceModel); + Guid result = await this._roleService.CreateRole(createRoleServiceModel); Assert.IsTrue(result == Guid.Empty); } @@ -87,9 +87,9 @@ namespace DevHive.Services.Tests Name = roleName }; - this.RoleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(true)); + this._roleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(true)); - Exception ex = Assert.ThrowsAsync(() => this.RoleService.CreateRole(createRoleServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._roleService.CreateRole(createRoleServiceModel)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -110,10 +110,10 @@ namespace DevHive.Services.Tests Name = name }; - this.RoleRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(role)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(roleServiceModel); + this._roleRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(role)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(roleServiceModel); - RoleServiceModel result = await this.RoleService.GetRoleById(id); + RoleServiceModel result = await this._roleService.GetRoleById(id); Assert.AreEqual(name, result.Name); } @@ -123,9 +123,9 @@ namespace DevHive.Services.Tests { string exceptionMessage = "Role does not exist!"; Guid id = Guid.NewGuid(); - this.RoleRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + this._roleRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); - Exception ex = Assert.ThrowsAsync(() => this.RoleService.GetRoleById(id)); + Exception ex = Assert.ThrowsAsync(() => this._roleService.GetRoleById(id)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -149,12 +149,12 @@ namespace DevHive.Services.Tests Name = name, }; - this.RoleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(true)); - this.RoleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(false)); - this.RoleRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(shouldPass)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(role); + this._roleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(true)); + this._roleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(false)); + this._roleRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(shouldPass)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(role); - bool result = await this.RoleService.UpdateRole(updateRoleServiceModel); + bool result = await this._roleService.UpdateRole(updateRoleServiceModel); Assert.AreEqual(shouldPass, result); } @@ -167,9 +167,9 @@ namespace DevHive.Services.Tests { }; - this.RoleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(false)); + this._roleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(false)); - Exception ex = Assert.ThrowsAsync(() => this.RoleService.UpdateRole(updateRoleServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._roleService.UpdateRole(updateRoleServiceModel)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -182,10 +182,10 @@ namespace DevHive.Services.Tests { }; - this.RoleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(true)); - this.RoleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(true)); + this._roleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(true)); + this._roleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(true)); - Exception ex = Assert.ThrowsAsync(() => this.RoleService.UpdateRole(updateRoleServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._roleService.UpdateRole(updateRoleServiceModel)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -200,11 +200,11 @@ namespace DevHive.Services.Tests Guid id = Guid.NewGuid(); Role role = new Role(); - this.RoleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(true)); - this.RoleRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(role)); - this.RoleRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); + this._roleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(true)); + this._roleRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(role)); + this._roleRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); - bool result = await this.RoleService.DeleteRole(id); + bool result = await this._roleService.DeleteRole(id); Assert.AreEqual(shouldPass, result); } @@ -215,9 +215,9 @@ namespace DevHive.Services.Tests string exceptionMessage = "Role does not exist!"; Guid id = Guid.NewGuid(); - this.RoleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(false)); + this._roleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(false)); - Exception ex = Assert.ThrowsAsync(() => this.RoleService.DeleteRole(id)); + Exception ex = Assert.ThrowsAsync(() => this._roleService.DeleteRole(id)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } diff --git a/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs b/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs index 5f56f19..8cc78f1 100644 --- a/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs +++ b/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs @@ -14,17 +14,17 @@ namespace DevHive.Services.Tests [TestFixture] public class TechnologyServicesTests { - private Mock TechnologyRepositoryMock { get; set; } - private Mock MapperMock { get; set; } - private TechnologyService TechnologyService { get; set; } + private Mock _technologyRepositoryMock; + private Mock _mapperMock; + private TechnologyService _technologyService; #region SetUps [SetUp] public void Setup() { - this.TechnologyRepositoryMock = new Mock(); - this.MapperMock = new Mock(); - this.TechnologyService = new TechnologyService(this.TechnologyRepositoryMock.Object, this.MapperMock.Object); + this._technologyRepositoryMock = new Mock(); + this._mapperMock = new Mock(); + this._technologyService = new TechnologyService(this._technologyRepositoryMock.Object, this._mapperMock.Object); } #endregion @@ -44,12 +44,12 @@ namespace DevHive.Services.Tests Id = id }; - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - this.TechnologyRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.TechnologyRepositoryMock.Setup(p => p.GetByNameAsync(It.IsAny())).Returns(Task.FromResult(technology)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(technology); + this._technologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._technologyRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._technologyRepositoryMock.Setup(p => p.GetByNameAsync(It.IsAny())).Returns(Task.FromResult(technology)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(technology); - Guid result = await this.TechnologyService.CreateTechnology(createTechnologyServiceModel); + Guid result = await this._technologyService.CreateTechnology(createTechnologyServiceModel); Assert.AreEqual(id, result); } @@ -68,11 +68,11 @@ namespace DevHive.Services.Tests Name = technologyName }; - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - this.TechnologyRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(technology); + this._technologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._technologyRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(technology); - Guid result = await this.TechnologyService.CreateTechnology(createTechnologyServiceModel); + Guid result = await this._technologyService.CreateTechnology(createTechnologyServiceModel); Assert.IsTrue(result == Guid.Empty); } @@ -88,9 +88,9 @@ namespace DevHive.Services.Tests Name = technologyName }; - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._technologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - Exception ex = Assert.ThrowsAsync(() => this.TechnologyService.CreateTechnology(createTechnologyServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._technologyService.CreateTechnology(createTechnologyServiceModel)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -111,10 +111,10 @@ namespace DevHive.Services.Tests Name = name }; - this.TechnologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(technology)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readTechnologyServiceModel); + this._technologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(technology)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readTechnologyServiceModel); - ReadTechnologyServiceModel result = await this.TechnologyService.GetTechnologyById(id); + ReadTechnologyServiceModel result = await this._technologyService.GetTechnologyById(id); Assert.AreEqual(name, result.Name); } @@ -124,9 +124,9 @@ namespace DevHive.Services.Tests { string exceptionMessage = "The technology does not exist"; Guid id = Guid.NewGuid(); - this.TechnologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + this._technologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); - Exception ex = Assert.ThrowsAsync(() => this.TechnologyService.GetTechnologyById(id)); + Exception ex = Assert.ThrowsAsync(() => this._technologyService.GetTechnologyById(id)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -142,10 +142,10 @@ namespace DevHive.Services.Tests technologies.Add(firstTechnology); technologies.Add(secondTechnology); - this.TechnologyRepositoryMock.Setup(p => p.GetTechnologies()).Returns(new HashSet()); - this.MapperMock.Setup(p => p.Map>(It.IsAny>())).Returns(technologies); + this._technologyRepositoryMock.Setup(p => p.GetTechnologies()).Returns(new HashSet()); + this._mapperMock.Setup(p => p.Map>(It.IsAny>())).Returns(technologies); - HashSet result = this.TechnologyService.GetTechnologies(); + HashSet result = this._technologyService.GetTechnologies(); Assert.GreaterOrEqual(2, result.Count, "GetTechnologies does not return all technologies"); } @@ -153,10 +153,10 @@ namespace DevHive.Services.Tests [Test] public void GetLanguages_ReturnsEmptyHashSet_IfNoLanguagesExist() { - this.TechnologyRepositoryMock.Setup(p => p.GetTechnologies()).Returns(new HashSet()); - this.MapperMock.Setup(p => p.Map>(It.IsAny>())).Returns(new HashSet()); + this._technologyRepositoryMock.Setup(p => p.GetTechnologies()).Returns(new HashSet()); + this._mapperMock.Setup(p => p.Map>(It.IsAny>())).Returns(new HashSet()); - HashSet result = this.TechnologyService.GetTechnologies(); + HashSet result = this._technologyService.GetTechnologies(); Assert.IsEmpty(result, "GetTechnologies does not return empty string when no technologies exist"); } @@ -180,12 +180,12 @@ namespace DevHive.Services.Tests Name = name, }; - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - this.TechnologyRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(shouldPass)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(technology); + this._technologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._technologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._technologyRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(shouldPass)); + this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(technology); - bool result = await this.TechnologyService.UpdateTechnology(updatetechnologyServiceModel); + bool result = await this._technologyService.UpdateTechnology(updatetechnologyServiceModel); Assert.AreEqual(shouldPass, result); } @@ -198,9 +198,9 @@ namespace DevHive.Services.Tests { }; - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._technologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - Exception ex = Assert.ThrowsAsync(() => this.TechnologyService.UpdateTechnology(updateTechnologyServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._technologyService.UpdateTechnology(updateTechnologyServiceModel)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -213,10 +213,10 @@ namespace DevHive.Services.Tests { }; - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._technologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._technologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - Exception ex = Assert.ThrowsAsync(() => this.TechnologyService.UpdateTechnology(updateTechnologyServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._technologyService.UpdateTechnology(updateTechnologyServiceModel)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -232,11 +232,11 @@ namespace DevHive.Services.Tests Guid id = Guid.NewGuid(); Technology technology = new Technology(); - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.TechnologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(technology)); - this.TechnologyRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); + this._technologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._technologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(technology)); + this._technologyRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); - bool result = await this.TechnologyService.DeleteTechnology(id); + bool result = await this._technologyService.DeleteTechnology(id); Assert.AreEqual(shouldPass, result); } @@ -247,9 +247,9 @@ namespace DevHive.Services.Tests string exceptionMessage = "Technology does not exist!"; Guid id = Guid.NewGuid(); - this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._technologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - Exception ex = Assert.ThrowsAsync(() => this.TechnologyService.DeleteTechnology(id)); + Exception ex = Assert.ThrowsAsync(() => this._technologyService.DeleteTechnology(id)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } -- cgit v1.2.3 From 5372fa5e7cd1a3d97a61052cd87f2105c65b143a Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 14 Mar 2021 11:39:23 +0200 Subject: Updated code style of mock setups in Service layer tests --- .../DevHive.Services.Tests/CommentService.Tests.cs | 104 +++++++++--- .../LanguageService.Tests.cs | 104 +++++++++--- .../DevHive.Services.Tests/PostService.Tests.cs | 104 +++++++++--- .../DevHive.Services.Tests/RoleService.Tests.cs | 88 +++++++--- .../TechnologyServices.Tests.cs | 104 +++++++++--- .../DevHive.Services.Tests/UserService.Tests.cs | 180 +++++++++++---------- 6 files changed, 470 insertions(+), 214 deletions(-) (limited to 'src/Services') diff --git a/src/Services/DevHive.Services.Tests/CommentService.Tests.cs b/src/Services/DevHive.Services.Tests/CommentService.Tests.cs index a73cf90..729e943 100644 --- a/src/Services/DevHive.Services.Tests/CommentService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/CommentService.Tests.cs @@ -48,11 +48,21 @@ namespace DevHive.Services.Tests Id = id, }; - _ = this._commentRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); - _ = this._commentRepositoryMock.Setup(p => p.GetCommentByIssuerAndTimeCreatedAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(comment)); - _ = this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - _ = this._userRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(creator)); - _ = this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); + this._commentRepositoryMock + .Setup(p => p.AddAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._commentRepositoryMock + .Setup(p => p.GetCommentByIssuerAndTimeCreatedAsync(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(comment)); + this._postRepositoryMock + .Setup(p => p.DoesPostExist(It.IsAny())) + .Returns(Task.FromResult(true)); + this._userRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(creator)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(comment); Guid result = await this._commentService.AddComment(createCommentServiceModel); @@ -71,9 +81,15 @@ namespace DevHive.Services.Tests Message = MESSAGE, }; - _ = this._commentRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); - _ = this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - _ = this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); + this._commentRepositoryMock + .Setup(p => p.AddAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._postRepositoryMock + .Setup(p => p.DoesPostExist(It.IsAny())) + .Returns(Task.FromResult(true)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(comment); Guid result = await this._commentService.AddComment(createCommentServiceModel); @@ -116,9 +132,15 @@ namespace DevHive.Services.Tests Id = creatorId, }; - _ = this._commentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); - _ = this._userRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - _ = this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(commentServiceModel); + this._commentRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(comment)); + this._userRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(user)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(commentServiceModel); ReadCommentServiceModel result = await this._commentService.GetCommentById(Guid.NewGuid()); @@ -137,7 +159,9 @@ namespace DevHive.Services.Tests Creator = creator }; - _ = this._commentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); + this._commentRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(comment)); Exception ex = Assert.ThrowsAsync(() => this._commentService.GetCommentById(Guid.NewGuid()), "GetCommentById does not throw exception when the user does not exist"); @@ -154,8 +178,12 @@ namespace DevHive.Services.Tests Id = creatorId, }; - _ = this._commentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); - _ = this._userRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); + this._commentRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(null)); + this._userRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(user)); Exception ex = Assert.ThrowsAsync(() => this._commentService.GetCommentById(Guid.NewGuid())); @@ -179,10 +207,18 @@ namespace DevHive.Services.Tests NewMessage = MESSAGE }; - _ = this._commentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); - _ = this._commentRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - _ = this._commentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); - _ = this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); + this._commentRepositoryMock + .Setup(p => p.DoesCommentExist(It.IsAny())) + .Returns(Task.FromResult(true)); + this._commentRepositoryMock + .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); + this._commentRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(comment)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(comment); Guid result = await this._commentService.UpdateComment(updateCommentServiceModel); @@ -202,9 +238,15 @@ namespace DevHive.Services.Tests NewMessage = MESSAGE }; - _ = this._commentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); - _ = this._commentRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - _ = this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(comment); + this._commentRepositoryMock + .Setup(p => p.DoesCommentExist(It.IsAny())) + .Returns(Task.FromResult(true)); + this._commentRepositoryMock + .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(false)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(comment); Guid result = await this._commentService.UpdateComment(updateCommentServiceModel); @@ -219,7 +261,9 @@ namespace DevHive.Services.Tests { }; - _ = this._commentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(false)); + this._commentRepositoryMock + .Setup(p => p.DoesCommentExist(It.IsAny())) + .Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this._commentService.UpdateComment(updateCommentServiceModel)); @@ -236,9 +280,15 @@ namespace DevHive.Services.Tests Guid id = new(); Comment comment = new(); - _ = this._commentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(true)); - _ = this._commentRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(comment)); - _ = this._commentRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); + this._commentRepositoryMock + .Setup(p => p.DoesCommentExist(It.IsAny())) + .Returns(Task.FromResult(true)); + this._commentRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(comment)); + this._commentRepositoryMock + .Setup(p => p.DeleteAsync(It.IsAny())) + .Returns(Task.FromResult(shouldPass)); bool result = await this._commentService.DeleteComment(id); @@ -251,7 +301,9 @@ namespace DevHive.Services.Tests string exceptionMessage = "Comment does not exist!"; Guid id = new(); - _ = this._commentRepositoryMock.Setup(p => p.DoesCommentExist(It.IsAny())).Returns(Task.FromResult(false)); + this._commentRepositoryMock + .Setup(p => p.DoesCommentExist(It.IsAny())) + .Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this._commentService.DeleteComment(id)); diff --git a/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs b/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs index 0b5f198..c1f4d54 100644 --- a/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs @@ -44,10 +44,18 @@ namespace DevHive.Services.Tests Id = id }; - this._languageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - this._languageRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); - this._languageRepositoryMock.Setup(p => p.GetByNameAsync(It.IsAny())).Returns(Task.FromResult(language)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(language); + this._languageRepositoryMock + .Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._languageRepositoryMock + .Setup(p => p.AddAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._languageRepositoryMock + .Setup(p => p.GetByNameAsync(It.IsAny())) + .Returns(Task.FromResult(language)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(language); Guid result = await this._languageService.CreateLanguage(createLanguageServiceModel); @@ -68,9 +76,15 @@ namespace DevHive.Services.Tests Name = languageName }; - this._languageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - this._languageRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(language); + this._languageRepositoryMock + .Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._languageRepositoryMock + .Setup(p => p.AddAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(language); Guid result = await this._languageService.CreateLanguage(createLanguageServiceModel); @@ -93,7 +107,9 @@ namespace DevHive.Services.Tests Name = languageName }; - this._languageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._languageRepositoryMock + .Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); Exception ex = Assert.ThrowsAsync(() => this._languageService.CreateLanguage(createLanguageServiceModel)); @@ -116,8 +132,12 @@ namespace DevHive.Services.Tests Name = name }; - this._languageRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(language)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readLanguageServiceModel); + this._languageRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(language)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readLanguageServiceModel); ReadLanguageServiceModel result = await this._languageService.GetLanguageById(id); @@ -129,7 +149,9 @@ namespace DevHive.Services.Tests { string exceptionMessage = "The language does not exist"; Guid id = Guid.NewGuid(); - this._languageRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + this._languageRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(null)); Exception ex = Assert.ThrowsAsync(() => this._languageService.GetLanguageById(id)); @@ -147,8 +169,12 @@ namespace DevHive.Services.Tests languges.Add(firstLanguage); languges.Add(secondLanguage); - this._languageRepositoryMock.Setup(p => p.GetLanguages()).Returns(new HashSet()); - this._mapperMock.Setup(p => p.Map>(It.IsAny>())).Returns(languges); + this._languageRepositoryMock + .Setup(p => p.GetLanguages()) + .Returns(new HashSet()); + this._mapperMock + .Setup(p => p.Map>(It.IsAny>())) + .Returns(languges); HashSet result = this._languageService.GetLanguages(); @@ -158,8 +184,12 @@ namespace DevHive.Services.Tests [Test] public void GetLanguages_ReturnsEmptyHashSet_IfNoLanguagesExist() { - this._languageRepositoryMock.Setup(p => p.GetLanguages()).Returns(new HashSet()); - this._mapperMock.Setup(p => p.Map>(It.IsAny>())).Returns(new HashSet()); + this._languageRepositoryMock + .Setup(p => p.GetLanguages()) + .Returns(new HashSet()); + this._mapperMock + .Setup(p => p.Map>(It.IsAny>())) + .Returns(new HashSet()); HashSet result = this._languageService.GetLanguages(); @@ -185,10 +215,18 @@ namespace DevHive.Services.Tests Name = name, }; - this._languageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this._languageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - this._languageRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(shouldPass)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(language); + this._languageRepositoryMock + .Setup(p => p.DoesLanguageExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._languageRepositoryMock + .Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._languageRepositoryMock + .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(shouldPass)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(language); bool result = await this._languageService.UpdateLanguage(updateLanguageServiceModel); @@ -203,7 +241,9 @@ namespace DevHive.Services.Tests { }; - this._languageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._languageRepositoryMock + .Setup(p => p.DoesLanguageExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this._languageService.UpdateLanguage(updateTechnologyServiceModel)); @@ -218,8 +258,12 @@ namespace DevHive.Services.Tests { }; - this._languageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this._languageRepositoryMock.Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._languageRepositoryMock + .Setup(p => p.DoesLanguageExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._languageRepositoryMock + .Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); Exception ex = Assert.ThrowsAsync(() => this._languageService.UpdateLanguage(updateTechnologyServiceModel)); @@ -236,9 +280,15 @@ namespace DevHive.Services.Tests Guid id = Guid.NewGuid(); Language language = new Language(); - this._languageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this._languageRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(language)); - this._languageRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); + this._languageRepositoryMock + .Setup(p => p.DoesLanguageExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._languageRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(language)); + this._languageRepositoryMock + .Setup(p => p.DeleteAsync(It.IsAny())) + .Returns(Task.FromResult(shouldPass)); bool result = await this._languageService.DeleteLanguage(id); @@ -251,7 +301,9 @@ namespace DevHive.Services.Tests string exceptionMessage = "Language does not exist!"; Guid id = Guid.NewGuid(); - this._languageRepositoryMock.Setup(p => p.DoesLanguageExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._languageRepositoryMock + .Setup(p => p.DoesLanguageExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this._languageService.DeleteLanguage(id)); diff --git a/src/Services/DevHive.Services.Tests/PostService.Tests.cs b/src/Services/DevHive.Services.Tests/PostService.Tests.cs index e51f250..5aea4a8 100644 --- a/src/Services/DevHive.Services.Tests/PostService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/PostService.Tests.cs @@ -53,11 +53,21 @@ namespace DevHive.Services.Tests Id = postId, }; - this._postRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); - this._postRepositoryMock.Setup(p => p.GetPostByCreatorAndTimeCreatedAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(post)); - this._userRepositoryMock.Setup(p => p.DoesUserExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this._userRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(creator)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(post); + this._postRepositoryMock + .Setup(p => p.AddAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._postRepositoryMock + .Setup(p => p.GetPostByCreatorAndTimeCreatedAsync(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(post)); + this._userRepositoryMock + .Setup(p => p.DoesUserExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._userRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(creator)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(post); Guid result = await this._postService.CreatePost(createPostServiceModel); @@ -76,9 +86,15 @@ namespace DevHive.Services.Tests Message = MESSAGE, }; - this._postRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); - this._userRepositoryMock.Setup(p => p.DoesUserExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(post); + this._postRepositoryMock + .Setup(p => p.AddAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._userRepositoryMock + .Setup(p => p.DoesUserExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(post); Guid result = await this._postService.CreatePost(createPostServiceModel); @@ -119,9 +135,15 @@ namespace DevHive.Services.Tests Id = creatorId, }; - this._postRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); - this._userRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readPostServiceModel); + this._postRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(post)); + this._userRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(user)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readPostServiceModel); ReadPostServiceModel result = await this._postService.GetPostById(Guid.NewGuid()); @@ -140,7 +162,9 @@ namespace DevHive.Services.Tests Creator = creator }; - this._postRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); + this._postRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(post)); Exception ex = Assert.ThrowsAsync(() => this._postService.GetPostById(Guid.NewGuid()), "GetPostById does not throw exception when the user does not exist"); @@ -157,8 +181,12 @@ namespace DevHive.Services.Tests Id = creatorId, }; - this._postRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); - this._userRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); + this._postRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(null)); + this._userRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(user)); Exception ex = Assert.ThrowsAsync(() => this._postService.GetPostById(Guid.NewGuid())); @@ -183,10 +211,18 @@ namespace DevHive.Services.Tests Files = new List() }; - this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - this._postRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - this._postRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(post); + this._postRepositoryMock + .Setup(p => p.DoesPostExist(It.IsAny())) + .Returns(Task.FromResult(true)); + this._postRepositoryMock + .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); + this._postRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(post)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(post); Guid result = await this._postService.UpdatePost(updatePostServiceModel); @@ -207,9 +243,15 @@ namespace DevHive.Services.Tests Files = new List() }; - this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - this._postRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(post); + this._postRepositoryMock + .Setup(p => p.DoesPostExist(It.IsAny())) + .Returns(Task.FromResult(true)); + this._postRepositoryMock + .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(false)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(post); Guid result = await this._postService.UpdatePost(updatePostServiceModel); @@ -224,7 +266,9 @@ namespace DevHive.Services.Tests { }; - this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(false)); + this._postRepositoryMock + .Setup(p => p.DoesPostExist(It.IsAny())) + .Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this._postService.UpdatePost(updatePostServiceModel)); @@ -241,9 +285,15 @@ namespace DevHive.Services.Tests Guid id = Guid.NewGuid(); Post post = new Post(); - this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - this._postRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); - this._postRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); + this._postRepositoryMock + .Setup(p => p.DoesPostExist(It.IsAny())) + .Returns(Task.FromResult(true)); + this._postRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(post)); + this._postRepositoryMock + .Setup(p => p.DeleteAsync(It.IsAny())) + .Returns(Task.FromResult(shouldPass)); bool result = await this._postService.DeletePost(id); @@ -256,7 +306,9 @@ namespace DevHive.Services.Tests string exceptionMessage = "Post does not exist!"; Guid id = Guid.NewGuid(); - this._postRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(false)); + this._postRepositoryMock + .Setup(p => p.DoesPostExist(It.IsAny())) + .Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this._postService.DeletePost(id)); diff --git a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs index 6d5a333..4f1b1f6 100644 --- a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs @@ -43,10 +43,18 @@ namespace DevHive.Services.Tests Id = id }; - this._roleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(false)); - this._roleRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); - this._roleRepositoryMock.Setup(p => p.GetByNameAsync(It.IsAny())).Returns(Task.FromResult(role)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(role); + this._roleRepositoryMock + .Setup(p => p.DoesNameExist(It.IsAny())) + .Returns(Task.FromResult(false)); + this._roleRepositoryMock + .Setup(p => p.AddAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._roleRepositoryMock + .Setup(p => p.GetByNameAsync(It.IsAny())) + .Returns(Task.FromResult(role)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(role); Guid result = await this._roleService.CreateRole(createRoleServiceModel); @@ -67,9 +75,15 @@ namespace DevHive.Services.Tests Name = roleName }; - this._roleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(false)); - this._roleRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(role); + this._roleRepositoryMock + .Setup(p => p.DoesNameExist(It.IsAny())) + .Returns(Task.FromResult(false)); + this._roleRepositoryMock + .Setup(p => p.AddAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(role); Guid result = await this._roleService.CreateRole(createRoleServiceModel); @@ -87,7 +101,9 @@ namespace DevHive.Services.Tests Name = roleName }; - this._roleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(true)); + this._roleRepositoryMock + .Setup(p => p.DoesNameExist(It.IsAny())) + .Returns(Task.FromResult(true)); Exception ex = Assert.ThrowsAsync(() => this._roleService.CreateRole(createRoleServiceModel)); @@ -110,8 +126,12 @@ namespace DevHive.Services.Tests Name = name }; - this._roleRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(role)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(roleServiceModel); + this._roleRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(role)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(roleServiceModel); RoleServiceModel result = await this._roleService.GetRoleById(id); @@ -123,7 +143,9 @@ namespace DevHive.Services.Tests { string exceptionMessage = "Role does not exist!"; Guid id = Guid.NewGuid(); - this._roleRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + this._roleRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(null)); Exception ex = Assert.ThrowsAsync(() => this._roleService.GetRoleById(id)); @@ -149,10 +171,18 @@ namespace DevHive.Services.Tests Name = name, }; - this._roleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(true)); - this._roleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(false)); - this._roleRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(shouldPass)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(role); + this._roleRepositoryMock + .Setup(p => p.DoesRoleExist(It.IsAny())) + .Returns(Task.FromResult(true)); + this._roleRepositoryMock + .Setup(p => p.DoesNameExist(It.IsAny())) + .Returns(Task.FromResult(false)); + this._roleRepositoryMock + .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(shouldPass)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(role); bool result = await this._roleService.UpdateRole(updateRoleServiceModel); @@ -167,7 +197,9 @@ namespace DevHive.Services.Tests { }; - this._roleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(false)); + this._roleRepositoryMock + .Setup(p => p.DoesRoleExist(It.IsAny())) + .Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this._roleService.UpdateRole(updateRoleServiceModel)); @@ -182,8 +214,12 @@ namespace DevHive.Services.Tests { }; - this._roleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(true)); - this._roleRepositoryMock.Setup(p => p.DoesNameExist(It.IsAny())).Returns(Task.FromResult(true)); + this._roleRepositoryMock + .Setup(p => p.DoesRoleExist(It.IsAny())) + .Returns(Task.FromResult(true)); + this._roleRepositoryMock + .Setup(p => p.DoesNameExist(It.IsAny())) + .Returns(Task.FromResult(true)); Exception ex = Assert.ThrowsAsync(() => this._roleService.UpdateRole(updateRoleServiceModel)); @@ -200,9 +236,15 @@ namespace DevHive.Services.Tests Guid id = Guid.NewGuid(); Role role = new Role(); - this._roleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(true)); - this._roleRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(role)); - this._roleRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); + this._roleRepositoryMock + .Setup(p => p.DoesRoleExist(It.IsAny())) + .Returns(Task.FromResult(true)); + this._roleRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(role)); + this._roleRepositoryMock + .Setup(p => p.DeleteAsync(It.IsAny())) + .Returns(Task.FromResult(shouldPass)); bool result = await this._roleService.DeleteRole(id); @@ -215,7 +257,9 @@ namespace DevHive.Services.Tests string exceptionMessage = "Role does not exist!"; Guid id = Guid.NewGuid(); - this._roleRepositoryMock.Setup(p => p.DoesRoleExist(It.IsAny())).Returns(Task.FromResult(false)); + this._roleRepositoryMock + .Setup(p => p.DoesRoleExist(It.IsAny())) + .Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this._roleService.DeleteRole(id)); diff --git a/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs b/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs index 8cc78f1..6df26f1 100644 --- a/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs +++ b/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs @@ -44,10 +44,18 @@ namespace DevHive.Services.Tests Id = id }; - this._technologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - this._technologyRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); - this._technologyRepositoryMock.Setup(p => p.GetByNameAsync(It.IsAny())).Returns(Task.FromResult(technology)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(technology); + this._technologyRepositoryMock + .Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._technologyRepositoryMock + .Setup(p => p.AddAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._technologyRepositoryMock + .Setup(p => p.GetByNameAsync(It.IsAny())) + .Returns(Task.FromResult(technology)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(technology); Guid result = await this._technologyService.CreateTechnology(createTechnologyServiceModel); @@ -68,9 +76,15 @@ namespace DevHive.Services.Tests Name = technologyName }; - this._technologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - this._technologyRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(technology); + this._technologyRepositoryMock + .Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._technologyRepositoryMock + .Setup(p => p.AddAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(technology); Guid result = await this._technologyService.CreateTechnology(createTechnologyServiceModel); @@ -88,7 +102,9 @@ namespace DevHive.Services.Tests Name = technologyName }; - this._technologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._technologyRepositoryMock + .Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); Exception ex = Assert.ThrowsAsync(() => this._technologyService.CreateTechnology(createTechnologyServiceModel)); @@ -111,8 +127,12 @@ namespace DevHive.Services.Tests Name = name }; - this._technologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(technology)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(readTechnologyServiceModel); + this._technologyRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(technology)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readTechnologyServiceModel); ReadTechnologyServiceModel result = await this._technologyService.GetTechnologyById(id); @@ -124,7 +144,9 @@ namespace DevHive.Services.Tests { string exceptionMessage = "The technology does not exist"; Guid id = Guid.NewGuid(); - this._technologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + this._technologyRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(null)); Exception ex = Assert.ThrowsAsync(() => this._technologyService.GetTechnologyById(id)); @@ -142,8 +164,12 @@ namespace DevHive.Services.Tests technologies.Add(firstTechnology); technologies.Add(secondTechnology); - this._technologyRepositoryMock.Setup(p => p.GetTechnologies()).Returns(new HashSet()); - this._mapperMock.Setup(p => p.Map>(It.IsAny>())).Returns(technologies); + this._technologyRepositoryMock + .Setup(p => p.GetTechnologies()) + .Returns(new HashSet()); + this._mapperMock + .Setup(p => p.Map>(It.IsAny>())) + .Returns(technologies); HashSet result = this._technologyService.GetTechnologies(); @@ -153,8 +179,12 @@ namespace DevHive.Services.Tests [Test] public void GetLanguages_ReturnsEmptyHashSet_IfNoLanguagesExist() { - this._technologyRepositoryMock.Setup(p => p.GetTechnologies()).Returns(new HashSet()); - this._mapperMock.Setup(p => p.Map>(It.IsAny>())).Returns(new HashSet()); + this._technologyRepositoryMock + .Setup(p => p.GetTechnologies()) + .Returns(new HashSet()); + this._mapperMock + .Setup(p => p.Map>(It.IsAny>())) + .Returns(new HashSet()); HashSet result = this._technologyService.GetTechnologies(); @@ -180,10 +210,18 @@ namespace DevHive.Services.Tests Name = name, }; - this._technologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this._technologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - this._technologyRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(shouldPass)); - this._mapperMock.Setup(p => p.Map(It.IsAny())).Returns(technology); + this._technologyRepositoryMock + .Setup(p => p.DoesTechnologyExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._technologyRepositoryMock + .Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._technologyRepositoryMock + .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(shouldPass)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(technology); bool result = await this._technologyService.UpdateTechnology(updatetechnologyServiceModel); @@ -198,7 +236,9 @@ namespace DevHive.Services.Tests { }; - this._technologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._technologyRepositoryMock + .Setup(p => p.DoesTechnologyExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this._technologyService.UpdateTechnology(updateTechnologyServiceModel)); @@ -213,8 +253,12 @@ namespace DevHive.Services.Tests { }; - this._technologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this._technologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._technologyRepositoryMock + .Setup(p => p.DoesTechnologyExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._technologyRepositoryMock + .Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); Exception ex = Assert.ThrowsAsync(() => this._technologyService.UpdateTechnology(updateTechnologyServiceModel)); @@ -232,9 +276,15 @@ namespace DevHive.Services.Tests Guid id = Guid.NewGuid(); Technology technology = new Technology(); - this._technologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(true)); - this._technologyRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(technology)); - this._technologyRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(shouldPass)); + this._technologyRepositoryMock + .Setup(p => p.DoesTechnologyExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._technologyRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(technology)); + this._technologyRepositoryMock + .Setup(p => p.DeleteAsync(It.IsAny())) + .Returns(Task.FromResult(shouldPass)); bool result = await this._technologyService.DeleteTechnology(id); @@ -247,7 +297,9 @@ namespace DevHive.Services.Tests string exceptionMessage = "Technology does not exist!"; Guid id = Guid.NewGuid(); - this._technologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._technologyRepositoryMock + .Setup(p => p.DoesTechnologyExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this._technologyService.DeleteTechnology(id)); diff --git a/src/Services/DevHive.Services.Tests/UserService.Tests.cs b/src/Services/DevHive.Services.Tests/UserService.Tests.cs index 58ee223..809e83b 100644 --- a/src/Services/DevHive.Services.Tests/UserService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/UserService.Tests.cs @@ -65,18 +65,20 @@ namespace DevHive.Services.Tests UserName = "g_trapov" }; - this._userRepositoryMock.Setup(p => - p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); - this._userRepositoryMock.Setup(p => - p.VerifyPassword(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); - this._userRepositoryMock.Setup(p => - p.GetByUsernameAsync(It.IsAny())) - .Returns(Task.FromResult(user)); + this._userRepositoryMock + .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._userRepositoryMock + .Setup(p => p.VerifyPassword(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); + this._userRepositoryMock + .Setup(p => p.GetByUsernameAsync(It.IsAny())) + .Returns(Task.FromResult(user)); string jwtSecurityToken = "akjdhfakndvlahdfkljahdlfkjhasldf"; - this._jwtServiceMock.Setup(p => p.GenerateJwtToken(It.IsAny(), It.IsAny(), It.IsAny>())).Returns(jwtSecurityToken); + this._jwtServiceMock + .Setup(p => p.GenerateJwtToken(It.IsAny(), It.IsAny(), It.IsAny>())) + .Returns(jwtSecurityToken); TokenModel tokenModel = await this._userService.LoginUser(loginServiceModel); Assert.AreEqual(jwtSecurityToken, tokenModel.Token, "LoginUser does not return the correct token"); @@ -87,9 +89,9 @@ namespace DevHive.Services.Tests { LoginServiceModel loginServiceModel = new(); - this._userRepositoryMock.Setup(p => - p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + this._userRepositoryMock + .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync( () => this._userService.LoginUser(loginServiceModel)); @@ -111,12 +113,12 @@ namespace DevHive.Services.Tests Id = Guid.NewGuid(), }; - this._userRepositoryMock.Setup(p => - p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); - this._userRepositoryMock.Setup(p => - p.GetByUsernameAsync(It.IsAny())) - .Returns(Task.FromResult(user)); + this._userRepositoryMock + .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._userRepositoryMock + .Setup(p => p.GetByUsernameAsync(It.IsAny())) + .Returns(Task.FromResult(user)); Exception ex = Assert.ThrowsAsync(() => this._userService.LoginUser(loginServiceModel)); @@ -140,38 +142,40 @@ namespace DevHive.Services.Tests }; Role role = new() { Name = Role.DefaultRole }; - this._userRepositoryMock.Setup(p => - p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); - this._userRepositoryMock.Setup(p => - p.VerifyPassword(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); - this._userRepositoryMock.Setup(p => - p.DoesEmailExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); - this._userRepositoryMock.Setup(p => - p.AddAsync(It.IsAny())) - .ReturnsAsync(true); - this._userRepositoryMock.Setup(p => - p.AddRoleToUser(It.IsAny(), It.IsAny())) - .ReturnsAsync(true); - this._userRepositoryMock.Setup(p => - p.GetByUsernameAsync(It.IsAny())) - .ReturnsAsync(user); - - this._roleRepositoryMock.Setup(p => - p.DoesNameExist(It.IsAny())) - .Returns(Task.FromResult(true)); - this._roleRepositoryMock.Setup(p => - p.GetByNameAsync(It.IsAny())) - .Returns(Task.FromResult(role)); - - this._mapperMock.Setup(p => - p.Map(It.IsAny())) - .Returns(user); + this._userRepositoryMock + .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._userRepositoryMock + .Setup(p => p.VerifyPassword(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(true)); + this._userRepositoryMock + .Setup(p => p.DoesEmailExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._userRepositoryMock + .Setup(p => p.AddAsync(It.IsAny())) + .ReturnsAsync(true); + this._userRepositoryMock + .Setup(p => p.AddRoleToUser(It.IsAny(), It.IsAny())) + .ReturnsAsync(true); + this._userRepositoryMock + .Setup(p => p.GetByUsernameAsync(It.IsAny())) + .ReturnsAsync(user); + + this._roleRepositoryMock + .Setup(p => p.DoesNameExist(It.IsAny())) + .Returns(Task.FromResult(true)); + this._roleRepositoryMock + .Setup(p => p.GetByNameAsync(It.IsAny())) + .Returns(Task.FromResult(role)); + + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(user); string jwtSecurityToken = "akjdhfakndvlahdfkljahdlfkjhasldf"; - this._jwtServiceMock.Setup(p => p.GenerateJwtToken(It.IsAny(), It.IsAny(), It.IsAny>())).Returns(jwtSecurityToken); + this._jwtServiceMock + .Setup(p => p.GenerateJwtToken(It.IsAny(), It.IsAny(), It.IsAny>())) + .Returns(jwtSecurityToken); TokenModel tokenModel = await this._userService.RegisterUser(registerServiceModel); Assert.AreEqual(jwtSecurityToken, tokenModel.Token, "RegisterUser does not return the correct token"); @@ -183,9 +187,9 @@ namespace DevHive.Services.Tests const string EXCEPTION_MESSAGE = "Username already exists!"; RegisterServiceModel registerServiceModel = new(); - this._userRepositoryMock.Setup(p => - p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + this._userRepositoryMock + .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); Exception ex = Assert.ThrowsAsync( () => this._userService.RegisterUser(registerServiceModel)); @@ -198,12 +202,12 @@ namespace DevHive.Services.Tests { RegisterServiceModel registerServiceModel = new(); - this._userRepositoryMock.Setup(p => - p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); - this._userRepositoryMock.Setup(p => - p.DoesEmailExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + this._userRepositoryMock + .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); + this._userRepositoryMock + .Setup(p => p.DoesEmailExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); Exception ex = Assert.ThrowsAsync(() => this._userService.RegisterUser(registerServiceModel)); @@ -223,12 +227,12 @@ namespace DevHive.Services.Tests UserName = username }; - this._userRepositoryMock.Setup(p => - p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(user)); - this._mapperMock.Setup(p => - p.Map(It.IsAny())) - .Returns(userServiceModel); + this._userRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(user)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(userServiceModel); UserServiceModel result = await this._userService.GetUserById(id); @@ -239,9 +243,9 @@ namespace DevHive.Services.Tests public void GetTechnologyById_ThrowsException_WhenTechnologyDoesNotExist() { Guid id = new(); - this._userRepositoryMock.Setup(p => - p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(null)); + this._userRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(null)); Exception ex = Assert.ThrowsAsync(() => this._userService.GetUserById(id)); @@ -260,12 +264,12 @@ namespace DevHive.Services.Tests UserName = username }; - this._userRepositoryMock.Setup(p => - p.GetByUsernameAsync(It.IsAny())) - .Returns(Task.FromResult(user)); - this._mapperMock.Setup(p => - p.Map(It.IsAny())) - .Returns(userServiceModel); + this._userRepositoryMock + .Setup(p => p.GetByUsernameAsync(It.IsAny())) + .Returns(Task.FromResult(user)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(userServiceModel); UserServiceModel result = await this._userService.GetUserByUsername(username); @@ -277,9 +281,9 @@ namespace DevHive.Services.Tests { string username = "g_trapov"; - this._userRepositoryMock.Setup(p => - p.GetByUsernameAsync(It.IsAny())) - .Returns(Task.FromResult(null)); + this._userRepositoryMock + .Setup(p => p.GetByUsernameAsync(It.IsAny())) + .Returns(Task.FromResult(null)); Exception ex = Assert.ThrowsAsync(() => this._userService.GetUserByUsername(username)); @@ -353,9 +357,9 @@ namespace DevHive.Services.Tests { UpdateUserServiceModel updateUserServiceModel = new(); - this._userRepositoryMock.Setup(p => - p.DoesUserExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + this._userRepositoryMock + .Setup(p => p.DoesUserExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this._userService.UpdateUser(updateUserServiceModel)); @@ -367,12 +371,12 @@ namespace DevHive.Services.Tests { UpdateUserServiceModel updateUserServiceModel = new(); - this._userRepositoryMock.Setup(p => - p.DoesUserExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); - this._userRepositoryMock.Setup(p => - p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + this._userRepositoryMock + .Setup(p => p.DoesUserExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); + this._userRepositoryMock + .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) + .Returns(Task.FromResult(true)); Exception ex = Assert.ThrowsAsync(() => this._userService.UpdateUser(updateUserServiceModel)); @@ -411,9 +415,9 @@ namespace DevHive.Services.Tests string exceptionMessage = "User does not exist!"; Guid id = new(); - this._userRepositoryMock.Setup(p => - p.DoesUserExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + this._userRepositoryMock + .Setup(p => p.DoesUserExistAsync(It.IsAny())) + .Returns(Task.FromResult(false)); Exception ex = Assert.ThrowsAsync(() => this._userService.DeleteUser(id)); -- cgit v1.2.3 From 10ac1adbf9fbeaca116d3fd356f85dd64c8c2bf8 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 14 Mar 2021 12:02:14 +0200 Subject: Made all Returns(Task.FromResult) into ReturnsAsync in Service layer tests --- .../DevHive.Services.Tests/CommentService.Tests.cs | 40 ++++++++-------- .../LanguageService.Tests.cs | 34 ++++++------- .../DevHive.Services.Tests/PostService.Tests.cs | 40 ++++++++-------- .../DevHive.Services.Tests/RoleService.Tests.cs | 34 ++++++------- .../TechnologyServices.Tests.cs | 34 ++++++------- .../DevHive.Services.Tests/UserService.Tests.cs | 56 +++++++++++----------- 6 files changed, 119 insertions(+), 119 deletions(-) (limited to 'src/Services') diff --git a/src/Services/DevHive.Services.Tests/CommentService.Tests.cs b/src/Services/DevHive.Services.Tests/CommentService.Tests.cs index 729e943..3d58bc6 100644 --- a/src/Services/DevHive.Services.Tests/CommentService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/CommentService.Tests.cs @@ -50,16 +50,16 @@ namespace DevHive.Services.Tests this._commentRepositoryMock .Setup(p => p.AddAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._commentRepositoryMock .Setup(p => p.GetCommentByIssuerAndTimeCreatedAsync(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(comment)); + .ReturnsAsync(comment); this._postRepositoryMock .Setup(p => p.DoesPostExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._userRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(creator)); + .ReturnsAsync(creator); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(comment); @@ -83,10 +83,10 @@ namespace DevHive.Services.Tests this._commentRepositoryMock .Setup(p => p.AddAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._postRepositoryMock .Setup(p => p.DoesPostExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(comment); @@ -134,10 +134,10 @@ namespace DevHive.Services.Tests this._commentRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(comment)); + .ReturnsAsync(comment); this._userRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(user)); + .ReturnsAsync(user); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(commentServiceModel); @@ -161,7 +161,7 @@ namespace DevHive.Services.Tests this._commentRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(comment)); + .ReturnsAsync(comment); Exception ex = Assert.ThrowsAsync(() => this._commentService.GetCommentById(Guid.NewGuid()), "GetCommentById does not throw exception when the user does not exist"); @@ -183,7 +183,7 @@ namespace DevHive.Services.Tests .Returns(Task.FromResult(null)); this._userRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(user)); + .ReturnsAsync(user); Exception ex = Assert.ThrowsAsync(() => this._commentService.GetCommentById(Guid.NewGuid())); @@ -209,13 +209,13 @@ namespace DevHive.Services.Tests this._commentRepositoryMock .Setup(p => p.DoesCommentExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._commentRepositoryMock .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._commentRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(comment)); + .ReturnsAsync(comment); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(comment); @@ -240,10 +240,10 @@ namespace DevHive.Services.Tests this._commentRepositoryMock .Setup(p => p.DoesCommentExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._commentRepositoryMock .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(comment); @@ -263,7 +263,7 @@ namespace DevHive.Services.Tests this._commentRepositoryMock .Setup(p => p.DoesCommentExist(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); Exception ex = Assert.ThrowsAsync(() => this._commentService.UpdateComment(updateCommentServiceModel)); @@ -282,13 +282,13 @@ namespace DevHive.Services.Tests this._commentRepositoryMock .Setup(p => p.DoesCommentExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._commentRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(comment)); + .ReturnsAsync(comment); this._commentRepositoryMock .Setup(p => p.DeleteAsync(It.IsAny())) - .Returns(Task.FromResult(shouldPass)); + .ReturnsAsync(shouldPass); bool result = await this._commentService.DeleteComment(id); @@ -303,7 +303,7 @@ namespace DevHive.Services.Tests this._commentRepositoryMock .Setup(p => p.DoesCommentExist(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); Exception ex = Assert.ThrowsAsync(() => this._commentService.DeleteComment(id)); diff --git a/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs b/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs index c1f4d54..c95c38e 100644 --- a/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/LanguageService.Tests.cs @@ -46,13 +46,13 @@ namespace DevHive.Services.Tests this._languageRepositoryMock .Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._languageRepositoryMock .Setup(p => p.AddAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._languageRepositoryMock .Setup(p => p.GetByNameAsync(It.IsAny())) - .Returns(Task.FromResult(language)); + .ReturnsAsync(language); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(language); @@ -78,10 +78,10 @@ namespace DevHive.Services.Tests this._languageRepositoryMock .Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._languageRepositoryMock .Setup(p => p.AddAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(language); @@ -109,7 +109,7 @@ namespace DevHive.Services.Tests this._languageRepositoryMock .Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); Exception ex = Assert.ThrowsAsync(() => this._languageService.CreateLanguage(createLanguageServiceModel)); @@ -134,7 +134,7 @@ namespace DevHive.Services.Tests this._languageRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(language)); + .ReturnsAsync(language); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(readLanguageServiceModel); @@ -217,13 +217,13 @@ namespace DevHive.Services.Tests this._languageRepositoryMock .Setup(p => p.DoesLanguageExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._languageRepositoryMock .Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._languageRepositoryMock .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(shouldPass)); + .ReturnsAsync(shouldPass); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(language); @@ -243,7 +243,7 @@ namespace DevHive.Services.Tests this._languageRepositoryMock .Setup(p => p.DoesLanguageExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); Exception ex = Assert.ThrowsAsync(() => this._languageService.UpdateLanguage(updateTechnologyServiceModel)); @@ -260,10 +260,10 @@ namespace DevHive.Services.Tests this._languageRepositoryMock .Setup(p => p.DoesLanguageExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._languageRepositoryMock .Setup(p => p.DoesLanguageNameExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); Exception ex = Assert.ThrowsAsync(() => this._languageService.UpdateLanguage(updateTechnologyServiceModel)); @@ -282,13 +282,13 @@ namespace DevHive.Services.Tests this._languageRepositoryMock .Setup(p => p.DoesLanguageExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._languageRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(language)); + .ReturnsAsync(language); this._languageRepositoryMock .Setup(p => p.DeleteAsync(It.IsAny())) - .Returns(Task.FromResult(shouldPass)); + .ReturnsAsync(shouldPass); bool result = await this._languageService.DeleteLanguage(id); @@ -303,7 +303,7 @@ namespace DevHive.Services.Tests this._languageRepositoryMock .Setup(p => p.DoesLanguageExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); Exception ex = Assert.ThrowsAsync(() => this._languageService.DeleteLanguage(id)); diff --git a/src/Services/DevHive.Services.Tests/PostService.Tests.cs b/src/Services/DevHive.Services.Tests/PostService.Tests.cs index 5aea4a8..058485e 100644 --- a/src/Services/DevHive.Services.Tests/PostService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/PostService.Tests.cs @@ -55,16 +55,16 @@ namespace DevHive.Services.Tests this._postRepositoryMock .Setup(p => p.AddAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._postRepositoryMock .Setup(p => p.GetPostByCreatorAndTimeCreatedAsync(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(post)); + .ReturnsAsync(post); this._userRepositoryMock .Setup(p => p.DoesUserExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._userRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(creator)); + .ReturnsAsync(creator); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(post); @@ -88,10 +88,10 @@ namespace DevHive.Services.Tests this._postRepositoryMock .Setup(p => p.AddAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._userRepositoryMock .Setup(p => p.DoesUserExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(post); @@ -137,10 +137,10 @@ namespace DevHive.Services.Tests this._postRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(post)); + .ReturnsAsync(post); this._userRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(user)); + .ReturnsAsync(user); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(readPostServiceModel); @@ -164,7 +164,7 @@ namespace DevHive.Services.Tests this._postRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(post)); + .ReturnsAsync(post); Exception ex = Assert.ThrowsAsync(() => this._postService.GetPostById(Guid.NewGuid()), "GetPostById does not throw exception when the user does not exist"); @@ -186,7 +186,7 @@ namespace DevHive.Services.Tests .Returns(Task.FromResult(null)); this._userRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(user)); + .ReturnsAsync(user); Exception ex = Assert.ThrowsAsync(() => this._postService.GetPostById(Guid.NewGuid())); @@ -213,13 +213,13 @@ namespace DevHive.Services.Tests this._postRepositoryMock .Setup(p => p.DoesPostExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._postRepositoryMock .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._postRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(post)); + .ReturnsAsync(post); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(post); @@ -245,10 +245,10 @@ namespace DevHive.Services.Tests this._postRepositoryMock .Setup(p => p.DoesPostExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._postRepositoryMock .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(post); @@ -268,7 +268,7 @@ namespace DevHive.Services.Tests this._postRepositoryMock .Setup(p => p.DoesPostExist(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); Exception ex = Assert.ThrowsAsync(() => this._postService.UpdatePost(updatePostServiceModel)); @@ -287,13 +287,13 @@ namespace DevHive.Services.Tests this._postRepositoryMock .Setup(p => p.DoesPostExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._postRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(post)); + .ReturnsAsync(post); this._postRepositoryMock .Setup(p => p.DeleteAsync(It.IsAny())) - .Returns(Task.FromResult(shouldPass)); + .ReturnsAsync(shouldPass); bool result = await this._postService.DeletePost(id); @@ -308,7 +308,7 @@ namespace DevHive.Services.Tests this._postRepositoryMock .Setup(p => p.DoesPostExist(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); Exception ex = Assert.ThrowsAsync(() => this._postService.DeletePost(id)); diff --git a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs index 4f1b1f6..83dabf9 100644 --- a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs @@ -45,13 +45,13 @@ namespace DevHive.Services.Tests this._roleRepositoryMock .Setup(p => p.DoesNameExist(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._roleRepositoryMock .Setup(p => p.AddAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._roleRepositoryMock .Setup(p => p.GetByNameAsync(It.IsAny())) - .Returns(Task.FromResult(role)); + .ReturnsAsync(role); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(role); @@ -77,10 +77,10 @@ namespace DevHive.Services.Tests this._roleRepositoryMock .Setup(p => p.DoesNameExist(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._roleRepositoryMock .Setup(p => p.AddAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(role); @@ -103,7 +103,7 @@ namespace DevHive.Services.Tests this._roleRepositoryMock .Setup(p => p.DoesNameExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); Exception ex = Assert.ThrowsAsync(() => this._roleService.CreateRole(createRoleServiceModel)); @@ -128,7 +128,7 @@ namespace DevHive.Services.Tests this._roleRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(role)); + .ReturnsAsync(role); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(roleServiceModel); @@ -173,13 +173,13 @@ namespace DevHive.Services.Tests this._roleRepositoryMock .Setup(p => p.DoesRoleExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._roleRepositoryMock .Setup(p => p.DoesNameExist(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._roleRepositoryMock .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(shouldPass)); + .ReturnsAsync(shouldPass); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(role); @@ -199,7 +199,7 @@ namespace DevHive.Services.Tests this._roleRepositoryMock .Setup(p => p.DoesRoleExist(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); Exception ex = Assert.ThrowsAsync(() => this._roleService.UpdateRole(updateRoleServiceModel)); @@ -216,10 +216,10 @@ namespace DevHive.Services.Tests this._roleRepositoryMock .Setup(p => p.DoesRoleExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._roleRepositoryMock .Setup(p => p.DoesNameExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); Exception ex = Assert.ThrowsAsync(() => this._roleService.UpdateRole(updateRoleServiceModel)); @@ -238,13 +238,13 @@ namespace DevHive.Services.Tests this._roleRepositoryMock .Setup(p => p.DoesRoleExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._roleRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(role)); + .ReturnsAsync(role); this._roleRepositoryMock .Setup(p => p.DeleteAsync(It.IsAny())) - .Returns(Task.FromResult(shouldPass)); + .ReturnsAsync(shouldPass); bool result = await this._roleService.DeleteRole(id); @@ -259,7 +259,7 @@ namespace DevHive.Services.Tests this._roleRepositoryMock .Setup(p => p.DoesRoleExist(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); Exception ex = Assert.ThrowsAsync(() => this._roleService.DeleteRole(id)); diff --git a/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs b/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs index 6df26f1..f9c599c 100644 --- a/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs +++ b/src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs @@ -46,13 +46,13 @@ namespace DevHive.Services.Tests this._technologyRepositoryMock .Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._technologyRepositoryMock .Setup(p => p.AddAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._technologyRepositoryMock .Setup(p => p.GetByNameAsync(It.IsAny())) - .Returns(Task.FromResult(technology)); + .ReturnsAsync(technology); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(technology); @@ -78,10 +78,10 @@ namespace DevHive.Services.Tests this._technologyRepositoryMock .Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._technologyRepositoryMock .Setup(p => p.AddAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(technology); @@ -104,7 +104,7 @@ namespace DevHive.Services.Tests this._technologyRepositoryMock .Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); Exception ex = Assert.ThrowsAsync(() => this._technologyService.CreateTechnology(createTechnologyServiceModel)); @@ -129,7 +129,7 @@ namespace DevHive.Services.Tests this._technologyRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(technology)); + .ReturnsAsync(technology); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(readTechnologyServiceModel); @@ -212,13 +212,13 @@ namespace DevHive.Services.Tests this._technologyRepositoryMock .Setup(p => p.DoesTechnologyExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._technologyRepositoryMock .Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._technologyRepositoryMock .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(shouldPass)); + .ReturnsAsync(shouldPass); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(technology); @@ -238,7 +238,7 @@ namespace DevHive.Services.Tests this._technologyRepositoryMock .Setup(p => p.DoesTechnologyExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); Exception ex = Assert.ThrowsAsync(() => this._technologyService.UpdateTechnology(updateTechnologyServiceModel)); @@ -255,10 +255,10 @@ namespace DevHive.Services.Tests this._technologyRepositoryMock .Setup(p => p.DoesTechnologyExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._technologyRepositoryMock .Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); Exception ex = Assert.ThrowsAsync(() => this._technologyService.UpdateTechnology(updateTechnologyServiceModel)); @@ -278,13 +278,13 @@ namespace DevHive.Services.Tests this._technologyRepositoryMock .Setup(p => p.DoesTechnologyExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._technologyRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(technology)); + .ReturnsAsync(technology); this._technologyRepositoryMock .Setup(p => p.DeleteAsync(It.IsAny())) - .Returns(Task.FromResult(shouldPass)); + .ReturnsAsync(shouldPass); bool result = await this._technologyService.DeleteTechnology(id); @@ -299,7 +299,7 @@ namespace DevHive.Services.Tests this._technologyRepositoryMock .Setup(p => p.DoesTechnologyExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); Exception ex = Assert.ThrowsAsync(() => this._technologyService.DeleteTechnology(id)); diff --git a/src/Services/DevHive.Services.Tests/UserService.Tests.cs b/src/Services/DevHive.Services.Tests/UserService.Tests.cs index 809e83b..7990b32 100644 --- a/src/Services/DevHive.Services.Tests/UserService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/UserService.Tests.cs @@ -67,13 +67,13 @@ namespace DevHive.Services.Tests this._userRepositoryMock .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._userRepositoryMock .Setup(p => p.VerifyPassword(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._userRepositoryMock .Setup(p => p.GetByUsernameAsync(It.IsAny())) - .Returns(Task.FromResult(user)); + .ReturnsAsync(user); string jwtSecurityToken = "akjdhfakndvlahdfkljahdlfkjhasldf"; this._jwtServiceMock @@ -91,7 +91,7 @@ namespace DevHive.Services.Tests this._userRepositoryMock .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); Exception ex = Assert.ThrowsAsync( () => this._userService.LoginUser(loginServiceModel)); @@ -115,10 +115,10 @@ namespace DevHive.Services.Tests this._userRepositoryMock .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._userRepositoryMock .Setup(p => p.GetByUsernameAsync(It.IsAny())) - .Returns(Task.FromResult(user)); + .ReturnsAsync(user); Exception ex = Assert.ThrowsAsync(() => this._userService.LoginUser(loginServiceModel)); @@ -144,13 +144,13 @@ namespace DevHive.Services.Tests this._userRepositoryMock .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._userRepositoryMock .Setup(p => p.VerifyPassword(It.IsAny(), It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._userRepositoryMock .Setup(p => p.DoesEmailExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._userRepositoryMock .Setup(p => p.AddAsync(It.IsAny())) .ReturnsAsync(true); @@ -163,10 +163,10 @@ namespace DevHive.Services.Tests this._roleRepositoryMock .Setup(p => p.DoesNameExist(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._roleRepositoryMock .Setup(p => p.GetByNameAsync(It.IsAny())) - .Returns(Task.FromResult(role)); + .ReturnsAsync(role); this._mapperMock .Setup(p => p.Map(It.IsAny())) @@ -189,7 +189,7 @@ namespace DevHive.Services.Tests this._userRepositoryMock .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); Exception ex = Assert.ThrowsAsync( () => this._userService.RegisterUser(registerServiceModel)); @@ -204,10 +204,10 @@ namespace DevHive.Services.Tests this._userRepositoryMock .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); this._userRepositoryMock .Setup(p => p.DoesEmailExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); Exception ex = Assert.ThrowsAsync(() => this._userService.RegisterUser(registerServiceModel)); @@ -229,7 +229,7 @@ namespace DevHive.Services.Tests this._userRepositoryMock .Setup(p => p.GetByIdAsync(It.IsAny())) - .Returns(Task.FromResult(user)); + .ReturnsAsync(user); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(userServiceModel); @@ -266,7 +266,7 @@ namespace DevHive.Services.Tests this._userRepositoryMock .Setup(p => p.GetByUsernameAsync(It.IsAny())) - .Returns(Task.FromResult(user)); + .ReturnsAsync(user); this._mapperMock .Setup(p => p.Map(It.IsAny())) .Returns(userServiceModel); @@ -316,19 +316,19 @@ namespace DevHive.Services.Tests // // this._userRepositoryMock.Setup(p => // p.DoesUserExistAsync(It.IsAny())) - // .Returns(Task.FromResult(true)); + // .ReturnsAsync(true); // this._userRepositoryMock.Setup(p => // p.DoesUsernameExistAsync(It.IsAny())) - // .Returns(Task.FromResult(false)); + // .ReturnsAsync(false); // this._userRepositoryMock.Setup(p => // p.DoesUserHaveThisUsernameAsync(It.IsAny(), It.IsAny())) // .Returns(true); // this._userRepositoryMock.Setup(p => // p.EditAsync(It.IsAny(), It.IsAny())) - // .Returns(Task.FromResult(shouldPass)); + // .ReturnsAsync(shouldPass); // this._userRepositoryMock.Setup(p => // p.GetByIdAsync(It.IsAny())) - // .Returns(Task.FromResult(user)); + // .ReturnsAsync(user); // this._mapperMock.Setup(p => // p.Map(It.IsAny())) // .Returns(user); @@ -346,7 +346,7 @@ namespace DevHive.Services.Tests // { // const string EXCEPTION_MESSAGE = "Unable to edit user!"; // - // Exception ex = Assert.ThrowsAsync(() => this._userService.UpdateUser(updateUserServiceModel)); + // Exception ex = Assert.ThrowsAsync(() => this._userService.UpdateUser(updateUserServiceModel); // // Assert.AreEqual(EXCEPTION_MESSAGE, ex.Message, "Incorrect exception message"); // } @@ -359,7 +359,7 @@ namespace DevHive.Services.Tests this._userRepositoryMock .Setup(p => p.DoesUserExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); Exception ex = Assert.ThrowsAsync(() => this._userService.UpdateUser(updateUserServiceModel)); @@ -373,10 +373,10 @@ namespace DevHive.Services.Tests this._userRepositoryMock .Setup(p => p.DoesUserExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); this._userRepositoryMock .Setup(p => p.DoesUsernameExistAsync(It.IsAny())) - .Returns(Task.FromResult(true)); + .ReturnsAsync(true); Exception ex = Assert.ThrowsAsync(() => this._userService.UpdateUser(updateUserServiceModel)); @@ -396,13 +396,13 @@ namespace DevHive.Services.Tests // // this._userRepositoryMock.Setup(p => // p.DoesUserExistAsync(It.IsAny())) - // .Returns(Task.FromResult(true)); + // .ReturnsAsync(true); // this._userRepositoryMock.Setup(p => // p.GetByIdAsync(It.IsAny())) - // .Returns(Task.FromResult(user)); + // .ReturnsAsync(user); // this._userRepositoryMock.Setup(p => // p.DeleteAsync(It.IsAny())) - // .Returns(Task.FromResult(shouldPass)); + // .ReturnsAsync(shouldPass); // // bool result = await this._userService.DeleteUser(id); // @@ -417,7 +417,7 @@ namespace DevHive.Services.Tests this._userRepositoryMock .Setup(p => p.DoesUserExistAsync(It.IsAny())) - .Returns(Task.FromResult(false)); + .ReturnsAsync(false); Exception ex = Assert.ThrowsAsync(() => this._userService.DeleteUser(id)); -- cgit v1.2.3 From 76f71bb8cab45922f3e4999253a1567a0e4af3db Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 14 Mar 2021 21:39:37 +0200 Subject: Updated rating tests to follow our current code style standards --- .../DevHive.Data.Tests/RatingRepository.Tests.cs | 46 ++--- .../DevHive.Services.Tests/RatingService.Tests.cs | 210 ++++++++++++++------- .../DevHive.Web.Tests/RatingController.Tests.cs | 118 ++++++++---- 3 files changed, 247 insertions(+), 127 deletions(-) (limited to 'src/Services') diff --git a/src/Data/DevHive.Data.Tests/RatingRepository.Tests.cs b/src/Data/DevHive.Data.Tests/RatingRepository.Tests.cs index 17616fe..2da90d9 100644 --- a/src/Data/DevHive.Data.Tests/RatingRepository.Tests.cs +++ b/src/Data/DevHive.Data.Tests/RatingRepository.Tests.cs @@ -12,8 +12,8 @@ namespace DevHive.Data.Tests [TestFixture] public class RatingRepositoryTests { - private DevHiveContext Context { get; set; } - private RatingRepository RatingRepository { get; set; } + private DevHiveContext _context; + private RatingRepository _ratingRepository; #region Setups [SetUp] @@ -22,14 +22,14 @@ namespace DevHive.Data.Tests var optionsBuilder = new DbContextOptionsBuilder() .UseInMemoryDatabase(databaseName: "DevHive_Test_Database"); - this.Context = new DevHiveContext(optionsBuilder.Options); - this.RatingRepository = new RatingRepository(this.Context, null); + this._context = new DevHiveContext(optionsBuilder.Options); + this._ratingRepository = new RatingRepository(this._context, null); } [TearDown] public void TearDown() { - this.Context.Database.EnsureDeleted(); + this._context.Database.EnsureDeleted(); } #endregion @@ -40,7 +40,7 @@ namespace DevHive.Data.Tests Guid ratingId = Guid.NewGuid(); await AddDummyRating(ratingId); - Rating ratingResult = await this.RatingRepository.GetByIdAsync(ratingId); + Rating ratingResult = await this._ratingRepository.GetByIdAsync(ratingId); Assert.AreEqual(ratingResult.Id, ratingId); } @@ -48,7 +48,7 @@ namespace DevHive.Data.Tests [Test] public async Task GetByIdAsync_ReturnsNull_IfRatingDoesNotExist() { - Rating ratingResult = await this.RatingRepository.GetByIdAsync(Guid.NewGuid()); + Rating ratingResult = await this._ratingRepository.GetByIdAsync(Guid.NewGuid()); Assert.IsNull(ratingResult); } @@ -63,7 +63,7 @@ namespace DevHive.Data.Tests await AddDummyRating(Guid.NewGuid(), postId); await AddDummyRating(Guid.NewGuid(), postId); - List result = await this.RatingRepository.GetRatingsByPostId(postId); + List result = await this._ratingRepository.GetRatingsByPostId(postId); Assert.IsNotEmpty(result); } @@ -71,7 +71,7 @@ namespace DevHive.Data.Tests [Test] public async Task GetRatingsByPostId_ReturnsEmptyList_WhenThereAreNoRatings() { - List result = await this.RatingRepository.GetRatingsByPostId(Guid.NewGuid()); + List result = await this._ratingRepository.GetRatingsByPostId(Guid.NewGuid()); Assert.IsEmpty(result); } @@ -88,7 +88,7 @@ namespace DevHive.Data.Tests await AddDummyUser(userId); await AddDummyRating(ratingId, postId, userId); - Rating result = await this.RatingRepository.GetRatingByUserAndPostId(userId, postId); + Rating result = await this._ratingRepository.GetRatingByUserAndPostId(userId, postId); Assert.AreEqual(result.Id, ratingId); } @@ -96,7 +96,7 @@ namespace DevHive.Data.Tests [Test] public async Task GetRatingByUserAndPostId_ReturnsNull_WhenRatingDoesNotExist() { - Rating result = await this.RatingRepository.GetRatingByUserAndPostId(Guid.NewGuid(), Guid.NewGuid()); + Rating result = await this._ratingRepository.GetRatingByUserAndPostId(Guid.NewGuid(), Guid.NewGuid()); Assert.IsNull(result); } @@ -112,7 +112,7 @@ namespace DevHive.Data.Tests await AddDummyUser(userId); await AddDummyRating(Guid.NewGuid(), postId, userId); - bool result = await this.RatingRepository.UserRatedPost(userId, postId); + bool result = await this._ratingRepository.UserRatedPost(userId, postId); Assert.IsTrue(result); } @@ -120,7 +120,7 @@ namespace DevHive.Data.Tests [Test] public async Task UserRatedPost_ReturnsFalse_WhenUserHasNotRatedPost() { - bool result = await this.RatingRepository.UserRatedPost(Guid.NewGuid(), Guid.NewGuid()); + bool result = await this._ratingRepository.UserRatedPost(Guid.NewGuid(), Guid.NewGuid()); Assert.IsFalse(result); } @@ -133,7 +133,7 @@ namespace DevHive.Data.Tests Guid ratingId = Guid.NewGuid(); await AddDummyRating(ratingId); - bool result = await this.RatingRepository.DoesRatingExist(ratingId); + bool result = await this._ratingRepository.DoesRatingExist(ratingId); Assert.IsTrue(result); } @@ -141,7 +141,7 @@ namespace DevHive.Data.Tests [Test] public async Task DoesRatingExist_ReturnsFalse_WhenRatingDoesNotExist() { - bool result = await this.RatingRepository.DoesRatingExist(Guid.NewGuid()); + bool result = await this._ratingRepository.DoesRatingExist(Guid.NewGuid()); Assert.IsFalse(result); } @@ -153,12 +153,12 @@ namespace DevHive.Data.Tests Rating rating = new Rating { Id = ratingId, - Post = this.Context.Posts.FirstOrDefault(x => x.Id == postId), - User = this.Context.Users.FirstOrDefault(x => x.Id == userId) + Post = this._context.Posts.FirstOrDefault(x => x.Id == postId), + User = this._context.Users.FirstOrDefault(x => x.Id == userId) }; - await this.Context.Rating.AddAsync(rating); - await this.Context.SaveChangesAsync(); + await this._context.Rating.AddAsync(rating); + await this._context.SaveChangesAsync(); } private async Task AddDummyPost(Guid postId) @@ -169,8 +169,8 @@ namespace DevHive.Data.Tests Message = "Never gonna give you up" }; - await this.Context.Posts.AddAsync(post); - await this.Context.SaveChangesAsync(); + await this._context.Posts.AddAsync(post); + await this._context.SaveChangesAsync(); } private async Task AddDummyUser(Guid userId) @@ -180,8 +180,8 @@ namespace DevHive.Data.Tests Id = userId }; - await this.Context.Users.AddAsync(user); - await this.Context.SaveChangesAsync(); + await this._context.Users.AddAsync(user); + await this._context.SaveChangesAsync(); } #endregion } diff --git a/src/Services/DevHive.Services.Tests/RatingService.Tests.cs b/src/Services/DevHive.Services.Tests/RatingService.Tests.cs index 89c1a2e..5f84530 100644 --- a/src/Services/DevHive.Services.Tests/RatingService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/RatingService.Tests.cs @@ -13,21 +13,21 @@ namespace DevHive.Services.Tests [TestFixture] public class RatingServiceTests { - private Mock PostRepositoryMock { get; set; } - private Mock RatingRepositoryMock { get; set; } - private Mock UserRepositoryMock { get; set; } - private Mock MapperMock { get; set; } - private RatingService RatingService { get; set; } + private Mock _postRepositoryMock; + private Mock _ratingRepositoryMock; + private Mock _userRepositoryMock; + private Mock _mapperMock; + private RatingService _ratingService; #region SetUps [SetUp] public void SetUp() { - this.PostRepositoryMock = new Mock(); - this.RatingRepositoryMock = new Mock(); - this.UserRepositoryMock = new Mock(); - this.MapperMock = new Mock(); - this.RatingService = new RatingService(this.PostRepositoryMock.Object, this.RatingRepositoryMock.Object, this.UserRepositoryMock.Object, this.MapperMock.Object); + this._postRepositoryMock = new Mock(); + this._ratingRepositoryMock = new Mock(); + this._userRepositoryMock = new Mock(); + this._mapperMock = new Mock(); + this._ratingService = new RatingService(this._postRepositoryMock.Object, this._ratingRepositoryMock.Object, this._userRepositoryMock.Object, this._mapperMock.Object); } #endregion @@ -59,15 +59,29 @@ namespace DevHive.Services.Tests Id = postId }; - this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - this.RatingRepositoryMock.Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - this.PostRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); - this.RatingRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(true)); - this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(rating)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(rating); - - Guid result = await this.RatingService.RatePost(createRatingServiceModel); + this._postRepositoryMock + .Setup(p => p.DoesPostExist(It.IsAny())) + .ReturnsAsync(true); + this._ratingRepositoryMock + .Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())) + .ReturnsAsync(false); + this._userRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .ReturnsAsync(user); + this._postRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .ReturnsAsync(post); + this._ratingRepositoryMock + .Setup(p => p.AddAsync(It.IsAny())) + .ReturnsAsync(true); + this._ratingRepositoryMock + .Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())) + .ReturnsAsync(rating); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(rating); + + Guid result = await this._ratingService.RatePost(createRatingServiceModel); Assert.AreEqual(id, result); } @@ -99,14 +113,26 @@ namespace DevHive.Services.Tests Id = postId }; - this.PostRepositoryMock.Setup(p => p.DoesPostExist(It.IsAny())).Returns(Task.FromResult(true)); - this.RatingRepositoryMock.Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - this.PostRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(post)); - this.RatingRepositoryMock.Setup(p => p.AddAsync(It.IsAny())).Returns(Task.FromResult(false)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(rating); - - Guid result = await this.RatingService.RatePost(createRatingServiceModel); + this._postRepositoryMock + .Setup(p => p.DoesPostExist(It.IsAny())) + .ReturnsAsync(true); + this._ratingRepositoryMock + .Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())) + .ReturnsAsync(false); + this._userRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .ReturnsAsync(user); + this._postRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .ReturnsAsync(post); + this._ratingRepositoryMock + .Setup(p => p.AddAsync(It.IsAny())) + .ReturnsAsync(false); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(rating); + + Guid result = await this._ratingService.RatePost(createRatingServiceModel); Assert.AreEqual(result, Guid.Empty); } @@ -134,10 +160,14 @@ namespace DevHive.Services.Tests IsLike = isLike }; - this.RatingRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(rating)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readRatingServiceModel); + this._ratingRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .ReturnsAsync(rating); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readRatingServiceModel); - ReadRatingServiceModel result = await this.RatingService.GetRatingById(id); + ReadRatingServiceModel result = await this._ratingService.GetRatingById(id); Assert.AreEqual(isLike, result.IsLike); } @@ -146,9 +176,11 @@ namespace DevHive.Services.Tests public void GetRatingById_ThrowsException_WhenRatingDoesNotExist() { string exceptionMessage = "The rating does not exist"; - this.RatingRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); + this._ratingRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(null)); - Exception ex = Assert.ThrowsAsync(() => this.RatingService.GetRatingById(Guid.Empty)); + Exception ex = Assert.ThrowsAsync(() => this._ratingService.GetRatingById(Guid.Empty)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -174,10 +206,14 @@ namespace DevHive.Services.Tests IsLike = isLike }; - this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(rating)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readRatingServiceModel); + this._ratingRepositoryMock + .Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())) + .ReturnsAsync(rating); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readRatingServiceModel); - ReadRatingServiceModel result = await this.RatingService.GetRatingByPostAndUser(user.Id, Guid.Empty); + ReadRatingServiceModel result = await this._ratingService.GetRatingByPostAndUser(user.Id, Guid.Empty); Assert.AreEqual(isLike, result.IsLike); } @@ -186,9 +222,11 @@ namespace DevHive.Services.Tests public void GetRatingByPostAndUser_ThrowsException_WhenRatingDoesNotExist() { string exceptionMessage = "The rating does not exist"; - this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(null)); + this._ratingRepositoryMock + .Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(null)); - Exception ex = Assert.ThrowsAsync(() => this.RatingService.GetRatingById(Guid.Empty)); + Exception ex = Assert.ThrowsAsync(() => this._ratingService.GetRatingById(Guid.Empty)); Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message"); } @@ -221,13 +259,23 @@ namespace DevHive.Services.Tests IsLike = isLike }; - this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(rating)); - this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - this.RatingRepositoryMock.Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - this.RatingRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readRatingServiceModel); - - ReadRatingServiceModel result = await this.RatingService.UpdateRating(updateRatingServiceModel); + this._ratingRepositoryMock + .Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())) + .ReturnsAsync(rating); + this._userRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .ReturnsAsync(user); + this._ratingRepositoryMock + .Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())) + .ReturnsAsync(true); + this._ratingRepositoryMock + .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) + .ReturnsAsync(true); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readRatingServiceModel); + + ReadRatingServiceModel result = await this._ratingService.UpdateRating(updateRatingServiceModel); Assert.AreEqual(result, readRatingServiceModel); } @@ -258,12 +306,20 @@ namespace DevHive.Services.Tests IsLike = isLike }; - this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(rating)); - this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - this.RatingRepositoryMock.Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(true)); - this.RatingRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); - - ReadRatingServiceModel result = await this.RatingService.UpdateRating(updateRatingServiceModel); + this._ratingRepositoryMock + .Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())) + .ReturnsAsync(rating); + this._userRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .ReturnsAsync(user); + this._ratingRepositoryMock + .Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())) + .ReturnsAsync(true); + this._ratingRepositoryMock + .Setup(p => p.EditAsync(It.IsAny(), It.IsAny())) + .ReturnsAsync(false); + + ReadRatingServiceModel result = await this._ratingService.UpdateRating(updateRatingServiceModel); Assert.IsNull(result); } @@ -278,9 +334,11 @@ namespace DevHive.Services.Tests IsLike = true }; - this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(null)); + this._ratingRepositoryMock + .Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())) + .Returns(Task.FromResult(null)); - Exception ex = Assert.ThrowsAsync(() => this.RatingService.UpdateRating(updateRatingServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._ratingService.UpdateRating(updateRatingServiceModel)); Assert.AreEqual(ex.Message, exceptionMessage); } @@ -307,11 +365,17 @@ namespace DevHive.Services.Tests User = user }; - this.RatingRepositoryMock.Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())).Returns(Task.FromResult(rating)); - this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); - this.RatingRepositoryMock.Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())).Returns(Task.FromResult(false)); + this._ratingRepositoryMock + .Setup(p => p.GetRatingByUserAndPostId(It.IsAny(), It.IsAny())) + .ReturnsAsync(rating); + this._userRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .ReturnsAsync(user); + this._ratingRepositoryMock + .Setup(p => p.UserRatedPost(It.IsAny(), It.IsAny())) + .ReturnsAsync(false); - Exception ex = Assert.ThrowsAsync(() => this.RatingService.UpdateRating(updateRatingServiceModel)); + Exception ex = Assert.ThrowsAsync(() => this._ratingService.UpdateRating(updateRatingServiceModel)); Assert.AreEqual(ex.Message, exceptionMessage); } @@ -327,11 +391,17 @@ namespace DevHive.Services.Tests Id = ratingId }; - this.RatingRepositoryMock.Setup(p => p.DoesRatingExist(It.IsAny())).Returns(Task.FromResult(true)); - this.RatingRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); - this.RatingRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(true)); + this._ratingRepositoryMock + .Setup(p => p.DoesRatingExist(It.IsAny())) + .ReturnsAsync(true); + this._ratingRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(null)); + this._ratingRepositoryMock + .Setup(p => p.DeleteAsync(It.IsAny())) + .ReturnsAsync(true); - bool result = await this.RatingService.DeleteRating(ratingId); + bool result = await this._ratingService.DeleteRating(ratingId); Assert.IsTrue(result); } @@ -345,11 +415,17 @@ namespace DevHive.Services.Tests Id = ratingId }; - this.RatingRepositoryMock.Setup(p => p.DoesRatingExist(It.IsAny())).Returns(Task.FromResult(true)); - this.RatingRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(null)); - this.RatingRepositoryMock.Setup(p => p.DeleteAsync(It.IsAny())).Returns(Task.FromResult(false)); + this._ratingRepositoryMock + .Setup(p => p.DoesRatingExist(It.IsAny())) + .ReturnsAsync(true); + this._ratingRepositoryMock + .Setup(p => p.GetByIdAsync(It.IsAny())) + .Returns(Task.FromResult(null)); + this._ratingRepositoryMock + .Setup(p => p.DeleteAsync(It.IsAny())) + .ReturnsAsync(false); - bool result = await this.RatingService.DeleteRating(ratingId); + bool result = await this._ratingService.DeleteRating(ratingId); Assert.IsFalse(result); } @@ -359,9 +435,11 @@ namespace DevHive.Services.Tests { string exceptionMessage = "Rating does not exist!"; - this.RatingRepositoryMock.Setup(p => p.DoesRatingExist(It.IsAny())).Returns(Task.FromResult(false)); + this._ratingRepositoryMock + .Setup(p => p.DoesRatingExist(It.IsAny())) + .ReturnsAsync(false); - Exception ex = Assert.ThrowsAsync(() => this.RatingService.DeleteRating(Guid.Empty)); + Exception ex = Assert.ThrowsAsync(() => this._ratingService.DeleteRating(Guid.Empty)); Assert.AreEqual(ex.Message, exceptionMessage); } diff --git a/src/Web/DevHive.Web.Tests/RatingController.Tests.cs b/src/Web/DevHive.Web.Tests/RatingController.Tests.cs index dd8954f..c7340a6 100644 --- a/src/Web/DevHive.Web.Tests/RatingController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/RatingController.Tests.cs @@ -16,18 +16,18 @@ namespace DevHive.Web.Tests [TestFixture] public class RatingControllerTests { - private Mock RatingServiceMock { get; set; } - private Mock MapperMock { get; set; } - private Mock JwtServiceMock { get; set; } - private RatingController RatingController { get; set; } + private Mock _ratingServiceMock; + private Mock _mapperMock; + private Mock _jwtServiceMock; + private RatingController _ratingController; [SetUp] public void SetUp() { - this.RatingServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.JwtServiceMock = new Mock(); - this.RatingController = new RatingController(this.RatingServiceMock.Object, this.MapperMock.Object, this.JwtServiceMock.Object); + this._ratingServiceMock = new Mock(); + this._mapperMock = new Mock(); + this._jwtServiceMock = new Mock(); + this._ratingController = new RatingController(this._ratingServiceMock.Object, this._mapperMock.Object, this._jwtServiceMock.Object); } #region Create @@ -47,11 +47,17 @@ namespace DevHive.Web.Tests }; Guid ratingId = Guid.NewGuid(); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createRatingServiceModel); - this.RatingServiceMock.Setup(p => p.RatePost(It.IsAny())).Returns(Task.FromResult(ratingId)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(createRatingServiceModel); + this._ratingServiceMock + .Setup(p => p.RatePost(It.IsAny())) + .ReturnsAsync(ratingId); - IActionResult result = this.RatingController.RatePost(Guid.Empty, createRatingWebModel, String.Empty).Result; + IActionResult result = this._ratingController.RatePost(Guid.Empty, createRatingWebModel, String.Empty).Result; Assert.IsInstanceOf(result); @@ -82,11 +88,17 @@ namespace DevHive.Web.Tests }; Guid ratingId = Guid.NewGuid(); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(createRatingServiceModel); - this.RatingServiceMock.Setup(p => p.RatePost(It.IsAny())).Returns(Task.FromResult(Guid.Empty)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(createRatingServiceModel); + this._ratingServiceMock + .Setup(p => p.RatePost(It.IsAny())) + .ReturnsAsync(Guid.Empty); - IActionResult result = this.RatingController.RatePost(Guid.Empty, createRatingWebModel, String.Empty).Result; + IActionResult result = this._ratingController.RatePost(Guid.Empty, createRatingWebModel, String.Empty).Result; Assert.IsInstanceOf(result); } @@ -114,10 +126,14 @@ namespace DevHive.Web.Tests IsLike = true }; - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readRatingServiceModel); - this.RatingServiceMock.Setup(p => p.GetRatingById(It.IsAny())).Returns(Task.FromResult(readRatingServiceModel)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readRatingServiceModel); + this._ratingServiceMock + .Setup(p => p.GetRatingById(It.IsAny())) + .ReturnsAsync(readRatingServiceModel); - IActionResult result = this.RatingController.GetRatingById(id).Result; + IActionResult result = this._ratingController.GetRatingById(id).Result; Assert.IsInstanceOf(result); } @@ -143,10 +159,14 @@ namespace DevHive.Web.Tests IsLike = true }; - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readRatingServiceModel); - this.RatingServiceMock.Setup(p => p.GetRatingByPostAndUser(It.IsAny(), It.IsAny())).Returns(Task.FromResult(readRatingServiceModel)); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readRatingServiceModel); + this._ratingServiceMock + .Setup(p => p.GetRatingByPostAndUser(It.IsAny(), It.IsAny())) + .ReturnsAsync(readRatingServiceModel); - IActionResult result = this.RatingController.GetRatingByUserAndPost(userId, postId).Result; + IActionResult result = this._ratingController.GetRatingByUserAndPost(userId, postId).Result; Assert.IsInstanceOf(result); } @@ -186,12 +206,20 @@ namespace DevHive.Web.Tests IsLike = true }; - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateRatingServiceModel); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(readRatingWebModel); - this.RatingServiceMock.Setup(p => p.UpdateRating(It.IsAny())).Returns(Task.FromResult(readRatingServiceModel)); - - IActionResult result = this.RatingController.UpdateRating(userId, postId, updateRatingWebModel, String.Empty).Result; + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(updateRatingServiceModel); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(readRatingWebModel); + this._ratingServiceMock + .Setup(p => p.UpdateRating(It.IsAny())) + .ReturnsAsync(readRatingServiceModel); + + IActionResult result = this._ratingController.UpdateRating(userId, postId, updateRatingWebModel, String.Empty).Result; Assert.IsInstanceOf(result); } @@ -210,11 +238,17 @@ namespace DevHive.Web.Tests IsLike = true }; - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(updateRatingServiceModel); - this.RatingServiceMock.Setup(p => p.UpdateRating(It.IsAny())).Returns(Task.FromResult(null)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._mapperMock + .Setup(p => p.Map(It.IsAny())) + .Returns(updateRatingServiceModel); + this._ratingServiceMock + .Setup(p => p.UpdateRating(It.IsAny())) + .Returns(Task.FromResult(null)); - IActionResult result = this.RatingController.UpdateRating(Guid.Empty, Guid.Empty, updateRatingWebModel, String.Empty).Result; + IActionResult result = this._ratingController.UpdateRating(Guid.Empty, Guid.Empty, updateRatingWebModel, String.Empty).Result; Assert.IsInstanceOf(result); } @@ -226,10 +260,14 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.RatingServiceMock.Setup(p => p.DeleteRating(It.IsAny())).Returns(Task.FromResult(true)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._ratingServiceMock + .Setup(p => p.DeleteRating(It.IsAny())) + .ReturnsAsync(true); - IActionResult result = this.RatingController.DeleteRating(Guid.Empty, Guid.Empty, String.Empty).Result; + IActionResult result = this._ratingController.DeleteRating(Guid.Empty, Guid.Empty, String.Empty).Result; Assert.IsInstanceOf(result); } @@ -240,10 +278,14 @@ namespace DevHive.Web.Tests string message = "Could not delete Rating"; Guid id = Guid.NewGuid(); - this.JwtServiceMock.Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())).Returns(true); - this.RatingServiceMock.Setup(p => p.DeleteRating(It.IsAny())).Returns(Task.FromResult(false)); + this._jwtServiceMock + .Setup(p => p.ValidateToken(It.IsAny(), It.IsAny())) + .Returns(true); + this._ratingServiceMock + .Setup(p => p.DeleteRating(It.IsAny())) + .ReturnsAsync(false); - IActionResult result = this.RatingController.DeleteRating(Guid.Empty, Guid.Empty, String.Empty).Result; + IActionResult result = this._ratingController.DeleteRating(Guid.Empty, Guid.Empty, String.Empty).Result; Assert.IsInstanceOf(result); -- cgit v1.2.3