88using Microsoft . AspNetCore . Connections ;
99using Microsoft . AspNetCore . Http . Timeouts ;
1010using Microsoft . AspNetCore . Testing ;
11+ using Microsoft . Extensions . Logging ;
1112using Microsoft . Net . Http . Headers ;
1213
1314namespace Microsoft . AspNetCore . WebSockets . Test ;
@@ -516,21 +517,19 @@ public async Task WebSocket_Abort_Interrupts_Pending_ReceiveAsync()
516517 serverSocket = await context . WebSockets . AcceptWebSocketAsync ( ) ;
517518 socketWasAccepted . Set ( ) ;
518519
519- var serverBuffer = new byte [ 1024 ] ;
520-
521520 try
522521 {
523522 while ( serverSocket . State is WebSocketState . Open or WebSocketState . CloseSent )
524523 {
525524 if ( firstReceiveOccured . IsSet )
526525 {
527- var pendingResponse = serverSocket . ReceiveAsync ( serverBuffer , default ) ;
526+ var pendingResponse = serverSocket . ReceiveAsync ( new ArraySegment < byte > ( new byte [ 1024 ] ) , default ) ;
528527 secondReceiveInitiated . Set ( ) ;
529528 var response = await pendingResponse ;
530529 }
531530 else
532531 {
533- var response = await serverSocket . ReceiveAsync ( serverBuffer , default ) ;
532+ var response = await serverSocket . ReceiveAsync ( new ArraySegment < byte > ( new byte [ 1024 ] ) , default ) ;
534533 firstReceiveOccured . Set ( ) ;
535534 }
536535 }
@@ -543,6 +542,7 @@ public async Task WebSocket_Abort_Interrupts_Pending_ReceiveAsync()
543542 catch ( Exception ex )
544543 {
545544 // Capture this exception so a test failure can give us more information.
545+ Logger . LogError ( ex , "Unexpected error." ) ;
546546 receiveException = ex ;
547547 }
548548 finally
@@ -592,15 +592,13 @@ public async Task WebSocket_AllowsCancelling_Pending_ReceiveAsync_When_Cancellat
592592 serverSocket = await context . WebSockets . AcceptWebSocketAsync ( ) ;
593593 socketWasAccepted . Set ( ) ;
594594
595- var serverBuffer = new byte [ 1024 ] ;
596-
597595 var finishedWithOperationCancelled = false ;
598596
599597 try
600598 {
601599 while ( serverSocket . State is WebSocketState . Open or WebSocketState . CloseSent )
602600 {
603- var response = await serverSocket . ReceiveAsync ( serverBuffer , cts . Token ) ;
601+ var response = await serverSocket . ReceiveAsync ( new ArraySegment < byte > ( new byte [ 1024 ] ) , cts . Token ) ;
604602 firstReceiveOccured . Set ( ) ;
605603 }
606604 }
@@ -609,6 +607,11 @@ public async Task WebSocket_AllowsCancelling_Pending_ReceiveAsync_When_Cancellat
609607 operationWasCancelled . Set ( ) ;
610608 finishedWithOperationCancelled = true ;
611609 }
610+ catch ( Exception ex )
611+ {
612+ Logger . LogError ( ex , "Unexpected error." ) ;
613+ throw ;
614+ }
612615 finally
613616 {
614617 Assert . True ( finishedWithOperationCancelled ) ;
0 commit comments