From af2a9b9886b429489e4ef4c2467d0e9e40520c12 Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Sun, 14 Mar 2021 10:59:12 +0200
Subject: Made properties into variables in Web layer tests

---
 .../DevHive.Web.Tests/LanguageController.Tests.cs  | 50 +++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'src/Web/DevHive.Web.Tests/LanguageController.Tests.cs')

diff --git a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs
index af4672a..f11e1a1 100644
--- a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs
@@ -16,16 +16,16 @@ namespace DevHive.Web.Tests
 	public class LanguageControllerTests
 	{
 		const string NAME = "Gosho Trapov";
-		private Mock<ILanguageService> LanguageServiceMock { get; set; }
-		private Mock<IMapper> MapperMock { get; set; }
-		private LanguageController LanguageController { get; set; }
+		private Mock<ILanguageService> _languageServiceMock;
+		private Mock<IMapper> _mapperMock;
+		private LanguageController _languageController;
 
 		[SetUp]
 		public void SetUp()
 		{
-			this.LanguageServiceMock = new Mock<ILanguageService>();
-			this.MapperMock = new Mock<IMapper>();
-			this.LanguageController = new LanguageController(this.LanguageServiceMock.Object, this.MapperMock.Object);
+			this._languageServiceMock = new Mock<ILanguageService>();
+			this._mapperMock = new Mock<IMapper>();
+			this._languageController = new LanguageController(this._languageServiceMock.Object, this._mapperMock.Object);
 		}
 
 		#region Create
@@ -42,10 +42,10 @@ namespace DevHive.Web.Tests
 			};
 			Guid id = Guid.NewGuid();
 
-			this.MapperMock.Setup(p => p.Map<CreateLanguageServiceModel>(It.IsAny<CreateLanguageWebModel>())).Returns(createLanguageServiceModel);
-			this.LanguageServiceMock.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>())).Returns(Task.FromResult(id));
+			this._mapperMock.Setup(p => p.Map<CreateLanguageServiceModel>(It.IsAny<CreateLanguageWebModel>())).Returns(createLanguageServiceModel);
+			this._languageServiceMock.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>())).Returns(Task.FromResult(id));
 
-			IActionResult result = this.LanguageController.Create(createLanguageWebModel).Result;
+			IActionResult result = this._languageController.Create(createLanguageWebModel).Result;
 
 			Assert.IsInstanceOf<OkObjectResult>(result);
 
@@ -74,10 +74,10 @@ namespace DevHive.Web.Tests
 			Guid id = Guid.Empty;
 			string errorMessage = $"Could not create language {NAME}";
 
-			this.MapperMock.Setup(p => p.Map<CreateLanguageServiceModel>(It.IsAny<CreateLanguageWebModel>())).Returns(createTechnologyServiceModel);
-			this.LanguageServiceMock.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>())).Returns(Task.FromResult(id));
+			this._mapperMock.Setup(p => p.Map<CreateLanguageServiceModel>(It.IsAny<CreateLanguageWebModel>())).Returns(createTechnologyServiceModel);
+			this._languageServiceMock.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>())).Returns(Task.FromResult(id));
 
-			IActionResult result = this.LanguageController.Create(createTechnologyWebModel).Result;
+			IActionResult result = this._languageController.Create(createTechnologyWebModel).Result;
 
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);
 
@@ -103,10 +103,10 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this.LanguageServiceMock.Setup(p => p.GetLanguageById(It.IsAny<Guid>())).Returns(Task.FromResult(readLanguageServiceModel));
-			this.MapperMock.Setup(p => p.Map<ReadLanguageWebModel>(It.IsAny<ReadLanguageServiceModel>())).Returns(readLanguageWebModel);
+			this._languageServiceMock.Setup(p => p.GetLanguageById(It.IsAny<Guid>())).Returns(Task.FromResult(readLanguageServiceModel));
+			this._mapperMock.Setup(p => p.Map<ReadLanguageWebModel>(It.IsAny<ReadLanguageServiceModel>())).Returns(readLanguageWebModel);
 
-			IActionResult result = this.LanguageController.GetById(id).Result;
+			IActionResult result = this._languageController.GetById(id).Result;
 
 			Assert.IsInstanceOf<OkObjectResult>(result);
 
@@ -131,10 +131,10 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this.LanguageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>())).Returns(Task.FromResult(true));
-			this.MapperMock.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>())).Returns(updateLanguageServiceModel);
+			this._languageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>())).Returns(Task.FromResult(true));
+			this._mapperMock.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>())).Returns(updateLanguageServiceModel);
 
-			IActionResult result = this.LanguageController.Update(id, updateLanguageWebModel).Result;
+			IActionResult result = this._languageController.Update(id, updateLanguageWebModel).Result;
 
 			Assert.IsInstanceOf<OkResult>(result);
 		}
@@ -153,10 +153,10 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this.LanguageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>())).Returns(Task.FromResult(false));
-			this.MapperMock.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>())).Returns(updateLanguageServiceModel);
+			this._languageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>())).Returns(Task.FromResult(false));
+			this._mapperMock.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>())).Returns(updateLanguageServiceModel);
 
-			IActionResult result = this.LanguageController.Update(id, updateLanguageWebModel).Result;
+			IActionResult result = this._languageController.Update(id, updateLanguageWebModel).Result;
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);
 
 			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
@@ -172,9 +172,9 @@ namespace DevHive.Web.Tests
 		{
 			Guid id = Guid.NewGuid();
 
-			this.LanguageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny<Guid>())).Returns(Task.FromResult(true));
+			this._languageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny<Guid>())).Returns(Task.FromResult(true));
 
-			IActionResult result = this.LanguageController.Delete(id).Result;
+			IActionResult result = this._languageController.Delete(id).Result;
 
 			Assert.IsInstanceOf<OkResult>(result);
 		}
@@ -185,9 +185,9 @@ namespace DevHive.Web.Tests
 			string message = "Could not delete Language";
 			Guid id = Guid.NewGuid();
 
-			this.LanguageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny<Guid>())).Returns(Task.FromResult(false));
+			this._languageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny<Guid>())).Returns(Task.FromResult(false));
 
-			IActionResult result = this.LanguageController.Delete(id).Result;
+			IActionResult result = this._languageController.Delete(id).Result;
 
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);
 
-- 
cgit v1.2.3


From a2dde73b37ad311213a6787fb5aeb5cb4103968c Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Sun, 14 Mar 2021 11:23:35 +0200
Subject: Updated code style of mock setups in Web layer tests

---
 .../DevHive.Web.Tests/CommentController.Tests.cs   | 120 +++++++++++++++------
 src/Web/DevHive.Web.Tests/FeedController.Tests.cs  |  24 +++--
 .../DevHive.Web.Tests/LanguageController.Tests.cs  |  48 ++++++---
 src/Web/DevHive.Web.Tests/PostController.Tests.cs  | 108 ++++++++++++++-----
 src/Web/DevHive.Web.Tests/RoleController.Tests.cs  |  50 ++++++---
 .../TechnologyController.Tests.cs                  |  48 ++++++---
 src/Web/DevHive.Web.Tests/UserController.Tests.cs  |  76 +++++++++----
 7 files changed, 355 insertions(+), 119 deletions(-)

(limited to 'src/Web/DevHive.Web.Tests/LanguageController.Tests.cs')

diff --git a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs
index 3b7f0a9..4e1715c 100644
--- a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs
@@ -47,10 +47,18 @@ namespace DevHive.Web.Tests
 				Message = MESSAGE
 			};
 
