From 6a8f6e48daa3ec101fa770ba96240f406b436a0b Mon Sep 17 00:00:00 2001
From: 杨宇千 <crupest@outlook.com>
Date: Sun, 4 Aug 2019 16:54:20 +0800
Subject: WIP: Need to solve the entity framework problem.

---
 .../Authentication/AuthenticationExtensions.cs     |  4 +-
 Timeline.Tests/Helpers/TestClock.cs                | 50 +++++++++++-----------
 .../Helpers/WebApplicationFactoryExtensions.cs     | 12 +++---
 3 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'Timeline.Tests/Helpers')

diff --git a/Timeline.Tests/Helpers/Authentication/AuthenticationExtensions.cs b/Timeline.Tests/Helpers/Authentication/AuthenticationExtensions.cs
index 03fb9714..27362ac3 100644
--- a/Timeline.Tests/Helpers/Authentication/AuthenticationExtensions.cs
+++ b/Timeline.Tests/Helpers/Authentication/AuthenticationExtensions.cs
@@ -10,9 +10,9 @@ namespace Timeline.Tests.Helpers.Authentication
     {
         private const string CreateTokenUrl = "/token/create";
 
-        public static async Task<CreateTokenResponse> CreateUserTokenAsync(this HttpClient client, string username, string password)
+        public static async Task<CreateTokenResponse> CreateUserTokenAsync(this HttpClient client, string username, string password, double? expireOffset = null)
         {
-            var response = await client.PostAsJsonAsync(CreateTokenUrl, new CreateTokenRequest { Username = username, Password = password });
+            var response = await client.PostAsJsonAsync(CreateTokenUrl, new CreateTokenRequest { Username = username, Password = password, ExpireOffset = expireOffset });
             var result = JsonConvert.DeserializeObject<CreateTokenResponse>(await response.Content.ReadAsStringAsync());
             return result;
         }
diff --git a/Timeline.Tests/Helpers/TestClock.cs b/Timeline.Tests/Helpers/TestClock.cs
index fc200be9..91523f2b 100644
--- a/Timeline.Tests/Helpers/TestClock.cs
+++ b/Timeline.Tests/Helpers/TestClock.cs
@@ -1,25 +1,25 @@
-using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using Timeline.Services;
-
-namespace Timeline.Tests.Helpers
-{
-    public class TestClock : IClock
-    {
-        DateTime? MockCurrentTime { get; set; } = null;
-
-        public DateTime GetCurrentTime()
-        {
-            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;
-        }
-    }
-}
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using Timeline.Services;
+
+namespace Timeline.Tests.Helpers
+{
+    public class TestClock : IClock
+    {
+        public DateTime? MockCurrentTime { get; set; } = null;
+
+        public DateTime GetCurrentTime()
+        {
+            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;
+        }
+    }
+}
diff --git a/Timeline.Tests/Helpers/WebApplicationFactoryExtensions.cs b/Timeline.Tests/Helpers/WebApplicationFactoryExtensions.cs
index aa005ba3..5a1f97d5 100644
--- a/Timeline.Tests/Helpers/WebApplicationFactoryExtensions.cs
+++ b/Timeline.Tests/Helpers/WebApplicationFactoryExtensions.cs
@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.AspNetCore.TestHost;
+using Microsoft.AspNetCore.TestHost;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Timeline.Models;
-using Timeline.Services;
+using Timeline.Services;
 using Xunit.Abstractions;
 
 namespace Timeline.Tests.Helpers
@@ -24,12 +24,12 @@ namespace Timeline.Tests.Helpers
                     .ConfigureServices(services =>
                     {
                         var serviceProvider = new ServiceCollection()
-                            .AddEntityFrameworkInMemoryDatabase()
+                            .AddEntityFrameworkSqlite()
                             .BuildServiceProvider();
 
                         services.AddDbContext<DatabaseContext>(options =>
                         {
-                            options.UseInMemoryDatabase("timeline");
+                            options.UseSqlite("Data Source=:memory:;"); //TODO! This not work!
                             options.UseInternalServiceProvider(serviceProvider);
                         });
 
@@ -50,8 +50,8 @@ namespace Timeline.Tests.Helpers
                         }
                     })
                     .ConfigureTestServices(services =>
-                    {
-                        services.AddSingleton<IClock, TestClock>();
+                    {
+                        services.AddSingleton<IClock, TestClock>();
                     });
             });
         }
-- 
cgit v1.2.3