Skip to content

Commit e19ce06

Browse files
author
fabien.menager
committed
Refactor test classes and rename for improved clarity and organization
1 parent 1cba602 commit e19ce06

29 files changed

Lines changed: 166 additions & 143 deletions

tests/EntityFrameworkCore.ExecuteInsert.Benchmark/BulkInsertVsExecuteInsert.cs renamed to tests/EntityFrameworkCore.ExecuteInsert.Benchmark/LibComparator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace EntityFrameworkCore.ExecuteInsert.Benchmark;
1010

11-
public abstract class BulkInsertVsExecuteInsert
11+
public abstract class LibComparator
1212
{
1313
[Params(100_000/*, 1_000_000/*, 10_000_000*/)]
1414
public int N;
@@ -29,7 +29,7 @@ public void GlobalSetup()
2929
}).ToList();
3030
}
3131

32-
public BulkInsertVsExecuteInsert()
32+
public LibComparator()
3333
{
3434
DbContainer = GetDbContainer();
3535
DbContainer?.StartAsync().GetAwaiter().GetResult();

tests/EntityFrameworkCore.ExecuteInsert.Benchmark/BulkInsertVsExecuteInsertPostgreSql.cs renamed to tests/EntityFrameworkCore.ExecuteInsert.Benchmark/LibComparatorPostgreSql.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace EntityFrameworkCore.ExecuteInsert.Benchmark;
1414
[MinColumn, MaxColumn, BaselineColumn]
1515
[MemoryDiagnoser]
1616
[SimpleJob(RunStrategy.Throughput, launchCount: 1, warmupCount: 0, iterationCount: 5)]
17-
public class BulkInsertVsExecuteInsertPostgreSql : BulkInsertVsExecuteInsert
17+
public class LibComparatorPostgreSql : LibComparator
1818
{
1919
protected override void ConfigureDbContext()
2020
{

tests/EntityFrameworkCore.ExecuteInsert.Benchmark/BulkInsertVsExecuteInsertSqlServer.cs renamed to tests/EntityFrameworkCore.ExecuteInsert.Benchmark/LibComparatorSqlServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace EntityFrameworkCore.ExecuteInsert.Benchmark;
1414
[MinColumn, MaxColumn, BaselineColumn]
1515
[MemoryDiagnoser]
1616
[SimpleJob(RunStrategy.Throughput, launchCount: 1, warmupCount: 0, iterationCount: 5)]
17-
public class BulkInsertVsExecuteInsertSqlServer : BulkInsertVsExecuteInsert
17+
public class LibComparatorSqlServer : LibComparator
1818
{
1919
protected override void ConfigureDbContext()
2020
{

tests/EntityFrameworkCore.ExecuteInsert.Benchmark/BulkInsertVsExecuteInsertSqlite.cs renamed to tests/EntityFrameworkCore.ExecuteInsert.Benchmark/LibComparatorSqlite.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace EntityFrameworkCore.ExecuteInsert.Benchmark;
1212
[MinColumn, MaxColumn, BaselineColumn]
1313
[MemoryDiagnoser]
1414
[SimpleJob(RunStrategy.Throughput, launchCount: 1, warmupCount: 0, iterationCount: 5)]
15-
public class BulkInsertVsExecuteInsertSqlite : BulkInsertVsExecuteInsert
15+
public class LibComparatorSqlite : LibComparator
1616
{
1717
protected override void ConfigureDbContext()
1818
{

‎tests/EntityFrameworkCore.ExecuteInsert.Benchmark/Program.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ public class Program
66
{
77
public static void Main(string[] args)
88
{
9-
BenchmarkRunner.Run<BulkInsertVsExecuteInsertPostgreSql>();
10-
BenchmarkRunner.Run<BulkInsertVsExecuteInsertSqlServer>();
11-
BenchmarkRunner.Run<BulkInsertVsExecuteInsertSqlite>();
9+
BenchmarkRunner.Run<LibComparatorPostgreSql>();
10+
BenchmarkRunner.Run<LibComparatorSqlServer>();
11+
BenchmarkRunner.Run<LibComparatorSqlite>();
1212
}
1313
}

tests/EntityFrameworkCore.ExecuteInsert.Tests/DbContainer/BulkInsertProviderDbContainer.cs renamed to tests/EntityFrameworkCore.ExecuteInsert.Tests/DbContainer/TestDbContainer.cs

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,23 @@
1-
using System;
2-
using System.ComponentModel.DataAnnotations.Schema;
3-
using System.Threading.Tasks;
1+
using System.Threading.Tasks;
42

53
using DotNet.Testcontainers.Containers;
64

5+
using EntityFrameworkCore.ExecuteInsert.Tests.DbContext;
6+
77
using Microsoft.EntityFrameworkCore;
88

99
using Xunit;
1010

1111
namespace EntityFrameworkCore.ExecuteInsert.Tests.DbContainer;
1212

13-
14-
[PrimaryKey(nameof(Id))]
15-
[Index(nameof(Name), IsUnique = true)]
16-
public class TestEntity
17-
{
18-
public int Id { get; set; }
19-
public string Name { get; set; } = string.Empty;
20-
public decimal Price { get; set; }
21-
public Guid Identifier { get; set; }
22-
23-
[Column(nameof(StringEnumValue), TypeName = "text")]
24-
public StringEnum StringEnumValue { get; set; }
25-
26-
public NumericEnum NumericEnumValue { get; set; }
27-
}
28-
29-
public enum NumericEnum
30-
{
31-
First = 1,
32-
Second = 2,
33-
}
34-
35-
public enum StringEnum
36-
{
37-
First,
38-
Second,
39-
}
40-
41-
public class TestDbContext : BulkDbContext
42-
{
43-
public DbSet<TestEntity> TestEntities { get; set; } = null!;
44-
}
45-
46-
public abstract class BulkInsertProviderDbContainer<TDbContext> : IAsyncLifetime
47-
where TDbContext : BulkDbContext, new()
13+
public abstract class TestDbContainer<TDbContext> : IAsyncLifetime
14+
where TDbContext : TestDbContextBase, new()
4815
{
4916
protected readonly IDatabaseContainer? DbContainer;
5017

5118
public TDbContext DbContext { get; private set; } = null!;
5219

53-
protected BulkInsertProviderDbContainer()
20+
protected TestDbContainer()
5421
{
5522
DbContainer = GetDbContainer();
5623
}

tests/EntityFrameworkCore.ExecuteInsert.Tests/DbContainer/BulkInsertProviderDbContainerPostgreSql.cs renamed to tests/EntityFrameworkCore.ExecuteInsert.Tests/DbContainer/TestDbContainerPostgreSql.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
using DotNet.Testcontainers.Containers;
22

33
using EntityFrameworkCore.ExecuteInsert.PostgreSql;
4+
using EntityFrameworkCore.ExecuteInsert.Tests.DbContext;
45

56
using Microsoft.EntityFrameworkCore;
67

78
using Testcontainers.PostgreSql;
89

910
namespace EntityFrameworkCore.ExecuteInsert.Tests.DbContainer;
1011

11-
public class BulkInsertProviderDbContainerPostgreSql<TDbContext> : BulkInsertProviderDbContainer<TDbContext>
12-
where TDbContext : BulkDbContext, new()
12+
public class TestDbContainerPostgreSql<TDbContext> : TestDbContainer<TDbContext>
13+
where TDbContext : TestDbContextBase, new()
1314
{
1415
protected override IDatabaseContainer? GetDbContainer()
1516
{

tests/EntityFrameworkCore.ExecuteInsert.Tests/DbContainer/BulkInsertProviderDbContainerSqlServer.cs renamed to tests/EntityFrameworkCore.ExecuteInsert.Tests/DbContainer/TestDbContainerSqlServer.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
using DotNet.Testcontainers.Containers;
22

33
using EntityFrameworkCore.ExecuteInsert.SqlServer;
4+
using EntityFrameworkCore.ExecuteInsert.Tests.DbContext;
45

56
using Microsoft.EntityFrameworkCore;
67

78
using Testcontainers.MsSql;
89

910
namespace EntityFrameworkCore.ExecuteInsert.Tests.DbContainer;
1011

11-
public class BulkInsertProviderDbContainerSqlServer<TDbContext> : BulkInsertProviderDbContainer<TDbContext>
12-
where TDbContext : BulkDbContext, new()
12+
public class TestDbContainerSqlServer<TDbContext> : TestDbContainer<TDbContext>
13+
where TDbContext : TestDbContextBase, new()
1314
{
1415
protected override IDatabaseContainer? GetDbContainer()
1516
{

tests/EntityFrameworkCore.ExecuteInsert.Tests/DbContainer/BulkInsertProviderDbContainerSqlite.cs renamed to tests/EntityFrameworkCore.ExecuteInsert.Tests/DbContainer/TestDbContainerSqlite.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
using DotNet.Testcontainers.Containers;
44

55
using EntityFrameworkCore.ExecuteInsert.Sqlite;
6+
using EntityFrameworkCore.ExecuteInsert.Tests.DbContext;
67

78
using Microsoft.EntityFrameworkCore;
89

910
namespace EntityFrameworkCore.ExecuteInsert.Tests.DbContainer;
1011

11-
public class BulkInsertProviderDbContainerSqlite<TDbContext> : BulkInsertProviderDbContainer<TDbContext>
12-
where TDbContext : BulkDbContext, new()
12+
public class TestDbContainerSqlite<TDbContext> : TestDbContainer<TDbContext>
13+
where TDbContext : TestDbContextBase, new()
1314
{
1415
protected override IDatabaseContainer? GetDbContainer() => null;
1516

‎tests/EntityFrameworkCore.ExecuteInsert.Tests/DbContext/NumericEnum.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace EntityFrameworkCore.ExecuteInsert.Tests.DbContext;
2+
3+
public enum NumericEnum
4+
{
5+
First = 1,
6+
Second = 2,
7+
}

0 commit comments

Comments
 (0)