1 files changed, 51 insertions, 28 deletions

diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
index ff80dc0..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,20 +11,20 @@ using NUnit.Framework;
 
 namespace DevHive.Web.Tests
 {
-	[TestFixture]
+    [TestFixture]
 	public class RoleControllerTests
 	{
 		const string NAME = "Gosho Trapov";
-		private Mock<IRoleService> RoleServiceMock { get; set; }
-		private Mock<IMapper> MapperMock { get; set; }
-		private RoleController RoleController { get; set; }
+		private Mock<IRoleService> _roleServiceMock;
+		private Mock<IMapper> _mapperMock;
+		private RoleController _roleController;
 
 		[SetUp]
 		public void SetUp()
 		{
-			this.RoleServiceMock = new Mock<IRoleService>();
-			this.MapperMock = new Mock<IMapper>();
-			this.RoleController = new RoleController(this.RoleServiceMock.Object, this.MapperMock.Object);
+			this._roleServiceMock = new Mock<IRoleService>();
+			this._mapperMock = new Mock<IMapper>();
+			this._roleController = new RoleController(this._roleServiceMock.Object, this._mapperMock.Object);
 		}
 
 		#region Create
@@ -42,10 +41,14 @@ 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>()))
+				.ReturnsAsync(id);
 
-			IActionResult result = this.RoleController.Create(createRoleWebModel).Result;
+			IActionResult result = this._roleController.Create(createRoleWebModel).Result;
 
 			Assert.IsInstanceOf<OkObjectResult>(result);
 
@@ -74,10 +77,14 @@ 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>()))
+				.ReturnsAsync(id);
 
-			IActionResult result = this.RoleController.Create(createTechnologyWebModel).Result;
+			IActionResult result = this._roleController.Create(createTechnologyWebModel).Result;
 
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);
 
@@ -103,10 +110,14 @@ 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>()))
+				.ReturnsAsync(roleServiceModel);
+			this._mapperMock
+				.Setup(p => p.Map<RoleWebModel>(It.IsAny<RoleServiceModel>()))
+				.Returns(roleWebModel);
 
-			IActionResult result = this.RoleController.GetById(id).Result;
+			IActionResult result = this._roleController.GetById(id).Result;
 
 			Assert.IsInstanceOf<OkObjectResult>(result);
 
@@ -131,10 +142,14 @@ 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>()))
+				.ReturnsAsync(true);
+			this._mapperMock
+				.Setup(p => p.Map<UpdateRoleServiceModel>(It.IsAny<UpdateRoleWebModel>()))
+				.Returns(updateRoleServiceModel);
 
-			IActionResult result = this.RoleController.Update(id, updateRoleWebModel).Result;
+			IActionResult result = this._roleController.Update(id, updateRoleWebModel).Result;
 
 			Assert.IsInstanceOf<OkResult>(result);
 		}
@@ -153,10 +168,14 @@ 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>()))
+				.ReturnsAsync(false);
+			this._mapperMock
+				.Setup(p => p.Map<UpdateRoleServiceModel>(It.IsAny<UpdateRoleWebModel>()))
+				.Returns(updateRoleServiceModel);
 
-			IActionResult result = this.RoleController.Update(id, updateRoleWebModel).Result;
+			IActionResult result = this._roleController.Update(id, updateRoleWebModel).Result;
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);
 
 			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
@@ -172,22 +191,26 @@ 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>()))
+				.ReturnsAsync(true);
 
-			IActionResult result = this.RoleController.Delete(id).Result;
+			IActionResult result = this._roleController.Delete(id).Result;
 
 			Assert.IsInstanceOf<OkResult>(result);
 		}
 
 		[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>()))
+				.ReturnsAsync(false);
 
-			IActionResult result = this.RoleController.Delete(id).Result;
+			IActionResult result = this._roleController.Delete(id).Result;
 
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);