-			this._mapperMock.Setup(p => p.Map<CreateCommentServiceModel>(It.IsAny<CreateCommentWebModel>())).Returns(createCommentServiceModel);
-			this._commentServiceMock.Setup(p => p.AddComment(It.IsAny<CreateCommentServiceModel>())).Returns(Task.FromResult(id));
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._commentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
+			this._mapperMock
+				.Setup(p => p.Map<CreateCommentServiceModel>(It.IsAny<CreateCommentWebModel>()))
+				.Returns(createCommentServiceModel);
+			this._commentServiceMock
+				.Setup(p => p.AddComment(It.IsAny<CreateCommentServiceModel>()))
+				.Returns(Task.FromResult(id));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._commentServiceMock
+				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result;
 
@@ -81,10 +89,18 @@ namespace DevHive.Web.Tests
 			string errorMessage = $"Could not create comment!";
 
 
-			this._mapperMock.Setup(p => p.Map<CreateCommentServiceModel>(It.IsAny<CreateCommentWebModel>())).Returns(createCommentServiceModel);
-			this._commentServiceMock.Setup(p => p.AddComment(It.IsAny<CreateCommentServiceModel>())).Returns(Task.FromResult(Guid.Empty));
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._commentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
+			this._mapperMock
+				.Setup(p => p.Map<CreateCommentServiceModel>(It.IsAny<CreateCommentWebModel>()))
+				.Returns(createCommentServiceModel);
+			this._commentServiceMock
+				.Setup(p => p.AddComment(It.IsAny<CreateCommentServiceModel>()))
+				.Returns(Task.FromResult(Guid.Empty));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._commentServiceMock
+				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result;
 
@@ -104,8 +120,12 @@ namespace DevHive.Web.Tests
 				Message = MESSAGE
 			};
 
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._commentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._commentServiceMock
+				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(false));
 
 			IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result;
 
@@ -127,9 +147,15 @@ namespace DevHive.Web.Tests
 				Message = MESSAGE
 			};
 
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._commentServiceMock.Setup(p => p.GetCommentById(It.IsAny<Guid>())).Returns(Task.FromResult(readCommentServiceModel));
-			this._mapperMock.Setup(p => p.Map<ReadCommentWebModel>(It.IsAny<ReadCommentServiceModel>())).Returns(readCommentWebModel);
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._commentServiceMock
+				.Setup(p => p.GetCommentById(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(readCommentServiceModel));
+			this._mapperMock
+				.Setup(p => p.Map<ReadCommentWebModel>(It.IsAny<ReadCommentServiceModel>()))
+				.Returns(readCommentWebModel);
 
 			IActionResult result = this._commentController.GetCommentById(id).Result;
 
@@ -156,10 +182,18 @@ namespace DevHive.Web.Tests
 				NewMessage = MESSAGE
 			};
 
-			this._commentServiceMock.Setup(p => p.UpdateComment(It.IsAny<UpdateCommentServiceModel>())).Returns(Task.FromResult(id));
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-			this._mapperMock.Setup(p => p.Map<UpdateCommentServiceModel>(It.IsAny<UpdateCommentWebModel>())).Returns(updateCommentServiceModel);
+			this._commentServiceMock
+				.Setup(p => p.UpdateComment(It.IsAny<UpdateCommentServiceModel>()))
+				.Returns(Task.FromResult(id));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._commentServiceMock
+				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(true));
+			this._mapperMock
+				.Setup(p => p.Map<UpdateCommentServiceModel>(It.IsAny<UpdateCommentWebModel>()))
+				.Returns(updateCommentServiceModel);
 
 			IActionResult result = this._commentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result;
 
@@ -185,10 +219,18 @@ namespace DevHive.Web.Tests
 				NewMessage = MESSAGE
 			};
 
-			this._commentServiceMock.Setup(p => p.UpdateComment(It.IsAny<UpdateCommentServiceModel>())).Returns(Task.FromResult(Guid.Empty));
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-			this._mapperMock.Setup(p => p.Map<UpdateCommentServiceModel>(It.IsAny<UpdateCommentWebModel>())).Returns(updateCommentServiceModel);
+			this._commentServiceMock
+				.Setup(p => p.UpdateComment(It.IsAny<UpdateCommentServiceModel>()))
+				.Returns(Task.FromResult(Guid.Empty));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._commentServiceMock
+				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(true));
+			this._mapperMock
+				.Setup(p => p.Map<UpdateCommentServiceModel>(It.IsAny<UpdateCommentWebModel>()))
+				.Returns(updateCommentServiceModel);
 
 			IActionResult result = this._commentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result;
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);
@@ -207,7 +249,9 @@ namespace DevHive.Web.Tests
 				NewMessage = MESSAGE
 			};
 
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(false);
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(false);
 			// this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
 
 			IActionResult result = this._commentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result;
@@ -222,9 +266,15 @@ namespace DevHive.Web.Tests
 		{
 			Guid id = Guid.NewGuid();
 
-			this._commentServiceMock.Setup(p => p.DeleteComment(It.IsAny<Guid>())).Returns(Task.FromResult(true));
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
+			this._commentServiceMock
+				.Setup(p => p.DeleteComment(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(true));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._commentServiceMock
+				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._commentController.DeleteComment(id, null).Result;
 
@@ -237,9 +287,15 @@ namespace DevHive.Web.Tests
 			string message = "Could not delete Comment";
 			Guid id = Guid.NewGuid();
 
-			this._commentServiceMock.Setup(p => p.DeleteComment(It.IsAny<Guid>())).Returns(Task.FromResult(false));
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
+			this._commentServiceMock
+				.Setup(p => p.DeleteComment(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(false));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._commentServiceMock
+				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._commentController.DeleteComment(id, null).Result;
 
@@ -254,8 +310,12 @@ namespace DevHive.Web.Tests
 		[Test]
 		public void DeleteComment_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized()
 		{
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._commentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._commentServiceMock
+				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(false));
 
 			IActionResult result = this._commentController.DeleteComment(Guid.Empty, null).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs
index 80a2a14..7a7fd8d 100644
--- a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs
@@ -48,9 +48,15 @@ namespace DevHive.Web.Tests
 				}
 			};
 
-			this._feedServiceMock.Setup(p => p.GetPage(It.IsAny<GetPageServiceModel>())).Returns(Task.FromResult(readPageServiceModel));
-			this._mapperMock.Setup(p => p.Map<GetPageServiceModel>(It.IsAny<GetPageWebModel>())).Returns(getPageServiceModel);
-			this._mapperMock.Setup(p => p.Map<ReadPageWebModel>(It.IsAny<ReadPageServiceModel>())).Returns(readPageWebModel);
+			this._feedServiceMock
+				.Setup(p => p.GetPage(It.IsAny<GetPageServiceModel>()))
+				.Returns(Task.FromResult(readPageServiceModel));
+			this._mapperMock
+				.Setup(p => p.Map<GetPageServiceModel>(It.IsAny<GetPageWebModel>()))
+				.Returns(getPageServiceModel);
+			this._mapperMock
+				.Setup(p => p.Map<ReadPageWebModel>(It.IsAny<ReadPageServiceModel>()))
+				.Returns(readPageWebModel);
 
 			IActionResult result = await this._feedController.GetPosts(Guid.Empty, getPageWebModel);
 
@@ -80,9 +86,15 @@ namespace DevHive.Web.Tests
 				}
 			};
 
