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

Upgrade to xunit 2.3.0-beta3

This commit is contained in:
Nate McMaster 2017-08-11 17:22:40 -07:00
parent 02028b65c7
commit d3cf0494e7
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/dependencies.props
View File

@ -10,7 +10,7 @@
<NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion> <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
<RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion> <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
<MicrosoftNETCoreCompilersVersion>2.6.0-rdonly-ref-61915-01</MicrosoftNETCoreCompilersVersion> <MicrosoftNETCoreCompilersVersion>2.6.0-rdonly-ref-61915-01</MicrosoftNETCoreCompilersVersion>
<TestSdkVersion>15.3.0-*</TestSdkVersion> <TestSdkVersion>15.3.0</TestSdkVersion>
<XunitVersion>2.3.0-beta2-*</XunitVersion> <XunitVersion>2.3.0-beta3-build3705</XunitVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

12
test/Kestrel.Core.Tests/FrameHeadersTests.cs
View File

@ -217,11 +217,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
[Fact] [Fact]
public void ValidContentLengthsAccepted() public void ValidContentLengthsAccepted()
{ {
ValidContentLengthsAccepted(new FrameRequestHeaders()); ValidContentLengthsAcceptedImpl(new FrameRequestHeaders());
ValidContentLengthsAccepted(new FrameResponseHeaders()); ValidContentLengthsAcceptedImpl(new FrameResponseHeaders());
} }
private static void ValidContentLengthsAccepted(FrameHeaders frameHeaders) private static void ValidContentLengthsAcceptedImpl(FrameHeaders frameHeaders)
{ {
IDictionary<string, StringValues> headers = frameHeaders; IDictionary<string, StringValues> headers = frameHeaders;
@ -252,11 +252,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
[Fact] [Fact]
public void InvalidContentLengthsRejected() public void InvalidContentLengthsRejected()
{ {
InvalidContentLengthsRejected(new FrameRequestHeaders()); InvalidContentLengthsRejectedImpl(new FrameRequestHeaders());
InvalidContentLengthsRejected(new FrameResponseHeaders()); InvalidContentLengthsRejectedImpl(new FrameResponseHeaders());
} }
private static void InvalidContentLengthsRejected(FrameHeaders frameHeaders) private static void InvalidContentLengthsRejectedImpl(FrameHeaders frameHeaders)
{ {
IDictionary<string, StringValues> headers = frameHeaders; IDictionary<string, StringValues> headers = frameHeaders;

6
test/Kestrel.Core.Tests/FrameTests.cs
View File

@ -590,7 +590,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
await _input.Writer.WriteAsync(data); await _input.Writer.WriteAsync(data);
_frame.Stop(); _frame.Stop();
Assert.IsNotType(typeof(Task<Task>), requestProcessingTask); Assert.IsNotType<Task<Task>>(requestProcessingTask);
await requestProcessingTask.TimeoutAfter(TimeSpan.FromSeconds(10)); await requestProcessingTask.TimeoutAfter(TimeSpan.FromSeconds(10));
_input.Writer.Complete(); _input.Writer.Complete();
@ -812,9 +812,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
.Select(i => $"Header-{startAt + i}: value{startAt + i}\r\n")); .Select(i => $"Header-{startAt + i}: value{startAt + i}\r\n"));
} }
public static IEnumerable<object> RequestLineValidData => HttpParsingData.RequestLineValidData; public static IEnumerable<object[]> RequestLineValidData => HttpParsingData.RequestLineValidData;
public static IEnumerable<object> RequestLineDotSegmentData => HttpParsingData.RequestLineDotSegmentData; public static IEnumerable<object[]> RequestLineDotSegmentData => HttpParsingData.RequestLineDotSegmentData;
public static TheoryData<string> TargetWithEncodedNullCharData public static TheoryData<string> TargetWithEncodedNullCharData
{ {

2
test/Kestrel.Core.Tests/HttpParserTests.cs
View File

@ -419,7 +419,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
private IHttpParser<RequestHandler> CreateParser(IKestrelTrace log) => new HttpParser<RequestHandler>(log.IsEnabled(LogLevel.Information)); private IHttpParser<RequestHandler> CreateParser(IKestrelTrace log) => new HttpParser<RequestHandler>(log.IsEnabled(LogLevel.Information));
public static IEnumerable<string[]> RequestLineValidData => HttpParsingData.RequestLineValidData; public static IEnumerable<object[]> RequestLineValidData => HttpParsingData.RequestLineValidData;
public static IEnumerable<object[]> RequestLineIncompleteData => HttpParsingData.RequestLineIncompleteData.Select(requestLine => new[] { requestLine }); public static IEnumerable<object[]> RequestLineIncompleteData => HttpParsingData.RequestLineIncompleteData.Select(requestLine => new[] { requestLine });

4
test/Kestrel.Core.Tests/KestrelServerTests.cs
View File

@ -90,7 +90,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
StartDummyApplication(server); StartDummyApplication(server);
var warning = testLogger.Messages.Single(log => log.LogLevel == LogLevel.Warning); var warning = testLogger.Messages.Single(log => log.LogLevel == LogLevel.Warning);
Assert.True(warning.Message.Contains("Overriding")); Assert.Contains("Overriding", warning.Message);
} }
} }
@ -271,7 +271,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
private static KestrelServer CreateServer(KestrelServerOptions options, ILogger testLogger) private static KestrelServer CreateServer(KestrelServerOptions options, ILogger testLogger)
{ {
return new KestrelServer(Options.Create(options), new MockTransportFactory(), new LoggerFactory(new [] { new KestrelTestLoggerProvider(testLogger)} )); return new KestrelServer(Options.Create(options), new MockTransportFactory(), new LoggerFactory(new[] { new KestrelTestLoggerProvider(testLogger) }));
} }
private static void StartDummyApplication(IServer server) private static void StartDummyApplication(IServer server)