This repository has been archived by the owner on Dec 18, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 446
Add error to negotiate #2998
Merged
Merged
Add error to negotiate #2998
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,8 +8,10 @@ | |
using System.Threading.Tasks; | ||
using Microsoft.AspNetCore.Connections; | ||
using Microsoft.AspNetCore.Http.Connections; | ||
using Microsoft.AspNetCore.Http.Connections.Client; | ||
using Microsoft.AspNetCore.Http.Connections.Client.Internal; | ||
using Microsoft.AspNetCore.SignalR.Tests; | ||
using Microsoft.Extensions.Logging.Testing; | ||
using Moq; | ||
using Newtonsoft.Json; | ||
using Xunit; | ||
|
@@ -380,6 +382,37 @@ public async Task StartSkipsOverTransportsThatDoNotSupportTheRequredTransferForm | |
}); | ||
} | ||
|
||
[Fact] | ||
public async Task NegotiateThatReturnsErrorThrowsFromStart() | ||
{ | ||
bool ExpectedError(WriteContext writeContext) | ||
{ | ||
return writeContext.LoggerName == typeof(HttpConnection).FullName && | ||
writeContext.EventId.Name == "ErrorWithNegotiation"; | ||
} | ||
|
||
var testHttpHandler = new TestHttpMessageHandler(autoNegotiate: false); | ||
testHttpHandler.OnNegotiate((request, cancellationToken) => | ||
{ | ||
return ResponseUtils.CreateResponse(HttpStatusCode.OK, | ||
JsonConvert.SerializeObject(new | ||
{ | ||
error = "Negotiate failed." | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: Change this error message to something that isn't about negotiation. This seems like something that could be ambiguous |
||
})); | ||
}); | ||
|
||
using (var noErrorScope = new VerifyNoErrorsScope(expectedErrorsFilter: ExpectedError)) | ||
{ | ||
await WithConnectionAsync( | ||
CreateConnection(testHttpHandler, loggerFactory: noErrorScope.LoggerFactory), | ||
async (connection) => | ||
{ | ||
var exception = await Assert.ThrowsAsync<Exception>(() => connection.StartAsync(TransferFormat.Text).OrTimeout()); | ||
Assert.Equal("Negotiate failed.", exception.Message); | ||
}); | ||
} | ||
} | ||
|
||
private async Task RunInvalidNegotiateResponseTest<TException>(string negotiatePayload, string expectedExceptionMessage) where TException : Exception | ||
{ | ||
var testHttpHandler = new TestHttpMessageHandler(autoNegotiate: false); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we have a test case for this assertion?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+have a test case for skipping a simple value, e.g. "a string!", and a complex value, e.g. ["array", "of", "content"]
I'm guessing skipValue will skip all of the complex value but it is worth double checking. It is a common bug I've seen in code that manually reads JSON
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We do now, both cases. Thanks James