From 5b1408615a8e1fa320bad6ca5860628a188d136d Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Wed, 10 May 2023 10:56:36 -0400 Subject: [PATCH] Fix tests --- .../Schema/ColumnAttributeTests.cs | 17 +++++++- .../Schema/ForeignKeyAttributeTests.cs | 8 +++- .../Schema/InversePropertyAttributeTests.cs | 8 +++- .../Schema/TableAttributeTests.cs | 17 +++++++- .../tests/FunctionalTests/HttpMethodTest.cs | 2 +- .../FunctionalTests/MultipartContentTest.cs | 4 +- .../MultipartFormDataContentTest.cs | 6 +-- .../Headers/AuthenticationHeaderValueTest.cs | 2 +- .../Headers/CacheControlHeaderValueTest.cs | 4 +- .../ContentDispositionHeaderValueTest.cs | 2 +- .../Headers/ContentRangeHeaderValueTest.cs | 2 +- .../Headers/EntityTagHeaderValueTest.cs | 2 +- .../UnitTests/Headers/HeaderUtilitiesTest.cs | 2 +- .../UnitTests/Headers/HttpHeadersTest.cs | 42 +++++++++++++++++-- .../Headers/MediaTypeHeaderValueTest.cs | 2 +- .../Headers/NameValueHeaderValueTest.cs | 2 +- .../NameValueWithParametersHeaderValueTest.cs | 2 +- .../Headers/ProductHeaderValueTest.cs | 2 +- .../Headers/ProductInfoHeaderValueTest.cs | 2 +- .../Headers/RangeConditionHeaderValueTest.cs | 2 +- .../UnitTests/Headers/RangeHeaderValueTest.cs | 2 +- .../StringWithQualityHeaderValueTest.cs | 4 +- .../Headers/TransferCodingHeaderValueTest.cs | 2 +- .../UnitTests/Headers/ViaHeaderValueTest.cs | 4 +- .../Headers/WarningHeaderValueTest.cs | 8 ++-- 25 files changed, 112 insertions(+), 38 deletions(-) diff --git a/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/ColumnAttributeTests.cs b/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/ColumnAttributeTests.cs index feef0f8a09ab6c..e8283ed52c3d2c 100644 --- a/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/ColumnAttributeTests.cs +++ b/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/ColumnAttributeTests.cs @@ -28,9 +28,15 @@ public static void Ctor_String(string name) [Theory] [InlineData(null)] + public static void Ctor_String_NullName_ThrowsArgumentException(string name) + { + AssertExtensions.Throws("name", null, () => new ColumnAttribute(name)); + } + + [Theory] [InlineData("")] [InlineData(" \t\r\n")] - public static void Ctor_String_NullOrWhitespaceName_ThrowsArgumentException(string name) + public static void Ctor_String_WhitespaceName_ThrowsArgumentException(string name) { AssertExtensions.Throws("name", null, () => new ColumnAttribute(name)); } @@ -61,9 +67,16 @@ public static void TypeName_Set_ReturnsExpected(string value) [Theory] [InlineData(null)] + public static void TypeName_Set_NullValue_ThrowsArgumentException(string value) + { + ColumnAttribute attribute = new ColumnAttribute(); + AssertExtensions.Throws("value", null, () => attribute.TypeName = value); + } + + [Theory] [InlineData("")] [InlineData(" \t\r\n")] - public static void TypeName_Set_NullOrWhitespaceValue_ThrowsArgumentException(string value) + public static void TypeName_Set_WhitespaceValue_ThrowsArgumentException(string value) { ColumnAttribute attribute = new ColumnAttribute(); AssertExtensions.Throws("value", null, () => attribute.TypeName = value); diff --git a/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/ForeignKeyAttributeTests.cs b/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/ForeignKeyAttributeTests.cs index fee82dac2c3f34..45c732d212595c 100644 --- a/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/ForeignKeyAttributeTests.cs +++ b/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/ForeignKeyAttributeTests.cs @@ -17,9 +17,15 @@ public static void Ctor_String(string name) [Theory] [InlineData(null)] + public static void Ctor_String_NullName_ThrowsArgumentException(string name) + { + AssertExtensions.Throws("name", null, () => new ForeignKeyAttribute(name)); + } + + [Theory] [InlineData("")] [InlineData(" \t\r\n")] - public static void Ctor_String_NullOrWhitespaceName_ThrowsArgumentException(string name) + public static void Ctor_String_WhitespaceName_ThrowsArgumentException(string name) { AssertExtensions.Throws("name", null, () => new ForeignKeyAttribute(name)); } diff --git a/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/InversePropertyAttributeTests.cs b/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/InversePropertyAttributeTests.cs index 9d17043325fce0..cb1362867781d6 100644 --- a/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/InversePropertyAttributeTests.cs +++ b/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/InversePropertyAttributeTests.cs @@ -17,9 +17,15 @@ public static void Ctor_String(string property) [Theory] [InlineData(null)] + public static void Ctor_String_NullProperty_ThrowsArgumentException(string property) + { + AssertExtensions.Throws("property", null, () => new InversePropertyAttribute(property)); + } + + [Theory] [InlineData("")] [InlineData(" \t\r\n")] - public static void Ctor_String_NullOrWhitespaceProperty_ThrowsArgumentException(string property) + public static void Ctor_String_WhitespaceProperty_ThrowsArgumentException(string property) { AssertExtensions.Throws("property", null, () => new InversePropertyAttribute(property)); } diff --git a/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/TableAttributeTests.cs b/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/TableAttributeTests.cs index d34b762e3a43c6..3e5aab421542d5 100644 --- a/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/TableAttributeTests.cs +++ b/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/Schema/TableAttributeTests.cs @@ -18,9 +18,15 @@ public static void Ctor_String(string name) [Theory] [InlineData(null)] + public static void Ctor_String_NullName_ThrowsArgumentException(string name) + { + AssertExtensions.Throws("name", null, () => new TableAttribute(name)); + } + + [Theory] [InlineData("")] [InlineData(" \t\r\n")] - public static void Ctor_String_NullOrWhitespaceName_ThrowsArgumentException(string name) + public static void Ctor_String_WhitespaceName_ThrowsArgumentException(string name) { AssertExtensions.Throws("name", null, () => new TableAttribute(name)); } @@ -35,9 +41,16 @@ public static void Schema_Set_ReturnsExpected(string value) [Theory] [InlineData(null)] + public static void Schema_Set_NullValue_ThrowsArgumentException(string value) + { + TableAttribute attribute = new TableAttribute("Perspicacia Tick"); + AssertExtensions.Throws("value", null, () => attribute.Schema = value); + } + + [Theory] [InlineData("")] [InlineData(" \t\r\n")] - public static void Schema_Set_NullOrWhitespaceValue_ThrowsArgumentException(string value) + public static void Schema_Set_WhitespaceValue_ThrowsArgumentException(string value) { TableAttribute attribute = new TableAttribute("Perspicacia Tick"); AssertExtensions.Throws("value", null, () => attribute.Schema = value); diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpMethodTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpMethodTest.cs index 1961ce9d42ecbd..2a804decd9fb2d 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpMethodTest.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpMethodTest.cs @@ -52,7 +52,7 @@ public void Ctor_ValidMethodToken_Success() [Fact] public void Ctor_NullMethod_Exception() { - AssertExtensions.Throws("method", () => { new HttpMethod(null); } ); + AssertExtensions.Throws("method", () => { new HttpMethod(null); } ); } [Theory] diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/MultipartContentTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/MultipartContentTest.cs index c67def2093ed8e..7df54b8ddd9550 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/MultipartContentTest.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/MultipartContentTest.cs @@ -16,7 +16,7 @@ public class MultipartContentTest [Fact] public void Ctor_NullOrEmptySubType_ThrowsArgumentException() { - AssertExtensions.Throws("subtype", () => new MultipartContent(null)); + AssertExtensions.Throws("subtype", () => new MultipartContent(null)); AssertExtensions.Throws("subtype", () => new MultipartContent("")); AssertExtensions.Throws("subtype", () => new MultipartContent(" ")); } @@ -24,7 +24,7 @@ public void Ctor_NullOrEmptySubType_ThrowsArgumentException() [Fact] public void Ctor_NullOrEmptyBoundary_ThrowsArgumentException() { - AssertExtensions.Throws("boundary", () => new MultipartContent("Some", null)); + AssertExtensions.Throws("boundary", () => new MultipartContent("Some", null)); AssertExtensions.Throws("boundary", () => new MultipartContent("Some", "")); AssertExtensions.Throws("boundary", () => new MultipartContent("Some", " ")); } diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/MultipartFormDataContentTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/MultipartFormDataContentTest.cs index 4a02ada4deb5f8..90a75c3b7078b2 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/MultipartFormDataContentTest.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/MultipartFormDataContentTest.cs @@ -22,7 +22,7 @@ public void Ctor_NoParams_CorrectMediaType() [Fact] public void Ctor_NullBoundary_ThrowsArgumentException() { - AssertExtensions.Throws("boundary", () => new MultipartFormDataContent(null)); + AssertExtensions.Throws("boundary", () => new MultipartFormDataContent(null)); } [Fact] @@ -42,7 +42,7 @@ public void Add_NullContent_ThrowsArgumentNullException() public void Add_NullName_ThrowsArgumentException() { var content = new MultipartFormDataContent(); - AssertExtensions.Throws("name", () => content.Add(new StringContent("Hello world"), null)); + AssertExtensions.Throws("name", () => content.Add(new StringContent("Hello world"), null)); } [Fact] @@ -56,7 +56,7 @@ public void Add_EmptyName_ThrowsArgumentException() public void Add_NullFileName_ThrowsArgumentException() { var content = new MultipartFormDataContent(); - AssertExtensions.Throws("fileName", () => content.Add(new StringContent("Hello world"), "name", null)); + AssertExtensions.Throws("fileName", () => content.Add(new StringContent("Hello world"), "name", null)); } [Fact] diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/AuthenticationHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/AuthenticationHeaderValueTest.cs index c5944885917edd..51122ee49838b4 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/AuthenticationHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/AuthenticationHeaderValueTest.cs @@ -16,7 +16,7 @@ public void Ctor_SetBothSchemeAndParameters_MatchExpectation() Assert.Equal("Basic", auth.Scheme); Assert.Equal("realm=\"contoso.com\"", auth.Parameter); - AssertExtensions.Throws("scheme", () => { new AuthenticationHeaderValue(null, "x"); }); + AssertExtensions.Throws("scheme", () => { new AuthenticationHeaderValue(null, "x"); }); AssertExtensions.Throws("scheme", () => { new AuthenticationHeaderValue("", "x"); }); Assert.Throws(() => { new AuthenticationHeaderValue(" x", "x"); }); Assert.Throws(() => { new AuthenticationHeaderValue("x ", "x"); }); diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/CacheControlHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/CacheControlHeaderValueTest.cs index e93c46f4816e2a..595c07a18ad819 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/CacheControlHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/CacheControlHeaderValueTest.cs @@ -51,14 +51,14 @@ public void Properties_SetAndGetAllProperties_SetValueReturnedInGetter() // String collection properties Assert.NotNull(cacheControl.NoCacheHeaders); - AssertExtensions.Throws("item", () => { cacheControl.NoCacheHeaders.Add(null); }); + AssertExtensions.Throws("item", () => { cacheControl.NoCacheHeaders.Add(null); }); Assert.Throws(() => { cacheControl.NoCacheHeaders.Add("invalid token"); }); cacheControl.NoCacheHeaders.Add("token"); Assert.Equal(1, cacheControl.NoCacheHeaders.Count); Assert.Equal("token", cacheControl.NoCacheHeaders.First()); Assert.NotNull(cacheControl.PrivateHeaders); - AssertExtensions.Throws("item", () => { cacheControl.PrivateHeaders.Add(null); }); + AssertExtensions.Throws("item", () => { cacheControl.PrivateHeaders.Add(null); }); Assert.Throws(() => { cacheControl.PrivateHeaders.Add("invalid token"); }); cacheControl.PrivateHeaders.Add("token"); Assert.Equal(1, cacheControl.PrivateHeaders.Count); diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/ContentDispositionHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/ContentDispositionHeaderValueTest.cs index cb44f49b767814..5601ad137d2719 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/ContentDispositionHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/ContentDispositionHeaderValueTest.cs @@ -14,7 +14,7 @@ public class ContentDispositionHeaderValueTest [Fact] public void Ctor_ContentDispositionNull_Throw() { - AssertExtensions.Throws("dispositionType", () => { new ContentDispositionHeaderValue(null); }); + AssertExtensions.Throws("dispositionType", () => { new ContentDispositionHeaderValue(null); }); } [Fact] diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/ContentRangeHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/ContentRangeHeaderValueTest.cs index 69073870fe18f9..aa021f4ea37353 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/ContentRangeHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/ContentRangeHeaderValueTest.cs @@ -79,7 +79,7 @@ public void Unit_GetAndSetValidAndInvalidValues_MatchExpectation() range.Unit = "myunit"; Assert.Equal("myunit", range.Unit); // "Unit (custom value)" - AssertExtensions.Throws("value", () => { range.Unit = null; }); // "" + AssertExtensions.Throws("value", () => { range.Unit = null; }); // "" AssertExtensions.Throws("value", () => { range.Unit = ""; }); // "empty string" Assert.Throws(() => { range.Unit = " x"; }); // "leading space" Assert.Throws(() => { range.Unit = "x "; }); // "trailing space" diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/EntityTagHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/EntityTagHeaderValueTest.cs index 644c6cb1581a28..e43b6ef5c7aa97 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/EntityTagHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/EntityTagHeaderValueTest.cs @@ -12,7 +12,7 @@ public class EntityTagHeaderValueTest [Fact] public void Ctor_ETagNull_Throw() { - AssertExtensions.Throws("tag", () => { new EntityTagHeaderValue(null); }); + AssertExtensions.Throws("tag", () => { new EntityTagHeaderValue(null); }); } [Fact] diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/HeaderUtilitiesTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/HeaderUtilitiesTest.cs index d063895aabbc6e..3dd4d63e94bed2 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/HeaderUtilitiesTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/HeaderUtilitiesTest.cs @@ -82,7 +82,7 @@ public void CheckValidQuotedString_ValidAndInvalidvalues_MatchExpectation() HeaderUtilities.CheckValidQuotedString("\"x\"", "param"); HeaderUtilities.CheckValidQuotedString("\"x y\"", "param"); - AssertExtensions.Throws("param", () => { HeaderUtilities.CheckValidQuotedString(null, "param"); }); + AssertExtensions.Throws("param", () => { HeaderUtilities.CheckValidQuotedString(null, "param"); }); AssertExtensions.Throws("param", () => { HeaderUtilities.CheckValidQuotedString("", "param"); }); Assert.Throws(() => { HeaderUtilities.CheckValidQuotedString("\"x", "param"); }); Assert.Throws(() => { HeaderUtilities.CheckValidQuotedString("\"x\"y", "param"); }); diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/HttpHeadersTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/HttpHeadersTest.cs index 4fbff52d6af72e..9def1da0e76bfd 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/HttpHeadersTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/HttpHeadersTest.cs @@ -443,8 +443,17 @@ public void TryAddWithoutValidation_MultipleAddNullValueCollection_Throws() [Theory] [InlineData(null)] + public void Add_SingleUseNullHeaderName_Throw(string headerName) + { + MockHeaders headers = new MockHeaders(); + + AssertExtensions.Throws("name", () => { headers.Add(headerName, "value"); }); + } + + [Theory] [InlineData("")] - public void Add_SingleUseEmptyHeaderName_Throw(string headerName) + [InlineData(" \t\r\n ")] + public void Add_SingleUseWhiteSpaceHeaderName_Throw(string headerName) { MockHeaders headers = new MockHeaders(); @@ -1064,8 +1073,17 @@ public void Clear_AddMultipleHeadersAndThenClear_NoHeadersInCollection() [Theory] [InlineData(null)] + public void Remove_UseNullHeaderName_Throw(string headerName) + { + MockHeaders headers = new MockHeaders(); + + AssertExtensions.Throws("name", () => { headers.Remove(headerName); }); + } + + [Theory] [InlineData("")] - public void Remove_UseEmptyHeaderName_Throw(string headerName) + [InlineData(" \t\r\n ")] + public void Remove_UseWhiteSpaceHeaderName_Throw(string headerName) { MockHeaders headers = new MockHeaders(); @@ -1211,8 +1229,17 @@ public void TryGetValues_GetValuesForExistingHeader_ReturnsTrueAndListOfValues() [Theory] [InlineData(null)] + public void GetValues_UseNullHeaderName_Throw(string headerName) + { + MockHeaders headers = new MockHeaders(); + + AssertExtensions.Throws("name", () => { headers.GetValues(headerName); }); + } + + [Theory] [InlineData("")] - public void GetValues_UseEmptyHeaderName_Throw(string headerName) + [InlineData(" \t\r\n ")] + public void GetValues_UseWhiteSpaceHeaderName_Throw(string headerName) { MockHeaders headers = new MockHeaders(); @@ -1576,7 +1603,16 @@ public void NonValidated_ValidInvalidAndRaw_AllReturned() [Theory] [InlineData(null)] + public void Contains_UseNullHeaderName_Throw(string headerName) + { + MockHeaders headers = new MockHeaders(); + + AssertExtensions.Throws("name", () => { headers.Contains(headerName); }); + } + + [Theory] [InlineData("")] + [InlineData(" \t\r\n ")] public void Contains_UseEmptyHeaderName_Throw(string headerName) { MockHeaders headers = new MockHeaders(); diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/MediaTypeHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/MediaTypeHeaderValueTest.cs index 88d1a58df08211..e51e8efc5e6101 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/MediaTypeHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/MediaTypeHeaderValueTest.cs @@ -13,7 +13,7 @@ public class MediaTypeHeaderValueTest [Fact] public void Ctor_MediaTypeNull_Throw() { - AssertExtensions.Throws("mediaType", () => { new MediaTypeHeaderValue(null); }); + AssertExtensions.Throws("mediaType", () => { new MediaTypeHeaderValue(null); }); } [Fact] diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/NameValueHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/NameValueHeaderValueTest.cs index dc2270e545547b..f9078d3736d1ca 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/NameValueHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/NameValueHeaderValueTest.cs @@ -12,7 +12,7 @@ public class NameValueHeaderValueTest [Fact] public void Ctor_NameNull_Throw() { - AssertExtensions.Throws("name", () => { NameValueHeaderValue nameValue = new NameValueHeaderValue((string)null); }); + AssertExtensions.Throws("name", () => { NameValueHeaderValue nameValue = new NameValueHeaderValue((string)null); }); } [Fact] diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/NameValueWithParametersHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/NameValueWithParametersHeaderValueTest.cs index 5aca687e2882e3..651d22ea96c404 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/NameValueWithParametersHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/NameValueWithParametersHeaderValueTest.cs @@ -13,7 +13,7 @@ public class NameValueWithParametersHeaderValueTest [Fact] public void Ctor_NameNull_Throw() { - AssertExtensions.Throws("name", () => { NameValueWithParametersHeaderValue nameValue = new NameValueWithParametersHeaderValue(null); }); + AssertExtensions.Throws("name", () => { NameValueWithParametersHeaderValue nameValue = new NameValueWithParametersHeaderValue(null); }); } [Fact] diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/ProductHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/ProductHeaderValueTest.cs index e810e572f07cb3..8e75d2fa7b52a3 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/ProductHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/ProductHeaderValueTest.cs @@ -28,7 +28,7 @@ public void Ctor_SetValidHeaderValues_InstanceCreatedCorrectly() [Fact] public void Ctor_UseInvalidValues_Throw() { - AssertExtensions.Throws("name", () => { new ProductHeaderValue(null); }); + AssertExtensions.Throws("name", () => { new ProductHeaderValue(null); }); AssertExtensions.Throws("name", () => { new ProductHeaderValue(string.Empty); }); Assert.Throws(() => { new ProductHeaderValue(" x"); }); Assert.Throws(() => { new ProductHeaderValue("x "); }); diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/ProductInfoHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/ProductInfoHeaderValueTest.cs index 59cacbb496d0dd..72118cce54fd95 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/ProductInfoHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/ProductInfoHeaderValueTest.cs @@ -35,7 +35,7 @@ public void Ctor_CommentOverload_MatchExpectation() Assert.Null(productInfo.Product); Assert.Equal("(this is a comment)", productInfo.Comment); - AssertExtensions.Throws("comment", () => { new ProductInfoHeaderValue((string)null); }); + AssertExtensions.Throws("comment", () => { new ProductInfoHeaderValue((string)null); }); Assert.Throws(() => { new ProductInfoHeaderValue("invalid comment"); }); Assert.Throws(() => { new ProductInfoHeaderValue(" (leading space)"); }); Assert.Throws(() => { new ProductInfoHeaderValue("(trailing space) "); }); diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/RangeConditionHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/RangeConditionHeaderValueTest.cs index edb31cbe1584dd..2648a718c4b368 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/RangeConditionHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/RangeConditionHeaderValueTest.cs @@ -27,7 +27,7 @@ public void Ctor_EntityTagStringOverload_MatchExpectation() Assert.Equal(new EntityTagHeaderValue("\"y\""), rangeCondition.EntityTag); Assert.Null(rangeCondition.Date); - AssertExtensions.Throws("tag", () => { new RangeConditionHeaderValue((string)null); }); + AssertExtensions.Throws("tag", () => { new RangeConditionHeaderValue((string)null); }); } [Fact] diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/RangeHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/RangeHeaderValueTest.cs index 463a6fdac95c99..187d9ce35ac176 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/RangeHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/RangeHeaderValueTest.cs @@ -23,7 +23,7 @@ public void Unit_GetAndSetValidAndInvalidValues_MatchExpectation() range.Unit = "myunit"; Assert.Equal("myunit", range.Unit); - AssertExtensions.Throws("value", () => { range.Unit = null; }); + AssertExtensions.Throws("value", () => { range.Unit = null; }); AssertExtensions.Throws("value", () => { range.Unit = ""; }); Assert.Throws(() => { range.Unit = " x"; }); Assert.Throws(() => { range.Unit = "x "; }); diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/StringWithQualityHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/StringWithQualityHeaderValueTest.cs index 8e3075c10168b3..6da88c1c2accf3 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/StringWithQualityHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/StringWithQualityHeaderValueTest.cs @@ -16,7 +16,7 @@ public void Ctor_StringOnlyOverload_MatchExpectation() Assert.Equal("token", value.Value); Assert.Null(value.Quality); - AssertExtensions.Throws("value", () => { new StringWithQualityHeaderValue(null); }); + AssertExtensions.Throws("value", () => { new StringWithQualityHeaderValue(null); }); AssertExtensions.Throws("value", () => { new StringWithQualityHeaderValue(""); }); Assert.Throws(() => { new StringWithQualityHeaderValue("in valid"); }); } @@ -28,7 +28,7 @@ public void Ctor_StringWithQualityOverload_MatchExpectation() Assert.Equal("token", value.Value); Assert.Equal(0.5, value.Quality); - AssertExtensions.Throws("value", () => { new StringWithQualityHeaderValue(null, 0.1); }); + AssertExtensions.Throws("value", () => { new StringWithQualityHeaderValue(null, 0.1); }); AssertExtensions.Throws("value", () => { new StringWithQualityHeaderValue("", 0.1); }); Assert.Throws(() => { new StringWithQualityHeaderValue("in valid", 0.1); }); diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/TransferCodingHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/TransferCodingHeaderValueTest.cs index e59958ea421037..58be4c458f4472 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/TransferCodingHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/TransferCodingHeaderValueTest.cs @@ -13,7 +13,7 @@ public class TransferCodingHeaderValueTest [Fact] public void Ctor_ValueNull_Throw() { - AssertExtensions.Throws("value", () => { new TransferCodingHeaderValue(null); }); + AssertExtensions.Throws("value", () => { new TransferCodingHeaderValue(null); }); } [Fact] diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/ViaHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/ViaHeaderValueTest.cs index 902a5fd5ac3ecc..a803faa912a61d 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/ViaHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/ViaHeaderValueTest.cs @@ -22,12 +22,12 @@ public void Ctor_ProtocolVersionAndReceivedByOnlyOverload_CallForwardedToOtherCt Assert.Equal("x11", via.ProtocolVersion); Assert.Equal("[::1]:1818", via.ReceivedBy); - AssertExtensions.Throws("protocolVersion", () => { new ViaHeaderValue(null, "host"); }); + AssertExtensions.Throws("protocolVersion", () => { new ViaHeaderValue(null, "host"); }); AssertExtensions.Throws("protocolVersion", () => { new ViaHeaderValue("", "host"); }); Assert.Throws(() => { new ViaHeaderValue("x y", "h"); }); Assert.Throws(() => { new ViaHeaderValue("x ", "h"); }); Assert.Throws(() => { new ViaHeaderValue(" x", "h"); }); - AssertExtensions.Throws("receivedBy", () => { new ViaHeaderValue("1.1", null); }); + AssertExtensions.Throws("receivedBy", () => { new ViaHeaderValue("1.1", null); }); AssertExtensions.Throws("receivedBy", () => { new ViaHeaderValue("1.1", ""); }); Assert.Throws(() => { new ViaHeaderValue("v", "x y"); }); Assert.Throws(() => { new ViaHeaderValue("v", "x "); }); diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/WarningHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/WarningHeaderValueTest.cs index dc867577ea76e7..65de44e7ec0c16 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/WarningHeaderValueTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/WarningHeaderValueTest.cs @@ -27,13 +27,13 @@ public void Ctor_3ParamsOverload_AllFieldsInitializedCorrectly() Assert.Throws(() => { new WarningHeaderValue(-1, "host", "\"\""); }); Assert.Throws(() => { new WarningHeaderValue(1000, "host", "\"\""); }); - AssertExtensions.Throws("agent", () => { new WarningHeaderValue(100, null, "\"\""); }); + AssertExtensions.Throws("agent", () => { new WarningHeaderValue(100, null, "\"\""); }); AssertExtensions.Throws("agent", () => { new WarningHeaderValue(100, "", "\"\""); }); Assert.Throws(() => { new WarningHeaderValue(100, "x y", "\"\""); }); Assert.Throws(() => { new WarningHeaderValue(100, "x ", "\"\""); }); Assert.Throws(() => { new WarningHeaderValue(100, " x", "\"\""); }); - AssertExtensions.Throws("agent", () => { new WarningHeaderValue(100, null, "\"\""); }); + AssertExtensions.Throws("agent", () => { new WarningHeaderValue(100, null, "\"\""); }); AssertExtensions.Throws("agent", () => { new WarningHeaderValue(100, "", "\"\""); }); Assert.Throws(() => { new WarningHeaderValue(100, "h", "x"); }); Assert.Throws(() => { new WarningHeaderValue(100, "h", "\"x"); }); @@ -52,13 +52,13 @@ public void Ctor_4ParamsOverload_AllFieldsInitializedCorrectly() Assert.Throws(() => { new WarningHeaderValue(-1, "host", "\"\""); }); Assert.Throws(() => { new WarningHeaderValue(1000, "host", "\"\""); }); - AssertExtensions.Throws("agent", () => { new WarningHeaderValue(100, null, "\"\""); }); + AssertExtensions.Throws("agent", () => { new WarningHeaderValue(100, null, "\"\""); }); AssertExtensions.Throws("agent", () => { new WarningHeaderValue(100, "", "\"\""); }); Assert.Throws(() => { new WarningHeaderValue(100, "[::1]:80(x)", "\"\""); }); Assert.Throws(() => { new WarningHeaderValue(100, "host::80", "\"\""); }); Assert.Throws(() => { new WarningHeaderValue(100, "192.168.0.1=", "\"\""); }); - AssertExtensions.Throws("agent", () => { new WarningHeaderValue(100, null, "\"\""); }); + AssertExtensions.Throws("agent", () => { new WarningHeaderValue(100, null, "\"\""); }); AssertExtensions.Throws("agent", () => { new WarningHeaderValue(100, "", "\"\""); }); Assert.Throws(() => { new WarningHeaderValue(100, "h", "(x)"); }); Assert.Throws(() => { new WarningHeaderValue(100, "h", "\"x\"y"); });