From 5b2464a8113fa4a68c8749b3553a5924d2131d9f Mon Sep 17 00:00:00 2001
From: 杨宇千 <crupest@outlook.com>
Date: Mon, 19 Aug 2019 15:43:47 +0800
Subject: Add avatar 304.

---
 Timeline.Tests/Mock/Data/TestUsers.cs | 40 ++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'Timeline.Tests/Mock/Data/TestUsers.cs')

diff --git a/Timeline.Tests/Mock/Data/TestUsers.cs b/Timeline.Tests/Mock/Data/TestUsers.cs
index f34f62c5..378fc280 100644
--- a/Timeline.Tests/Mock/Data/TestUsers.cs
+++ b/Timeline.Tests/Mock/Data/TestUsers.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Timeline.Entities;
@@ -10,38 +11,39 @@ namespace Timeline.Tests.Mock.Data
     {
         static MockUsers()
         {
-            var mockUsers = new List<User>();
-            var passwordService = new PasswordService();
+            var mockUserInfos = CreateMockUsers().Select(u => UserUtility.CreateUserInfo(u)).ToList();
+            UserUserInfo = mockUserInfos[0];
+            AdminUserInfo = mockUserInfos[1];
+            UserInfos = mockUserInfos;
+        }
 
-            mockUsers.Add(new User
+        public const string UserUsername = "user";
+        public const string AdminUsername = "admin";
+        public const string UserPassword = "user";
+        public const string AdminPassword = "admin";
+
+        // emmmmmmm. Never reuse the user instances because EF Core uses them which will cause strange things.
+        internal static IEnumerable<User> CreateMockUsers()
+        {
+            var users = new List<User>();
+            var passwordService = new PasswordService();
+            users.Add(new User
             {
                 Name = UserUsername,
                 EncryptedPassword = passwordService.HashPassword(UserPassword),
                 RoleString = UserUtility.IsAdminToRoleString(false),
-                Version = 0,
+                Avatar = UserAvatar.Create(DateTime.Now)
             });
-            mockUsers.Add(new User
+            users.Add(new User
             {
                 Name = AdminUsername,
                 EncryptedPassword = passwordService.HashPassword(AdminPassword),
                 RoleString = UserUtility.IsAdminToRoleString(true),
-                Version = 0,
+                Avatar = UserAvatar.Create(DateTime.Now)
             });
-
-            Users = mockUsers;
-
-            var mockUserInfos = mockUsers.Select(u => UserUtility.CreateUserInfo(u)).ToList();
-            UserUserInfo = mockUserInfos[0];
-            AdminUserInfo = mockUserInfos[1];
-            UserInfos = mockUserInfos;
+            return users;
         }
 
-        public const string UserUsername = "user";
-        public const string AdminUsername = "admin";
-        public const string UserPassword = "user";
-        public const string AdminPassword = "admin";
-
-        internal static IReadOnlyList<User> Users { get; }
         public static IReadOnlyList<UserInfo> UserInfos { get; }
 
         public static UserInfo AdminUserInfo { get; }
-- 
cgit v1.2.3