Fix build errors in IdentityServer4.EntityFramework.Storage

cnblogs-dudu · cnblogs-dudu · commit 68aeb022c1e4 · 2022-11-19T19:24:40.000+08:00
diff --git a/src/EntityFramework.Storage/test/IntegrationTests/Stores/DeviceFlowStoreTests.cs b/src/EntityFramework.Storage/test/IntegrationTests/Stores/DeviceFlowStoreTests.cs
@@ -1,4 +1,4 @@
-﻿using FluentAssertions;
+using FluentAssertions;
 using IdentityServer4.EntityFramework.DbContexts;
 using IdentityServer4.EntityFramework.Options;
 using IdentityServer4.EntityFramework.Stores;
@@ -23,7 +23,7 @@ public class DeviceFlowStoreTests : IntegrationTest<DeviceFlowStoreTests, Persis
 
         public DeviceFlowStoreTests(DatabaseProviderFixture<PersistedGrantDbContext> fixture) : base(fixture)
         {
-            foreach (var options in TestDatabaseProviders.SelectMany(x => x.Select(y => (DbContextOptions<PersistedGrantDbContext>)y)).ToList())
+            foreach (var options in TestDatabaseProviders.SelectMany(x => x.Select(y => (DbContextOptions<PersistedGrantDbContext>) y)).ToList())
             {
                 using (var context = new PersistedGrantDbContext(options, StoreOptions))
                     context.Database.EnsureCreated();
@@ -83,7 +83,7 @@ public async Task StoreDeviceAuthorizationAsync_WhenSuccessful_ExpectDataStored(
                 foundDeviceFlowCodes.Should().NotBeNull();
                 var deserializedData = new PersistentGrantSerializer().Deserialize<DeviceCode>(foundDeviceFlowCodes?.Data);
 
-                deserializedData.CreationTime.Should().BeCloseTo(data.CreationTime);
+                deserializedData.CreationTime.Should().BeCloseTo(data.CreationTime, TimeSpan.FromSeconds(5));
                 deserializedData.ClientId.Should().Be(data.ClientId);
                 deserializedData.Lifetime.Should().Be(data.Lifetime);
             }
@@ -213,9 +213,9 @@ public async Task FindByUserCodeAsync_WhenUserCodeExists_ExpectDataRetrievedCorr
                 var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), FakeLogger<DeviceFlowStore>.Create());
                 code = await store.FindByUserCodeAsync(testUserCode);
             }
-            
-            code.Should().BeEquivalentTo(expectedDeviceCodeData, 
-                assertionOptions => assertionOptions.Excluding(x=> x.Subject));
+
+            code.Should().BeEquivalentTo(expectedDeviceCodeData,
+                assertionOptions => assertionOptions.Excluding(x => x.Subject));
 
             code.Subject.Claims.FirstOrDefault(x => x.Type == JwtClaimTypes.Subject && x.Value == expectedSubject).Should().NotBeNull();
         }
@@ -297,7 +297,7 @@ public async Task UpdateByUserCodeAsync_WhenDeviceCodeAuthorized_ExpectSubjectAn
             var unauthorizedDeviceCode = new DeviceCode
             {
                 ClientId = "device_flow",
-                RequestedScopes = new[] {"openid", "api1"},
+                RequestedScopes = new[] { "openid", "api1" },
                 CreationTime = new DateTime(2018, 10, 19, 16, 14, 29),
                 Lifetime = 300,
                 IsOpenId = true
@@ -381,13 +381,13 @@ public async Task RemoveByDeviceCodeAsync_WhenDeviceCodeExists_ExpectDeviceCodeD
                 });
                 context.SaveChanges();
             }
-            
+
             using (var context = new PersistedGrantDbContext(options, StoreOptions))
             {
                 var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), FakeLogger<DeviceFlowStore>.Create());
                 await store.RemoveByDeviceCodeAsync(testDeviceCode);
             }
