Skip to content

Commit fafa535

Browse files
Ja bist du narrischJa bist du narrisch
Ja bist du narrisch
authored and
Ja bist du narrisch
committed
Fixed tests
1 parent d4ae6cb commit fafa535

13 files changed

+98
-66
lines changed

‎src/Migrator.Tests/Database/DerivedDatabaseIntegrationTestServices/SqlServerDatabaseIntegrationTestService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public override async Task<DatabaseInfo> CreateTestDatabaseAsync(DatabaseConnect
2525
using var context = new DataConnection(new DataOptions().UseSqlServer(databaseConnectionConfig.ConnectionString));
2626
await context.ExecuteAsync("use master", cancellationToken);
2727

28-
var databaseNames = await context.FromSql<string>($"SELECT name FROM sys.databases WHERE name NOT IN ('master', 'model', 'msdb', 'tempdb')").ToListAsync(cancellationToken);
28+
var databaseNames = context.Query<string>($"SELECT name FROM sys.databases WHERE name NOT IN ('master', 'model', 'msdb', 'tempdb')").ToList();
2929

3030
var toBeDeletedDatabaseNames = databaseNames.Where(x =>
3131
{

‎src/Migrator.Tests/Migrator.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.6" />
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
2222
<PackageReference Include="linq2db" Version="6.0.0-rc.2" />
23-
<PackageReference Include="linq2db.Oracle.Managed" Version="6.0.0-preview.1" />
23+
<PackageReference Include="linq2db.Oracle" Version="6.0.0-rc.2" />
2424
<PackageReference Include="DryIoc.dll" Version="5.4.3" />
2525
<PackageReference Include="Mapster" Version="7.4.0" />
2626
<PackageReference Include="Npgsql" Version="9.0.3" />

‎src/Migrator.Tests/ProviderFactoryTest.cs‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Migrator.Providers;
66
using Migrator.Tests.Settings;
77
using Migrator.Tests.Settings.Config;
8-
using Npgsql;
8+
using Npgsql;
99
using NUnit.Framework;
1010

1111
namespace Migrator.Tests;
@@ -25,77 +25,77 @@ public void CanGetDialectsForProvider()
2525
}
2626

2727
[SetUp]
28-
public void SetUp()
29-
{
30-
DbProviderFactories.RegisterFactory("Npgsql", () => NpgsqlFactory.Instance);
31-
DbProviderFactories.RegisterFactory("MySql.Data.MySqlClient", () => MySql.Data.MySqlClient.MySqlClientFactory.Instance);
32-
DbProviderFactories.RegisterFactory("Oracle.DataAccess.Client", () => Oracle.ManagedDataAccess.Client.OracleClientFactory.Instance);
28+
public void SetUp()
29+
{
30+
DbProviderFactories.RegisterFactory("Npgsql", () => NpgsqlFactory.Instance);
31+
DbProviderFactories.RegisterFactory("MySql.Data.MySqlClient", () => MySql.Data.MySqlClient.MySqlClientFactory.Instance);
32+
DbProviderFactories.RegisterFactory("Oracle.DataAccess.Client", () => Oracle.ManagedDataAccess.Client.OracleClientFactory.Instance);
3333
DbProviderFactories.RegisterFactory("System.Data.SqlClient", () => Microsoft.Data.SqlClient.SqlClientFactory.Instance);
34-
DbProviderFactories.RegisterFactory("System.Data.SQLite", () => System.Data.SQLite.SQLiteFactory.Instance);
34+
DbProviderFactories.RegisterFactory("System.Data.SQLite", () => System.Data.SQLite.SQLiteFactory.Instance);
3535
}
3636

3737
[Test]
3838
[Category("MySql")]
3939
public void CanLoad_MySqlProvider()
40-
{
40+
{
4141
var configReader = new ConfigurationReader();
42-
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.MySQL)?.ConnectionString;
43-
if (!String.IsNullOrEmpty(connectionString))
44-
{
45-
using var provider = ProviderFactory.Create(ProviderTypes.Mysql, connectionString, null);
46-
Assert.That(provider, Is.Not.Null);
42+
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.MySQLId)?.ConnectionString;
43+
if (!String.IsNullOrEmpty(connectionString))
44+
{
45+
using var provider = ProviderFactory.Create(ProviderTypes.Mysql, connectionString, null);
46+
Assert.That(provider, Is.Not.Null);
4747
}
4848
}
4949

5050
[Test]
5151
[Category("Oracle")]
5252
public void CanLoad_OracleProvider()
53-
{
53+
{
5454
var configReader = new ConfigurationReader();
55-
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.Oracle)?.ConnectionString;
56-
if (!String.IsNullOrEmpty(connectionString))
57-
{
58-
using var provider = ProviderFactory.Create(ProviderTypes.Oracle, connectionString, null);
59-
Assert.That(provider, Is.Not.Null);
55+
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.OracleId)?.ConnectionString;
56+
if (!String.IsNullOrEmpty(connectionString))
57+
{
58+
using var provider = ProviderFactory.Create(ProviderTypes.Oracle, connectionString, null);
59+
Assert.That(provider, Is.Not.Null);
6060
}
6161
}
6262

6363
[Test]
6464
[Category("Postgre")]
6565
public void CanLoad_PostgreSQLProvider()
66-
{
66+
{
6767
var configReader = new ConfigurationReader();
6868
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.PostgreSQL)?.ConnectionString;
69-
if (!String.IsNullOrEmpty(connectionString))
70-
{
71-
using var provider = ProviderFactory.Create(ProviderTypes.PostgreSQL, connectionString, null);
72-
Assert.That(provider, Is.Not.Null);
69+
if (!String.IsNullOrEmpty(connectionString))
70+
{
71+
using var provider = ProviderFactory.Create(ProviderTypes.PostgreSQL, connectionString, null);
72+
Assert.That(provider, Is.Not.Null);
7373
}
7474
}
7575

7676
[Test]
7777
[Category("SQLite")]
7878
public void CanLoad_SQLiteProvider()
79-
{
79+
{
8080
var configReader = new ConfigurationReader();
81-
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLiteConnectionConfigId)?.ConnectionString;
82-
if (!String.IsNullOrEmpty(connectionString))
83-
{
84-
using var provider = ProviderFactory.Create(ProviderTypes.SQLite, connectionString, null);
85-
Assert.That(provider, Is.Not.Null);
81+
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLiteId)?.ConnectionString;
82+
if (!String.IsNullOrEmpty(connectionString))
83+
{
84+
using var provider = ProviderFactory.Create(ProviderTypes.SQLite, connectionString, null);
85+
Assert.That(provider, Is.Not.Null);
8686
}
8787
}
8888

8989
[Test]
9090
[Category("SqlServer")]
9191
public void CanLoad_SqlServerProvider()
92-
{
92+
{
9393
var configReader = new ConfigurationReader();
94-
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLServerConnectionConfigId)?.ConnectionString;
95-
if (!String.IsNullOrEmpty(connectionString))
96-
{
97-
using var provider = ProviderFactory.Create(ProviderTypes.SqlServer, connectionString, null);
98-
Assert.That(provider, Is.Not.Null);
94+
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLServerId)?.ConnectionString;
95+
if (!String.IsNullOrEmpty(connectionString))
96+
{
97+
using var provider = ProviderFactory.Create(ProviderTypes.SqlServer, connectionString, null);
98+
Assert.That(provider, Is.Not.Null);
9999
}
100100
}
101101
}

‎src/Migrator.Tests/Providers/MySQL/MySqlTransformationProviderTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ public class MySqlTransformationProviderTest : TransformationProviderConstraintB
1717
public void SetUp()
1818
{
1919
var configReader = new ConfigurationReader();
20-
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.MySQL)
20+
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.MySQLId)
2121
?.ConnectionString;
2222

2323
if (string.IsNullOrEmpty(connectionString))
2424
{
2525
throw new IgnoreException("No MySQL ConnectionString is Set.");
26-
}
27-
26+
}
27+
2828
DbProviderFactories.RegisterFactory("MySql.Data.MySqlClient", () => MySql.Data.MySqlClient.MySqlClientFactory.Instance);
2929

3030
Provider = new MySqlTransformationProvider(new MysqlDialect(), connectionString, "default", null);

‎src/Migrator.Tests/Providers/OracleProvider/OracleTransformationProviderTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public async Task SetUpAsync()
2626
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
2727
var configReader = new ConfigurationReader();
2828

29-
var databaseConnectionConfig = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.Oracle);
29+
var databaseConnectionConfig = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.OracleId);
3030

