Skip to content

Commit 4ffac0e

Browse files
Copilotrenemadsen
andcommitted
Update integration test infrastructure from upstream PR PomeloFoundation#2019
Co-authored-by: renemadsen <76994+renemadsen@users.noreply.github.com>
1 parent da82eb8 commit 4ffac0e

3 files changed

Lines changed: 28 additions & 28 deletions

File tree

test/EFCore.MySql.IntegrationTests/Commands/TestPerformanceCommand.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,9 @@ async Task select100(AppDb db)
116116
}
117117
}
118118

119-
var tableName = _db.Model.FindEntityType(typeof(Blog)).GetTableName();
120-
_db.Database.ExecuteSql($"DELETE FROM `{tableName}`");
119+
#pragma warning disable EF1003
120+
_db.Database.ExecuteSqlRaw("DELETE FROM `" + _db.Model.FindEntityType(typeof(Blog)).GetTableName() + "`");
121+
#pragma warning restore EF1003
121122

122123
PerfTest(insert1, "Insert 1", iterations, concurrency, ops).GetAwaiter().GetResult();
123124
var insertCount = _db.Blogs.Count();

test/EFCore.MySql.IntegrationTests/Program.cs

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using System;
2+
using System.Linq;
23
using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Commands;
4+
using Microsoft.AspNetCore.Builder;
35
using Microsoft.AspNetCore.Hosting;
46
using Microsoft.Extensions.DependencyInjection;
57
using Microsoft.Extensions.Logging;
6-
using Microsoft.Extensions.Hosting;
78
using Pomelo.EntityFrameworkCore.MySql.Tests;
89

910
namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests
@@ -12,12 +13,20 @@ public class Program
1213
{
1314
public static void Main(string[] args)
1415
{
15-
if (args.Length == 0)
16+
if (args.Length == 0 ||
17+
args.Any(arg => string.Equals(arg, "--applicationName", StringComparison.OrdinalIgnoreCase)))
1618
{
17-
BuildWebHost(args).Run();
19+
BuildWebApplication(args)
20+
.Run();
1821
}
1922
else
2023
{
24+
Console.WriteLine("Args:");
25+
for (var i = 0; i < args.Length; i++)
26+
{
27+
Console.WriteLine($"{i}: {args[i]}");
28+
}
29+
2130
var serviceCollection = new ServiceCollection();
2231
serviceCollection
2332
.AddLogging(builder =>
@@ -41,16 +50,17 @@ public static void Main(string[] args)
4150
}
4251
}
4352

44-
public static IHost BuildWebHost(string[] args)
53+
private static WebApplication BuildWebApplication(string[] args)
4554
{
46-
return Host.CreateDefaultBuilder(args)
47-
.ConfigureWebHostDefaults(webBuilder =>
48-
{
49-
webBuilder.UseUrls("http://*:5000")
50-
.UseStartup<Startup>();
51-
})
52-
.Build();
53-
}
55+
var builder = WebApplication.CreateBuilder(args);
56+
builder.WebHost
57+
.UseUrls("http://*:5000");
58+
Startup.ConfigureServices(builder.Services);
59+
60+
var app = builder.Build();
61+
Startup.Configure(app, app.Environment);
5462

63+
return app;
64+
}
5565
}
5666
}

test/EFCore.MySql.IntegrationTests/Startup.cs

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,21 @@
11
using System;
2-
using System.Buffers;
32
using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models;
43
using Microsoft.AspNetCore.Builder;
54
using Microsoft.AspNetCore.Hosting;
65
using Microsoft.AspNetCore.Identity;
7-
using Microsoft.AspNetCore.Mvc.Formatters;
86
using Microsoft.EntityFrameworkCore;
9-
using Microsoft.Extensions.Configuration;
107
using Microsoft.Extensions.DependencyInjection;
118
using Microsoft.Extensions.Logging;
129
using MySqlConnector;
1310
using Newtonsoft.Json;
14-
using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
1511
using Pomelo.EntityFrameworkCore.MySql.Tests;
1612

1713
namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests
1814
{
19-
public class Startup
15+
public static class Startup
2016
{
21-
public Startup(IWebHostEnvironment env)
22-
{
23-
Configuration = AppConfig.Config;
24-
}
25-
26-
public IConfigurationRoot Configuration { get; }
27-
2817
// This method gets called by the runtime. Use this method to add services to the container.
29-
public void ConfigureServices(IServiceCollection services)
18+
public static void ConfigureServices(IServiceCollection services)
3019
{
3120
// Add framework services.
3221
services
@@ -81,7 +70,7 @@ private static string GetConnectionString()
8170
}
8271

8372
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
84-
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
73+
public static void Configure(IApplicationBuilder app, IWebHostEnvironment env)
8574
{
8675
app.UseRouting();
8776
app.UseEndpoints(endpoints =>

0 commit comments

Comments
 (0)