From 2dcfadf5c233c8190bad570a52b9f74cb1046299 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 12 May 2017 12:26:38 -0700 Subject: [PATCH] Update test framework versions --- build/dependencies.props | 4 ++-- .../Implementation/OpenIdConnectLoginScenarios.cs | 3 +-- .../MusicStore.E2ETests/MusicStore.E2ETests.csproj | 5 +---- test/MusicStore.E2ETests/PublishAndRunTests.cs | 11 ++++++----- test/MusicStore.E2ETests/SmokeTests.cs | 14 ++++++++------ test/MusicStore.Test/MusicStore.Test.csproj | 4 ---- 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 95607dedc7..ea86d56d22 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -14,7 +14,7 @@ 4.3.0 $(BundledNETStandardPackageVersion) 4.0.0 - 15.0.0 - 2.2.0 + 15.3.0-* + 2.3.0-beta2-* diff --git a/test/MusicStore.E2ETests/Implementation/OpenIdConnectLoginScenarios.cs b/test/MusicStore.E2ETests/Implementation/OpenIdConnectLoginScenarios.cs index 641484b4e9..3022730ed2 100644 --- a/test/MusicStore.E2ETests/Implementation/OpenIdConnectLoginScenarios.cs +++ b/test/MusicStore.E2ETests/Implementation/OpenIdConnectLoginScenarios.cs @@ -38,7 +38,6 @@ namespace E2ETests Assert.Equal("code id_token", queryItems["response_type"]); Assert.Equal("openid profile", queryItems["scope"]); Assert.Equal("ValidStateData", queryItems["state"]); - Assert.NotNull(queryItems["nonce"]); Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNetCore.OpenIdConnect.Nonce.protectedString")); // This is just enable the auto-redirect. @@ -120,4 +119,4 @@ namespace E2ETests Assert.Contains("Log in", responseContent); } } -} \ No newline at end of file +} diff --git a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj index 7bda4710aa..94ef09e6f6 100644 --- a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj +++ b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj @@ -7,6 +7,7 @@ MusicStore.E2ETests true true + $(WarningsNotAsErrors);xUnit1004 @@ -45,8 +46,4 @@ - - - - diff --git a/test/MusicStore.E2ETests/PublishAndRunTests.cs b/test/MusicStore.E2ETests/PublishAndRunTests.cs index 2c2293d1fc..ab8940202c 100644 --- a/test/MusicStore.E2ETests/PublishAndRunTests.cs +++ b/test/MusicStore.E2ETests/PublishAndRunTests.cs @@ -55,10 +55,9 @@ namespace E2ETests } } - // TODO: temporarily disabling x86 tests as dotnet xunit test runner currently does not support 32-bit - // public - class PublishAndRunTests_OnX86 + public class PublishAndRunTests_OnX86 { + private const string SkipReason = "temporarily disabling x86 tests as dotnet xunit test runner currently does not support 32-bit"; private readonly ITestOutputHelper _output; public PublishAndRunTests_OnX86(ITestOutputHelper output) @@ -66,7 +65,8 @@ namespace E2ETests _output = output; } - [ConditionalTheory, Trait("E2Etests", "PublishAndRun")] + [ConditionalTheory(Skip = SkipReason)] + [Trait("E2Etests", "PublishAndRun")] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(ServerType.WebListener, RuntimeArchitecture.x86, ApplicationType.Portable, false)] @@ -84,7 +84,8 @@ namespace E2ETests serverType, architecture, applicationType, noSource); } - [ConditionalTheory, Trait("E2Etests", "PublishAndRun")] + [ConditionalTheory(Skip = SkipReason)] + [Trait("E2Etests", "PublishAndRun")] [OSSkipCondition(OperatingSystems.Windows)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Portable, false)] public async Task NonWindowsOS( diff --git a/test/MusicStore.E2ETests/SmokeTests.cs b/test/MusicStore.E2ETests/SmokeTests.cs index 55681ccfca..8ff5fdc102 100644 --- a/test/MusicStore.E2ETests/SmokeTests.cs +++ b/test/MusicStore.E2ETests/SmokeTests.cs @@ -9,8 +9,7 @@ using Xunit.Abstractions; namespace E2ETests { - // TODO: temporarily disabling these tests as dotnet xunit runner does not support 32-bit yet. - internal class SmokeTests_X86 + public class SmokeTests_X86 { private readonly ITestOutputHelper _output; @@ -19,7 +18,8 @@ namespace E2ETests _output = output; } - [ConditionalTheory, Trait("E2Etests", "Smoke")] + [ConditionalTheory(Skip = "temporarily disabling these tests as dotnet xunit runner does not support 32-bit yet.")] + [Trait("E2Etests", "Smoke")] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(ServerType.WebListener, RuntimeArchitecture.x86, ApplicationType.Portable)] @@ -37,7 +37,8 @@ namespace E2ETests await smokeTestRunner.SmokeTestSuite(serverType, architecture, applicationType); } - [ConditionalTheory(Skip = "Temporarily disabling test"), Trait("E2Etests", "Smoke")] + [ConditionalTheory(Skip = "Temporarily disabling test")] + [Trait("E2Etests", "Smoke")] [OSSkipCondition(OperatingSystems.Windows)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Portable)] public async Task NonWindowsOS( @@ -91,7 +92,7 @@ namespace E2ETests } } - class SmokeTests_OnIIS + public class SmokeTests_OnIIS { private readonly ITestOutputHelper _output; @@ -100,7 +101,8 @@ namespace E2ETests _output = output; } - [ConditionalTheory, Trait("E2Etests", "Smoke")] + [ConditionalTheory] + [Trait("E2Etests", "Smoke")] [OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.Linux)] [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] diff --git a/test/MusicStore.Test/MusicStore.Test.csproj b/test/MusicStore.Test/MusicStore.Test.csproj index 4e507b4d53..33782fc445 100644 --- a/test/MusicStore.Test/MusicStore.Test.csproj +++ b/test/MusicStore.Test/MusicStore.Test.csproj @@ -18,8 +18,4 @@ - - - -