3131
var connectionString = databaseConnectionConfig?.ConnectionString;
3232

‎src/Migrator.Tests/Providers/SQLServer/Base/SQLServerTransformationProviderTestBase.cs‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
using System.Data.SqlClient;
1+
using System.Threading;
2+
using System.Threading.Tasks;
3+
using DryIoc;
24
using Migrator.Providers;
35
using Migrator.Providers.SqlServer;
6+
using Migrator.Tests.Database;
7+
using Migrator.Tests.Database.Interfaces;
48
using Migrator.Tests.Providers.Base;
59
using Migrator.Tests.Settings;
610
using Migrator.Tests.Settings.Config;
11+
using Migrator.Tests.Settings.Models;
712
using NUnit.Framework;
813

914
namespace Migrator.Tests.Providers.SQLServer.Base;
@@ -13,21 +18,28 @@ namespace Migrator.Tests.Providers.SQLServer.Base;
1318
public abstract class SQLServerTransformationProviderTestBase : TransformationProviderSimpleBase
1419
{
1520
[SetUp]
16-
public void SetUp()
21+
public async Task SetUpAsync()
1722
{
1823
var configReader = new ConfigurationReader();
19-
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLServerConnectionConfigId)
20-
?.ConnectionString;
21-
24+
25+
var databaseConnectionConfig = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLServerId);
26+
27+
var connectionString = databaseConnectionConfig?.ConnectionString;
28+
2229
if (string.IsNullOrEmpty(connectionString))
2330
{
24-
throw new IgnoreException("No SqlServer ConnectionString is Set.");
31+
throw new IgnoreException($"No SQL Server {nameof(DatabaseConnectionConfig.ConnectionString)} is set.");
2532
}
2633

