Skip to content

Commit 66562b2

Browse files
committed
Fix "Calls to methods which accept CancellationToken should use TestContext.Current.CancellationToken to allow test cancellation to be more responsive."
1 parent b1fd51e commit 66562b2

25 files changed

Lines changed: 93 additions & 85 deletions

Source/HttpMultipartParser.UnitTests/HttpMultipartFormParserUnitTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void ConstructingWithNullStreamFails()
4646
[Fact]
4747
public async Task ConstructingWithNullStreamFailsAsync()
4848
{
49-
await Assert.ThrowsAsync<ArgumentNullException>(() => MultipartFormDataParser.ParseAsync(Stream.Null));
49+
await Assert.ThrowsAsync<ArgumentNullException>(() => MultipartFormDataParser.ParseAsync(Stream.Null, cancellationToken: TestContext.Current.CancellationToken));
5050
}
5151

5252
/// <summary>
@@ -89,7 +89,7 @@ line 3
8989

9090
using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))
9191
{
92-
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
92+
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8, cancellationToken: TestContext.Current.CancellationToken);
9393
Assert.Equal($"line 1{Environment.NewLine}line 2{Environment.NewLine}line 3", parser.GetParameterValue("multilined"));
9494
Assert.Equal($"line 1{Environment.NewLine}line 2{Environment.NewLine}line 3", parser.GetParameterValues("multilined").First());
9595
}
@@ -139,7 +139,7 @@ public async Task HandlesFileWithLastCrLfAtBufferLengthAsync()
139139

140140
using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))
141141
{
142-
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
142+
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8, cancellationToken: TestContext.Current.CancellationToken);
143143
}
144144
}
145145

@@ -187,7 +187,7 @@ public async Task HandlesFileWithLastCrLfImmediatlyAfterBufferLengthAsync()
187187

188188
using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))
189189
{
190-
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
190+
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8, cancellationToken: TestContext.Current.CancellationToken);
191191
}
192192
}
193193

@@ -211,7 +211,7 @@ public async Task HandlesFileWithoutFilename()
211211

212212
using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))
213213
{
214-
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
214+
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8, cancellationToken: TestContext.Current.CancellationToken);
215215
Assert.Single(parser.Files);
216216
}
217217
}

Source/HttpMultipartParser.UnitTests/ParserScenarios/BlankLinesBeforeFirstBoundary.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public async Task CanAutoDetectBoundaryAsync()
5656
{
5757
using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
5858
{
59-
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
59+
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8, cancellationToken: TestContext.Current.CancellationToken);
6060
Assert.True(_testCase.Validate(parser));
6161
}
6262
}

Source/HttpMultipartParser.UnitTests/ParserScenarios/BoundaryEndsWithDoubleDash.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public async Task CanAutoDetectBoundaryAsync()
6363
{
6464
using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
6565
{
66-
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
66+
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8, cancellationToken: TestContext.Current.CancellationToken);
6767
Assert.True(_testCase.Validate(parser));
6868
}
6969
}

Source/HttpMultipartParser.UnitTests/ParserScenarios/EmptyForm.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public async Task Parse_empty_form_boundary_specified_async()
5151
{
5252
using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
5353
{
54-
var parser = await MultipartFormDataParser.ParseAsync(stream, "----WebKitFormBoundaryb4SfPlH9Bv7c2PKS");
54+
var parser = await MultipartFormDataParser.ParseAsync(stream, "----WebKitFormBoundaryb4SfPlH9Bv7c2PKS", cancellationToken: TestContext.Current.CancellationToken);
5555
Assert.True(_testCase.Validate(parser));
5656
}
5757
}
@@ -61,7 +61,7 @@ public async Task Parse_empty_form_boundary_omitted_async()
6161
{
6262
using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
6363
{
64-
var parser = await MultipartFormDataParser.ParseAsync(stream);
64+
var parser = await MultipartFormDataParser.ParseAsync(stream, cancellationToken: TestContext.Current.CancellationToken);
6565
Assert.True(_testCase.Validate(parser));
6666
}
6767
}

Source/HttpMultipartParser.UnitTests/ParserScenarios/ExactBufferTruncate.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public async Task CanHandleFinalDashesInSeperateBufferFromEndBinaryAsync()
6767
{
6868
using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
6969
{
70-
var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16);
70+
var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16, cancellationToken: TestContext.Current.CancellationToken);
7171
Assert.True(_testCase.Validate(parser));
7272
}
7373
}

Source/HttpMultipartParser.UnitTests/ParserScenarios/FileIsLast.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public async Task CanHandleFileAsLastSectionAsync()
5757
{
5858
using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
5959
{
60-
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
60+
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8, cancellationToken: TestContext.Current.CancellationToken);
6161
Assert.True(_testCase.Validate(parser));
6262
}
6363
}

Source/HttpMultipartParser.UnitTests/ParserScenarios/FileWithAdditionalParameter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public async Task FileWithAdditionalParameterTest_Async()
5656
{
5757
using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
5858
{
59-
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
59+
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8, cancellationToken: TestContext.Current.CancellationToken);
6060
Assert.True(_testCase.Validate(parser));
6161
}
6262
}

Source/HttpMultipartParser.UnitTests/ParserScenarios/FilenameStar.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public async Task FilenameStarTest_Async()
6767
{
6868
using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
6969
{
70-
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
70+
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8, cancellationToken: TestContext.Current.CancellationToken);
7171
Assert.True(_testCase.Validate(parser));
7272
}
7373
}

Source/HttpMultipartParser.UnitTests/ParserScenarios/FullPathAsFileName.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public async Task HandlesFullPathAsFileNameWithSemicolonCorrectlyAsync()
4848
{
4949
using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
5050
{
51-
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
51+
var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8, cancellationToken: TestContext.Current.CancellationToken);
5252
Assert.True(_testCase.Validate(parser));
5353
}
5454
}

Source/HttpMultipartParser.UnitTests/ParserScenarios/InvalidPart.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public async Task Exception_is_thrown_when_attempting_to_parse_async()
4444
// The default behavior is to throw an exception when the form contains an invalid section.
4545
using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
4646
{
47-
await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream));
47+
await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream, cancellationToken: TestContext.Current.CancellationToken));
4848
}
4949
}
5050

@@ -64,7 +64,7 @@ public async Task Invalid_part_is_ignored_async()
6464
{
6565
using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
6666
{
67-
var parser = await MultipartFormDataParser.ParseAsync(stream, ignoreInvalidParts: true);
67+
var parser = await MultipartFormDataParser.ParseAsync(stream, ignoreInvalidParts: true, cancellationToken: TestContext.Current.CancellationToken);
6868
Assert.Empty(parser.Files);
6969
Assert.Empty(parser.Parameters);
7070
}

0 commit comments

Comments
 (0)