-			this._feedServiceMock.Setup(p => p.GetUserPage(It.IsAny<GetPageServiceModel>())).Returns(Task.FromResult(readPageServiceModel));
-			this._mapperMock.Setup(p => p.Map<GetPageServiceModel>(It.IsAny<GetPageWebModel>())).Returns(getPageServiceModel);
-			this._mapperMock.Setup(p => p.Map<ReadPageWebModel>(It.IsAny<ReadPageServiceModel>())).Returns(readPageWebModel);
+			this._feedServiceMock
+				.Setup(p => p.GetUserPage(It.IsAny<GetPageServiceModel>()))
+				.Returns(Task.FromResult(readPageServiceModel));
+			this._mapperMock
+				.Setup(p => p.Map<GetPageServiceModel>(It.IsAny<GetPageWebModel>()))
+				.Returns(getPageServiceModel);
+			this._mapperMock
+				.Setup(p => p.Map<ReadPageWebModel>(It.IsAny<ReadPageServiceModel>()))
+				.Returns(readPageWebModel);
 
 			IActionResult result = await this._feedController.GetUserPosts(null, getPageWebModel);
 
diff --git a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs
index f11e1a1..de882fc 100644
--- a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs
@@ -42,8 +42,12 @@ namespace DevHive.Web.Tests
 			};
 			Guid id = Guid.NewGuid();
 
-			this._mapperMock.Setup(p => p.Map<CreateLanguageServiceModel>(It.IsAny<CreateLanguageWebModel>())).Returns(createLanguageServiceModel);
-			this._languageServiceMock.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>())).Returns(Task.FromResult(id));
+			this._mapperMock
+				.Setup(p => p.Map<CreateLanguageServiceModel>(It.IsAny<CreateLanguageWebModel>()))
+				.Returns(createLanguageServiceModel);
+			this._languageServiceMock
+				.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>()))
+				.Returns(Task.FromResult(id));
 
 			IActionResult result = this._languageController.Create(createLanguageWebModel).Result;
 
@@ -74,8 +78,12 @@ namespace DevHive.Web.Tests
 			Guid id = Guid.Empty;
 			string errorMessage = $"Could not create language {NAME}";
 
-			this._mapperMock.Setup(p => p.Map<CreateLanguageServiceModel>(It.IsAny<CreateLanguageWebModel>())).Returns(createTechnologyServiceModel);
-			this._languageServiceMock.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>())).Returns(Task.FromResult(id));
+			this._mapperMock
+				.Setup(p => p.Map<CreateLanguageServiceModel>(It.IsAny<CreateLanguageWebModel>()))
+				.Returns(createTechnologyServiceModel);
+			this._languageServiceMock
+				.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>()))
+				.Returns(Task.FromResult(id));
 
 			IActionResult result = this._languageController.Create(createTechnologyWebModel).Result;
 
@@ -103,8 +111,12 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this._languageServiceMock.Setup(p => p.GetLanguageById(It.IsAny<Guid>())).Returns(Task.FromResult(readLanguageServiceModel));
-			this._mapperMock.Setup(p => p.Map<ReadLanguageWebModel>(It.IsAny<ReadLanguageServiceModel>())).Returns(readLanguageWebModel);
+			this._languageServiceMock
+				.Setup(p => p.GetLanguageById(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(readLanguageServiceModel));
+			this._mapperMock
+				.Setup(p => p.Map<ReadLanguageWebModel>(It.IsAny<ReadLanguageServiceModel>()))
+				.Returns(readLanguageWebModel);
 
 			IActionResult result = this._languageController.GetById(id).Result;
 
@@ -131,8 +143,12 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this._languageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>())).Returns(Task.FromResult(true));
-			this._mapperMock.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>())).Returns(updateLanguageServiceModel);
+			this._languageServiceMock
+				.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>()))
+				.Returns(Task.FromResult(true));
+			this._mapperMock
+				.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>()))
+				.Returns(updateLanguageServiceModel);
 
 			IActionResult result = this._languageController.Update(id, updateLanguageWebModel).Result;
 
@@ -153,8 +169,12 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this._languageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>())).Returns(Task.FromResult(false));
-			this._mapperMock.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>())).Returns(updateLanguageServiceModel);
+			this._languageServiceMock
+				.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>()))
+				.Returns(Task.FromResult(false));
+			this._mapperMock
+				.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>()))
+				.Returns(updateLanguageServiceModel);
 
 			IActionResult result = this._languageController.Update(id, updateLanguageWebModel).Result;
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);
@@ -172,7 +192,9 @@ namespace DevHive.Web.Tests
 		{
 			Guid id = Guid.NewGuid();
 
-			this._languageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny<Guid>())).Returns(Task.FromResult(true));
+			this._languageServiceMock
+				.Setup(p => p.DeleteLanguage(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._languageController.Delete(id).Result;
 
@@ -185,7 +207,9 @@ namespace DevHive.Web.Tests
 			string message = "Could not delete Language";
 			Guid id = Guid.NewGuid();
 
-			this._languageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny<Guid>())).Returns(Task.FromResult(false));
+			this._languageServiceMock
+				.Setup(p => p.DeleteLanguage(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(false));
 
 			IActionResult result = this._languageController.Delete(id).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/PostController.Tests.cs b/src/Web/DevHive.Web.Tests/PostController.Tests.cs
index c2c2fbc..384a92a 100644
--- a/src/Web/DevHive.Web.Tests/PostController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/PostController.Tests.cs
@@ -45,10 +45,18 @@ namespace DevHive.Web.Tests
 			};
 			Guid id = Guid.NewGuid();
 
-			this._mapperMock.Setup(p => p.Map<CreatePostServiceModel>(It.IsAny<CreatePostWebModel>())).Returns(createPostServiceModel);
-			this._postServiceMock.Setup(p => p.CreatePost(It.IsAny<CreatePostServiceModel>())).Returns(Task.FromResult(id));
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._postServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
+			this._mapperMock
+				.Setup(p => p.Map<CreatePostServiceModel>(It.IsAny<CreatePostWebModel>()))
+				.Returns(createPostServiceModel);
+			this._postServiceMock
+				.Setup(p => p.CreatePost(It.IsAny<CreatePostServiceModel>()))
+				.Returns(Task.FromResult(id));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._postServiceMock
+				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._postController.Create(Guid.Empty, createPostWebModel, null).Result;
 
@@ -79,10 +87,18 @@ namespace DevHive.Web.Tests
 			Guid id = Guid.Empty;
 			string errorMessage = $"Could not create post!";
 
-			this._mapperMock.Setup(p => p.Map<CreatePostServiceModel>(It.IsAny<CreatePostWebModel>())).Returns(createTechnologyServiceModel);
-			this._postServiceMock.Setup(p => p.CreatePost(It.IsAny<CreatePostServiceModel>())).Returns(Task.FromResult(id));
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._postServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
+			this._mapperMock
+				.Setup(p => p.Map<CreatePostServiceModel>(It.IsAny<CreatePostWebModel>()))
+				.Returns(createTechnologyServiceModel);
+			this._postServiceMock
+				.Setup(p => p.CreatePost(It.IsAny<CreatePostServiceModel>()))
+				.Returns(Task.FromResult(id));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._postServiceMock
+				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._postController.Create(Guid.Empty, createTechnologyWebModel, null).Result;
 
@@ -102,7 +118,9 @@ namespace DevHive.Web.Tests
 				Message = MESSAGE
 			};
 
-			this._postServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
+			this._postServiceMock
+				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(false));
 
 			IActionResult result = this._postController.Create(Guid.NewGuid(), createPostWebModel, null).Result;
 
@@ -125,8 +143,12 @@ namespace DevHive.Web.Tests
 				Message = MESSAGE
 			};
 