2734
DbProviderFactories.RegisterFactory("Microsoft.Data.SqlClient", () => Microsoft.Data.SqlClient.SqlClientFactory.Instance);
2835

29-
Provider = new SqlServerTransformationProvider(new SqlServerDialect(), connectionString, "dbo", "default", "Microsoft.Data.SqlClient");
30-
Provider.BeginTransaction();
36+
using var container = new Container();
37+
container.RegisterDatabaseIntegrationTestService();
38+
var databaseIntegrationTestServiceFactory = container.Resolve<IDatabaseIntegrationTestServiceFactory>();
39+
var sqlServerIntegrationTestService = databaseIntegrationTestServiceFactory.Create(DatabaseProviderType.SQLServer);
40+
var databaseInfo = await sqlServerIntegrationTestService.CreateTestDatabaseAsync(databaseConnectionConfig, CancellationToken.None);
41+
42+
Provider = new SqlServerTransformationProvider(new SqlServerDialect(), databaseInfo.DatabaseConnectionConfig.ConnectionString, "dbo", "default", "Microsoft.Data.SqlClient");
3143

3244
AddDefaultTable();
3345
}

‎src/Migrator.Tests/Providers/SQLServer/SqlServerTransformationProviderGenericTests.cs‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1+
using System;
12
using System.Data;
3+
using System.Threading;
4+
using System.Threading.Tasks;
5+
using DryIoc;
26
using Migrator.Providers;
37
using Migrator.Providers.SqlServer;
8+
using Migrator.Tests.Database;
9+
using Migrator.Tests.Database.Interfaces;
410
using Migrator.Tests.Settings;
511
using Migrator.Tests.Settings.Config;
12+
using Migrator.Tests.Settings.Models;
613
using NUnit.Framework;
714

815
namespace Migrator.Tests.Providers.SQLServer;
@@ -12,20 +19,28 @@ namespace Migrator.Tests.Providers.SQLServer;
1219
public class SqlServerTransformationProviderGenericTests : TransformationProviderConstraintBase
1320
{
1421
[SetUp]
15-
public void SetUp()
22+
public async Task SetUpAsync()
1623
{
1724
var configReader = new ConfigurationReader();
18-
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLServerConnectionConfigId)
19-
?.ConnectionString;
20-
25+
26+
var databaseConnectionConfig = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLServerId);
27+
28+
var connectionString = databaseConnectionConfig?.ConnectionString;
29+
2130
if (string.IsNullOrEmpty(connectionString))
2231
{
23-
throw new IgnoreException("No SqlServer ConnectionString is Set.");
32+
throw new IgnoreException($"No SQL Server {nameof(DatabaseConnectionConfig.ConnectionString)} is set.");
2433
}
2534

2635
DbProviderFactories.RegisterFactory("Microsoft.Data.SqlClient", () => Microsoft.Data.SqlClient.SqlClientFactory.Instance);
2736

28-
Provider = new SqlServerTransformationProvider(new SqlServerDialect(), connectionString, "dbo", "default", "Microsoft.Data.SqlClient");
37+
using var container = new Container();
38+
container.RegisterDatabaseIntegrationTestService();
39+
var databaseIntegrationTestServiceFactory = container.Resolve<IDatabaseIntegrationTestServiceFactory>();
40+
var sqlServerIntegrationTestService = databaseIntegrationTestServiceFactory.Create(DatabaseProviderType.SQLServer);
41+
var databaseInfo = await sqlServerIntegrationTestService.CreateTestDatabaseAsync(databaseConnectionConfig, CancellationToken.None);
42+
43+
Provider = new SqlServerTransformationProvider(new SqlServerDialect(), databaseInfo.DatabaseConnectionConfig.ConnectionString, "dbo", "default", "Microsoft.Data.SqlClient");
2944
Provider.BeginTransaction();
3045

3146
AddDefaultTable();

‎src/Migrator.Tests/Providers/SQLServer/SqlServerTransformationProviderTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Data;
2+
using System.Threading.Tasks;
23
using Migrator.Providers;
34
using Migrator.Providers.SqlServer;
45
using Migrator.Tests.Providers.SQLServer.Base;

‎src/Migrator.Tests/Providers/SQLite/Base/SQLiteTransformationProviderTestBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public abstract class SQLiteTransformationProviderTestBase : TransformationProvi
1515
public void SetUp()
1616
{
1717
var configReader = new ConfigurationReader();
18-
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLiteConnectionConfigId)
18+
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLiteId)
1919
.ConnectionString;
2020

2121
Provider = new SQLiteTransformationProvider(new SQLiteDialect(), connectionString, "default", null);

‎src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProviderGenericTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class SQLiteTransformationProviderGenericTests : TransformationProviderBa
1414
public void SetUp()
1515
{
1616
var configReader = new ConfigurationReader();
17-
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLiteConnectionConfigId)
17+
var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLiteId)
1818
.ConnectionString;
1919

2020
Provider = new SQLiteTransformationProvider(new SQLiteDialect(), connectionString, "default", null);

0 commit comments

Comments
 (0)