From 91ba0f2594c83d00e2a8c35aea82579ed862f570 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 23 Oct 2019 20:50:26 +0800
Subject: [PATCH] Configuring AbpClockOptions in
 AbpEntityFrameworkCoreTestModule.

---
 .../Volo/Abp/EntityFrameworkCore/AbpDbContext.cs            | 2 +-
 .../EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs | 6 +++++-
 .../Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs  | 5 -----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index aa91755f5d..b42a2cfc66 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -511,7 +511,7 @@ namespace Volo.Abp.EntityFrameworkCore
                 !typeof(TEntity).IsDefined(typeof(OwnedAttribute), true) &&
                 !mutableEntityType.IsOwned())
             {
-                if (Clock == null)
+                if (Clock == null || !Clock.SupportsMultipleTimezone)
                 {
                     return;
                 }
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs
index b1b92ab5b2..85eb1119d5 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs
@@ -1,4 +1,5 @@
-using Microsoft.Data.Sqlite;
+using System;
+using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -10,6 +11,7 @@ using Volo.Abp.Modularity;
 using Volo.Abp.TestApp;
 using Volo.Abp.TestApp.Domain;
 using Volo.Abp.TestApp.EntityFrameworkCore;
+using Volo.Abp.Timing;
 
 namespace Volo.Abp.EntityFrameworkCore
 {
@@ -41,6 +43,8 @@ namespace Volo.Abp.EntityFrameworkCore
                     abpDbContextConfigurationContext.DbContextOptions.UseSqlite(sqliteConnection);
                 });
             });
+
+            Configure<AbpClockOptions>(options => options.Kind = DateTimeKind.Utc);
         }
 
         public override void OnPreApplicationInitialization(ApplicationInitializationContext context)
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
index cbeef807cb..6b0caaa7b6 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs
@@ -20,11 +20,6 @@ namespace Volo.Abp.TestApp.Testing
             _personRepository = GetRequiredService<IBasicRepository<Person, Guid>>();
         }
 
-        protected override void AfterAddApplication(IServiceCollection services)
-        {
-            services.Configure<AbpClockOptions>(options => options.Kind = DateTimeKind.Utc);
-        }
-
         [Fact]
         public async Task DateTime_Kind_Should_Be_Normalized_To_UTC_Test()
         {