From c354afebc80daffb6659a4d8e2c88f13bcce6fa7 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Tue, 14 Feb 2017 16:42:29 -0800 Subject: [PATCH] Bump test projects up to .NET 4.5.2 - aspnet/Testing#248 - xUnit no longer supports .NET 4.5.1 - build tests for desktop .NET only on Windows Address existing issues - work around test failures, including #350 - skip tests mentioned in #350 - reorder xunit and xunit.runner.visualstudio; setup fails for .NET Core otherwise - skip all tests using LocalDB on Linux and OSX - `[FrameworkSkipCondition(RuntimeFrameworks.Mono)]` now redundant - correct AppVeyor image nits: - let VS add the test `` - use `[ConditionalFact]` when there's no test data --- appveyor.yml | 4 +- .../DatabaseErrorPageMiddlewareTest.cs | 45 +++++++++++-------- ...EntityFrameworkCore.FunctionalTests.csproj | 9 +++- .../MigrationsEndPointMiddlewareTest.cs | 15 ++++--- .../DataStoreErrorLoggerTest.cs | 2 +- ...agnostics.EntityFrameworkCore.Tests.csproj | 9 +++- ...NetCore.Diagnostics.FunctionalTests.csproj | 9 +++- .../ElmLoggerTest.cs | 2 +- ...rosoft.AspNetCore.Diagnostics.Tests.csproj | 9 +++- ...AspNetCore.MiddlewareAnalysis.Tests.csproj | 9 +++- 10 files changed, 75 insertions(+), 38 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 741873cbe5..13c0650228 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,8 +7,8 @@ branches: - dev - /^(.*\/)?ci-.*$/ build_script: - - build.cmd verify + - build.cmd --quiet verify clone_depth: 1 test: off deploy: off -os: Visual Studio 2015 +os: Visual Studio 2017 RC diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs index 7171938c23..53560bdc1b 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs @@ -77,8 +77,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests } } - [ConditionalTheory] - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + [ConditionalFact(Skip = "aspnet/Diagnostics#350")] + [OSSkipCondition(OperatingSystems.Linux)] + [OSSkipCondition(OperatingSystems.MacOSX)] public async Task Existing_database_not_using_migrations_exception_passes_thru() { TestServer server = SetupTestServer(); @@ -105,8 +106,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests } } - [ConditionalTheory] - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + [ConditionalFact(Skip = "aspnet/Diagnostics#350")] + [OSSkipCondition(OperatingSystems.Linux)] + [OSSkipCondition(OperatingSystems.MacOSX)] public async Task Error_page_displayed_no_migrations() { TestServer server = SetupTestServer(); @@ -133,8 +135,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests } } - [ConditionalTheory] - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + [ConditionalFact(Skip = "aspnet/Diagnostics#350")] + [OSSkipCondition(OperatingSystems.Linux)] + [OSSkipCondition(OperatingSystems.MacOSX)] public async Task Error_page_displayed_pending_migrations() { TestServer server = SetupTestServer(); @@ -165,8 +168,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests } } - [ConditionalTheory] - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + [ConditionalFact(Skip = "aspnet/Diagnostics#350")] + [OSSkipCondition(OperatingSystems.Linux)] + [OSSkipCondition(OperatingSystems.MacOSX)] public async Task Error_page_displayed_pending_model_changes() { TestServer server = SetupTestServer(); @@ -196,8 +200,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests } } - [ConditionalTheory] - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + [ConditionalFact(Skip = "aspnet/Diagnostics#350")] + [OSSkipCondition(OperatingSystems.Linux)] + [OSSkipCondition(OperatingSystems.MacOSX)] public async Task Error_page_then_apply_migrations() { TestServer server = SetupTestServer(); @@ -247,8 +252,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests } } - [ConditionalTheory] - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + [ConditionalFact(Skip = "aspnet/Diagnostics#350")] + [OSSkipCondition(OperatingSystems.Linux)] + [OSSkipCondition(OperatingSystems.MacOSX)] public async Task Customize_migrations_end_point() { var migrationsEndpoint = "/MyCustomEndPoints/ApplyMyMigrationsHere"; @@ -285,8 +291,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests } } - [ConditionalTheory] - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + [ConditionalFact(Skip = "aspnet/Diagnostics#350")] + [OSSkipCondition(OperatingSystems.Linux)] + [OSSkipCondition(OperatingSystems.MacOSX)] public async Task Pass_thru_when_context_not_in_services() { using (var database = SqlServerTestStore.CreateScratch()) @@ -340,8 +347,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests } } - [ConditionalTheory] - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + [ConditionalFact(Skip = "aspnet/Diagnostics#350")] + [OSSkipCondition(OperatingSystems.Linux)] + [OSSkipCondition(OperatingSystems.MacOSX)] public async Task Pass_thru_when_exception_in_logic() { using (var database = SqlServerTestStore.CreateScratch()) @@ -372,8 +380,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests } } - [ConditionalTheory] - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + [ConditionalFact(Skip = "aspnet/Diagnostics#350")] + [OSSkipCondition(OperatingSystems.Linux)] + [OSSkipCondition(OperatingSystems.MacOSX)] public async Task Error_page_displayed_when_exception_wrapped() { TestServer server = SetupTestServer(); diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.csproj index ef476b9dcc..55b6ee5b57 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.csproj @@ -3,7 +3,8 @@ - netcoreapp1.1;net451 + netcoreapp1.1;net452 + netcoreapp1.1 @@ -11,8 +12,12 @@ - + + + + + diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs index d823e83760..8a1a493cfa 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs @@ -50,15 +50,17 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests } } - [ConditionalTheory] - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Linux)] + [OSSkipCondition(OperatingSystems.MacOSX)] public async Task Migration_request_default_path() { await Migration_request(useCustomPath: false); } - [ConditionalTheory] - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Linux)] + [OSSkipCondition(OperatingSystems.MacOSX)] public async Task Migration_request_custom_path() { await Migration_request(useCustomPath: true); @@ -187,8 +189,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests Assert.True(content.Length > 512); } - [ConditionalTheory] - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Linux)] + [OSSkipCondition(OperatingSystems.MacOSX)] public async Task Exception_while_applying_migrations() { using (var database = SqlServerTestStore.CreateScratch()) diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DataStoreErrorLoggerTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DataStoreErrorLoggerTest.cs index 0360cb23ae..e8a9e65837 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DataStoreErrorLoggerTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DataStoreErrorLoggerTest.cs @@ -4,7 +4,7 @@ using Xunit; namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { -#if NET451 +#if NET452 public class DataStoreErrorLoggerTest { private const string _name = "test"; diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj index 1e4c3b898d..f2a756fc01 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj @@ -3,7 +3,8 @@ - netcoreapp1.1;net451 + netcoreapp1.1;net452 + netcoreapp1.1 @@ -12,8 +13,12 @@ - + + + + + diff --git a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.csproj index 04c6a1fd39..e7c0bf8907 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.csproj @@ -3,7 +3,8 @@ - netcoreapp1.1;net451 + netcoreapp1.1;net452 + netcoreapp1.1 win7-x64 false false @@ -21,8 +22,12 @@ - + + + + + diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs index 2e42e09e4a..89753bdafa 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs @@ -305,7 +305,7 @@ namespace Microsoft.AspNetCore.Diagnostics.Tests Assert.Empty(store.GetActivities()); } -#if NET451 +#if NET452 private static void DomainFunc() { var t = SetUp(); diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj index ec00ab5dca..331693f356 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj @@ -3,7 +3,8 @@ - netcoreapp1.1;net451 + netcoreapp1.1;net452 + netcoreapp1.1 @@ -22,8 +23,12 @@ - + + + + + diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj index df77b5a374..805116380c 100644 --- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj +++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj @@ -3,7 +3,8 @@ - netcoreapp1.1;net451 + netcoreapp1.1;net452 + netcoreapp1.1 @@ -14,8 +15,12 @@ - + + + + +