From dcf3d41d2ee7edda8944abb7d865d1b2f3394da0 Mon Sep 17 00:00:00 2001 From: Brett Hazen <2651260+bhazen@users.noreply.github.com> Date: Wed, 14 May 2025 06:28:53 -0500 Subject: [PATCH] Collapsed EF integration tests into main integration test project --- .github/workflow-gen/Program.cs | 2 +- .github/workflows/identity-server-ci.yml | 14 ------- identity-server/identity-server.slnf | 1 - .../EntityFramework.IntegrationTests.csproj | 30 -------------- .../FakeLogger.cs | 27 ------------- .../EntityFramework}/DI/DITests.cs | 0 .../DatabaseProviderBuilder.cs | 0 .../DatabaseProviderFixture.cs | 0 .../EntityFramework}/IntegrationTest.cs | 0 .../Services/CorsPolicyServiceTests.cs | 5 ++- .../DbContexts/ClientDbContextTests.cs | 0 .../MockOperationalStoreNotification.cs | 0 .../Storage/Stores/ClientStoreTests.cs | 9 +++-- .../Storage/Stores/DeviceFlowStoreTests.cs | 23 +++++------ .../Stores/IdentityProviderStoreTests.cs | 7 ++-- .../Stores/PersistedGrantStoreTests.cs | 39 ++++++++++--------- .../Storage/Stores/ResourceStoreTests.cs | 19 ++++----- .../Storage/TokenCleanup/TokenCleanupTests.cs | 0 .../IdentityServer.IntegrationTests.csproj | 4 ++ products.slnx | 1 - 20 files changed, 59 insertions(+), 122 deletions(-) delete mode 100644 identity-server/test/EntityFramework.IntegrationTests/EntityFramework.IntegrationTests.csproj delete mode 100644 identity-server/test/EntityFramework.IntegrationTests/FakeLogger.cs rename identity-server/test/{EntityFramework.IntegrationTests => IdentityServer.IntegrationTests/EntityFramework}/DI/DITests.cs (100%) rename identity-server/test/{EntityFramework.IntegrationTests => IdentityServer.IntegrationTests/EntityFramework}/DatabaseProviderBuilder.cs (100%) rename identity-server/test/{EntityFramework.IntegrationTests => IdentityServer.IntegrationTests/EntityFramework}/DatabaseProviderFixture.cs (100%) rename identity-server/test/{EntityFramework.IntegrationTests => IdentityServer.IntegrationTests/EntityFramework}/IntegrationTest.cs (100%) rename identity-server/test/{EntityFramework.IntegrationTests => IdentityServer.IntegrationTests/EntityFramework}/Services/CorsPolicyServiceTests.cs (90%) rename identity-server/test/{EntityFramework.IntegrationTests => IdentityServer.IntegrationTests/EntityFramework}/Storage/DbContexts/ClientDbContextTests.cs (100%) rename identity-server/test/{EntityFramework.IntegrationTests => IdentityServer.IntegrationTests/EntityFramework}/Storage/MockOperationalStoreNotification.cs (100%) rename identity-server/test/{EntityFramework.IntegrationTests => IdentityServer.IntegrationTests/EntityFramework}/Storage/Stores/ClientStoreTests.cs (93%) rename identity-server/test/{EntityFramework.IntegrationTests => IdentityServer.IntegrationTests/EntityFramework}/Storage/Stores/DeviceFlowStoreTests.cs (94%) rename identity-server/test/{EntityFramework.IntegrationTests => IdentityServer.IntegrationTests/EntityFramework}/Storage/Stores/IdentityProviderStoreTests.cs (86%) rename identity-server/test/{EntityFramework.IntegrationTests => IdentityServer.IntegrationTests/EntityFramework}/Storage/Stores/PersistedGrantStoreTests.cs (86%) rename identity-server/test/{EntityFramework.IntegrationTests => IdentityServer.IntegrationTests/EntityFramework}/Storage/Stores/ResourceStoreTests.cs (92%) rename identity-server/test/{EntityFramework.IntegrationTests => IdentityServer.IntegrationTests/EntityFramework}/Storage/TokenCleanup/TokenCleanupTests.cs (100%) diff --git a/.github/workflow-gen/Program.cs b/.github/workflow-gen/Program.cs index 0b4573130..1d4ba43cd 100644 --- a/.github/workflow-gen/Program.cs +++ b/.github/workflow-gen/Program.cs @@ -20,7 +20,7 @@ var products = new Product[] new("identity-server", "identity-server.slnf", "is", - ["Configuration.IntegrationTests", "EntityFramework.IntegrationTests", "EntityFramework.Storage.UnitTests", "IdentityServer.IntegrationTests", "IdentityServer.UnitTests"], + ["Configuration.IntegrationTests", "EntityFramework.Storage.UnitTests", "IdentityServer.IntegrationTests", "IdentityServer.UnitTests"], []) }; foreach (var product in products) diff --git a/.github/workflows/identity-server-ci.yml b/.github/workflows/identity-server-ci.yml index 4963ed535..79fcb947f 100644 --- a/.github/workflows/identity-server-ci.yml +++ b/.github/workflows/identity-server-ci.yml @@ -104,20 +104,6 @@ jobs: fail-on-empty: true - name: Publish test report link run: echo "[Test Results - test/Configuration.IntegrationTests](${{ steps.test-report-test-Configuration-IntegrationTests.outputs.url_html }})" >> $GITHUB_STEP_SUMMARY - - name: Test - test/EntityFramework.IntegrationTests - run: dotnet test test/EntityFramework.IntegrationTests -c Release --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=test/EntityFramework.IntegrationTests-tests.trx" --collect:"XPlat Code Coverage" - - id: test-report-test-EntityFramework-IntegrationTests - name: Test report - test/EntityFramework.IntegrationTests - if: github.event_name == 'push' && (success() || failure()) - uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5 - with: - name: Test Report - test/EntityFramework.IntegrationTests - path: '**/test/EntityFramework.IntegrationTests-tests.trx' - reporter: dotnet-trx - fail-on-error: true - fail-on-empty: true - - name: Publish test report link - run: echo "[Test Results - test/EntityFramework.IntegrationTests](${{ steps.test-report-test-EntityFramework-IntegrationTests.outputs.url_html }})" >> $GITHUB_STEP_SUMMARY - name: Test - test/EntityFramework.Storage.UnitTests run: dotnet test test/EntityFramework.Storage.UnitTests -c Release --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=test/EntityFramework.Storage.UnitTests-tests.trx" --collect:"XPlat Code Coverage" - id: test-report-test-EntityFramework-Storage-UnitTests diff --git a/identity-server/identity-server.slnf b/identity-server/identity-server.slnf index 396f4021c..80fbcc73d 100644 --- a/identity-server/identity-server.slnf +++ b/identity-server/identity-server.slnf @@ -55,7 +55,6 @@ "identity-server\\templates\\src\\IdentityServerEntityFramework\\IdentityServerEntityFramework.csproj", "identity-server\\templates\\src\\IdentityServerInMem\\IdentityServerInMem.csproj", "identity-server\\test\\Configuration.IntegrationTests\\Configuration.IntegrationTests.csproj", - "identity-server\\test\\EntityFramework.IntegrationTests\\EntityFramework.IntegrationTests.csproj", "identity-server\\test\\EntityFramework.Storage.UnitTests\\EntityFramework.Storage.UnitTests.csproj", "identity-server\\test\\IdentityServer.IntegrationTests\\IdentityServer.IntegrationTests.csproj", "identity-server\\test\\IdentityServer.UnitTests\\IdentityServer.UnitTests.csproj", diff --git a/identity-server/test/EntityFramework.IntegrationTests/EntityFramework.IntegrationTests.csproj b/identity-server/test/EntityFramework.IntegrationTests/EntityFramework.IntegrationTests.csproj deleted file mode 100644 index 1fd845d21..000000000 --- a/identity-server/test/EntityFramework.IntegrationTests/EntityFramework.IntegrationTests.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - net8.0;net9.0 - - - - - - - - - - - - - - - - - - - - diff --git a/identity-server/test/EntityFramework.IntegrationTests/FakeLogger.cs b/identity-server/test/EntityFramework.IntegrationTests/FakeLogger.cs deleted file mode 100644 index 3e9d10473..000000000 --- a/identity-server/test/EntityFramework.IntegrationTests/FakeLogger.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) Duende Software. All rights reserved. -// See LICENSE in the project root for license information. - - -using Microsoft.Extensions.Logging; - -namespace EntityFramework.IntegrationTests; - -public class FakeLogger : FakeLogger, ILogger -{ - public static ILogger Create() => new FakeLogger(); -} - -public class FakeLogger : ILogger, IDisposable -{ - public IDisposable BeginScope(TState state) => this; - - public void Dispose() - { - } - - public bool IsEnabled(LogLevel logLevel) => false; - - public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) - { - } -} diff --git a/identity-server/test/EntityFramework.IntegrationTests/DI/DITests.cs b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/DI/DITests.cs similarity index 100% rename from identity-server/test/EntityFramework.IntegrationTests/DI/DITests.cs rename to identity-server/test/IdentityServer.IntegrationTests/EntityFramework/DI/DITests.cs diff --git a/identity-server/test/EntityFramework.IntegrationTests/DatabaseProviderBuilder.cs b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/DatabaseProviderBuilder.cs similarity index 100% rename from identity-server/test/EntityFramework.IntegrationTests/DatabaseProviderBuilder.cs rename to identity-server/test/IdentityServer.IntegrationTests/EntityFramework/DatabaseProviderBuilder.cs diff --git a/identity-server/test/EntityFramework.IntegrationTests/DatabaseProviderFixture.cs b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/DatabaseProviderFixture.cs similarity index 100% rename from identity-server/test/EntityFramework.IntegrationTests/DatabaseProviderFixture.cs rename to identity-server/test/IdentityServer.IntegrationTests/EntityFramework/DatabaseProviderFixture.cs diff --git a/identity-server/test/EntityFramework.IntegrationTests/IntegrationTest.cs b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/IntegrationTest.cs similarity index 100% rename from identity-server/test/EntityFramework.IntegrationTests/IntegrationTest.cs rename to identity-server/test/IdentityServer.IntegrationTests/EntityFramework/IntegrationTest.cs diff --git a/identity-server/test/EntityFramework.IntegrationTests/Services/CorsPolicyServiceTests.cs b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Services/CorsPolicyServiceTests.cs similarity index 90% rename from identity-server/test/EntityFramework.IntegrationTests/Services/CorsPolicyServiceTests.cs rename to identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Services/CorsPolicyServiceTests.cs index dd2ea31a6..4849e950a 100644 --- a/identity-server/test/EntityFramework.IntegrationTests/Services/CorsPolicyServiceTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Services/CorsPolicyServiceTests.cs @@ -9,6 +9,7 @@ using Duende.IdentityServer.EntityFramework.Services; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging.Abstractions; namespace EntityFramework.IntegrationTests.Services; @@ -48,7 +49,7 @@ public class CorsPolicyServiceTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var service = new CorsPolicyService(context, new NullLogger(), new NoneCancellationTokenProvider()); result = await service.IsOriginAllowedAsync(testCorsOrigin); } @@ -72,7 +73,7 @@ public class CorsPolicyServiceTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var service = new CorsPolicyService(context, new NullLogger(), new NoneCancellationTokenProvider()); result = await service.IsOriginAllowedAsync("InvalidOrigin"); } diff --git a/identity-server/test/EntityFramework.IntegrationTests/Storage/DbContexts/ClientDbContextTests.cs b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/DbContexts/ClientDbContextTests.cs similarity index 100% rename from identity-server/test/EntityFramework.IntegrationTests/Storage/DbContexts/ClientDbContextTests.cs rename to identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/DbContexts/ClientDbContextTests.cs diff --git a/identity-server/test/EntityFramework.IntegrationTests/Storage/MockOperationalStoreNotification.cs b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/MockOperationalStoreNotification.cs similarity index 100% rename from identity-server/test/EntityFramework.IntegrationTests/Storage/MockOperationalStoreNotification.cs rename to identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/MockOperationalStoreNotification.cs diff --git a/identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/ClientStoreTests.cs b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/ClientStoreTests.cs similarity index 93% rename from identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/ClientStoreTests.cs rename to identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/ClientStoreTests.cs index b8c1b3cd2..926d86291 100644 --- a/identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/ClientStoreTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/ClientStoreTests.cs @@ -9,6 +9,7 @@ using Duende.IdentityServer.EntityFramework.Stores; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging.Abstractions; using Xunit.Sdk; namespace EntityFramework.IntegrationTests.Storage.Stores; @@ -28,7 +29,7 @@ public class ClientStoreTests : IntegrationTest options) { await using var context = new ConfigurationDbContext(options); - var store = new ClientStore(context, FakeLogger.Create(), new NoneCancellationTokenProvider()); + var store = new ClientStore(context, new NullLogger(), new NoneCancellationTokenProvider()); var client = await store.FindClientByIdAsync(Guid.NewGuid().ToString()); client.ShouldBeNull(); } @@ -51,7 +52,7 @@ public class ClientStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new ClientStore(context, new NullLogger(), new NoneCancellationTokenProvider()); client = await store.FindClientByIdAsync(testClient.ClientId); } @@ -85,7 +86,7 @@ public class ClientStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new ClientStore(context, new NullLogger(), new NoneCancellationTokenProvider()); client = await store.FindClientByIdAsync(testClient.ClientId); } @@ -146,7 +147,7 @@ public class ClientStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new ClientStore(context, new NullLogger(), new NoneCancellationTokenProvider()); const int timeout = 5000; var task = Task.Run(() => store.FindClientByIdAsync(testClient.ClientId)); diff --git a/identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/DeviceFlowStoreTests.cs b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/DeviceFlowStoreTests.cs similarity index 94% rename from identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/DeviceFlowStoreTests.cs rename to identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/DeviceFlowStoreTests.cs index d454ff709..72bdb8e40 100644 --- a/identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/DeviceFlowStoreTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/DeviceFlowStoreTests.cs @@ -13,6 +13,7 @@ using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores.Serialization; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.InMemory.Infrastructure.Internal; +using Microsoft.Extensions.Logging.Abstractions; namespace EntityFramework.IntegrationTests.Storage.Stores; @@ -43,7 +44,7 @@ public class DeviceFlowStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), new NullLogger(), new NoneCancellationTokenProvider()); await store.StoreDeviceAuthorizationAsync(deviceCode, userCode, data); } @@ -71,7 +72,7 @@ public class DeviceFlowStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), new NullLogger(), new NoneCancellationTokenProvider()); await store.StoreDeviceAuthorizationAsync(deviceCode, userCode, data); } @@ -120,7 +121,7 @@ public class DeviceFlowStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), new NullLogger(), new NoneCancellationTokenProvider()); // skip odd behaviour of in-memory provider #pragma warning disable EF1001 // Internal EF Core API usage. @@ -165,7 +166,7 @@ public class DeviceFlowStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), new NullLogger(), new NoneCancellationTokenProvider()); // skip odd behaviour of in-memory provider #pragma warning disable EF1001 // Internal EF Core API usage. @@ -213,7 +214,7 @@ public class DeviceFlowStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), new NullLogger(), new NoneCancellationTokenProvider()); code = await store.FindByUserCodeAsync(testUserCode); } @@ -234,7 +235,7 @@ public class DeviceFlowStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), new NullLogger(), new NoneCancellationTokenProvider()); var code = await store.FindByUserCodeAsync($"user_{Guid.NewGuid().ToString()}"); code.ShouldBeNull(); } @@ -275,7 +276,7 @@ public class DeviceFlowStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), new NullLogger(), new NoneCancellationTokenProvider()); code = await store.FindByDeviceCodeAsync(testDeviceCode); } @@ -295,7 +296,7 @@ public class DeviceFlowStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), new NullLogger(), new NoneCancellationTokenProvider()); var code = await store.FindByDeviceCodeAsync($"device_{Guid.NewGuid().ToString()}"); code.ShouldBeNull(); } @@ -345,7 +346,7 @@ public class DeviceFlowStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), new NullLogger(), new NoneCancellationTokenProvider()); await store.UpdateByUserCodeAsync(testUserCode, authorizedDeviceCode); } @@ -408,7 +409,7 @@ public class DeviceFlowStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveByDeviceCodeAsync(testDeviceCode); } @@ -422,7 +423,7 @@ public class DeviceFlowStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new DeviceFlowStore(context, new PersistentGrantSerializer(), new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveByDeviceCodeAsync($"device_{Guid.NewGuid().ToString()}"); } } diff --git a/identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/IdentityProviderStoreTests.cs b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/IdentityProviderStoreTests.cs similarity index 86% rename from identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/IdentityProviderStoreTests.cs rename to identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/IdentityProviderStoreTests.cs index a20e52f54..7d9820340 100644 --- a/identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/IdentityProviderStoreTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/IdentityProviderStoreTests.cs @@ -9,6 +9,7 @@ using Duende.IdentityServer.EntityFramework.Stores; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging.Abstractions; namespace EntityFramework.IntegrationTests.Storage.Stores; @@ -41,7 +42,7 @@ public class IdentityProviderStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new IdentityProviderStore(context, new NullLogger(), new NoneCancellationTokenProvider()); var item = await store.GetBySchemeAsync("scheme1"); item.ShouldNotBeNull(); @@ -65,7 +66,7 @@ public class IdentityProviderStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new IdentityProviderStore(context, new NullLogger(), new NoneCancellationTokenProvider()); var item = await store.GetBySchemeAsync("scheme2"); item.ShouldBeNull(); @@ -88,7 +89,7 @@ public class IdentityProviderStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new IdentityProviderStore(context, new NullLogger(), new NoneCancellationTokenProvider()); var item = await store.GetBySchemeAsync("scheme3"); item.ShouldBeNull(); diff --git a/identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/PersistedGrantStoreTests.cs b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/PersistedGrantStoreTests.cs similarity index 86% rename from identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/PersistedGrantStoreTests.cs rename to identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/PersistedGrantStoreTests.cs index c84d6f09c..8ff034526 100644 --- a/identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/PersistedGrantStoreTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/PersistedGrantStoreTests.cs @@ -10,6 +10,7 @@ using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging.Abstractions; namespace EntityFramework.IntegrationTests.Storage.Stores; @@ -43,7 +44,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.StoreAsync(persistedGrant); } @@ -68,7 +69,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); foundPersistedGrant = await store.GetAsync(persistedGrant.Key); } @@ -89,7 +90,7 @@ public class PersistedGrantStoreTests : IntegrationTest foundPersistedGrants; await using (var context = new PersistedGrantDbContext(options)) { - var store = new PersistedGrantStore(context, FakeLogger.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); foundPersistedGrants = (await store.GetAllAsync(new PersistedGrantFilter { SubjectId = persistedGrant.SubjectId })).ToList(); } @@ -118,7 +119,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); (await store.GetAllAsync(new PersistedGrantFilter { @@ -190,7 +191,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveAsync(persistedGrant.Key); } @@ -214,7 +215,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveAllAsync(new PersistedGrantFilter { SubjectId = persistedGrant.SubjectId, @@ -242,7 +243,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveAllAsync(new PersistedGrantFilter { SubjectId = persistedGrant.SubjectId, @@ -284,7 +285,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveAllAsync(new PersistedGrantFilter { @@ -296,7 +297,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveAllAsync(new PersistedGrantFilter { @@ -308,7 +309,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveAllAsync(new PersistedGrantFilter { @@ -321,7 +322,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveAllAsync(new PersistedGrantFilter { @@ -334,7 +335,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveAllAsync(new PersistedGrantFilter { @@ -347,7 +348,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveAllAsync(new PersistedGrantFilter { @@ -360,7 +361,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveAllAsync(new PersistedGrantFilter { @@ -374,7 +375,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveAllAsync(new PersistedGrantFilter { @@ -388,7 +389,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveAllAsync(new PersistedGrantFilter { @@ -403,7 +404,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.RemoveAllAsync(new PersistedGrantFilter { @@ -429,7 +430,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); await store.StoreAsync(persistedGrant); } @@ -454,7 +455,7 @@ public class PersistedGrantStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new PersistedGrantStore(context, new NullLogger(), new NoneCancellationTokenProvider()); persistedGrant.Expiration = newDate; await store.StoreAsync(persistedGrant); } diff --git a/identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/ResourceStoreTests.cs b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/ResourceStoreTests.cs similarity index 92% rename from identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/ResourceStoreTests.cs rename to identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/ResourceStoreTests.cs index ca7788a70..b75801b92 100644 --- a/identity-server/test/EntityFramework.IntegrationTests/Storage/Stores/ResourceStoreTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/Stores/ResourceStoreTests.cs @@ -10,6 +10,7 @@ using Duende.IdentityServer.EntityFramework.Stores; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging.Abstractions; namespace EntityFramework.IntegrationTests.Storage.Stores; @@ -74,7 +75,7 @@ public class ScopeStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new ResourceStore(context, new NullLogger(), new NoneCancellationTokenProvider()); foundResource = (await store.FindApiResourcesByNameAsync(new[] { resource.Name })).SingleOrDefault(); } @@ -103,7 +104,7 @@ public class ScopeStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new ResourceStore(context, new NullLogger(), new NoneCancellationTokenProvider()); foundResource = (await store.FindApiResourcesByNameAsync(new[] { resource.Name })).SingleOrDefault(); } @@ -135,7 +136,7 @@ public class ScopeStoreTests : IntegrationTest resources; await using (var context = new ConfigurationDbContext(options)) { - var store = new ResourceStore(context, FakeLogger.Create(), new NoneCancellationTokenProvider()); + var store = new ResourceStore(context, new NullLogger(), new NoneCancellationTokenProvider()); resources = await store.FindApiResourcesByScopeNameAsync(new List { testApiScope.Name @@ -169,7 +170,7 @@ public class ScopeStoreTests : IntegrationTest resources; await using (var context = new ConfigurationDbContext(options)) { - var store = new ResourceStore(context, FakeLogger.Create(), new NoneCancellationTokenProvider()); + var store = new ResourceStore(context, new NullLogger(), new NoneCancellationTokenProvider()); resources = await store.FindApiResourcesByScopeNameAsync(new[] { testApiScope.Name }); } @@ -192,7 +193,7 @@ public class ScopeStoreTests : IntegrationTest resources; await using (var context = new ConfigurationDbContext(options)) { - var store = new ResourceStore(context, FakeLogger.Create(), new NoneCancellationTokenProvider()); + var store = new ResourceStore(context, new NullLogger(), new NoneCancellationTokenProvider()); resources = (await store.FindIdentityResourcesByScopeNameAsync(new List { resource.Name @@ -223,7 +224,7 @@ public class ScopeStoreTests : IntegrationTest resources; await using (var context = new ConfigurationDbContext(options)) { - var store = new ResourceStore(context, FakeLogger.Create(), new NoneCancellationTokenProvider()); + var store = new ResourceStore(context, new NullLogger(), new NoneCancellationTokenProvider()); resources = (await store.FindIdentityResourcesByScopeNameAsync(new List { resource.Name @@ -249,7 +250,7 @@ public class ScopeStoreTests : IntegrationTest resources; await using (var context = new ConfigurationDbContext(options)) { - var store = new ResourceStore(context, FakeLogger.Create(), new NoneCancellationTokenProvider()); + var store = new ResourceStore(context, new NullLogger(), new NoneCancellationTokenProvider()); resources = (await store.FindApiScopesByNameAsync(new List { resource.Name @@ -280,7 +281,7 @@ public class ScopeStoreTests : IntegrationTest resources; await using (var context = new ConfigurationDbContext(options)) { - var store = new ResourceStore(context, FakeLogger.Create(), new NoneCancellationTokenProvider()); + var store = new ResourceStore(context, new NullLogger(), new NoneCancellationTokenProvider()); resources = (await store.FindApiScopesByNameAsync(new List { resource.Name @@ -327,7 +328,7 @@ public class ScopeStoreTests : IntegrationTest.Create(), new NoneCancellationTokenProvider()); + var store = new ResourceStore(context, new NullLogger(), new NoneCancellationTokenProvider()); resources = await store.GetAllResourcesAsync(); } diff --git a/identity-server/test/EntityFramework.IntegrationTests/Storage/TokenCleanup/TokenCleanupTests.cs b/identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/TokenCleanup/TokenCleanupTests.cs similarity index 100% rename from identity-server/test/EntityFramework.IntegrationTests/Storage/TokenCleanup/TokenCleanupTests.cs rename to identity-server/test/IdentityServer.IntegrationTests/EntityFramework/Storage/TokenCleanup/TokenCleanupTests.cs diff --git a/identity-server/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj b/identity-server/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj index 4747a16a1..7ed56cbbe 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj +++ b/identity-server/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj @@ -11,6 +11,9 @@ + + + @@ -41,6 +44,7 @@ + diff --git a/products.slnx b/products.slnx index 77188a829..f84ece3d3 100644 --- a/products.slnx +++ b/products.slnx @@ -135,7 +135,6 @@ -