From 6434d21abe925b1336df14877e26f4508ea9872d Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Mon, 27 Jan 2020 14:14:31 +0100 Subject: [PATCH] Rename MigrationsInfrastructureFixtureBase --- .../MigrationsInfrastructureTestBase.cs | 10 +++++----- .../MigrationsInfrastructureSqlServerTest.cs | 2 +- .../MigrationsInfrastructureSqliteTest.cs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/EFCore.Relational.Specification.Tests/MigrationsInfrastructureTestBase.cs b/test/EFCore.Relational.Specification.Tests/MigrationsInfrastructureTestBase.cs index 0db3e8a7452..f78c0c19a0a 100644 --- a/test/EFCore.Relational.Specification.Tests/MigrationsInfrastructureTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/MigrationsInfrastructureTestBase.cs @@ -16,7 +16,7 @@ namespace Microsoft.EntityFrameworkCore { public abstract class MigrationsInfrastructureTestBase : IClassFixture - where TFixture : MigrationsFixtureBase, new() + where TFixture : MigrationsInfrastructureFixtureBase, new() { protected TFixture Fixture { get; } @@ -263,11 +263,11 @@ public virtual void Can_get_active_provider() { using var db = Fixture.CreateContext(); var migrator = db.GetService(); - MigrationsFixtureBase.ActiveProvider = null; + MigrationsInfrastructureFixtureBase.ActiveProvider = null; migrator.GenerateScript(toMigration: "Migration1"); - ActiveProvider = MigrationsFixtureBase.ActiveProvider; + ActiveProvider = MigrationsInfrastructureFixtureBase.ActiveProvider; } [ConditionalFact] @@ -308,7 +308,7 @@ protected virtual void DiffSnapshot(ModelSnapshot snapshot, DbContext context) private void SetSql(string value) => Sql = value.Replace(ProductInfo.GetVersion(), "7.0.0-test"); } - public abstract class MigrationsFixtureBase : SharedStoreFixtureBase + public abstract class MigrationsInfrastructureFixtureBase : SharedStoreFixtureBase { public static string ActiveProvider { get; set; } public new RelationalTestStore TestStore => (RelationalTestStore)base.TestStore; @@ -355,7 +355,7 @@ private class Migration1 : Migration { protected override void Up(MigrationBuilder migrationBuilder) { - MigrationsFixtureBase.ActiveProvider = migrationBuilder.ActiveProvider; + MigrationsInfrastructureFixtureBase.ActiveProvider = migrationBuilder.ActiveProvider; migrationBuilder .CreateTable( diff --git a/test/EFCore.SqlServer.FunctionalTests/MigrationsInfrastructureSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/MigrationsInfrastructureSqlServerTest.cs index e8f37bf90d5..78c767d55b7 100644 --- a/test/EFCore.SqlServer.FunctionalTests/MigrationsInfrastructureSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/MigrationsInfrastructureSqlServerTest.cs @@ -1227,7 +1227,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) } } - public class MigrationsInfrastructureSqlServerFixture : MigrationsFixtureBase + public class MigrationsInfrastructureSqlServerFixture : MigrationsInfrastructureFixtureBase { protected override ITestStoreFactory TestStoreFactory => SqlServerTestStoreFactory.Instance; diff --git a/test/EFCore.Sqlite.FunctionalTests/MigrationsInfrastructureSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/MigrationsInfrastructureSqliteTest.cs index 2956dcf1825..1730dab39de 100644 --- a/test/EFCore.Sqlite.FunctionalTests/MigrationsInfrastructureSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/MigrationsInfrastructureSqliteTest.cs @@ -988,7 +988,7 @@ public override void Can_diff_against_3_0_ASP_NET_Identity_model() DiffSnapshot(new AspNetIdentity30ModelSnapshot(), context); } - public class MigrationsInfrastructureSqliteFixture : MigrationsFixtureBase + public class MigrationsInfrastructureSqliteFixture : MigrationsInfrastructureFixtureBase { protected override ITestStoreFactory TestStoreFactory => SqliteTestStoreFactory.Instance; }