Fix UserStoreTest (#64019)

MackinnonBuck · web-flow · commit c299d9c57a0a · 2025-10-15T09:29:22.000-07:00
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs
@@ -19,6 +19,12 @@ public UserStoreTest(ScratchDatabaseFixture fixture)
         _fixture = fixture;
     }
 
+    public class UserStoreTestDbContext : IdentityDbContext
+    {
+        public UserStoreTestDbContext(DbContextOptions<UserStoreTestDbContext> options) : base(options)
+        { }
+    }
+
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
     {
         public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options)
@@ -38,9 +44,9 @@ public void CanCreateUserUsingEF()
         }
     }
 
-    private IdentityDbContext CreateContext()
+    private UserStoreTestDbContext CreateContext()
     {
-        var db = DbUtil.Create<IdentityDbContext>(_fixture.Connection);
+        var db = DbUtil.Create<UserStoreTestDbContext>(_fixture.Connection);
         db.Database.EnsureCreated();
         return db;
     }
@@ -52,18 +58,18 @@ protected override object CreateTestContext()
 
     protected override void AddUserStore(IServiceCollection services, object context = null)
     {
-        services.AddSingleton<IUserStore<IdentityUser>>(new UserStore<IdentityUser, IdentityRole, IdentityDbContext>((IdentityDbContext)context));
+        services.AddSingleton<IUserStore<IdentityUser>>(new UserStore<IdentityUser, IdentityRole, UserStoreTestDbContext>((UserStoreTestDbContext)context));
     }
 
     protected override void AddRoleStore(IServiceCollection services, object context = null)
     {
-        services.AddSingleton<IRoleStore<IdentityRole>>(new RoleStore<IdentityRole, IdentityDbContext>((IdentityDbContext)context));
+        services.AddSingleton<IRoleStore<IdentityRole>>(new RoleStore<IdentityRole, UserStoreTestDbContext>((UserStoreTestDbContext)context));
     }
 
     [Fact]
     public async Task SqlUserStoreMethodsThrowWhenDisposedTest()
     {
-        var store = new UserStore(new IdentityDbContext(new DbContextOptionsBuilder<IdentityDbContext>().Options));
+        var store = new UserStore(new UserStoreTestDbContext(new DbContextOptionsBuilder<UserStoreTestDbContext>().Options));
         store.Dispose();
         await Assert.ThrowsAsync<ObjectDisposedException>(async () => await store.AddClaimsAsync(null, null));
         await Assert.ThrowsAsync<ObjectDisposedException>(async () => await store.AddLoginAsync(null, null));
@@ -97,7 +103,7 @@ await Assert.ThrowsAsync<ObjectDisposedException>(
     public async Task UserStorePublicNullCheckTest()
     {
         Assert.Throws<ArgumentNullException>("context", () => new UserStore(null));
-        var store = new UserStore(new IdentityDbContext(new DbContextOptionsBuilder<IdentityDbContext>().Options));
+        var store = new UserStore(new UserStoreTestDbContext(new DbContextOptionsBuilder<UserStoreTestDbContext>().Options));
         await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.GetUserIdAsync(null));
         await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.GetUserNameAsync(null));
         await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.SetUserNameAsync(null, null));
