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 --- src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Services/DevHive.Services.Tests/TechnologyServices.Tests.cs') 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)); -- 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/DevHive.Services.Tests/TechnologyServices.Tests.cs') 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 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/DevHive.Services.Tests/TechnologyServices.Tests.cs') 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/DevHive.Services.Tests/TechnologyServices.Tests.cs') 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/DevHive.Services.Tests/TechnologyServices.Tests.cs') 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