Fixed TechnologyService.Tests after refactoring of TechnologyService

4 files changed, 58 insertions, 23 deletions

diff --git a/src/DevHive.Tests/DevHive.Data.Tests/LenguageRepository.Tests.cs b/src/DevHive.Tests/DevHive.Data.Tests/LenguageRepository.Tests.cs
new file mode 100644
index 0000000..0a99bf1
--- /dev/null
+++ b/src/DevHive.Tests/DevHive.Data.Tests/LenguageRepository.Tests.cs
@@ -0,0 +1,10 @@
+using System;
+using NUnit.Framework;
+
+namespace DevHive.Data.Tests
+{
+	[TestFixture]
+	public class LenguageRepositoryTests
+	{
+	}
+}
diff --git a/src/DevHive.Tests/DevHive.Data.Tests/TechnologyRepository.Tests.cs b/src/DevHive.Tests/DevHive.Data.Tests/TechnologyRepository.Tests.cs
index 18d72b9..98f2b2f 100644
--- a/src/DevHive.Tests/DevHive.Data.Tests/TechnologyRepository.Tests.cs
+++ b/src/DevHive.Tests/DevHive.Data.Tests/TechnologyRepository.Tests.cs
@@ -1,4 +1,4 @@
-using DevHive.Data.Models;
+using DevHive.Data.Models;
 using DevHive.Data.Repositories;
 using Microsoft.EntityFrameworkCore;
 using NUnit.Framework;