-			this._postServiceMock.Setup(p => p.GetPostById(It.IsAny<Guid>())).Returns(Task.FromResult(readPostServiceModel));
-			this._mapperMock.Setup(p => p.Map<ReadPostWebModel>(It.IsAny<ReadPostServiceModel>())).Returns(readPostWebModel);
+			this._postServiceMock
+				.Setup(p => p.GetPostById(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(readPostServiceModel));
+			this._mapperMock
+				.Setup(p => p.Map<ReadPostWebModel>(It.IsAny<ReadPostServiceModel>()))
+				.Returns(readPostWebModel);
 
 			IActionResult result = this._postController.GetById(id).Result;
 
@@ -153,10 +175,18 @@ namespace DevHive.Web.Tests
 				NewMessage = MESSAGE
 			};
 
-			this._postServiceMock.Setup(p => p.UpdatePost(It.IsAny<UpdatePostServiceModel>())).Returns(Task.FromResult(id));
-			this._mapperMock.Setup(p => p.Map<UpdatePostServiceModel>(It.IsAny<UpdatePostWebModel>())).Returns(updatePostServiceModel);
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
+			this._postServiceMock
+				.Setup(p => p.UpdatePost(It.IsAny<UpdatePostServiceModel>()))
+				.Returns(Task.FromResult(id));
+			this._mapperMock
+				.Setup(p => p.Map<UpdatePostServiceModel>(It.IsAny<UpdatePostWebModel>()))
+				.Returns(updatePostServiceModel);
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._postServiceMock
+				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._postController.Update(id, updatePostWebModel, null).Result;
 
@@ -177,10 +207,18 @@ namespace DevHive.Web.Tests
 				NewMessage = MESSAGE
 			};
 
-			this._postServiceMock.Setup(p => p.UpdatePost(It.IsAny<UpdatePostServiceModel>())).Returns(Task.FromResult(Guid.Empty));
-			this._mapperMock.Setup(p => p.Map<UpdatePostServiceModel>(It.IsAny<UpdatePostWebModel>())).Returns(updatePostServiceModel);
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
+			this._postServiceMock
+				.Setup(p => p.UpdatePost(It.IsAny<UpdatePostServiceModel>()))
+				.Returns(Task.FromResult(Guid.Empty));
+			this._mapperMock
+				.Setup(p => p.Map<UpdatePostServiceModel>(It.IsAny<UpdatePostWebModel>()))
+				.Returns(updatePostServiceModel);
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._postServiceMock
+				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._postController.Update(id, updatePostWebModel, null).Result;
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);
@@ -199,7 +237,9 @@ namespace DevHive.Web.Tests
 				NewMessage = MESSAGE
 			};
 
-			this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
+			this._postServiceMock
+				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(false));
 
 			IActionResult result = this._postController.Update(Guid.Empty, updatePostWebModel, null).Result;
 
