...

4 files changed, 33 insertions, 8 deletions

diff --git a/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs b/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs
index 74db74aa..a71c2208 100644
--- a/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs
+++ b/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs
@@ -35,7 +35,7 @@ namespace Timeline.Tests.Helpers
                 if (_createUser)

                 {

                     var passwordService = new PasswordService();

-                    var userService = new UserService(NullLogger<UserService>.Instance, context, passwordService, new Clock(), new UserPermissionService(context));

+                    var userService = new UserService(NullLogger<UserService>.Instance, context, passwordService, new UserPermissionService(context), new Clock());

 

                     var admin = await userService.CreateUser("admin", "adminpw");

                     await userService.ModifyUser(admin.Id, new ModifyUserParams() { Nickname = "administrator" });

diff --git a/BackEnd/Timeline.Tests/Services/HighlightTimelineServiceTest.cs b/BackEnd/Timeline.Tests/Services/HighlightTimelineServiceTest.cs
index a4cd983d..8ba26613 100644
--- a/BackEnd/Timeline.Tests/Services/HighlightTimelineServiceTest.cs
+++ b/BackEnd/Timeline.Tests/Services/HighlightTimelineServiceTest.cs
@@ -1,18 +1,43 @@
-using Timeline.Services;

+using FluentAssertions;

+using Microsoft.Extensions.Logging.Abstractions;

+using System.Threading.Tasks;

+using Timeline.Services;

+using Timeline.Tests.Helpers;

+using Xunit;

 

 namespace Timeline.Tests.Services

 {

     public class HighlightTimelineServiceTest : DatabaseBasedTest

     {

-        private UserService _userService;

-        private TimelineService _timelineService;

+        private readonly TestClock _clock = new TestClock();

+        private UserService _userService = default!;

+        private TimelineService _timelineService = default!;

 

-        private HighlightTimelineService _service;

+        private HighlightTimelineService _service = default!;

 

         protected override void OnDatabaseCreated()

         {

-

+            _userService = new UserService(NullLogger<UserService>.Instance, Database, new PasswordService(), new UserPermissionService(Database), _clock);

+            _timelineService = new TimelineService(Database, _userService, _clock);

+            _service = new HighlightTimelineService(Database, _userService, _timelineService, _clock);

         }

 

+        [Fact]

+        public async Task Should_Work()

+        {

+            {

+                var ht = await _service.GetHighlightTimelines();

+                ht.Should().BeEmpty();

+            }

+

+            var userId = await _userService.GetUserIdByUsername("user");

+            await _timelineService.CreateTimeline("tl", userId);

+            await _service.AddHighlightTimeline("tl", userId);

+

+            {

+                var ht = await _service.GetHighlightTimelines();

+                ht.Should().HaveCount(1).And.BeEquivalentTo(await _timelineService.GetTimeline("tl"));

+            }

+        }

     }

 }

diff --git a/BackEnd/Timeline.Tests/Services/TimelinePostServiceTest.cs b/BackEnd/Timeline.Tests/Services/TimelinePostServiceTest.cs
index 97512be5..7771ae0b 100644
--- a/BackEnd/Timeline.Tests/Services/TimelinePostServiceTest.cs
+++ b/BackEnd/Timeline.Tests/Services/TimelinePostServiceTest.cs
@@ -36,7 +36,7 @@ namespace Timeline.Tests.Services
         {

             _dataManager = new DataManager(Database, _eTagGenerator);

             _userPermissionService = new UserPermissionService(Database);

-            _userService = new UserService(NullLogger<UserService>.Instance, Database, _passwordService, _clock, _userPermissionService);

+            _userService = new UserService(NullLogger<UserService>.Instance, Database, _passwordService, _userPermissionService, _clock);

             _timelineService = new TimelineService(Database, _userService, _clock);

             _timelinePostService = new TimelinePostService(NullLogger<TimelinePostService>.Instance, Database, _timelineService, _userService, _dataManager, _imageValidator, _clock);

             _userDeleteService = new UserDeleteService(NullLogger<UserDeleteService>.Instance, Database, _timelinePostService);

diff --git a/BackEnd/Timeline.Tests/Services/TimelineServiceTest.cs b/BackEnd/Timeline.Tests/Services/TimelineServiceTest.cs
index 98f03066..70f54ede 100644
--- a/BackEnd/Timeline.Tests/Services/TimelineServiceTest.cs
+++ b/BackEnd/Timeline.Tests/Services/TimelineServiceTest.cs
@@ -26,7 +26,7 @@ namespace Timeline.Tests.Services
         protected override void OnDatabaseCreated()

         {

             _userPermissionService = new UserPermissionService(Database);

-            _userService = new UserService(NullLogger<UserService>.Instance, Database, _passwordService, _clock, _userPermissionService);

+            _userService = new UserService(NullLogger<UserService>.Instance, Database, _passwordService, _userPermissionService, _clock);

             _timelineService = new TimelineService(Database, _userService, _clock);

         }