@@ -69,7 +69,7 @@ namespace DevHive.Data.Tests
 		{
 			Task.Run(async () =>
 			{
-				Guid id = new Guid();
+				Guid id = Guid.NewGuid();
 
 				Technology technologyReturned = await this.TechnologyRepository.GetByIdAsync(id);
 
@@ -99,7 +99,7 @@ namespace DevHive.Data.Tests
 		{
 			Task.Run(async () =>
 			{
-				Guid id = new Guid();
+				Guid id = Guid.NewGuid();
 
 				bool result = await this.TechnologyRepository.DoesTechnologyExistAsync(id);
 
@@ -135,23 +135,24 @@ namespace DevHive.Data.Tests
 		#endregion
 
 		#region EditAsync
+		//TO DO fix
 		[Test]
 		public void EditAsync_UpdatesEntity()
 		{
 			Task.Run(async () =>
 			{
 				string newName = "New name";
-				Guid id = new Guid();
+				Guid id = Guid.NewGuid();
 				Technology technology = new Technology
 				{
 					Name = TECHNOLOGY_NAME,
 					Id = id
-				};
-				Technology newTechnology = new Technology
+				}; Technology newTechnology = new Technology
 				{
 					Name = newName,
 					Id = id
 				};
+
 				await this.TechnologyRepository.AddAsync(technology);
 
 				bool result = await this.TechnologyRepository.EditAsync(newTechnology);
diff --git a/src/DevHive.Tests/DevHive.Services.Tests/TechnologyServices.Tests.cs b/src/DevHive.Tests/DevHive.Services.Tests/TechnologyServices.Tests.cs
index d028957..9a780c1 100644
--- a/src/DevHive.Tests/DevHive.Services.Tests/TechnologyServices.Tests.cs
+++ b/src/DevHive.Tests/DevHive.Services.Tests/TechnologyServices.Tests.cs
@@ -28,9 +28,35 @@ namespace DevHive.Services.Tests
 		#region Create
 
 		[Test]
-		[TestCase(true)]
-		[TestCase(false)]
-		public void Create_ReturnsTrue_WhenEntityIsAddedSuccessfully(bool shouldFail)
+		public void Create_ReturnsNonEmptyGuid_WhenEntityIsAddedSuccessfully()
+		{
+			Task.Run(async () =>
+			{
+				string technologyName = "Gosho Trapov";
+				Guid id = Guid.NewGuid();
+				CreateTechnologyServiceModel createTechnologyServiceModel = new()
+				{
+					Name = technologyName
+				};
+				Technology technology = new()
+				{
+					Name = technologyName,
+					Id = id
+				};
+
+				this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(false));
+				this.TechnologyRepositoryMock.Setup(p => p.AddAsync(It.IsAny<Technology>())).Returns(Task.FromResult(true));
+				this.TechnologyRepositoryMock.Setup(p => p.GetByNameAsync(It.IsAny<string>())).Returns(Task.FromResult(technology));
+				this.MapperMock.Setup(p => p.Map<Technology>(It.IsAny<CreateTechnologyServiceModel>())).Returns(technology);
+
+				Guid result = await this.TechnologyService.Create(createTechnologyServiceModel);
+
+				Assert.AreEqual(id, result);
+			}).GetAwaiter().GetResult();
+		}
+
+		[Test]
+		public void Create_ReturnsEmptyGuid_WhenEntityIsNotAddedSuccessfully()
 		{
 			Task.Run(async () =>
 			{
@@ -46,15 +72,16 @@ namespace DevHive.Services.Tests
 				};
 
 				this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(false));
-				this.TechnologyRepositoryMock.Setup(p => p.AddAsync(It.IsAny<Technology>())).Returns(Task.FromResult(shouldFail));
+				this.TechnologyRepositoryMock.Setup(p => p.AddAsync(It.IsAny<Technology>())).Returns(Task.FromResult(false));
 				this.MapperMock.Setup(p => p.Map<Technology>(It.IsAny<CreateTechnologyServiceModel>())).Returns(technology);
 
-				bool result = await this.TechnologyService.Create(createTechnologyServiceModel);
+				Guid result = await this.TechnologyService.Create(createTechnologyServiceModel);
 
-				Assert.AreEqual(shouldFail, result);
+				Assert.IsTrue(result == Guid.Empty);
 			}).GetAwaiter().GetResult();
 		}
 
+
 		[Test]
 		public void Create_ThrowsArgumentException_WhenEntityAlreadyExists()
 		{
@@ -127,7 +154,6 @@ namespace DevHive.Services.Tests
 		{
 			Task.Run(async () =>
 			{
-				Guid id = new Guid();
 				string name = "Gosho Trapov";
 				Technology technology = new Technology
 				{
@@ -143,7 +169,7 @@ namespace DevHive.Services.Tests
 				this.TechnologyRepositoryMock.Setup(p => p.EditAsync(It.IsAny<Technology>())).Returns(Task.FromResult(shouldPass));
 				this.MapperMock.Setup(p => p.Map<Technology>(It.IsAny<UpdateTechnologyServiceModel>())).Returns(technology);
 
-				bool result = await this.TechnologyService.UpdateTechnology(id, updatetechnologyServiceModel);
+				bool result = await this.TechnologyService.UpdateTechnology(updatetechnologyServiceModel);
 
 				Assert.AreEqual(shouldPass, result);
 			}).GetAwaiter().GetResult();
@@ -153,14 +179,13 @@ namespace DevHive.Services.Tests
 		public void UpdateTechnology_ThrowsException_WhenTechnologyDoesNotExist()
 		{
 			string exceptionMessage = "Technology does not exist!";
-			Guid id = new Guid();
 			UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel
 			{
 			};
 
 			this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny<Guid>())).Returns(Task.FromResult(false));
 
-			Exception ex = Assert.ThrowsAsync<ArgumentException>(() => this.TechnologyService.UpdateTechnology(id, updateTechnologyServiceModel));
+			Exception ex = Assert.ThrowsAsync<ArgumentException>(() => this.TechnologyService.UpdateTechnology(updateTechnologyServiceModel));
 
 			Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message");
 		}
@@ -169,7 +194,6 @@ namespace DevHive.Services.Tests
 		public void UpdateTechnology_ThrowsException_WhenTechnologyNameAlreadyExists()
 		{
 			string exceptionMessage = "Technology name already exists!";
-			Guid id = new Guid();
 			UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel
 			{
 			};
@@ -177,7 +201,7 @@ namespace DevHive.Services.Tests
 			this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyExistAsync(It.IsAny<Guid>())).Returns(Task.FromResult(true));
 			this.TechnologyRepositoryMock.Setup(p => p.DoesTechnologyNameExistAsync(It.IsAny<string>())).Returns(Task.FromResult(true));
 
-			Exception ex = Assert.ThrowsAsync<ArgumentException>(() => this.TechnologyService.UpdateTechnology(id, updateTechnologyServiceModel));
+			Exception ex = Assert.ThrowsAsync<ArgumentException>(() => this.TechnologyService.UpdateTechnology(updateTechnologyServiceModel));
 
 			Assert.AreEqual(exceptionMessage, ex.Message, "Incorecct exception message");
 		}
diff --git a/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs b/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs
index 2709c9a..7e6b3a2 100644
--- a/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs
+++ b/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs
@@ -73,7 +73,7 @@ namespace DevHive.Web.Tests
 		[Test]
 		public void GetById_ReturnsTheThecnology_WhenItExists()
 		{
-			Guid id = new Guid();
+			Guid id = Guid.NewGuid();
 
 			CreateTechnologyServiceModel createTechnologyServiceModel = new CreateTechnologyServiceModel
 			{
@@ -102,7 +102,7 @@ namespace DevHive.Web.Tests
 		[Test]
 		public void Update_ShouldReturnOkResult_WhenTechnologyIsUpdatedSuccessfully()
 		{
-			Guid id = new Guid();
+			Guid id = Guid.NewGuid();
 			UpdateTechnologyWebModel updateTechnologyWebModel = new UpdateTechnologyWebModel
 			{
 				Name = NAME
@@ -123,7 +123,7 @@ namespace DevHive.Web.Tests
 		[Test]
 		public void Update_ShouldReturnOkResult_WhenTechnologyIsNotUpdatedSuccessfully ()
 		{
-			Guid id = new Guid();
+			Guid id = Guid.NewGuid();
 			string message = "Could not update Technology";
 			UpdateTechnologyWebModel updateTechnologyWebModel = new UpdateTechnologyWebModel
 			{
@@ -151,7 +151,7 @@ namespace DevHive.Web.Tests
 		[Test]
 		public void Delete_ReturnsOkResult_When_TechnologyIsDeletedSuccessfully()
 		{
-			Guid id = new Guid();
+			Guid id = Guid.NewGuid();
 
 			this.TechnologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny<Guid>())).Returns(Task.FromResult(true));
 
@@ -164,7 +164,7 @@ namespace DevHive.Web.Tests
 		public void Delet_ReturnsBadRequestObjectResult_WhenTechnologyIsNotDeletedSuccessfully()
 		{
 			string message = "Could not delete Technology";
-			Guid id = new Guid();
+			Guid id = Guid.NewGuid();
 
 			this.TechnologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny<Guid>())).Returns(Task.FromResult(false));