From fedec6f6a2a1ef8165a0ad2e2ce0fb88663fb514 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sat, 2 Jan 2021 03:12:43 +0000 Subject: [PATCH] regres => yes --- src/test/Mandatory/BatchTests.cs | 2 +- src/test/Mandatory/Database.cs | 8 +++----- src/test/Mandatory/Remoting.cs | 6 ++++-- src/test/Mandatory/ServerSideFixture.cs | 12 +++--------- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/test/Mandatory/BatchTests.cs b/src/test/Mandatory/BatchTests.cs index 165d9eb9..b83f4185 100644 --- a/src/test/Mandatory/BatchTests.cs +++ b/src/test/Mandatory/BatchTests.cs @@ -28,7 +28,7 @@ namespace test [Collection("Yavsc mandatory success story")] - [Trait("regres", "no")] + [Trait("regres", "yes")] public class BatchTests: BaseTestContext, IClassFixture, IDisposable { ServerSideFixture _fixture; diff --git a/src/test/Mandatory/Database.cs b/src/test/Mandatory/Database.cs index b7a90224..8510f5c6 100644 --- a/src/test/Mandatory/Database.cs +++ b/src/test/Mandatory/Database.cs @@ -5,7 +5,7 @@ using Xunit.Abstractions; namespace test.Mandatory { [Collection("Database")] - [Trait("regres", "no")] + [Trait("regres", "yes")] [Trait("dev", "wip")] public class Database: IClassFixture, IDisposable { @@ -16,9 +16,8 @@ namespace test.Mandatory this.output = output; _serverFixture = serverFixture; try { - - = new Microsoft.Data.Entity.Infrastructure.DatabaseFacade(_serverFixture.DbContext.Database); - + if (_serverFixture.DbCreated) + _serverFixture.DropTestDb(); } @@ -36,7 +35,6 @@ namespace test.Mandatory [Fact] public void InstallFromScratchUsingPoweredNpgsqlUser() { - _serverFixture.EnsureTestDb(); _serverFixture.UpgradeDb(); } diff --git a/src/test/Mandatory/Remoting.cs b/src/test/Mandatory/Remoting.cs index 889a4385..0f181c7c 100644 --- a/src/test/Mandatory/Remoting.cs +++ b/src/test/Mandatory/Remoting.cs @@ -19,7 +19,7 @@ using static OAuth.AspNet.AuthServer.Constants; namespace test { [Collection("Yavsc Work In Progress")] - [Trait("regres", "no")] + [Trait("regres", "yes")] public class Remoting : BaseTestContext, IClassFixture { public Remoting(ServerSideFixture serverFixture, ITestOutputHelper output) @@ -78,6 +78,8 @@ namespace test } internal static void EnsureWeb() { + throw new NotImplementedException(); + DirectoryInfo di = new DirectoryInfo("../Yavsc"); Environment.CurrentDirectory = di.FullName; var host = new WebHostBuilder(); @@ -86,7 +88,7 @@ namespace test .UseEnvironment("Development") - .UseServer("web") + .UseServer("Microsoft.AspNet.Server.Kestrel") .UseStartup() .Build(); // hostengine.ApplicationServices diff --git a/src/test/Mandatory/ServerSideFixture.cs b/src/test/Mandatory/ServerSideFixture.cs index a081e0db..ba14967d 100644 --- a/src/test/Mandatory/ServerSideFixture.cs +++ b/src/test/Mandatory/ServerSideFixture.cs @@ -140,18 +140,10 @@ namespace test TestingDatabase = (string)builder["Database"]; + Logger.LogInformation("ServerSideFixture created."); } - [Fact] - public void InitTestHost() - { - - - - EnsureTestDb(); - - } private ModelBuilder modelBuilder; @@ -201,6 +193,8 @@ namespace test { Logger.LogInformation("Disposing"); } + + public bool DbCreated { get { return dbCreated; } } } }