@@ -213,9 +253,15 @@ namespace DevHive.Web.Tests
 		{
 			Guid id = Guid.NewGuid();
 
-			this._postServiceMock.Setup(p => p.DeletePost(It.IsAny<Guid>())).Returns(Task.FromResult(true));
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
+			this._postServiceMock
+				.Setup(p => p.DeletePost(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(true));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._postServiceMock
+				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._postController.Delete(id, null).Result;
 
@@ -228,9 +274,15 @@ namespace DevHive.Web.Tests
 			string message = "Could not delete Post";
 			Guid id = Guid.NewGuid();
 
-			this._postServiceMock.Setup(p => p.DeletePost(It.IsAny<Guid>())).Returns(Task.FromResult(false));
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
+			this._postServiceMock
+				.Setup(p => p.DeletePost(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(false));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._postServiceMock
+				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._postController.Delete(id, null).Result;
 
@@ -245,7 +297,9 @@ namespace DevHive.Web.Tests
 		[Test]
 		public void DeletePost_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized()
 		{
-			this._postServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
+			this._postServiceMock
+				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(Task.FromResult(false));
 
 			IActionResult result = this._postController.Delete(Guid.Empty, null).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
index 83358a0..0f835c1 100644
--- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
@@ -42,8 +42,12 @@ namespace DevHive.Web.Tests
 			};
 			Guid id = Guid.NewGuid();
 
-			this._mapperMock.Setup(p => p.Map<CreateRoleServiceModel>(It.IsAny<CreateRoleWebModel>())).Returns(createRoleServiceModel);
-			this._roleServiceMock.Setup(p => p.CreateRole(It.IsAny<CreateRoleServiceModel>())).Returns(Task.FromResult(id));
+			this._mapperMock
+				.Setup(p => p.Map<CreateRoleServiceModel>(It.IsAny<CreateRoleWebModel>()))
+				.Returns(createRoleServiceModel);
+			this._roleServiceMock
+				.Setup(p => p.CreateRole(It.IsAny<CreateRoleServiceModel>()))
+				.Returns(Task.FromResult(id));
 
 			IActionResult result = this._roleController.Create(createRoleWebModel).Result;
 
@@ -74,8 +78,12 @@ namespace DevHive.Web.Tests
 			Guid id = Guid.Empty;
 			string errorMessage = $"Could not create role {NAME}";
 
-			this._mapperMock.Setup(p => p.Map<CreateRoleServiceModel>(It.IsAny<CreateRoleWebModel>())).Returns(createTechnologyServiceModel);
-			this._roleServiceMock.Setup(p => p.CreateRole(It.IsAny<CreateRoleServiceModel>())).Returns(Task.FromResult(id));
+			this._mapperMock
+				.Setup(p => p.Map<CreateRoleServiceModel>(It.IsAny<CreateRoleWebModel>()))
+				.Returns(createTechnologyServiceModel);
+			this._roleServiceMock
+				.Setup(p => p.CreateRole(It.IsAny<CreateRoleServiceModel>()))
+				.Returns(Task.FromResult(id));
 
 			IActionResult result = this._roleController.Create(createTechnologyWebModel).Result;
 
@@ -103,8 +111,12 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this._roleServiceMock.Setup(p => p.GetRoleById(It.IsAny<Guid>())).Returns(Task.FromResult(roleServiceModel));
-			this._mapperMock.Setup(p => p.Map<RoleWebModel>(It.IsAny<RoleServiceModel>())).Returns(roleWebModel);
+			this._roleServiceMock
+				.Setup(p => p.GetRoleById(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(roleServiceModel));
+			this._mapperMock
+				.Setup(p => p.Map<RoleWebModel>(It.IsAny<RoleServiceModel>()))
+				.Returns(roleWebModel);
 
 			IActionResult result = this._roleController.GetById(id).Result;
 
@@ -131,8 +143,12 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this._roleServiceMock.Setup(p => p.UpdateRole(It.IsAny<UpdateRoleServiceModel>())).Returns(Task.FromResult(true));
-			this._mapperMock.Setup(p => p.Map<UpdateRoleServiceModel>(It.IsAny<UpdateRoleWebModel>())).Returns(updateRoleServiceModel);
+			this._roleServiceMock
+				.Setup(p => p.UpdateRole(It.IsAny<UpdateRoleServiceModel>()))
+				.Returns(Task.FromResult(true));
+			this._mapperMock
+				.Setup(p => p.Map<UpdateRoleServiceModel>(It.IsAny<UpdateRoleWebModel>()))
+				.Returns(updateRoleServiceModel);
 
 			IActionResult result = this._roleController.Update(id, updateRoleWebModel).Result;
 
@@ -153,8 +169,12 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this._roleServiceMock.Setup(p => p.UpdateRole(It.IsAny<UpdateRoleServiceModel>())).Returns(Task.FromResult(false));
-			this._mapperMock.Setup(p => p.Map<UpdateRoleServiceModel>(It.IsAny<UpdateRoleWebModel>())).Returns(updateRoleServiceModel);
+			this._roleServiceMock
+				.Setup(p => p.UpdateRole(It.IsAny<UpdateRoleServiceModel>()))
+				.Returns(Task.FromResult(false));
+			this._mapperMock
+				.Setup(p => p.Map<UpdateRoleServiceModel>(It.IsAny<UpdateRoleWebModel>()))
+				.Returns(updateRoleServiceModel);
 
 			IActionResult result = this._roleController.Update(id, updateRoleWebModel).Result;
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);
@@ -172,7 +192,9 @@ namespace DevHive.Web.Tests
 		{
 			Guid id = Guid.NewGuid();
 
-			this._roleServiceMock.Setup(p => p.DeleteRole(It.IsAny<Guid>())).Returns(Task.FromResult(true));
+			this._roleServiceMock
+				.Setup(p => p.DeleteRole(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._roleController.Delete(id).Result;
 
@@ -180,12 +202,14 @@ namespace DevHive.Web.Tests
 		}
 
 		[Test]
-		public void Delet_ReturnsBadRequestObjectResult_WhenRoleIsNotDeletedSuccessfully()
+		public void Delete_ReturnsBadRequestObjectResult_WhenRoleIsNotDeletedSuccessfully()
 		{
 			string message = "Could not delete role!";
 			Guid id = Guid.NewGuid();
 
-			this._roleServiceMock.Setup(p => p.DeleteRole(It.IsAny<Guid>())).Returns(Task.FromResult(false));
+			this._roleServiceMock
+				.Setup(p => p.DeleteRole(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(false));
 
 			IActionResult result = this._roleController.Delete(id).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs
index 64b128c..76d291d 100644
--- a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs
@@ -44,8 +44,12 @@ namespace DevHive.Web.Tests
 			};
 			Guid id = Guid.NewGuid();
 
-			this._mapperMock.Setup(p => p.Map<CreateTechnologyServiceModel>(It.IsAny<CreateTechnologyWebModel>())).Returns(createTechnologyServiceModel);
-			this._technologyServiceMock.Setup(p => p.CreateTechnology(It.IsAny<CreateTechnologyServiceModel>())).Returns(Task.FromResult(id));
+			this._mapperMock
+				.Setup(p => p.Map<CreateTechnologyServiceModel>(It.IsAny<CreateTechnologyWebModel>()))
+				.Returns(createTechnologyServiceModel);
+			this._technologyServiceMock
+				.Setup(p => p.CreateTechnology(It.IsAny<CreateTechnologyServiceModel>()))
+				.Returns(Task.FromResult(id));
 
 			IActionResult result = this._technologyController.Create(createTechnologyWebModel).Result;
 
@@ -76,8 +80,12 @@ namespace DevHive.Web.Tests
 			Guid id = Guid.Empty;
 			string errorMessage = $"Could not create technology {NAME}";
 
-			this._mapperMock.Setup(p => p.Map<CreateTechnologyServiceModel>(It.IsAny<CreateTechnologyWebModel>())).Returns(createTechnologyServiceModel);
-			this._technologyServiceMock.Setup(p => p.CreateTechnology(It.IsAny<CreateTechnologyServiceModel>())).Returns(Task.FromResult(id));
+			this._mapperMock
+				.Setup(p => p.Map<CreateTechnologyServiceModel>(It.IsAny<CreateTechnologyWebModel>()))
+				.Returns(createTechnologyServiceModel);
+			this._technologyServiceMock
+				.Setup(p => p.CreateTechnology(It.IsAny<CreateTechnologyServiceModel>()))
+				.Returns(Task.FromResult(id));
 
 			IActionResult result = this._technologyController.Create(createTechnologyWebModel).Result;
 
@@ -105,8 +113,12 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this._technologyServiceMock.Setup(p => p.GetTechnologyById(It.IsAny<Guid>())).Returns(Task.FromResult(readTechnologyServiceModel));
-			this._mapperMock.Setup(p => p.Map<ReadTechnologyWebModel>(It.IsAny<ReadTechnologyServiceModel>())).Returns(readTechnologyWebModel);
+			this._technologyServiceMock
+				.Setup(p => p.GetTechnologyById(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(readTechnologyServiceModel));
+			this._mapperMock
+				.Setup(p => p.Map<ReadTechnologyWebModel>(It.IsAny<ReadTechnologyServiceModel>()))
+				.Returns(readTechnologyWebModel);
 
 			IActionResult result = this._technologyController.GetById(id).Result;
 
@@ -133,8 +145,12 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this._technologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny<UpdateTechnologyServiceModel>())).Returns(Task.FromResult(true));
-			this._mapperMock.Setup(p => p.Map<UpdateTechnologyServiceModel>(It.IsAny<UpdateTechnologyWebModel>())).Returns(updateTechnologyServiceModel);
+			this._technologyServiceMock
+				.Setup(p => p.UpdateTechnology(It.IsAny<UpdateTechnologyServiceModel>()))
+				.Returns(Task.FromResult(true));
+			this._mapperMock
+				.Setup(p => p.Map<UpdateTechnologyServiceModel>(It.IsAny<UpdateTechnologyWebModel>()))
+				.Returns(updateTechnologyServiceModel);
 
 			IActionResult result = this._technologyController.Update(id, updateTechnologyWebModel).Result;
 
@@ -155,8 +171,12 @@ namespace DevHive.Web.Tests
 				Name = NAME
 			};
 
-			this._technologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny<UpdateTechnologyServiceModel>())).Returns(Task.FromResult(false));
-			this._mapperMock.Setup(p => p.Map<UpdateTechnologyServiceModel>(It.IsAny<UpdateTechnologyWebModel>())).Returns(updateTechnologyServiceModel);
+			this._technologyServiceMock
+				.Setup(p => p.UpdateTechnology(It.IsAny<UpdateTechnologyServiceModel>()))
+				.Returns(Task.FromResult(false));
+			this._mapperMock
+				.Setup(p => p.Map<UpdateTechnologyServiceModel>(It.IsAny<UpdateTechnologyWebModel>()))
+				.Returns(updateTechnologyServiceModel);
 
 			IActionResult result = this._technologyController.Update(id, updateTechnologyWebModel).Result;
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);
@@ -174,7 +194,9 @@ namespace DevHive.Web.Tests
 		{
 			Guid id = Guid.NewGuid();
 
-			this._technologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny<Guid>())).Returns(Task.FromResult(true));
+			this._technologyServiceMock
+				.Setup(p => p.DeleteTechnology(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._technologyController.Delete(id).Result;
 
@@ -187,7 +209,9 @@ namespace DevHive.Web.Tests
 			string message = "Could not delete Technology";
 			Guid id = Guid.NewGuid();
 
-			this._technologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny<Guid>())).Returns(Task.FromResult(false));
+			this._technologyServiceMock
+				.Setup(p => p.DeleteTechnology(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(false));
 
 			IActionResult result = this._technologyController.Delete(id).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs
index 89e5fc9..ad7bdd9 100644
--- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs
@@ -47,9 +47,15 @@ namespace DevHive.Web.Tests
 			TokenModel tokenModel = new(token);
 			TokenWebModel tokenWebModel = new(token);
 
-			this._mapperMock.Setup(p => p.Map<LoginServiceModel>(It.IsAny<LoginWebModel>())).Returns(loginServiceModel);
-			this._mapperMock.Setup(p => p.Map<TokenWebModel>(It.IsAny<TokenModel>())).Returns(tokenWebModel);
-			this._userServiceMock.Setup(p => p.LoginUser(It.IsAny<LoginServiceModel>())).Returns(Task.FromResult(tokenModel));
+			this._mapperMock
+				.Setup(p => p.Map<LoginServiceModel>(It.IsAny<LoginWebModel>()))
+				.Returns(loginServiceModel);
+			this._mapperMock
+				.Setup(p => p.Map<TokenWebModel>(It.IsAny<TokenModel>()))
+				.Returns(tokenWebModel);
+			this._userServiceMock
+				.Setup(p => p.LoginUser(It.IsAny<LoginServiceModel>()))
+				.Returns(Task.FromResult(tokenModel));
 
 			IActionResult result = this._userController.Login(loginWebModel).Result;
 
@@ -75,9 +81,15 @@ namespace DevHive.Web.Tests
 			TokenModel tokenModel = new(token);
 			TokenWebModel tokenWebModel = new(token);
 
-			this._mapperMock.Setup(p => p.Map<RegisterServiceModel>(It.IsAny<RegisterWebModel>())).Returns(registerServiceModel);
-			this._mapperMock.Setup(p => p.Map<TokenWebModel>(It.IsAny<TokenModel>())).Returns(tokenWebModel);
-			this._userServiceMock.Setup(p => p.RegisterUser(It.IsAny<RegisterServiceModel>())).Returns(Task.FromResult(tokenModel));
+			this._mapperMock
+				.Setup(p => p.Map<RegisterServiceModel>(It.IsAny<RegisterWebModel>()))
+				.Returns(registerServiceModel);
+			this._mapperMock
+				.Setup(p => p.Map<TokenWebModel>(It.IsAny<TokenModel>()))
+				.Returns(tokenWebModel);
+			this._userServiceMock
+				.Setup(p => p.RegisterUser(It.IsAny<RegisterServiceModel>()))
+				.Returns(Task.FromResult(tokenModel));
 
 			IActionResult result = this._userController.Register(registerWebModel).Result;
 
@@ -105,9 +117,15 @@ namespace DevHive.Web.Tests
 				UserName = USERNAME
 			};
 
