diff options
author | crupest <crupest@outlook.com> | 2020-01-29 00:17:45 +0800 |
---|---|---|
committer | crupest <crupest@outlook.com> | 2020-01-29 00:17:45 +0800 |
commit | b6043126fae039c58512f60a576b10925b06df4c (patch) | |
tree | 480e4e0fa03f0736cfee97876603fdb87d3fd3bd /Timeline.Tests/Services | |
parent | 1a653fca9e4e3371dd65782c987a736e2259d66a (diff) | |
download | timeline-b6043126fae039c58512f60a576b10925b06df4c.tar.gz timeline-b6043126fae039c58512f60a576b10925b06df4c.tar.bz2 timeline-b6043126fae039c58512f60a576b10925b06df4c.zip |
...
Diffstat (limited to 'Timeline.Tests/Services')
-rw-r--r-- | Timeline.Tests/Services/UserAvatarServiceTest.cs | 6 | ||||
-rw-r--r-- | Timeline.Tests/Services/UserDetailServiceTest.cs | 4 | ||||
-rw-r--r-- | Timeline.Tests/Services/UserTokenManagerTest.cs | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/Timeline.Tests/Services/UserAvatarServiceTest.cs b/Timeline.Tests/Services/UserAvatarServiceTest.cs index d4371c48..2dca7ccf 100644 --- a/Timeline.Tests/Services/UserAvatarServiceTest.cs +++ b/Timeline.Tests/Services/UserAvatarServiceTest.cs @@ -171,7 +171,7 @@ namespace Timeline.Tests.Services var mockAvatarEntity = CreateMockAvatarEntity("aaa");
{
var context = _database.Context;
- var user = await context.Users.Where(u => u.Name == username).Include(u => u.Avatar).SingleAsync();
+ var user = await context.Users.Where(u => u.Username == username).Include(u => u.Avatar).SingleAsync();
user.Avatar = mockAvatarEntity;
await context.SaveChangesAsync();
}
@@ -205,7 +205,7 @@ namespace Timeline.Tests.Services var mockAvatarEntity = CreateMockAvatarEntity("aaa");
{
var context = _database.Context;
- var user = await context.Users.Where(u => u.Name == username).Include(u => u.Avatar).SingleAsync();
+ var user = await context.Users.Where(u => u.Username == username).Include(u => u.Avatar).SingleAsync();
user.Avatar = mockAvatarEntity;
await context.SaveChangesAsync();
}
@@ -236,7 +236,7 @@ namespace Timeline.Tests.Services {
string username = MockUser.User.Username;
- var user = await _database.Context.Users.Where(u => u.Name == username).Include(u => u.Avatar).SingleAsync();
+ var user = await _database.Context.Users.Where(u => u.Username == username).Include(u => u.Avatar).SingleAsync();
var avatar1 = CreateMockAvatar("aaa");
var avatar2 = CreateMockAvatar("bbb");
diff --git a/Timeline.Tests/Services/UserDetailServiceTest.cs b/Timeline.Tests/Services/UserDetailServiceTest.cs index e6eabadf..dbff2705 100644 --- a/Timeline.Tests/Services/UserDetailServiceTest.cs +++ b/Timeline.Tests/Services/UserDetailServiceTest.cs @@ -51,7 +51,7 @@ namespace Timeline.Tests.Services const string nickname = "aaaaaa";
{
var context = _testDatabase.Context;
- var userId = (await context.Users.Where(u => u.Name == MockUser.User.Username).Select(u => new { u.Id }).SingleAsync()).Id;
+ var userId = (await context.Users.Where(u => u.Username == MockUser.User.Username).Select(u => new { u.Id }).SingleAsync()).Id;
context.UserDetails.Add(new UserDetailEntity
{
Nickname = nickname,
@@ -83,7 +83,7 @@ namespace Timeline.Tests.Services public async Task SetNickname_ShouldWork()
{
var username = MockUser.User.Username;
- var user = await _testDatabase.Context.Users.Where(u => u.Name == username).Include(u => u.Detail).SingleAsync();
+ var user = await _testDatabase.Context.Users.Where(u => u.Username == username).Include(u => u.Detail).SingleAsync();
var nickname1 = "nickname1";
var nickname2 = "nickname2";
diff --git a/Timeline.Tests/Services/UserTokenManagerTest.cs b/Timeline.Tests/Services/UserTokenManagerTest.cs index 19122d31..e649fbab 100644 --- a/Timeline.Tests/Services/UserTokenManagerTest.cs +++ b/Timeline.Tests/Services/UserTokenManagerTest.cs @@ -2,8 +2,6 @@ using Microsoft.Extensions.Logging.Abstractions;
using Moq;
using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Threading.Tasks;
using Timeline.Models;
using Timeline.Services;
@@ -58,7 +56,7 @@ namespace Timeline.Tests.Services const string username = "uuu";
const string password = "ppp";
var mockExpireTime = setExpireTime ? (DateTime?)DateTime.Now : null;
- var mockUserInfo = new UserInfo
+ var mockUserInfo = new User
{
Id = 1,
Username = username,
@@ -126,7 +124,7 @@ namespace Timeline.Tests.Services ExpireAt = mockTime.AddDays(1)
};
_mockUserTokenService.Setup(s => s.VerifyToken(mockToken)).Returns(mockTokenInfo);
- _mockUserService.Setup(s => s.GetUserById(1)).ReturnsAsync(new UserInfo
+ _mockUserService.Setup(s => s.GetUserById(1)).ReturnsAsync(new User
{
Id = 1,
Username = "aaa",
@@ -149,7 +147,7 @@ namespace Timeline.Tests.Services Version = 1,
ExpireAt = mockTime.AddDays(1)
};
- var mockUserInfo = new UserInfo
+ var mockUserInfo = new User
{
Id = 1,
Username = "aaa",
|