From b966e2d012ec11ef5c91fa950df13547754589aa Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Sat, 2 May 2020 19:29:26 +0200 Subject: [PATCH] Benchmarks: cleanup benchmark class names Mainly to remove the database name Closes #19874 --- .../EFCore.Benchmarks/Initialization/InitializationTests.cs | 3 +-- benchmark/EFCore.Benchmarks/Query/FuncletizationTests.cs | 3 +-- benchmark/EFCore.Benchmarks/Query/NavigationsQueryTests.cs | 3 +-- benchmark/EFCore.Benchmarks/Query/QueryCompilationTests.cs | 3 +-- benchmark/EFCore.Benchmarks/Query/RawSqlQueryTests.cs | 3 +-- benchmark/EFCore.Benchmarks/Query/SimpleQueryTests.cs | 3 +-- .../Initialization/InitializationSqlServerTests.cs | 2 +- .../Query/FuncletizationSqlServerTests.cs | 2 +- .../Query/NavigationsQuerySqlServerTests.cs | 2 +- .../Query/QueryCompilationSqlServerTests.cs | 2 +- .../Query/RawSqlQuerySqlServerTests.cs | 2 +- .../Query/SimpleQuerySqlServerTests.cs | 2 +- .../Initialization/InitializationSqliteTests.cs | 2 +- .../Query/FuncletizationSqliteTests.cs | 2 +- .../Query/NavigationsQuerySqliteTests.cs | 2 +- .../Query/QueryCompilationSqliteTests.cs | 2 +- .../EFCore.Sqlite.Benchmarks/Query/RawSqlQuerySqliteTests.cs | 2 +- .../EFCore.Sqlite.Benchmarks/Query/SimpleQuerySqliteTests.cs | 2 +- 18 files changed, 18 insertions(+), 24 deletions(-) diff --git a/benchmark/EFCore.Benchmarks/Initialization/InitializationTests.cs b/benchmark/EFCore.Benchmarks/Initialization/InitializationTests.cs index c83b998082e..3f6964bfea3 100644 --- a/benchmark/EFCore.Benchmarks/Initialization/InitializationTests.cs +++ b/benchmark/EFCore.Benchmarks/Initialization/InitializationTests.cs @@ -9,8 +9,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Initialization { - [DisplayName("InitializationTests")] - public abstract class InitializationTests + public abstract class InitializationBase { protected abstract AdventureWorksContextBase CreateContext(); protected abstract ConventionSet CreateConventionSet(); diff --git a/benchmark/EFCore.Benchmarks/Query/FuncletizationTests.cs b/benchmark/EFCore.Benchmarks/Query/FuncletizationTests.cs index 5e577f115c9..29e60896397 100644 --- a/benchmark/EFCore.Benchmarks/Query/FuncletizationTests.cs +++ b/benchmark/EFCore.Benchmarks/Query/FuncletizationTests.cs @@ -11,8 +11,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - [DisplayName(nameof(FuncletizationTests))] - public abstract class FuncletizationTests + public abstract class FuncletizationBase { private OrdersContextBase _context; diff --git a/benchmark/EFCore.Benchmarks/Query/NavigationsQueryTests.cs b/benchmark/EFCore.Benchmarks/Query/NavigationsQueryTests.cs index 8dbeea7781e..77774a33823 100644 --- a/benchmark/EFCore.Benchmarks/Query/NavigationsQueryTests.cs +++ b/benchmark/EFCore.Benchmarks/Query/NavigationsQueryTests.cs @@ -10,8 +10,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - [DisplayName(nameof(NavigationsQueryTests))] - public abstract class NavigationsQueryTests + public abstract class NavigationsQueryBase { private AdventureWorksContextBase _context; private IQueryable _query; diff --git a/benchmark/EFCore.Benchmarks/Query/QueryCompilationTests.cs b/benchmark/EFCore.Benchmarks/Query/QueryCompilationTests.cs index edbf7c919d5..245ac6b8a77 100644 --- a/benchmark/EFCore.Benchmarks/Query/QueryCompilationTests.cs +++ b/benchmark/EFCore.Benchmarks/Query/QueryCompilationTests.cs @@ -16,8 +16,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - [DisplayName(nameof(QueryCompilationTests))] - public abstract class QueryCompilationTests + public abstract class QueryCompilationBase { public const int OperationsPerInvoke = 10; diff --git a/benchmark/EFCore.Benchmarks/Query/RawSqlQueryTests.cs b/benchmark/EFCore.Benchmarks/Query/RawSqlQueryTests.cs index 7b2382eac99..41151f5e67a 100644 --- a/benchmark/EFCore.Benchmarks/Query/RawSqlQueryTests.cs +++ b/benchmark/EFCore.Benchmarks/Query/RawSqlQueryTests.cs @@ -13,8 +13,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - [DisplayName(nameof(RawSqlQueryTests))] - public abstract class RawSqlQueryTests + public abstract class RawSqlQueryBase { private OrdersContextBase _context; diff --git a/benchmark/EFCore.Benchmarks/Query/SimpleQueryTests.cs b/benchmark/EFCore.Benchmarks/Query/SimpleQueryTests.cs index ad3a4d8b807..6abb52ff311 100644 --- a/benchmark/EFCore.Benchmarks/Query/SimpleQueryTests.cs +++ b/benchmark/EFCore.Benchmarks/Query/SimpleQueryTests.cs @@ -12,8 +12,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - [DisplayName(nameof(SimpleQueryTests))] - public abstract class SimpleQueryTests + public abstract class SimpleQueryBase { private OrdersContextBase _context; diff --git a/benchmark/EFCore.SqlServer.Benchmarks/Initialization/InitializationSqlServerTests.cs b/benchmark/EFCore.SqlServer.Benchmarks/Initialization/InitializationSqlServerTests.cs index 373cd264465..08e3b06f68d 100644 --- a/benchmark/EFCore.SqlServer.Benchmarks/Initialization/InitializationSqlServerTests.cs +++ b/benchmark/EFCore.SqlServer.Benchmarks/Initialization/InitializationSqlServerTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Initialization { - public class InitializationSqlServerTests : InitializationTests + public class Initialization : InitializationBase { protected override AdventureWorksContextBase CreateContext() => AdventureWorksSqlServerFixture.CreateContext(); protected override ConventionSet CreateConventionSet() => SqlServerConventionSetBuilder.Build(); diff --git a/benchmark/EFCore.SqlServer.Benchmarks/Query/FuncletizationSqlServerTests.cs b/benchmark/EFCore.SqlServer.Benchmarks/Query/FuncletizationSqlServerTests.cs index f8c051068b9..1a6c9635c3b 100644 --- a/benchmark/EFCore.SqlServer.Benchmarks/Query/FuncletizationSqlServerTests.cs +++ b/benchmark/EFCore.SqlServer.Benchmarks/Query/FuncletizationSqlServerTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - public class FuncletizationSqlServerTests : FuncletizationTests + public class Funcletization : FuncletizationBase { protected override OrdersFixtureBase CreateFixture() { diff --git a/benchmark/EFCore.SqlServer.Benchmarks/Query/NavigationsQuerySqlServerTests.cs b/benchmark/EFCore.SqlServer.Benchmarks/Query/NavigationsQuerySqlServerTests.cs index 4598be811d7..6bf36400824 100644 --- a/benchmark/EFCore.SqlServer.Benchmarks/Query/NavigationsQuerySqlServerTests.cs +++ b/benchmark/EFCore.SqlServer.Benchmarks/Query/NavigationsQuerySqlServerTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - public class NavigationsQuerySqlServerTests : NavigationsQueryTests + public class NavigationsQuery : NavigationsQueryBase { protected override AdventureWorksContextBase CreateContext() { diff --git a/benchmark/EFCore.SqlServer.Benchmarks/Query/QueryCompilationSqlServerTests.cs b/benchmark/EFCore.SqlServer.Benchmarks/Query/QueryCompilationSqlServerTests.cs index f3fc8e59e05..f04fc967922 100644 --- a/benchmark/EFCore.SqlServer.Benchmarks/Query/QueryCompilationSqlServerTests.cs +++ b/benchmark/EFCore.SqlServer.Benchmarks/Query/QueryCompilationSqlServerTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - public class QueryCompilationSqlServerTests : QueryCompilationTests + public class QueryCompilation : QueryCompilationBase { public override IServiceCollection AddProviderServices(IServiceCollection services) { diff --git a/benchmark/EFCore.SqlServer.Benchmarks/Query/RawSqlQuerySqlServerTests.cs b/benchmark/EFCore.SqlServer.Benchmarks/Query/RawSqlQuerySqlServerTests.cs index 078449f9625..c6ea21d990e 100644 --- a/benchmark/EFCore.SqlServer.Benchmarks/Query/RawSqlQuerySqlServerTests.cs +++ b/benchmark/EFCore.SqlServer.Benchmarks/Query/RawSqlQuerySqlServerTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - public class RawSqlQuerySqlServerTests : RawSqlQueryTests + public class RawSqlQuery : RawSqlQueryBase { protected override string StoredProcedureCreationScript => @"CREATE PROCEDURE dbo.SearchProducts diff --git a/benchmark/EFCore.SqlServer.Benchmarks/Query/SimpleQuerySqlServerTests.cs b/benchmark/EFCore.SqlServer.Benchmarks/Query/SimpleQuerySqlServerTests.cs index 2a303be7745..e2c31c19160 100644 --- a/benchmark/EFCore.SqlServer.Benchmarks/Query/SimpleQuerySqlServerTests.cs +++ b/benchmark/EFCore.SqlServer.Benchmarks/Query/SimpleQuerySqlServerTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - public class SimpleQuerySqlServerTests : SimpleQueryTests + public class SimpleQuery : SimpleQueryBase { protected override OrdersFixtureBase CreateFixture() { diff --git a/benchmark/EFCore.Sqlite.Benchmarks/Initialization/InitializationSqliteTests.cs b/benchmark/EFCore.Sqlite.Benchmarks/Initialization/InitializationSqliteTests.cs index 3998146a8c6..6ab2a131f4a 100644 --- a/benchmark/EFCore.Sqlite.Benchmarks/Initialization/InitializationSqliteTests.cs +++ b/benchmark/EFCore.Sqlite.Benchmarks/Initialization/InitializationSqliteTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Initialization { - public class InitializationSqliteTests : InitializationTests + public class Initialization : InitializationBase { protected override AdventureWorksContextBase CreateContext()=> AdventureWorksSqliteFixture.CreateContext(); protected override ConventionSet CreateConventionSet() => SqliteConventionSetBuilder.Build(); diff --git a/benchmark/EFCore.Sqlite.Benchmarks/Query/FuncletizationSqliteTests.cs b/benchmark/EFCore.Sqlite.Benchmarks/Query/FuncletizationSqliteTests.cs index 4062ba3de13..c8d2992f370 100644 --- a/benchmark/EFCore.Sqlite.Benchmarks/Query/FuncletizationSqliteTests.cs +++ b/benchmark/EFCore.Sqlite.Benchmarks/Query/FuncletizationSqliteTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - public class FuncletizationSqliteTests : FuncletizationTests + public class Funcletization : FuncletizationBase { protected override OrdersFixtureBase CreateFixture() { diff --git a/benchmark/EFCore.Sqlite.Benchmarks/Query/NavigationsQuerySqliteTests.cs b/benchmark/EFCore.Sqlite.Benchmarks/Query/NavigationsQuerySqliteTests.cs index 51f9c4fbd68..fe7f3b481c0 100644 --- a/benchmark/EFCore.Sqlite.Benchmarks/Query/NavigationsQuerySqliteTests.cs +++ b/benchmark/EFCore.Sqlite.Benchmarks/Query/NavigationsQuerySqliteTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - public class NavigationsQuerySqliteTests : NavigationsQueryTests + public class NavigationsQuery : NavigationsQueryBase { protected override AdventureWorksContextBase CreateContext() { diff --git a/benchmark/EFCore.Sqlite.Benchmarks/Query/QueryCompilationSqliteTests.cs b/benchmark/EFCore.Sqlite.Benchmarks/Query/QueryCompilationSqliteTests.cs index a2bfeea6e18..bf84361375b 100644 --- a/benchmark/EFCore.Sqlite.Benchmarks/Query/QueryCompilationSqliteTests.cs +++ b/benchmark/EFCore.Sqlite.Benchmarks/Query/QueryCompilationSqliteTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - public class QueryCompilationSqliteTests : QueryCompilationTests + public class QueryCompilationSqliteTests : QueryCompilationBase { public override IServiceCollection AddProviderServices(IServiceCollection services) { diff --git a/benchmark/EFCore.Sqlite.Benchmarks/Query/RawSqlQuerySqliteTests.cs b/benchmark/EFCore.Sqlite.Benchmarks/Query/RawSqlQuerySqliteTests.cs index 65aa414cefa..55475a5bfd9 100644 --- a/benchmark/EFCore.Sqlite.Benchmarks/Query/RawSqlQuerySqliteTests.cs +++ b/benchmark/EFCore.Sqlite.Benchmarks/Query/RawSqlQuerySqliteTests.cs @@ -6,7 +6,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - public class RawSqlQuerySqliteTests : RawSqlQueryTests + public class RawSqlQuery : RawSqlQueryBase { protected override string StoredProcedureCreationScript => @""; diff --git a/benchmark/EFCore.Sqlite.Benchmarks/Query/SimpleQuerySqliteTests.cs b/benchmark/EFCore.Sqlite.Benchmarks/Query/SimpleQuerySqliteTests.cs index 9d3c92c735e..124b0e95195 100644 --- a/benchmark/EFCore.Sqlite.Benchmarks/Query/SimpleQuerySqliteTests.cs +++ b/benchmark/EFCore.Sqlite.Benchmarks/Query/SimpleQuerySqliteTests.cs @@ -5,7 +5,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Query { - public class SimpleQuerySqliteTests : SimpleQueryTests + public class SimpleQuery : SimpleQueryBase { protected override OrdersFixtureBase CreateFixture() {