Skip to content

Commit 08323c3

Browse files
committed
Replace Pomelo with MySql.Data in tests
1 parent aa2d5e8 commit 08323c3

File tree

6 files changed

+40
-36
lines changed

6 files changed

+40
-36
lines changed

EntityFramework.Exceptions/Tests/DatabaseTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ protected DatabaseTests(DemoContext demoContext, SameNameIndexesContext sameName
2222
DemoContext = demoContext;
2323
SameNameIndexesContext = sameNameIndexesContext;
2424

25-
isMySql = MySqlDatabaseFacadeExtensions.IsMySql(DemoContext.Database) || MySQLDatabaseFacadeExtensions.IsMySql(DemoContext.Database);
25+
isMySql = MySQLDatabaseFacadeExtensions.IsMySql(DemoContext.Database);
2626
isSqlite = demoContext.Database.IsSqlite();
2727
}
2828

EntityFramework.Exceptions/Tests/DemoContextFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public async Task InitializeAsync()
3737
var sameNameIndexesOptionsBuilder = BuildSameNameIndexesContextOptions(new DbContextOptionsBuilder<SameNameIndexesContext>(), connectionString);
3838
SameNameIndexesContext = new SameNameIndexesContext(sameNameIndexesOptionsBuilder.Options);
3939

40-
var isMySql = MySqlDatabaseFacadeExtensions.IsMySql(SameNameIndexesContext.Database) || MySQLDatabaseFacadeExtensions.IsMySql(SameNameIndexesContext.Database);
40+
var isMySql = MySQLDatabaseFacadeExtensions.IsMySql(SameNameIndexesContext.Database);
4141
var isSqlite = SameNameIndexesContext.Database.IsSqlite();
4242
var isOracle = SameNameIndexesContext.Database.IsOracle();
4343

EntityFramework.Exceptions/Tests/MySqlServerPomeloTests.cs

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
using EntityFramework.Exceptions.MySQL;
2+
using Microsoft.EntityFrameworkCore;
3+
using Testcontainers.MySql;
4+
using Xunit;
5+
6+
namespace EntityFramework.Exceptions.Tests;
7+
8+
[Collection("MySql Test Collection")]
9+
public class MySqlServerTests : DatabaseTests, IClassFixture<MySqlDemoContextFixture>
10+
{
11+
public MySqlServerTests(MySqlDemoContextFixture fixture) : base(fixture.DemoContext)
12+
{
13+
14+
}
15+
}
16+
17+
public class MySqlDemoContextFixture : DemoContextFixture<MySqlContainer>
18+
{
19+
static MySqlDemoContextFixture()
20+
{
21+
Container = new MySqlBuilder().Build();
22+
}
23+
24+
protected override DbContextOptionsBuilder<DemoContext> BuildDemoContextOptions(DbContextOptionsBuilder<DemoContext> builder, string connectionString)
25+
=> builder.UseMySQL(connectionString).UseExceptionProcessor();
26+
27+
protected override DbContextOptionsBuilder BuildSameNameIndexesContextOptions(
28+
DbContextOptionsBuilder builder, string connectionString)
29+
=> builder.UseMySQL(connectionString).UseExceptionProcessor();
30+
31+
}

EntityFramework.Exceptions/Tests/SqlServerTests.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ public override Task NumericOverflowViolationThrowsNumericOverflowException()
3131
{
3232
return Task.CompletedTask;
3333
}
34+
35+
[Fact(Skip = "Skipping as Microsoft.Data.SqlClient throws ArgumentException when numeric value is not in range.")]
36+
public override Task NumericOverflowViolationThrowsNumericOverflowExceptionThroughExecuteUpdate()
37+
{
38+
return Task.CompletedTask;
39+
}
3440
}
3541

3642
public class SqlServerDemoContextFixture : DemoContextFixture<MsSqlContainer>

EntityFramework.Exceptions/Tests/Tests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,11 @@
3636
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
3737
<PackageReference Include="MySql.EntityFrameworkCore" Version="10.0.1" />
3838
<PackageReference Include="Oracle.EntityFrameworkCore" Version="10.23.26100" />
39-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
4039
</ItemGroup>
4140

4241
<ItemGroup>
4342
<ProjectReference Include="..\Common\Common.csproj" />
44-
<ProjectReference Include="..\MySQL.Pomelo\MySQL.Pomelo.csproj" />
43+
<ProjectReference Include="..\MySQL\MySQL.csproj" />
4544
<ProjectReference Include="..\Oracle\Oracle.csproj" />
4645
<ProjectReference Include="..\PostgreSQL\PostgreSQL.csproj" />
4746
<ProjectReference Include="..\Sqlite\Sqlite.csproj" />

0 commit comments

Comments
 (0)