Benchmarks: cleanup benchmark class names

roji · roji · commit b966e2d012ec · 2020-05-02T20:02:53.000+02:00
Mainly to remove the database name Closes dotnet#19874
diff --git 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
@@ -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
@@ -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<Store> _query;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
 
 namespace Microsoft.EntityFrameworkCore.Benchmarks.Query
 {
-    public class SimpleQuerySqliteTests : SimpleQueryTests
+    public class SimpleQuery : SimpleQueryBase
     {
         protected override OrdersFixtureBase CreateFixture()
         {

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace Microsoft.EntityFrameworkCore.Benchmarks.Initialization`
`11`	`11`	`{`
`12`		`- [DisplayName("InitializationTests")]`
`13`		`- public abstract class InitializationTests`
	`12`	`+ public abstract class InitializationBase`
`14`	`13`	`{`
`15`	`14`	`protected abstract AdventureWorksContextBase CreateContext();`
`16`	`15`	`protected abstract ConventionSet CreateConventionSet();`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Microsoft.EntityFrameworkCore.Benchmarks.Query`
`13`	`13`	`{`
`14`		`- [DisplayName(nameof(FuncletizationTests))]`
`15`		`- public abstract class FuncletizationTests`
	`14`	`+ public abstract class FuncletizationBase`
`16`	`15`	`{`
`17`	`16`	`private OrdersContextBase _context;`
`18`	`17`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace Microsoft.EntityFrameworkCore.Benchmarks.Query`
`12`	`12`	`{`
`13`		`- [DisplayName(nameof(NavigationsQueryTests))]`
`14`		`- public abstract class NavigationsQueryTests`
	`13`	`+ public abstract class NavigationsQueryBase`
`15`	`14`	`{`
`16`	`15`	`private AdventureWorksContextBase _context;`
`17`	`16`	`private IQueryable<Store> _query;`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@`
`16`	`16`
`17`	`17`	`namespace Microsoft.EntityFrameworkCore.Benchmarks.Query`
`18`	`18`	`{`
`19`		`- [DisplayName(nameof(QueryCompilationTests))]`
`20`		`- public abstract class QueryCompilationTests`
	`19`	`+ public abstract class QueryCompilationBase`
`21`	`20`	`{`
`22`	`21`	`public const int OperationsPerInvoke = 10;`
`23`	`22`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,7 @@`
`13`	`13`
`14`	`14`	`namespace Microsoft.EntityFrameworkCore.Benchmarks.Query`
`15`	`15`	`{`
`16`		`- [DisplayName(nameof(RawSqlQueryTests))]`
`17`		`- public abstract class RawSqlQueryTests`
	`16`	`+ public abstract class RawSqlQueryBase`
`18`	`17`	`{`
`19`	`18`	`private OrdersContextBase _context;`
`20`	`19`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,7 @@`
`12`	`12`
`13`	`13`	`namespace Microsoft.EntityFrameworkCore.Benchmarks.Query`
`14`	`14`	`{`
`15`		`- [DisplayName(nameof(SimpleQueryTests))]`
`16`		`- public abstract class SimpleQueryTests`
	`15`	`+ public abstract class SimpleQueryBase`
`17`	`16`	`{`
`18`	`17`	`private OrdersContextBase _context;`
`19`	`18`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace Microsoft.EntityFrameworkCore.Benchmarks.Initialization`
`8`	`8`	`{`
`9`		`- public class InitializationSqlServerTests : InitializationTests`
	`9`	`+ public class Initialization : InitializationBase`
`10`	`10`	`{`
`11`	`11`	`protected override AdventureWorksContextBase CreateContext() => AdventureWorksSqlServerFixture.CreateContext();`
`12`	`12`	`protected override ConventionSet CreateConventionSet() => SqlServerConventionSetBuilder.Build();`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Microsoft.EntityFrameworkCore.Benchmarks.Query`
`7`	`7`	`{`
`8`		`- public class FuncletizationSqlServerTests : FuncletizationTests`
	`8`	`+ public class Funcletization : FuncletizationBase`
`9`	`9`	`{`
`10`	`10`	`protected override OrdersFixtureBase CreateFixture()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Microsoft.EntityFrameworkCore.Benchmarks.Query`
`7`	`7`	`{`
`8`		`- public class NavigationsQuerySqlServerTests : NavigationsQueryTests`
	`8`	`+ public class NavigationsQuery : NavigationsQueryBase`
`9`	`9`	`{`
`10`	`10`	`protected override AdventureWorksContextBase CreateContext()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace Microsoft.EntityFrameworkCore.Benchmarks.Query`
`8`	`8`	`{`
`9`		`- public class QueryCompilationSqlServerTests : QueryCompilationTests`
	`9`	`+ public class QueryCompilation : QueryCompilationBase`
`10`	`10`	`{`
`11`	`11`	`public override IServiceCollection AddProviderServices(IServiceCollection services)`
`12`	`12`	`{`