huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade to xunit 2.3.0-beta4 

Includes a few changes as required by the new analyzers
This commit is contained in:
Nate McMaster 2017-08-22 18:16:54 -07:00
parent 044527e33c
commit 52569185f2
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/dependencies.props
View File

@ -5,7 +5,7 @@
<NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion> <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
<NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion> <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
<RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion> <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
<TestSdkVersion>15.3.0-*</TestSdkVersion> <TestSdkVersion>15.3.0</TestSdkVersion>
<XunitVersion>2.3.0-beta2-*</XunitVersion> <XunitVersion>2.3.0-beta4-build3742</XunitVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

20
test/Microsoft.AspNetCore.Session.Tests/SessionTests.cs
View File

@ -51,8 +51,7 @@ namespace Microsoft.AspNetCore.Session
var client = server.CreateClient(); var client = server.CreateClient();
var response = await client.GetAsync(string.Empty); var response = await client.GetAsync(string.Empty);
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
IEnumerable<string> values; Assert.False(response.Headers.TryGetValues("Set-Cookie", out var _));
Assert.False(response.Headers.TryGetValues("Set-Cookie", out values));
} }
} }
@ -82,9 +81,8 @@ namespace Microsoft.AspNetCore.Session
var client = server.CreateClient(); var client = server.CreateClient();
var response = await client.GetAsync(string.Empty); var response = await client.GetAsync(string.Empty);
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
IEnumerable<string> values; Assert.True(response.Headers.TryGetValues("Set-Cookie", out var values));
Assert.True(response.Headers.TryGetValues("Set-Cookie", out values)); Assert.Single(values);
Assert.Equal(1, values.Count());
Assert.True(!string.IsNullOrWhiteSpace(values.First())); Assert.True(!string.IsNullOrWhiteSpace(values.First()));
} }
} }
@ -131,9 +129,8 @@ namespace Microsoft.AspNetCore.Session
var client = server.CreateClient(); var client = server.CreateClient();
var response = await client.GetAsync(requestUri); var response = await client.GetAsync(requestUri);
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
IEnumerable<string> values; Assert.True(response.Headers.TryGetValues("Set-Cookie", out var values));
Assert.True(response.Headers.TryGetValues("Set-Cookie", out values)); Assert.Single(values);
Assert.Equal(1, values.Count());
if (shouldBeSecureOnly) if (shouldBeSecureOnly)
{ {
Assert.Contains("; secure", values.First()); Assert.Contains("; secure", values.First());
@ -570,8 +567,7 @@ namespace Microsoft.AspNetCore.Session
app.UseSession(); app.UseSession();
app.Run(context => app.Run(context =>
{ {
byte[] value; Assert.False(context.Session.TryGetValue("key", out var value));
Assert.False(context.Session.TryGetValue("key", out value));
Assert.Null(value); Assert.Null(value);
Assert.Equal(string.Empty, context.Session.Id); Assert.Equal(string.Empty, context.Session.Id);
Assert.False(context.Session.Keys.Any()); Assert.False(context.Session.Keys.Any());
@ -597,7 +593,7 @@ namespace Microsoft.AspNetCore.Session
var sessionLogMessages = sink.Writes; var sessionLogMessages = sink.Writes;
Assert.Equal(1, sessionLogMessages.Count); Assert.Single(sessionLogMessages);
Assert.Contains("Session cache read exception", sessionLogMessages[0].State.ToString()); Assert.Contains("Session cache read exception", sessionLogMessages[0].State.ToString());
Assert.Equal(LogLevel.Error, sessionLogMessages[0].LogLevel); Assert.Equal(LogLevel.Error, sessionLogMessages[0].LogLevel);
} }
@ -691,7 +687,7 @@ namespace Microsoft.AspNetCore.Session
var sessionLogMessages = sink.Writes; var sessionLogMessages = sink.Writes;
Assert.Equal(1, sessionLogMessages.Count); Assert.Single(sessionLogMessages);
Assert.Contains("Error closing the session.", sessionLogMessages[0].State.ToString()); Assert.Contains("Error closing the session.", sessionLogMessages[0].State.ToString());
Assert.Equal(LogLevel.Error, sessionLogMessages[0].LogLevel); Assert.Equal(LogLevel.Error, sessionLogMessages[0].LogLevel);
} }