From af3973af6538c9e4d2ec35ef2ebefeec6c547765 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Fri, 20 Jul 2018 02:27:53 +0200 Subject: [PATCH] fixes the tests --- test/project.json | 3 +++ test/src/EMailling.cs | 4 ++-- test/src/NotWorking.cs | 2 +- test/src/Program.cs | 1 + test/src/ServerSideFixture.cs | 11 ++++++++--- test/src/YavscDnxUnitTests.cs | 2 +- test/src/YavscMandatory.cs | 2 +- test/src/YavscWorkInProgress.cs | 2 +- 8 files changed, 18 insertions(+), 9 deletions(-) diff --git a/test/project.json b/test/project.json index 4a6a9855..1cc8b46e 100644 --- a/test/project.json +++ b/test/project.json @@ -36,6 +36,9 @@ "Microsoft.Dnx.TestHost": "1.0.0-rc1-final", "Microsoft.Dnx.Runtime": "1.0.0-rc1-final", "xunit.runner.dnx": "2.1.0-rc1-build204", + "Yavsc.Server": { + "target": "project" + }, "Yavsc": { "target": "project" } diff --git a/test/src/EMailling.cs b/test/src/EMailling.cs index 19b4a222..9031c8c0 100644 --- a/test/src/EMailling.cs +++ b/test/src/EMailling.cs @@ -9,7 +9,7 @@ using Yavsc.Abstract.Manage; using Yavsc.Lib; using Yavsc.Services; -namespace Yavsc.test +namespace test { [Collection("EMaillingTeststCollection")] @@ -40,4 +40,4 @@ namespace Yavsc.test output.WriteLine($">>done with {mailSentInfo.EMail} {mailSentInfo.Sent} {mailSentInfo.MessageId} {mailSentInfo.ErrorMessage}"); } } -} \ No newline at end of file +} diff --git a/test/src/NotWorking.cs b/test/src/NotWorking.cs index e138d143..f08bab58 100644 --- a/test/src/NotWorking.cs +++ b/test/src/NotWorking.cs @@ -15,7 +15,7 @@ using Microsoft.AspNet.Builder.Internal; using Yavsc; using Microsoft.Extensions.Logging; -namespace Test +namespace test { [Collection("Yavsc dropped intents")] public class NotWorking : BaseTestContext diff --git a/test/src/Program.cs b/test/src/Program.cs index c250c6da..c0bd6d60 100644 --- a/test/src/Program.cs +++ b/test/src/Program.cs @@ -2,6 +2,7 @@ using Microsoft.AspNet.Hosting; using Microsoft.Extensions.Logging; using Yavsc.Lib; using Yavsc.Services; +using Yavsc; namespace test { diff --git a/test/src/ServerSideFixture.cs b/test/src/ServerSideFixture.cs index 49a6a72a..bf6d7d39 100644 --- a/test/src/ServerSideFixture.cs +++ b/test/src/ServerSideFixture.cs @@ -5,8 +5,9 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.OptionsModel; using Yavsc.Lib; using Yavsc.Services; +using Yavsc; -namespace Yavsc.test +namespace test { public class ServerSideFixture : IDisposable { public SiteSettings _siteSetup; @@ -22,6 +23,8 @@ namespace Yavsc.test _logger = _loggerFactory.CreateLogger (); _logger.LogInformation("ServerSideFixture"); } + + void InitServices() { var host = new WebHostBuilder(); @@ -29,7 +32,7 @@ namespace Yavsc.test var hostengnine = host .UseEnvironment("Development") .UseServer("test") - .UseStartup() + .UseStartup() .Build(); _app = hostengnine.Start(); @@ -45,4 +48,6 @@ namespace Yavsc.test _logger.LogInformation("Disposing"); } } -} \ No newline at end of file +} + + diff --git a/test/src/YavscDnxUnitTests.cs b/test/src/YavscDnxUnitTests.cs index b35cc731..dcb70100 100755 --- a/test/src/YavscDnxUnitTests.cs +++ b/test/src/YavscDnxUnitTests.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using System.Diagnostics; using Yavsc.Helpers; -namespace tests +namespace test { public class YavscDnxUnitTests { diff --git a/test/src/YavscMandatory.cs b/test/src/YavscMandatory.cs index a4b895c3..d141f4b5 100755 --- a/test/src/YavscMandatory.cs +++ b/test/src/YavscMandatory.cs @@ -21,7 +21,7 @@ using Microsoft.Data.Entity; using Xunit.Abstractions; using System.IO; -namespace Test +namespace test { public class BaseTestContext { protected IApplicationEnvironment applicationEnvironment = null; diff --git a/test/src/YavscWorkInProgress.cs b/test/src/YavscWorkInProgress.cs index 7f6f117e..f137fed1 100644 --- a/test/src/YavscWorkInProgress.cs +++ b/test/src/YavscWorkInProgress.cs @@ -18,7 +18,7 @@ using Yavsc; using Yavsc.Lib; using Yavsc.Models; -namespace Test +namespace test { [Collection("Yavsc Work In Progress")] public class YavscWorkInProgress : BaseTestContext