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

Cleanup.

This commit is contained in:
Chris Ross 2014-09-25 15:36:40 -07:00
parent 66144c864e
commit 88da31af7c
2 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.Net.Http.Server/WebListener.cs
View File

@ -768,7 +768,8 @@ namespace Microsoft.Net.Http.Server
uint statusCode; uint statusCode;
try try
{ {
statusCode = UnsafeNclNativeMethods.HttpApi.HttpWaitForDisconnectEx(_requestQueueHandle, connectionId, 0, nativeOverlapped); statusCode = UnsafeNclNativeMethods.HttpApi.HttpWaitForDisconnectEx(requestQueueHandle: _requestQueueHandle,
connectionId: connectionId, reserved: 0, overlapped: nativeOverlapped);
} }
catch (Win32Exception exception) catch (Win32Exception exception)
{ {

57
test/Microsoft.Net.Http.Server.FunctionalTests/ServerTests.cs
View File

@ -17,15 +17,14 @@ namespace Microsoft.Net.Http.Server
[Fact] [Fact]
public async Task Server_200OK_Success() public async Task Server_200OK_Success()
{ {
string address; using (var server = Utilities.CreateHttpServer(out var address))
using (var server = Utilities.CreateHttpServer(out address))
{ {
Task<string> responseTask = SendRequestAsync(address); var responseTask = SendRequestAsync(address);
var context = await server.GetContextAsync(); var context = await server.GetContextAsync();
context.Dispose(); context.Dispose();
string response = await responseTask; var response = await responseTask;
Assert.Equal(string.Empty, response); Assert.Equal(string.Empty, response);
} }
} }
@ -33,8 +32,7 @@ namespace Microsoft.Net.Http.Server
[Fact] [Fact]
public async Task Server_SendHelloWorld_Success() public async Task Server_SendHelloWorld_Success()
{ {
string address; using (var server = Utilities.CreateHttpServer(out var address))
using (var server = Utilities.CreateHttpServer(out address))
{ {
Task<string> responseTask = SendRequestAsync(address); Task<string> responseTask = SendRequestAsync(address);
@ -53,10 +51,9 @@ namespace Microsoft.Net.Http.Server
[Fact] [Fact]
public async Task Server_EchoHelloWorld_Success() public async Task Server_EchoHelloWorld_Success()
{ {
string address; using (var server = Utilities.CreateHttpServer(out var address))
using (var server = Utilities.CreateHttpServer(out address))
{ {
Task<string> responseTask = SendRequestAsync(address, "Hello World"); var responseTask = SendRequestAsync(address, "Hello World");
var context = await server.GetContextAsync(); var context = await server.GetContextAsync();
string input = new StreamReader(context.Request.Body).ReadToEnd(); string input = new StreamReader(context.Request.Body).ReadToEnd();
@ -67,7 +64,7 @@ namespace Microsoft.Net.Http.Server
writer.Write("Hello World"); writer.Write("Hello World");
} }
string response = await responseTask; var response = await responseTask;
Assert.Equal("Hello World", response); Assert.Equal("Hello World", response);
} }
} }
@ -75,18 +72,17 @@ namespace Microsoft.Net.Http.Server
[Fact] [Fact]
public async Task Server_ClientDisconnects_CallCanceled() public async Task Server_ClientDisconnects_CallCanceled()
{ {
TimeSpan interval = TimeSpan.FromSeconds(1); var interval = TimeSpan.FromSeconds(1);
ManualResetEvent canceled = new ManualResetEvent(false); var canceled = new ManualResetEvent(false);
string address; using (var server = Utilities.CreateHttpServer(out var address))
using (var server = Utilities.CreateHttpServer(out address))
{ {
using (var client = new HttpClient()) using (var client = new HttpClient())
{ {
Task<HttpResponseMessage> responseTask = client.GetAsync(address); var responseTask = client.GetAsync(address);
var context = await server.GetContextAsync(); var context = await server.GetContextAsync();
CancellationToken ct = context.DisconnectToken; var ct = context.DisconnectToken;
Assert.True(ct.CanBeCanceled, "CanBeCanceled"); Assert.True(ct.CanBeCanceled, "CanBeCanceled");
Assert.False(ct.IsCancellationRequested, "IsCancellationRequested"); Assert.False(ct.IsCancellationRequested, "IsCancellationRequested");
ct.Register(() => canceled.Set()); ct.Register(() => canceled.Set());
@ -106,16 +102,15 @@ namespace Microsoft.Net.Http.Server
[Fact] [Fact]
public async Task Server_Abort_CallCanceled() public async Task Server_Abort_CallCanceled()
{ {
TimeSpan interval = TimeSpan.FromSeconds(1); var interval = TimeSpan.FromSeconds(1);
ManualResetEvent canceled = new ManualResetEvent(false); var canceled = new ManualResetEvent(false);
string address; using (var server = Utilities.CreateHttpServer(out var address))
using (var server = Utilities.CreateHttpServer(out address))
{ {
var responseTask = SendRequestAsync(address); var responseTask = SendRequestAsync(address);
var context = await server.GetContextAsync(); var context = await server.GetContextAsync();
CancellationToken ct = context.DisconnectToken; var ct = context.DisconnectToken;
Assert.True(ct.CanBeCanceled, "CanBeCanceled"); Assert.True(ct.CanBeCanceled, "CanBeCanceled");
Assert.False(ct.IsCancellationRequested, "IsCancellationRequested"); Assert.False(ct.IsCancellationRequested, "IsCancellationRequested");
ct.Register(() => canceled.Set()); ct.Register(() => canceled.Set());
@ -134,16 +129,15 @@ namespace Microsoft.Net.Http.Server
[Fact] [Fact]
public async Task Server_ConnectionCloseHeader_CancellationTokenFires() public async Task Server_ConnectionCloseHeader_CancellationTokenFires()
{ {
TimeSpan interval = TimeSpan.FromSeconds(1); var interval = TimeSpan.FromSeconds(1);
ManualResetEvent canceled = new ManualResetEvent(false); var canceled = new ManualResetEvent(false);
string address; using (var server = Utilities.CreateHttpServer(out var address))
using (var server = Utilities.CreateHttpServer(out address))
{ {
Task<string> responseTask = SendRequestAsync(address); var responseTask = SendRequestAsync(address);
var context = await server.GetContextAsync(); var context = await server.GetContextAsync();
CancellationToken ct = context.DisconnectToken; var ct = context.DisconnectToken;
Assert.True(ct.CanBeCanceled, "CanBeCanceled"); Assert.True(ct.CanBeCanceled, "CanBeCanceled");
Assert.False(ct.IsCancellationRequested, "IsCancellationRequested"); Assert.False(ct.IsCancellationRequested, "IsCancellationRequested");
ct.Register(() => canceled.Set()); ct.Register(() => canceled.Set());
@ -159,7 +153,7 @@ namespace Microsoft.Net.Http.Server
Assert.True(canceled.WaitOne(interval), "Disconnected"); Assert.True(canceled.WaitOne(interval), "Disconnected");
Assert.True(ct.IsCancellationRequested, "IsCancellationRequested"); Assert.True(ct.IsCancellationRequested, "IsCancellationRequested");
string response = await responseTask; var response = await responseTask;
Assert.Equal("Hello World", response); Assert.Equal("Hello World", response);
} }
} }
@ -167,16 +161,15 @@ namespace Microsoft.Net.Http.Server
[Fact] [Fact]
public async Task Server_SetQueueLimit_Success() public async Task Server_SetQueueLimit_Success()
{ {
string address; using (var server = Utilities.CreateHttpServer(out var address))
using (var server = Utilities.CreateHttpServer(out address))
{ {
server.SetRequestQueueLimit(1001); server.SetRequestQueueLimit(1001);
Task<string> responseTask = SendRequestAsync(address); var responseTask = SendRequestAsync(address);
var context = await server.GetContextAsync(); var context = await server.GetContextAsync();
context.Dispose(); context.Dispose();
string response = await responseTask; var response = await responseTask;
Assert.Equal(string.Empty, response); Assert.Equal(string.Empty, response);
} }
} }