@@ -210,17 +216,17 @@ await Assert.ThrowsAsync<InvalidOperationException>(
     [ConditionalFact]
     public async Task ConcurrentUpdatesWillFail()
     {
-        var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
+        var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
         var user = CreateTestUser();
-        using (var db = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
         {
             db.Database.EnsureCreated();
 
             var manager = CreateManager(db);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
         }
-        using (var db = new IdentityDbContext(options))
-        using (var db2 = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
+        using (var db2 = new UserStoreTestDbContext(options))
         {
             var manager1 = CreateManager(db);
             var manager2 = CreateManager(db2);
@@ -241,17 +247,17 @@ public async Task ConcurrentUpdatesWillFail()
     [ConditionalFact]
     public async Task ConcurrentUpdatesWillFailWithDetachedUser()
     {
-        var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
+        var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
         var user = CreateTestUser();
-        using (var db = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
         {
             db.Database.EnsureCreated();
 
             var manager = CreateManager(db);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
         }
-        using (var db = new IdentityDbContext(options))
-        using (var db2 = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
+        using (var db2 = new UserStoreTestDbContext(options))
         {
             var manager1 = CreateManager(db);
             var manager2 = CreateManager(db2);
@@ -270,17 +276,17 @@ public async Task ConcurrentUpdatesWillFailWithDetachedUser()
     [ConditionalFact]
     public async Task DeleteAModifiedUserWillFail()
     {
-        var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
+        var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
         var user = CreateTestUser();
-        using (var db = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
         {
             db.Database.EnsureCreated();
 
             var manager = CreateManager(db);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
         }
-        using (var db = new IdentityDbContext(options))
-        using (var db2 = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
+        using (var db2 = new UserStoreTestDbContext(options))
         {
             var manager1 = CreateManager(db);
             var manager2 = CreateManager(db2);
@@ -300,17 +306,17 @@ public async Task DeleteAModifiedUserWillFail()
     [ConditionalFact]
     public async Task ConcurrentRoleUpdatesWillFail()
     {
-        var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
+        var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
         var role = new IdentityRole(Guid.NewGuid().ToString());
-        using (var db = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
         {
             db.Database.EnsureCreated();
 
             var manager = CreateRoleManager(db);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(role));
         }
-        using (var db = new IdentityDbContext(options))
-        using (var db2 = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
+        using (var db2 = new UserStoreTestDbContext(options))
         {
             var manager1 = CreateRoleManager(db);
             var manager2 = CreateRoleManager(db2);
@@ -331,17 +337,17 @@ public async Task ConcurrentRoleUpdatesWillFail()
     [ConditionalFact]
     public async Task ConcurrentRoleUpdatesWillFailWithDetachedRole()
     {
-        var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
+        var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
         var role = new IdentityRole(Guid.NewGuid().ToString());
-        using (var db = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
         {
             db.Database.EnsureCreated();
 
             var manager = CreateRoleManager(db);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(role));
         }
-        using (var db = new IdentityDbContext(options))
-        using (var db2 = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
+        using (var db2 = new UserStoreTestDbContext(options))
         {
             var manager1 = CreateRoleManager(db);
             var manager2 = CreateRoleManager(db2);
@@ -361,17 +367,17 @@ public async Task ConcurrentRoleUpdatesWillFailWithDetachedRole()
     [ConditionalFact]
     public async Task DeleteAModifiedRoleWillFail()
     {
-        var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
+        var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
         var role = new IdentityRole(Guid.NewGuid().ToString());
-        using (var db = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
         {
             db.Database.EnsureCreated();
 
             var manager = CreateRoleManager(db);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(role));
         }
-        using (var db = new IdentityDbContext(options))
-        using (var db2 = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
+        using (var db2 = new UserStoreTestDbContext(options))
         {
             var manager1 = CreateRoleManager(db);
             var manager2 = CreateRoleManager(db2);

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,12 @@ public UserStoreTest(ScratchDatabaseFixture fixture)`
`19`	`19`	`_fixture = fixture;`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ public class UserStoreTestDbContext : IdentityDbContext`
	`23`	`+ {`
	`24`	`+ public UserStoreTestDbContext(DbContextOptions<UserStoreTestDbContext> options) : base(options)`
	`25`	`+ { }`
	`26`	`+ }`
	`27`	`+`
`22`	`28`	`public class ApplicationDbContext : IdentityDbContext<ApplicationUser>`
`23`	`29`	`{`
`24`	`30`	`public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options)`
`@@ -38,9 +44,9 @@ public void CanCreateUserUsingEF()`
`38`	`44`	`}`
`39`	`45`	`}`
`40`	`46`
`41`		`- private IdentityDbContext CreateContext()`
	`47`	`+ private UserStoreTestDbContext CreateContext()`
`42`	`48`	`{`
`43`		`- var db = DbUtil.Create<IdentityDbContext>(_fixture.Connection);`
	`49`	`+ var db = DbUtil.Create<UserStoreTestDbContext>(_fixture.Connection);`
`44`	`50`	`db.Database.EnsureCreated();`
`45`	`51`	`return db;`
`46`	`52`	`}`
`@@ -52,18 +58,18 @@ protected override object CreateTestContext()`
`52`	`58`
`53`	`59`	`protected override void AddUserStore(IServiceCollection services, object context = null)`
`54`	`60`	`{`
`55`		`- services.AddSingleton<IUserStore<IdentityUser>>(new UserStore<IdentityUser, IdentityRole, IdentityDbContext>((IdentityDbContext)context));`
	`61`	`+ services.AddSingleton<IUserStore<IdentityUser>>(new UserStore<IdentityUser, IdentityRole, UserStoreTestDbContext>((UserStoreTestDbContext)context));`
`56`	`62`	`}`
`57`	`63`
`58`	`64`	`protected override void AddRoleStore(IServiceCollection services, object context = null)`
`59`	`65`	`{`
`60`		`- services.AddSingleton<IRoleStore<IdentityRole>>(new RoleStore<IdentityRole, IdentityDbContext>((IdentityDbContext)context));`
	`66`	`+ services.AddSingleton<IRoleStore<IdentityRole>>(new RoleStore<IdentityRole, UserStoreTestDbContext>((UserStoreTestDbContext)context));`
`61`	`67`	`}`
`62`	`68`
`63`	`69`	`[Fact]`
`64`	`70`	`public async Task SqlUserStoreMethodsThrowWhenDisposedTest()`
`65`	`71`	`{`
`66`		`- var store = new UserStore(new IdentityDbContext(new DbContextOptionsBuilder<IdentityDbContext>().Options));`
	`72`	`+ var store = new UserStore(new UserStoreTestDbContext(new DbContextOptionsBuilder<UserStoreTestDbContext>().Options));`
`67`	`73`	`store.Dispose();`
`68`	`74`	`await Assert.ThrowsAsync<ObjectDisposedException>(async () => await store.AddClaimsAsync(null, null));`
`69`	`75`	`await Assert.ThrowsAsync<ObjectDisposedException>(async () => await store.AddLoginAsync(null, null));`
`@@ -97,7 +103,7 @@ await Assert.ThrowsAsync<ObjectDisposedException>(`
`97`	`103`	`public async Task UserStorePublicNullCheckTest()`
`98`	`104`	`{`
`99`	`105`	`Assert.Throws<ArgumentNullException>("context", () => new UserStore(null));`
`100`		`- var store = new UserStore(new IdentityDbContext(new DbContextOptionsBuilder<IdentityDbContext>().Options));`
	`106`	`+ var store = new UserStore(new UserStoreTestDbContext(new DbContextOptionsBuilder<UserStoreTestDbContext>().Options));`
`101`	`107`	`await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.GetUserIdAsync(null));`
`102`	`108`	`await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.GetUserNameAsync(null));`
`103`	`109`	`await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.SetUserNameAsync(null, null));`
`@@ -210,17 +216,17 @@ await Assert.ThrowsAsync<InvalidOperationException>(`
`210`	`216`	`[ConditionalFact]`
`211`	`217`	`public async Task ConcurrentUpdatesWillFail()`
`212`	`218`	`{`
`213`		`- var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;`
	`219`	`+ var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;`
`214`	`220`	`var user = CreateTestUser();`
`215`		`- using (var db = new IdentityDbContext(options))`
	`221`	`+ using (var db = new UserStoreTestDbContext(options))`
`216`	`222`	`{`
`217`	`223`	`db.Database.EnsureCreated();`
`218`	`224`
`219`	`225`	`var manager = CreateManager(db);`
`220`	`226`	`IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));`
`221`	`227`	`}`
`222`		`- using (var db = new IdentityDbContext(options))`
`223`		`- using (var db2 = new IdentityDbContext(options))`
	`228`	`+ using (var db = new UserStoreTestDbContext(options))`
	`229`	`+ using (var db2 = new UserStoreTestDbContext(options))`
`224`	`230`	`{`
`225`	`231`	`var manager1 = CreateManager(db);`
`226`	`232`	`var manager2 = CreateManager(db2);`
`@@ -241,17 +247,17 @@ public async Task ConcurrentUpdatesWillFail()`
`241`	`247`	`[ConditionalFact]`
`242`	`248`	`public async Task ConcurrentUpdatesWillFailWithDetachedUser()`
`243`	`249`	`{`
`244`		`- var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;`
	`250`	`+ var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;`
`245`	`251`	`var user = CreateTestUser();`
`246`		`- using (var db = new IdentityDbContext(options))`
	`252`	`+ using (var db = new UserStoreTestDbContext(options))`
`247`	`253`	`{`
`248`	`254`	`db.Database.EnsureCreated();`
`249`	`255`
`250`	`256`	`var manager = CreateManager(db);`
`251`	`257`	`IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));`
`252`	`258`	`}`
`253`		`- using (var db = new IdentityDbContext(options))`
`254`		`- using (var db2 = new IdentityDbContext(options))`
	`259`	`+ using (var db = new UserStoreTestDbContext(options))`
	`260`	`+ using (var db2 = new UserStoreTestDbContext(options))`
`255`	`261`	`{`
`256`	`262`	`var manager1 = CreateManager(db);`
`257`	`263`	`var manager2 = CreateManager(db2);`
`@@ -270,17 +276,17 @@ public async Task ConcurrentUpdatesWillFailWithDetachedUser()`
`270`	`276`	`[ConditionalFact]`
`271`	`277`	`public async Task DeleteAModifiedUserWillFail()`
`272`	`278`	`{`
`273`		`- var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;`
	`279`	`+ var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;`
`274`	`280`	`var user = CreateTestUser();`
`275`		`- using (var db = new IdentityDbContext(options))`
	`281`	`+ using (var db = new UserStoreTestDbContext(options))`
`276`	`282`	`{`
`277`	`283`	`db.Database.EnsureCreated();`
`278`	`284`
`279`	`285`	`var manager = CreateManager(db);`
`280`	`286`	`IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));`
`281`	`287`	`}`
`282`		`- using (var db = new IdentityDbContext(options))`
`283`		`- using (var db2 = new IdentityDbContext(options))`
	`288`	`+ using (var db = new UserStoreTestDbContext(options))`
	`289`	`+ using (var db2 = new UserStoreTestDbContext(options))`
`284`	`290`	`{`
`285`	`291`	`var manager1 = CreateManager(db);`
`286`	`292`	`var manager2 = CreateManager(db2);`
`@@ -300,17 +306,17 @@ public async Task DeleteAModifiedUserWillFail()`
`300`	`306`	`[ConditionalFact]`
`301`	`307`	`public async Task ConcurrentRoleUpdatesWillFail()`
`302`	`308`	`{`
`303`		`- var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;`
	`309`	`+ var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;`
`304`	`310`	`var role = new IdentityRole(Guid.NewGuid().ToString());`
`305`		`- using (var db = new IdentityDbContext(options))`
	`311`	`+ using (var db = new UserStoreTestDbContext(options))`
`306`	`312`	`{`
`307`	`313`	`db.Database.EnsureCreated();`
`308`	`314`
`309`	`315`	`var manager = CreateRoleManager(db);`
`310`	`316`	`IdentityResultAssert.IsSuccess(await manager.CreateAsync(role));`
`311`	`317`	`}`
`312`		`- using (var db = new IdentityDbContext(options))`
`313`		`- using (var db2 = new IdentityDbContext(options))`
	`318`	`+ using (var db = new UserStoreTestDbContext(options))`
	`319`	`+ using (var db2 = new UserStoreTestDbContext(options))`
`314`	`320`	`{`
`315`	`321`	`var manager1 = CreateRoleManager(db);`
`316`	`322`	`var manager2 = CreateRoleManager(db2);`
`@@ -331,17 +337,17 @@ public async Task ConcurrentRoleUpdatesWillFail()`
`331`	`337`	`[ConditionalFact]`
`332`	`338`	`public async Task ConcurrentRoleUpdatesWillFailWithDetachedRole()`
`333`	`339`	`{`
`334`		`- var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;`
	`340`	`+ var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;`
`335`	`341`	`var role = new IdentityRole(Guid.NewGuid().ToString());`
`336`		`- using (var db = new IdentityDbContext(options))`
	`342`	`+ using (var db = new UserStoreTestDbContext(options))`
`337`	`343`	`{`
`338`	`344`	`db.Database.EnsureCreated();`
`339`	`345`
`340`	`346`	`var manager = CreateRoleManager(db);`
`341`	`347`	`IdentityResultAssert.IsSuccess(await manager.CreateAsync(role));`
`342`	`348`	`}`
`343`		`- using (var db = new IdentityDbContext(options))`
`344`		`- using (var db2 = new IdentityDbContext(options))`
	`349`	`+ using (var db = new UserStoreTestDbContext(options))`
	`350`	`+ using (var db2 = new UserStoreTestDbContext(options))`
`345`	`351`	`{`
`346`	`352`	`var manager1 = CreateRoleManager(db);`
`347`	`353`	`var manager2 = CreateRoleManager(db2);`
`@@ -361,17 +367,17 @@ public async Task ConcurrentRoleUpdatesWillFailWithDetachedRole()`
`361`	`367`	`[ConditionalFact]`
`362`	`368`	`public async Task DeleteAModifiedRoleWillFail()`
`363`	`369`	`{`
`364`		`- var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;`
	`370`	`+ var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;`
`365`	`371`	`var role = new IdentityRole(Guid.NewGuid().ToString());`
`366`		`- using (var db = new IdentityDbContext(options))`
	`372`	`+ using (var db = new UserStoreTestDbContext(options))`
`367`	`373`	`{`
`368`	`374`	`db.Database.EnsureCreated();`
`369`	`375`
`370`	`376`	`var manager = CreateRoleManager(db);`
`371`	`377`	`IdentityResultAssert.IsSuccess(await manager.CreateAsync(role));`
`372`	`378`	`}`
`373`		`- using (var db = new IdentityDbContext(options))`
`374`		`- using (var db2 = new IdentityDbContext(options))`
	`379`	`+ using (var db = new UserStoreTestDbContext(options))`
	`380`	`+ using (var db2 = new UserStoreTestDbContext(options))`
`375`	`381`	`{`
`376`	`382`	`var manager1 = CreateRoleManager(db);`
`377`	`383`	`var manager2 = CreateRoleManager(db2);`