...

3 files changed, 41 insertions, 56 deletions

diff --git a/Timeline.Tests/Mock/Data/TestDatabase.cs b/Timeline.Tests/Mock/Data/TestDatabase.cs
index dd04f8f9..1e662546 100644
--- a/Timeline.Tests/Mock/Data/TestDatabase.cs
+++ b/Timeline.Tests/Mock/Data/TestDatabase.cs
@@ -10,36 +10,33 @@ namespace Timeline.Tests.Mock.Data
         public static void InitDatabase(DatabaseContext context)

         {

             context.Database.EnsureCreated();

-            context.Users.AddRange(MockUsers.CreateMockUsers());

+            context.Users.AddRange(MockUser.CreateMockEntities());

             context.SaveChanges();

         }

 

-        private readonly SqliteConnection _databaseConnection;

-        private readonly DatabaseContext _databaseContext;

-

         public TestDatabase()

         {

-            _databaseConnection = new SqliteConnection("Data Source=:memory:;");

-            _databaseConnection.Open();

+            DatabaseConnection = new SqliteConnection("Data Source=:memory:;");

+            DatabaseConnection.Open();

 

             var options = new DbContextOptionsBuilder<DatabaseContext>()

-                .UseSqlite(_databaseConnection)

+                .UseSqlite(DatabaseConnection)

                 .Options;

 

-            _databaseContext = new DatabaseContext(options);

+            DatabaseContext = new DatabaseContext(options);

 

-            InitDatabase(_databaseContext);

+            InitDatabase(DatabaseContext);

         }

 

         public void Dispose()

         {

-            _databaseContext.Dispose();

+            DatabaseContext.Dispose();

 

-            _databaseConnection.Close();

-            _databaseConnection.Dispose();

+            DatabaseConnection.Close();

+            DatabaseConnection.Dispose();

         }

 

-        public SqliteConnection DatabaseConnection => _databaseConnection;

-        public DatabaseContext DatabaseContext => _databaseContext;

+        public SqliteConnection DatabaseConnection { get; }

+        public DatabaseContext DatabaseContext { get; }

     }

 }

diff --git a/Timeline.Tests/Mock/Data/TestUsers.cs b/Timeline.Tests/Mock/Data/TestUsers.cs
index 378fc280..bc2df469 100644
--- a/Timeline.Tests/Mock/Data/TestUsers.cs
+++ b/Timeline.Tests/Mock/Data/TestUsers.cs
@@ -1,52 +1,50 @@
 using System;

 using System.Collections.Generic;

-using System.Linq;

 using Timeline.Entities;

 using Timeline.Models;

 using Timeline.Services;

 

 namespace Timeline.Tests.Mock.Data

 {

-    public static class MockUsers

+    public class MockUser

     {

-        static MockUsers()

+        public MockUser(string username, string password, bool administrator)

         {

-            var mockUserInfos = CreateMockUsers().Select(u => UserUtility.CreateUserInfo(u)).ToList();

-            UserUserInfo = mockUserInfos[0];

-            AdminUserInfo = mockUserInfos[1];

-            UserInfos = mockUserInfos;

+            Info = new UserInfo(username, administrator);

+            Password = password;

         }

 

-        public const string UserUsername = "user";

-        public const string AdminUsername = "admin";

-        public const string UserPassword = "user";

-        public const string AdminPassword = "admin";

+        public UserInfo Info { get; set; }

+        public string Username => Info.Username;

+        public string Password { get; set; }

+        public bool Administrator => Info.Administrator;

 

-        // emmmmmmm. Never reuse the user instances because EF Core uses them which will cause strange things.

-        internal static IEnumerable<User> CreateMockUsers()

+

+        public static MockUser User { get; } = new MockUser("user", "userpassword", false);

+        public static MockUser Admin { get; } = new MockUser("admin", "adminpassword", true);

+

+        public static IReadOnlyList<UserInfo> UserInfoList { get; } = new List<UserInfo> { User.Info, Admin.Info };

+

+        // emmmmmmm. Never reuse the user instances because EF Core uses them, which will cause strange things.

+        public static IEnumerable<User> CreateMockEntities()

         {

-            var users = new List<User>();

             var passwordService = new PasswordService();

-            users.Add(new User

+            User Create(MockUser user)

             {

-                Name = UserUsername,

-                EncryptedPassword = passwordService.HashPassword(UserPassword),

-                RoleString = UserUtility.IsAdminToRoleString(false),

-                Avatar = UserAvatar.Create(DateTime.Now)

-            });

-            users.Add(new User

+                return new User

+                {

+                    Name = user.Username,

+                    EncryptedPassword = passwordService.HashPassword(user.Password),

+                    RoleString = UserUtility.IsAdminToRoleString(user.Administrator),

+                    Avatar = UserAvatar.Create(DateTime.Now)

+                };

+            }

+

+            return new List<User>

             {

-                Name = AdminUsername,

-                EncryptedPassword = passwordService.HashPassword(AdminPassword),

-                RoleString = UserUtility.IsAdminToRoleString(true),

-                Avatar = UserAvatar.Create(DateTime.Now)

-            });

-            return users;

+                Create(User),

+                Create(Admin)

+            };

         }

-

-        public static IReadOnlyList<UserInfo> UserInfos { get; }

-

-        public static UserInfo AdminUserInfo { get; }

-        public static UserInfo UserUserInfo { get; }

     }

 }

diff --git a/Timeline.Tests/Mock/Services/TestClock.cs b/Timeline.Tests/Mock/Services/TestClock.cs
index 0082171e..6671395a 100644
--- a/Timeline.Tests/Mock/Services/TestClock.cs
+++ b/Timeline.Tests/Mock/Services/TestClock.cs
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Mvc.Testing;

-using Microsoft.Extensions.DependencyInjection;

 using System;

 using Timeline.Services;

 

@@ -14,12 +12,4 @@ namespace Timeline.Tests.Mock.Services
             return MockCurrentTime.GetValueOrDefault(DateTime.Now);

         }

     }

-

-    public static class TestClockWebApplicationFactoryExtensions

-    {

-        public static TestClock GetTestClock<T>(this WebApplicationFactory<T> factory) where T : class

-        {

-            return factory.Server.Host.Services.GetRequiredService<IClock>() as TestClock;

-        }

-    }

 }