From fa2a3282c51d831b25f374803301e75eac15d11c Mon Sep 17 00:00:00 2001 From: 杨宇千 Date: Thu, 17 Oct 2019 20:46:57 +0800 Subject: ... --- Timeline.Tests/Mock/Data/TestUsers.cs | 62 +++++++++++++++++------------------ 1 file changed, 30 insertions(+), 32 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 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 CreateMockUsers() + + public static MockUser User { get; } = new MockUser("user", "userpassword", false); + public static MockUser Admin { get; } = new MockUser("admin", "adminpassword", true); + + public static IReadOnlyList UserInfoList { get; } = new List { User.Info, Admin.Info }; + + // emmmmmmm. Never reuse the user instances because EF Core uses them, which will cause strange things. + public static IEnumerable CreateMockEntities() { - var users = new List(); 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 { - Name = AdminUsername, - EncryptedPassword = passwordService.HashPassword(AdminPassword), - RoleString = UserUtility.IsAdminToRoleString(true), - Avatar = UserAvatar.Create(DateTime.Now) - }); - return users; + Create(User), + Create(Admin) + }; } - - public static IReadOnlyList UserInfos { get; } - - public static UserInfo AdminUserInfo { get; } - public static UserInfo UserUserInfo { get; } } } -- cgit v1.2.3