Merge branch 'dev' of github.com:Team-Kaleidoscope/DevHive into dev

3 files changed, 33 insertions, 30 deletions

diff --git a/src/DevHive.Tests/DevHive.Data.Tests/FeedRepository.Tests.cs b/src/DevHive.Tests/DevHive.Data.Tests/FeedRepository.Tests.cs
index 62d6455..f134bf3 100644
--- a/src/DevHive.Tests/DevHive.Data.Tests/FeedRepository.Tests.cs
+++ b/src/DevHive.Tests/DevHive.Data.Tests/FeedRepository.Tests.cs
@@ -43,6 +43,7 @@ namespace DevHive.Data.Tests
 			friendsList.Add(dummyUser);
 
 			DateTime dateTime = new DateTime(3000, 05, 09, 9, 15, 0);
+			Console.WriteLine(dateTime.ToFileTime());
 
 			Post dummyPost = this.CreateDummyPost(dummyUser);
 			Post anotherDummnyPost = this.CreateDummyPost(dummyUser);
@@ -104,7 +105,8 @@ namespace DevHive.Data.Tests
 			{
 				Id = id,
 				Message = POST_MESSAGE,
-				Creator = poster
+				Creator = poster,
+				TimeCreated = new DateTime(2000, 05, 09, 9, 15, 0)
 			};
 
 			this.Context.Posts.Add(post);
diff --git a/src/DevHive.Tests/DevHive.Data.Tests/PostRepository.Tests.cs b/src/DevHive.Tests/DevHive.Data.Tests/PostRepository.Tests.cs
index 7d80f1f..6dacf0b 100644
--- a/src/DevHive.Tests/DevHive.Data.Tests/PostRepository.Tests.cs
+++ b/src/DevHive.Tests/DevHive.Data.Tests/PostRepository.Tests.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using DevHive.Data.Interfaces.Repositories;
 using DevHive.Data.Models;
+using DevHive.Data.RelationModels;
 using DevHive.Data.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Moq;
@@ -11,7 +11,7 @@ using NUnit.Framework;
 
 namespace DevHive.Data.Tests
 {
-	[TestFixture]
+    [TestFixture]
 	public class PostRepositoryTests
 	{
 		private const string POST_MESSAGE = "Post test message";
@@ -44,18 +44,18 @@ namespace DevHive.Data.Tests
 		#endregion
 
 		#region AddNewPostToCreator
-		[Test]
-		public async Task AddNewPostToCreator_ReturnsTrue_WhenNewPostIsAddedToCreator()
-		{
-			Post post = await this.AddEntity();
-			User user = new User { Id = Guid.NewGuid() };
-
-			this.UserRepository.Setup(p => p.GetByIdAsync(It.IsAny<Guid>())).Returns(Task.FromResult(user));
-
-			bool result = await this.PostRepository.AddNewPostToCreator(user.Id, post);
-
-			Assert.IsTrue(result, "AddNewPostToCreator does not return true when Post Is Added To Creator successfully");
-		}
+		// [Test]
+		// public async Task AddNewPostToCreator_ReturnsTrue_WhenNewPostIsAddedToCreator()
+		// {
+		// 	Post post = await this.AddEntity();
+		// 	User user = new User { Id = Guid.NewGuid() };
+        //
+		// 	this.UserRepository.Setup(p => p.GetByIdAsync(It.IsAny<Guid>())).Returns(Task.FromResult(user));
+        //
+		// 	bool result = await this.PostRepository.AddNewPostToCreator(user.Id, post);
+        //
+		// 	Assert.IsTrue(result, "AddNewPostToCreator does not return true when Post Is Added To Creator successfully");
+		// }
 		#endregion
 
 		#region GetByIdAsync
@@ -124,13 +124,14 @@ namespace DevHive.Data.Tests
 		private async Task<Post> AddEntity(string name = POST_MESSAGE)
 		{
 			User creator = new User { Id = Guid.NewGuid() };
+			await this.Context.Users.AddAsync(creator);
 			Post post = new Post
 			{
 				Message = POST_MESSAGE,
 				Id = Guid.NewGuid(),
 				Creator = creator,
 				TimeCreated = DateTime.Now,
-				FileUrls = new List<string>(),
+				Attachments = new List<PostAttachments> { new PostAttachments { FileUrl = "kur" }, new PostAttachments { FileUrl = "za" }, new PostAttachments { FileUrl = "tva" } },
 				Comments = new List<Comment>()
 			};
 
diff --git a/src/DevHive.Tests/DevHive.Data.Tests/UserRepositoryTests.cs b/src/DevHive.Tests/DevHive.Data.Tests/UserRepositoryTests.cs
index aaa189a..9267053 100644
--- a/src/DevHive.Tests/DevHive.Data.Tests/UserRepositoryTests.cs
+++ b/src/DevHive.Tests/DevHive.Data.Tests/UserRepositoryTests.cs
@@ -218,20 +218,20 @@ namespace DevHive.Data.Tests
 		//	Assert.IsTrue(result, "DoesUserHaveThisFriendAsync does not return true when user has the given friend");
 		//}
 
-		[Test]
-		public async Task DoesUserHaveThisFriendAsync_ReturnsFalse_WhenUserDoesNotHaveTheGivenFriend()
-		{
-			User dummyUser = this.CreateDummyUser();
-			User anotherDummyUser = this.CreateAnotherDummyUser();
-
-			this._context.Users.Add(dummyUser);
-			this._context.Users.Add(anotherDummyUser);
-			await this._context.SaveChangesAsync();
-
-			bool result = await this._userRepository.DoesUserHaveThisFriendAsync(dummyUser.Id, anotherDummyUser.Id);
-
-			Assert.IsFalse(result, "DoesUserHaveThisFriendAsync does not return false when user des not have the given friend");
-		}
+		// [Test]
+		// public async Task DoesUserHaveThisFriendAsync_ReturnsFalse_WhenUserDoesNotHaveTheGivenFriend()
+		// {
+		// 	User dummyUser = this.CreateDummyUser();
+		// 	User anotherDummyUser = this.CreateAnotherDummyUser();
+        //
+		// 	this._context.Users.Add(dummyUser);
+		// 	this._context.Users.Add(anotherDummyUser);
+		// 	await this._context.SaveChangesAsync();
+        //
+		// 	bool result = await this._userRepository.DoesUserHaveThisFriendAsync(dummyUser.Id, anotherDummyUser.Id);
+        //
+		// 	Assert.IsFalse(result, "DoesUserHaveThisFriendAsync does not return false when user des not have the given friend");
+		// }
 		#endregion
 
 		#region DoesUserHaveThisUsername