From 657fb589137099794e58fbd35beb7d942b376965 Mon Sep 17 00:00:00 2001 From: crupest Date: Sun, 25 Apr 2021 21:20:04 +0800 Subject: ... --- BackEnd/Timeline.Tests/Helpers/TestApplication.cs | 3 --- BackEnd/Timeline.Tests/Helpers/TestDatabase.cs | 1 + BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs | 2 +- BackEnd/Timeline.Tests/IntegratedTests/TimelinePostTest.cs | 9 ++++----- BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs | 2 +- BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs | 2 +- BackEnd/Timeline.Tests/PasswordGenerator.cs | 2 +- BackEnd/Timeline.Tests/Services/SearchServiceTest.cs | 4 +++- BackEnd/Timeline.Tests/Services/ServiceTestBase.cs | 3 ++- BackEnd/Timeline.Tests/Services/UserDeleteServiceTest.cs | 4 ++-- BackEnd/Timeline.Tests/Services/UserPermissionServiceTest.cs | 3 +-- 11 files changed, 17 insertions(+), 18 deletions(-) (limited to 'BackEnd/Timeline.Tests') diff --git a/BackEnd/Timeline.Tests/Helpers/TestApplication.cs b/BackEnd/Timeline.Tests/Helpers/TestApplication.cs index 037aa05e..e0db966c 100644 --- a/BackEnd/Timeline.Tests/Helpers/TestApplication.cs +++ b/BackEnd/Timeline.Tests/Helpers/TestApplication.cs @@ -1,14 +1,11 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; -using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using System.Collections.Generic; using System.IO; using System.Threading.Tasks; using Timeline.Configs; -using Timeline.Entities; using Xunit; namespace Timeline.Tests.Helpers diff --git a/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs b/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs index c3b61919..24f4a922 100644 --- a/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs +++ b/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.Logging.Abstractions; using System.Threading.Tasks; using Timeline.Entities; using Timeline.Services; +using Timeline.Services.User; using Xunit; using Xunit.Abstractions; diff --git a/BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs b/BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs index 161e5d98..427881a0 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; using Timeline.Models.Http; -using Timeline.Services; +using Timeline.Services.User; using Timeline.Tests.Helpers; using Xunit; diff --git a/BackEnd/Timeline.Tests/IntegratedTests/TimelinePostTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/TimelinePostTest.cs index 68a75898..c918f793 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/TimelinePostTest.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/TimelinePostTest.cs @@ -1,8 +1,12 @@ using FluentAssertions; +using SixLabors.ImageSharp.Formats.Gif; +using SixLabors.ImageSharp.Formats.Jpeg; +using SixLabors.ImageSharp.Formats.Png; using System; using System.Collections.Generic; using System.Globalization; using System.Linq; +using System.Net; using System.Text; using System.Threading.Tasks; using Timeline.Models; @@ -10,11 +14,6 @@ using Timeline.Models.Http; using Timeline.Tests.Helpers; using Xunit; using Xunit.Abstractions; -using SixLabors.ImageSharp.Formats.Gif; -using SixLabors.ImageSharp.Formats.Png; -using SixLabors.ImageSharp.Formats.Jpeg; -using System.Net; -using System.Text.RegularExpressions; namespace Timeline.Tests.IntegratedTests { diff --git a/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs index fdf1af99..7206dab8 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; using Timeline.Models.Http; -using Timeline.Services; +using Timeline.Services.User; using Xunit; namespace Timeline.Tests.IntegratedTests diff --git a/BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs index ba3d893e..32e25aaa 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Timeline.Models.Http; -using Timeline.Services; +using Timeline.Services.User; using Xunit; namespace Timeline.Tests.IntegratedTests diff --git a/BackEnd/Timeline.Tests/PasswordGenerator.cs b/BackEnd/Timeline.Tests/PasswordGenerator.cs index 863439b5..3e154d70 100644 --- a/BackEnd/Timeline.Tests/PasswordGenerator.cs +++ b/BackEnd/Timeline.Tests/PasswordGenerator.cs @@ -1,4 +1,4 @@ -using Timeline.Services; +using Timeline.Services.User; using Xunit; using Xunit.Abstractions; diff --git a/BackEnd/Timeline.Tests/Services/SearchServiceTest.cs b/BackEnd/Timeline.Tests/Services/SearchServiceTest.cs index 968352c0..0aa412b2 100644 --- a/BackEnd/Timeline.Tests/Services/SearchServiceTest.cs +++ b/BackEnd/Timeline.Tests/Services/SearchServiceTest.cs @@ -1,6 +1,8 @@ using FluentAssertions; using System.Threading.Tasks; -using Timeline.Services; +using Timeline.Services.Api; +using Timeline.Services.Timeline; +using Timeline.Services.User; using Xunit; namespace Timeline.Tests.Services diff --git a/BackEnd/Timeline.Tests/Services/ServiceTestBase.cs b/BackEnd/Timeline.Tests/Services/ServiceTestBase.cs index 654116d0..0f4efe95 100644 --- a/BackEnd/Timeline.Tests/Services/ServiceTestBase.cs +++ b/BackEnd/Timeline.Tests/Services/ServiceTestBase.cs @@ -1,7 +1,8 @@ using Microsoft.Extensions.Logging.Abstractions; using System.Threading.Tasks; using Timeline.Entities; -using Timeline.Services; +using Timeline.Services.Timeline; +using Timeline.Services.User; using Timeline.Tests.Helpers; using Xunit; using Xunit.Abstractions; diff --git a/BackEnd/Timeline.Tests/Services/UserDeleteServiceTest.cs b/BackEnd/Timeline.Tests/Services/UserDeleteServiceTest.cs index 10014d2b..376c1092 100644 --- a/BackEnd/Timeline.Tests/Services/UserDeleteServiceTest.cs +++ b/BackEnd/Timeline.Tests/Services/UserDeleteServiceTest.cs @@ -2,8 +2,8 @@ using Microsoft.Extensions.Logging.Abstractions; using Moq; using System.Threading.Tasks; -using Timeline.Services; -using Timeline.Services.Exceptions; +using Timeline.Services.Timeline; +using Timeline.Services.User; using Xunit; namespace Timeline.Tests.Services diff --git a/BackEnd/Timeline.Tests/Services/UserPermissionServiceTest.cs b/BackEnd/Timeline.Tests/Services/UserPermissionServiceTest.cs index 0c43c025..aa92ff73 100644 --- a/BackEnd/Timeline.Tests/Services/UserPermissionServiceTest.cs +++ b/BackEnd/Timeline.Tests/Services/UserPermissionServiceTest.cs @@ -1,8 +1,7 @@ using FluentAssertions; using System; using System.Threading.Tasks; -using Timeline.Services; -using Timeline.Services.Exceptions; +using Timeline.Services.User; using Xunit; namespace Timeline.Tests.Services -- cgit v1.2.3