-            
+
             using (var context = new PersistedGrantDbContext(options, StoreOptions))
             {
                 context.DeviceFlowCodes.FirstOrDefault(x => x.UserCode == testUserCode).Should().BeNull();
diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/ApiResourceMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/ApiResourceMappersTests.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
+// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
@@ -15,7 +15,7 @@ public class ApiResourceMappersTests
         [Fact]
         public void AutomapperConfigurationIsValid()
         {
-            ApiResourceMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid<ApiResourceMapperProfile>();
+            ApiResourceMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid();
         }
 
         [Fact]
@@ -34,11 +34,11 @@ public void Properties_Map()
         {
             var model = new ApiResource()
             {
-               Description = "description",
-               DisplayName = "displayname",
-               Name = "foo",
-               Scopes = { "foo1", "foo2" },
-               Enabled = false
+                Description = "description",
+                DisplayName = "displayname",
+                Name = "foo",
+                Scopes = { "foo1", "foo2" },
+                Enabled = false
             };
 
 
@@ -49,10 +49,10 @@ public void Properties_Map()
             foo1.Should().NotBeNull();
             var foo2 = mappedEntity.Scopes.FirstOrDefault(x => x.Scope == "foo2");
             foo2.Should().NotBeNull();
-            
+
 
             var mappedModel = mappedEntity.ToModel();
-            
+
             mappedModel.Description.Should().Be("description");
             mappedModel.DisplayName.Should().Be("displayname");
             mappedModel.Enabled.Should().BeFalse();
diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/ClientMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/ClientMappersTests.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
+// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
@@ -16,7 +16,7 @@ public class ClientMappersTests
         [Fact]
         public void AutomapperConfigurationIsValid()
         {
-            ClientMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid<ClientMapperProfile>();
+            ClientMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid();
         }
 
         [Fact]
diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/IdentityResourcesMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/IdentityResourcesMappersTests.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
+// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
@@ -13,7 +13,7 @@ public class IdentityResourcesMappersTests
         [Fact]
         public void IdentityResourceAutomapperConfigurationIsValid()
         {
-            IdentityResourceMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid<IdentityResourceMapperProfile>();
+            IdentityResourceMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid();
         }
 
         [Fact]
diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/PersistedGrantMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/PersistedGrantMappersTests.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
+// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
@@ -14,7 +14,7 @@ public class PersistedGrantMappersTests
         [Fact]
         public void PersistedGrantAutomapperConfigurationIsValid()
         {
-            PersistedGrantMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid<PersistedGrantMapperProfile>();
+            PersistedGrantMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid();
         }
 
         [Fact]
@@ -24,10 +24,10 @@ public void CanMap()
             {
                 ConsumedTime = new System.DateTime(2020, 02, 03, 4, 5, 6)
             };
-            
+
             var mappedEntity = model.ToEntity();
             mappedEntity.ConsumedTime.Value.Should().Be(new System.DateTime(2020, 02, 03, 4, 5, 6));
-            
+
             var mappedModel = mappedEntity.ToModel();
             mappedModel.ConsumedTime.Value.Should().Be(new System.DateTime(2020, 02, 03, 4, 5, 6));
 
diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/ScopeMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/ScopeMappersTests.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
+// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
@@ -15,7 +15,7 @@ public class ScopesMappersTests
         [Fact]
         public void ScopeAutomapperConfigurationIsValid()
         {
-            ScopeMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid<ScopeMapperProfile>();
+            ScopeMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid();
         }
 
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using FluentAssertions;`
	`1`	`+using FluentAssertions;`
`2`	`2`	`using IdentityServer4.EntityFramework.DbContexts;`
`3`	`3`	`using IdentityServer4.EntityFramework.Options;`
`4`	`4`	`using IdentityServer4.EntityFramework.Stores;`
`@@ -23,7 +23,7 @@ public class DeviceFlowStoreTests : IntegrationTest<DeviceFlowStoreTests, Persis`
`23`	`23`
`24`	`24`	`public DeviceFlowStoreTests(DatabaseProviderFixture<PersistedGrantDbContext> fixture) : base(fixture)`
`25`	`25`	`{`
`26`		`- foreach (var options in TestDatabaseProviders.SelectMany(x => x.Select(y => (DbContextOptions<PersistedGrantDbContext>)y)).ToList())`
	`26`	`+ foreach (var options in TestDatabaseProviders.SelectMany(x => x.Select(y => (DbContextOptions<PersistedGrantDbContext>) y)).ToList())`
`27`	`27`	`{`
`28`	`28`	`using (var context = new PersistedGrantDbContext(options, StoreOptions))`
`29`	`29`	`context.Database.EnsureCreated();`
`@@ -83,7 +83,7 @@ public async Task StoreDeviceAuthorizationAsync_WhenSuccessful_ExpectDataStored(`
`83`	`83`	`foundDeviceFlowCodes.Should().NotBeNull();`
`84`	`84`	`var deserializedData = new PersistentGrantSerializer().Deserialize<DeviceCode>(foundDeviceFlowCodes?.Data);`
`85`	`85`
`86`		`- deserializedData.CreationTime.Should().BeCloseTo(data.CreationTime);`
	`86`	`+ deserializedData.CreationTime.Should().BeCloseTo(data.CreationTime, TimeSpan.FromSeconds(5));`
`87`	`87`	`deserializedData.ClientId.Should().Be(data.ClientId);`
`88`	`88`	`deserializedData.Lifetime.Should().Be(data.Lifetime);`
`89`	`89`	`}`
`@@ -213,9 +213,9 @@ public async Task FindByUserCodeAsync_WhenUserCodeExists_ExpectDataRetrievedCorr`
`213`	`213`	`var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), FakeLogger<DeviceFlowStore>.Create());`
`214`	`214`	`code = await store.FindByUserCodeAsync(testUserCode);`
`215`	`215`	`}`
`216`		`-`
`217`		`- code.Should().BeEquivalentTo(expectedDeviceCodeData,`
`218`		`- assertionOptions => assertionOptions.Excluding(x=> x.Subject));`
	`216`	`+`
	`217`	`+ code.Should().BeEquivalentTo(expectedDeviceCodeData,`
	`218`	`+ assertionOptions => assertionOptions.Excluding(x => x.Subject));`
`219`	`219`
`220`	`220`	`code.Subject.Claims.FirstOrDefault(x => x.Type == JwtClaimTypes.Subject && x.Value == expectedSubject).Should().NotBeNull();`
`221`	`221`	`}`
`@@ -297,7 +297,7 @@ public async Task UpdateByUserCodeAsync_WhenDeviceCodeAuthorized_ExpectSubjectAn`
`297`	`297`	`var unauthorizedDeviceCode = new DeviceCode`
`298`	`298`	`{`
`299`	`299`	`ClientId = "device_flow",`
`300`		`- RequestedScopes = new[] {"openid", "api1"},`
	`300`	`+ RequestedScopes = new[] { "openid", "api1" },`
`301`	`301`	`CreationTime = new DateTime(2018, 10, 19, 16, 14, 29),`
`302`	`302`	`Lifetime = 300,`
`303`	`303`	`IsOpenId = true`
`@@ -381,13 +381,13 @@ public async Task RemoveByDeviceCodeAsync_WhenDeviceCodeExists_ExpectDeviceCodeD`
`381`	`381`	`});`
`382`	`382`	`context.SaveChanges();`
`383`	`383`	`}`
`384`		`-`
	`384`	`+`
`385`	`385`	`using (var context = new PersistedGrantDbContext(options, StoreOptions))`
`386`	`386`	`{`
`387`	`387`	`var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), FakeLogger<DeviceFlowStore>.Create());`
`388`	`388`	`await store.RemoveByDeviceCodeAsync(testDeviceCode);`
`389`	`389`	`}`
`390`		`-`
	`390`	`+`
`391`	`391`	`using (var context = new PersistedGrantDbContext(options, StoreOptions))`
`392`	`392`	`{`
`393`	`393`	`context.DeviceFlowCodes.FirstOrDefault(x => x.UserCode == testUserCode).Should().BeNull();`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.`
	`1`	`+// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.`
`3`	`3`
`4`	`4`
`@@ -16,7 +16,7 @@ public class ClientMappersTests`
`16`	`16`	`[Fact]`
`17`	`17`	`public void AutomapperConfigurationIsValid()`
`18`	`18`	`{`
`19`		`- ClientMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid<ClientMapperProfile>();`
	`19`	`+ ClientMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`[Fact]`