-			this._userServiceMock.Setup(p => p.GetUserById(It.IsAny<Guid>())).Returns(Task.FromResult(userServiceModel));
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._mapperMock.Setup(p => p.Map<UserWebModel>(It.IsAny<UserServiceModel>())).Returns(userWebModel);
+			this._userServiceMock
+				.Setup(p => p.GetUserById(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(userServiceModel));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._mapperMock
+				.Setup(p => p.Map<UserWebModel>(It.IsAny<UserServiceModel>()))
+				.Returns(userWebModel);
 
 			IActionResult result = this._userController.GetById(id, null).Result;
 
@@ -122,7 +140,9 @@ namespace DevHive.Web.Tests
 		[Test]
 		public void GetById_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized()
 		{
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(false);
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(false);
 
 			IActionResult result = this._userController.GetById(Guid.NewGuid(), null).Result;
 
@@ -141,8 +161,12 @@ namespace DevHive.Web.Tests
 				UserName = USERNAME
 			};
 
-			this._userServiceMock.Setup(p => p.GetUserByUsername(It.IsAny<string>())).Returns(Task.FromResult(userServiceModel));
-			this._mapperMock.Setup(p => p.Map<UserWebModel>(It.IsAny<UserServiceModel>())).Returns(userWebModel);
+			this._userServiceMock
+				.Setup(p => p.GetUserByUsername(It.IsAny<string>()))
+				.Returns(Task.FromResult(userServiceModel));
+			this._mapperMock
+				.Setup(p => p.Map<UserWebModel>(It.IsAny<UserServiceModel>()))
+				.Returns(userWebModel);
 
 			IActionResult result = this._userController.GetUser(null).Result;
 
@@ -173,9 +197,15 @@ namespace DevHive.Web.Tests
 				UserName = USERNAME
 			};
 
-			this._userServiceMock.Setup(p => p.UpdateUser(It.IsAny<UpdateUserServiceModel>())).Returns(Task.FromResult(userServiceModel));
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._mapperMock.Setup(p => p.Map<UpdateUserServiceModel>(It.IsAny<UpdateUserWebModel>())).Returns(updateUserServiceModel);
+			this._userServiceMock
+				.Setup(p => p.UpdateUser(It.IsAny<UpdateUserServiceModel>()))
+				.Returns(Task.FromResult(userServiceModel));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._mapperMock
+				.Setup(p => p.Map<UpdateUserServiceModel>(It.IsAny<UpdateUserWebModel>()))
+				.Returns(updateUserServiceModel);
 
 			IActionResult result = this._userController.Update(id, updateUserWebModel, null).Result;
 
@@ -189,8 +219,12 @@ namespace DevHive.Web.Tests
 		{
 			Guid id = Guid.NewGuid();
 
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._userServiceMock.Setup(p => p.DeleteUser(It.IsAny<Guid>())).Returns(Task.FromResult(true));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._userServiceMock
+				.Setup(p => p.DeleteUser(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(true));
 
 			IActionResult result = this._userController.Delete(id, null).Result;
 
@@ -203,8 +237,12 @@ namespace DevHive.Web.Tests
 			string message = "Could not delete User";
 			Guid id = Guid.NewGuid();
 
-			this._jwtServiceMock.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>())).Returns(true);
-			this._userServiceMock.Setup(p => p.DeleteUser(It.IsAny<Guid>())).Returns(Task.FromResult(false));
+			this._jwtServiceMock
+				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
+				.Returns(true);
+			this._userServiceMock
+				.Setup(p => p.DeleteUser(It.IsAny<Guid>()))
+				.Returns(Task.FromResult(false));
 
 			IActionResult result = this._userController.Delete(id, null).Result;
 
-- 
cgit v1.2.3


From dec1f686cdd1bdd2b1b9a2fe0925369624f46aba Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Sun, 14 Mar 2021 11:54:47 +0200
Subject: Made all Returns(Task.FromResult) into ReturnsAsync in Web layer
 tests

---
 .../DevHive.Web.Tests/CommentController.Tests.cs   | 33 ++++++++++----------
 src/Web/DevHive.Web.Tests/FeedController.Tests.cs  |  4 +--
 .../DevHive.Web.Tests/LanguageController.Tests.cs  | 17 +++++------
 src/Web/DevHive.Web.Tests/PostController.Tests.cs  | 35 +++++++++++-----------
 src/Web/DevHive.Web.Tests/RoleController.Tests.cs  | 17 +++++------
 .../TechnologyController.Tests.cs                  | 17 +++++------
 src/Web/DevHive.Web.Tests/UserController.Tests.cs  | 17 +++++------
 7 files changed, 67 insertions(+), 73 deletions(-)

(limited to 'src/Web/DevHive.Web.Tests/LanguageController.Tests.cs')

diff --git a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs
index 4e1715c..830677e 100644
--- a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 using AutoMapper;
 using DevHive.Common.Jwt.Interfaces;
 using DevHive.Services.Interfaces;
@@ -52,13 +51,13 @@ namespace DevHive.Web.Tests
 				.Returns(createCommentServiceModel);
 			this._commentServiceMock
 				.Setup(p => p.AddComment(It.IsAny<CreateCommentServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result;
 
@@ -94,13 +93,13 @@ namespace DevHive.Web.Tests
 				.Returns(createCommentServiceModel);
 			this._commentServiceMock
 				.Setup(p => p.AddComment(It.IsAny<CreateCommentServiceModel>()))
-				.Returns(Task.FromResult(Guid.Empty));
+				.ReturnsAsync(Guid.Empty);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result;
 
@@ -125,7 +124,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result;
 
@@ -152,7 +151,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.GetCommentById(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(readCommentServiceModel));
+				.ReturnsAsync(readCommentServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<ReadCommentWebModel>(It.IsAny<ReadCommentServiceModel>()))
 				.Returns(readCommentWebModel);
@@ -184,13 +183,13 @@ namespace DevHive.Web.Tests
 
 			this._commentServiceMock
 				.Setup(p => p.UpdateComment(It.IsAny<UpdateCommentServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateCommentServiceModel>(It.IsAny<UpdateCommentWebModel>()))
 				.Returns(updateCommentServiceModel);
@@ -221,13 +220,13 @@ namespace DevHive.Web.Tests
 
 			this._commentServiceMock
 				.Setup(p => p.UpdateComment(It.IsAny<UpdateCommentServiceModel>()))
-				.Returns(Task.FromResult(Guid.Empty));
+				.ReturnsAsync(Guid.Empty);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateCommentServiceModel>(It.IsAny<UpdateCommentWebModel>()))
 				.Returns(updateCommentServiceModel);
@@ -252,7 +251,7 @@ namespace DevHive.Web.Tests
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(false);
-			// this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
+			// this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).ReturnsAsync(false));
 
 			IActionResult result = this._commentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result;
 
@@ -268,13 +267,13 @@ namespace DevHive.Web.Tests
 
 			this._commentServiceMock
 				.Setup(p => p.DeleteComment(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._commentController.DeleteComment(id, null).Result;
 
@@ -289,13 +288,13 @@ namespace DevHive.Web.Tests
 
 			this._commentServiceMock
 				.Setup(p => p.DeleteComment(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._commentController.DeleteComment(id, null).Result;
 
@@ -315,7 +314,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._commentController.DeleteComment(Guid.Empty, null).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs
index 7a7fd8d..3af2b48 100644
--- a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs
@@ -50,7 +50,7 @@ namespace DevHive.Web.Tests
 
 			this._feedServiceMock
 				.Setup(p => p.GetPage(It.IsAny<GetPageServiceModel>()))
-				.Returns(Task.FromResult(readPageServiceModel));
+				.ReturnsAsync(readPageServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<GetPageServiceModel>(It.IsAny<GetPageWebModel>()))
 				.Returns(getPageServiceModel);
@@ -88,7 +88,7 @@ namespace DevHive.Web.Tests
 
 			this._feedServiceMock
 				.Setup(p => p.GetUserPage(It.IsAny<GetPageServiceModel>()))
-				.Returns(Task.FromResult(readPageServiceModel));
+				.ReturnsAsync(readPageServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<GetPageServiceModel>(It.IsAny<GetPageWebModel>()))
 				.Returns(getPageServiceModel);
diff --git a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs
index de882fc..34f1fc5 100644
--- a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 using AutoMapper;
 using DevHive.Services.Interfaces;
 using DevHive.Services.Models.Language;
@@ -12,7 +11,7 @@ using NUnit.Framework;
 
 namespace DevHive.Web.Tests
 {
-	[TestFixture]
+    [TestFixture]
 	public class LanguageControllerTests
 	{
 		const string NAME = "Gosho Trapov";
@@ -47,7 +46,7 @@ namespace DevHive.Web.Tests
 				.Returns(createLanguageServiceModel);
 			this._languageServiceMock
 				.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 
 			IActionResult result = this._languageController.Create(createLanguageWebModel).Result;
 
@@ -83,7 +82,7 @@ namespace DevHive.Web.Tests
 				.Returns(createTechnologyServiceModel);
 			this._languageServiceMock
 				.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 
 			IActionResult result = this._languageController.Create(createTechnologyWebModel).Result;
 
@@ -113,7 +112,7 @@ namespace DevHive.Web.Tests
 
 			this._languageServiceMock
 				.Setup(p => p.GetLanguageById(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(readLanguageServiceModel));
+				.ReturnsAsync(readLanguageServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<ReadLanguageWebModel>(It.IsAny<ReadLanguageServiceModel>()))
 				.Returns(readLanguageWebModel);
@@ -145,7 +144,7 @@ namespace DevHive.Web.Tests
 
 			this._languageServiceMock
 				.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>()))
 				.Returns(updateLanguageServiceModel);
@@ -171,7 +170,7 @@ namespace DevHive.Web.Tests
 
 			this._languageServiceMock
 				.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>()))
 				.Returns(updateLanguageServiceModel);
@@ -194,7 +193,7 @@ namespace DevHive.Web.Tests
 
 			this._languageServiceMock
 				.Setup(p => p.DeleteLanguage(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._languageController.Delete(id).Result;
 
@@ -209,7 +208,7 @@ namespace DevHive.Web.Tests
 
 			this._languageServiceMock
 				.Setup(p => p.DeleteLanguage(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._languageController.Delete(id).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/PostController.Tests.cs b/src/Web/DevHive.Web.Tests/PostController.Tests.cs
index 384a92a..93cce1d 100644
--- a/src/Web/DevHive.Web.Tests/PostController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/PostController.Tests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 using AutoMapper;
 using DevHive.Common.Jwt.Interfaces;
 using DevHive.Services.Interfaces;
@@ -13,7 +12,7 @@ using NUnit.Framework;
 
 namespace DevHive.Web.Tests
 {
-	[TestFixture]
+    [TestFixture]
 	public class PostControllerTests
 	{
 		const string MESSAGE = "Gosho Trapov";
@@ -50,13 +49,13 @@ namespace DevHive.Web.Tests
 				.Returns(createPostServiceModel);
 			this._postServiceMock
 				.Setup(p => p.CreatePost(It.IsAny<CreatePostServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._postController.Create(Guid.Empty, createPostWebModel, null).Result;
 
@@ -92,13 +91,13 @@ namespace DevHive.Web.Tests
 				.Returns(createTechnologyServiceModel);
 			this._postServiceMock
 				.Setup(p => p.CreatePost(It.IsAny<CreatePostServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._postController.Create(Guid.Empty, createTechnologyWebModel, null).Result;
 
@@ -120,7 +119,7 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._postController.Create(Guid.NewGuid(), createPostWebModel, null).Result;
 
@@ -145,7 +144,7 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.GetPostById(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(readPostServiceModel));
+				.ReturnsAsync(readPostServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<ReadPostWebModel>(It.IsAny<ReadPostServiceModel>()))
 				.Returns(readPostWebModel);
@@ -177,7 +176,7 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.UpdatePost(It.IsAny<UpdatePostServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 			this._mapperMock
 				.Setup(p => p.Map<UpdatePostServiceModel>(It.IsAny<UpdatePostWebModel>()))
 				.Returns(updatePostServiceModel);
@@ -186,7 +185,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._postController.Update(id, updatePostWebModel, null).Result;
 
@@ -209,7 +208,7 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.UpdatePost(It.IsAny<UpdatePostServiceModel>()))
-				.Returns(Task.FromResult(Guid.Empty));
+				.ReturnsAsync(Guid.Empty);
 			this._mapperMock
 				.Setup(p => p.Map<UpdatePostServiceModel>(It.IsAny<UpdatePostWebModel>()))
 				.Returns(updatePostServiceModel);
@@ -218,7 +217,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._postController.Update(id, updatePostWebModel, null).Result;
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);
@@ -239,7 +238,7 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._postController.Update(Guid.Empty, updatePostWebModel, null).Result;
 
@@ -255,13 +254,13 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.DeletePost(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._postController.Delete(id, null).Result;
 
@@ -276,13 +275,13 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.DeletePost(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._postController.Delete(id, null).Result;
 
@@ -299,7 +298,7 @@ namespace DevHive.Web.Tests
 		{
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._postController.Delete(Guid.Empty, null).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
index 0f835c1..0e19221 100644
--- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 using AutoMapper;
 using DevHive.Services.Interfaces;
 using DevHive.Services.Models.Role;
@@ -12,7 +11,7 @@ using NUnit.Framework;
 
 namespace DevHive.Web.Tests
 {
-	[TestFixture]
+    [TestFixture]
 	public class RoleControllerTests
 	{
 		const string NAME = "Gosho Trapov";
@@ -47,7 +46,7 @@ namespace DevHive.Web.Tests
 				.Returns(createRoleServiceModel);
 			this._roleServiceMock
 				.Setup(p => p.CreateRole(It.IsAny<CreateRoleServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 
 			IActionResult result = this._roleController.Create(createRoleWebModel).Result;
 
@@ -83,7 +82,7 @@ namespace DevHive.Web.Tests
 				.Returns(createTechnologyServiceModel);
 			this._roleServiceMock
 				.Setup(p => p.CreateRole(It.IsAny<CreateRoleServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 
 			IActionResult result = this._roleController.Create(createTechnologyWebModel).Result;
 
@@ -113,7 +112,7 @@ namespace DevHive.Web.Tests
 
 			this._roleServiceMock
 				.Setup(p => p.GetRoleById(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(roleServiceModel));
+				.ReturnsAsync(roleServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<RoleWebModel>(It.IsAny<RoleServiceModel>()))
 				.Returns(roleWebModel);
@@ -145,7 +144,7 @@ namespace DevHive.Web.Tests
 
 			this._roleServiceMock
 				.Setup(p => p.UpdateRole(It.IsAny<UpdateRoleServiceModel>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateRoleServiceModel>(It.IsAny<UpdateRoleWebModel>()))
 				.Returns(updateRoleServiceModel);
@@ -171,7 +170,7 @@ namespace DevHive.Web.Tests
 
 			this._roleServiceMock
 				.Setup(p => p.UpdateRole(It.IsAny<UpdateRoleServiceModel>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateRoleServiceModel>(It.IsAny<UpdateRoleWebModel>()))
 				.Returns(updateRoleServiceModel);
@@ -194,7 +193,7 @@ namespace DevHive.Web.Tests
 
 			this._roleServiceMock
 				.Setup(p => p.DeleteRole(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._roleController.Delete(id).Result;
 
@@ -209,7 +208,7 @@ namespace DevHive.Web.Tests
 
 			this._roleServiceMock
 				.Setup(p => p.DeleteRole(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._roleController.Delete(id).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs
index 76d291d..06e1ea2 100644
--- a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs
@@ -8,11 +8,10 @@ using Moq;
 using NUnit.Framework;
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace DevHive.Web.Tests
 {
-	[TestFixture]
+    [TestFixture]
 	public class TechnologyControllerTests
 	{
 		const string NAME = "Gosho Trapov";
@@ -49,7 +48,7 @@ namespace DevHive.Web.Tests
 				.Returns(createTechnologyServiceModel);
 			this._technologyServiceMock
 				.Setup(p => p.CreateTechnology(It.IsAny<CreateTechnologyServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 
 			IActionResult result = this._technologyController.Create(createTechnologyWebModel).Result;
 
@@ -85,7 +84,7 @@ namespace DevHive.Web.Tests
 				.Returns(createTechnologyServiceModel);
 			this._technologyServiceMock
 				.Setup(p => p.CreateTechnology(It.IsAny<CreateTechnologyServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 
 			IActionResult result = this._technologyController.Create(createTechnologyWebModel).Result;
 
@@ -115,7 +114,7 @@ namespace DevHive.Web.Tests
 
 			this._technologyServiceMock
 				.Setup(p => p.GetTechnologyById(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(readTechnologyServiceModel));
+				.ReturnsAsync(readTechnologyServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<ReadTechnologyWebModel>(It.IsAny<ReadTechnologyServiceModel>()))
 				.Returns(readTechnologyWebModel);
@@ -147,7 +146,7 @@ namespace DevHive.Web.Tests
 
 			this._technologyServiceMock
 				.Setup(p => p.UpdateTechnology(It.IsAny<UpdateTechnologyServiceModel>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateTechnologyServiceModel>(It.IsAny<UpdateTechnologyWebModel>()))
 				.Returns(updateTechnologyServiceModel);
@@ -173,7 +172,7 @@ namespace DevHive.Web.Tests
 
 			this._technologyServiceMock
 				.Setup(p => p.UpdateTechnology(It.IsAny<UpdateTechnologyServiceModel>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateTechnologyServiceModel>(It.IsAny<UpdateTechnologyWebModel>()))
 				.Returns(updateTechnologyServiceModel);
@@ -196,7 +195,7 @@ namespace DevHive.Web.Tests
 
 			this._technologyServiceMock
 				.Setup(p => p.DeleteTechnology(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._technologyController.Delete(id).Result;
 
@@ -211,7 +210,7 @@ namespace DevHive.Web.Tests
 
 			this._technologyServiceMock
 				.Setup(p => p.DeleteTechnology(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._technologyController.Delete(id).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs
index ad7bdd9..10d3c6b 100644
--- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Threading.Tasks;
 using AutoMapper;
 using DevHive.Common.Jwt.Interfaces;
 using DevHive.Common.Models.Identity;
@@ -13,7 +12,7 @@ using NUnit.Framework;
 
 namespace DevHive.Web.Tests
 {
-	[TestFixture]
+    [TestFixture]
 	public class UserControllerTests
 	{
 		const string USERNAME = "Gosho Trapov";
@@ -55,7 +54,7 @@ namespace DevHive.Web.Tests
 				.Returns(tokenWebModel);
 			this._userServiceMock
 				.Setup(p => p.LoginUser(It.IsAny<LoginServiceModel>()))
-				.Returns(Task.FromResult(tokenModel));
+				.ReturnsAsync(tokenModel);
 
 			IActionResult result = this._userController.Login(loginWebModel).Result;
 
@@ -89,7 +88,7 @@ namespace DevHive.Web.Tests
 				.Returns(tokenWebModel);
 			this._userServiceMock
 				.Setup(p => p.RegisterUser(It.IsAny<RegisterServiceModel>()))
-				.Returns(Task.FromResult(tokenModel));
+				.ReturnsAsync(tokenModel);
 
 			IActionResult result = this._userController.Register(registerWebModel).Result;
 
@@ -119,7 +118,7 @@ namespace DevHive.Web.Tests
 
 			this._userServiceMock
 				.Setup(p => p.GetUserById(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(userServiceModel));
+				.ReturnsAsync(userServiceModel);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
@@ -163,7 +162,7 @@ namespace DevHive.Web.Tests
 
 			this._userServiceMock
 				.Setup(p => p.GetUserByUsername(It.IsAny<string>()))
-				.Returns(Task.FromResult(userServiceModel));
+				.ReturnsAsync(userServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<UserWebModel>(It.IsAny<UserServiceModel>()))
 				.Returns(userWebModel);
@@ -199,7 +198,7 @@ namespace DevHive.Web.Tests
 
 			this._userServiceMock
 				.Setup(p => p.UpdateUser(It.IsAny<UpdateUserServiceModel>()))
-				.Returns(Task.FromResult(userServiceModel));
+				.ReturnsAsync(userServiceModel);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
@@ -224,7 +223,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._userServiceMock
 				.Setup(p => p.DeleteUser(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._userController.Delete(id, null).Result;
 
@@ -242,7 +241,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._userServiceMock
 				.Setup(p => p.DeleteUser(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._userController.Delete(id, null).Result;
 
-- 
cgit v1.2.3