diff --git a/src/GuardClauses/GuardAgainstStringLengthExtensions.cs b/src/GuardClauses/GuardAgainstStringLengthExtensions.cs index 4bb98c75..689862fd 100644 --- a/src/GuardClauses/GuardAgainstStringLengthExtensions.cs +++ b/src/GuardClauses/GuardAgainstStringLengthExtensions.cs @@ -3,6 +3,11 @@ using Ardalis.GuardClauses; namespace GuardClauses; + +/// +/// The class containing extension methods for +/// for and types. +/// public static partial class GuardClauseExtensions { /// diff --git a/test/GuardClauses.UnitTests/GuardAgainstDefault.cs b/test/GuardClauses.UnitTests/GuardAgainstDefault.cs index 47db86d7..3b0d01ed 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstDefault.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstDefault.cs @@ -38,7 +38,7 @@ public void ReturnsExpectedValueWhenGivenNonDefaultValue(object input, string na [Theory] [InlineData(null, "Parameter [parameterName] is default value for type String (Parameter 'parameterName')")] [InlineData("Please provide correct value", "Please provide correct value (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string expectedMessage) { var exception = Assert.Throws(() => Guard.Against.Default(default(string), "parameterName", customMessage)); Assert.NotNull(exception); @@ -49,7 +49,7 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [Theory] [InlineData(null, "Parameter [xyz] is default value for type String (Parameter 'xyz')")] [InlineData("Please provide correct value", "Please provide correct value (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvided(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvided(string? customMessage, string expectedMessage) { var xyz = default(string); var exception = Assert.Throws(() => Guard.Against.Default(xyz, message: customMessage)); @@ -63,7 +63,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvided(string cust [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string? expectedParamName, string? customMessage) { var exception = Assert.Throws(() => Guard.Against.Default(default(string), expectedParamName, customMessage)); Assert.NotNull(exception); diff --git a/test/GuardClauses.UnitTests/GuardAgainstExpressionDeprecated.cs b/test/GuardClauses.UnitTests/GuardAgainstExpressionDeprecated.cs index ad32bc95..f5841f7f 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstExpressionDeprecated.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstExpressionDeprecated.cs @@ -5,6 +5,9 @@ namespace GuardClauses.UnitTests; +/// +/// Tests removed to eliminate compiler warnings about obsolete method. +/// public class GuardAgainstExpressionDeprecated { public struct CustomStruct @@ -22,66 +25,66 @@ public static IEnumerable GetCustomStruct() }; } - [Theory] - [InlineData(10)] - public void GivenIntegerWhenTheAgainstExpressionEvaluatesToTrueDoesNothing(int test) - { - Guard.Against.AgainstExpression((x) => x == 10, test, "Value is not equal to 10"); - } + //[Theory] + //[InlineData(10)] + //public void GivenIntegerWhenTheAgainstExpressionEvaluatesToTrueDoesNothing(int test) + //{ + // Guard.Against.AgainstExpression((x) => x == 10, test, "Value is not equal to 10"); + //} - [Theory] - [InlineData(10)] - public void GivenIntegerWhenTheAgainstExpressionEvaluatesToFalseThrowsException(int test) - { - Assert.Throws(() => Guard.Against.AgainstExpression((x) => x == 5, test, "Value is not equal to 10")); - } + //[Theory] + //[InlineData(10)] + //public void GivenIntegerWhenTheAgainstExpressionEvaluatesToFalseThrowsException(int test) + //{ + // Assert.Throws(() => Guard.Against.AgainstExpression((x) => x == 5, test, "Value is not equal to 10")); + //} - [Theory] - [InlineData(1.1)] - public void GivenDoubleWhenTheAgainstExpressionEvaluatesToTrueDoesNothing(double test) - { - Guard.Against.AgainstExpression((x) => x == 1.1, test, "Value is not equal to 1.1"); - } + //[Theory] + //[InlineData(1.1)] + //public void GivenDoubleWhenTheAgainstExpressionEvaluatesToTrueDoesNothing(double test) + //{ + // Guard.Against.AgainstExpression((x) => x == 1.1, test, "Value is not equal to 1.1"); + //} - [Theory] - [InlineData(1.1)] - public void GivenDoubleWhenTheAgainstExpressionEvaluatesToFalseThrowsException(int test) - { - Assert.Throws(() => Guard.Against.AgainstExpression((x) => x == 5.0, test, "Value is not equal to 1.1")); - } + //[Theory] + //[InlineData(1.1)] + //public void GivenDoubleWhenTheAgainstExpressionEvaluatesToFalseThrowsException(int test) + //{ + // Assert.Throws(() => Guard.Against.AgainstExpression((x) => x == 5.0, test, "Value is not equal to 1.1")); + //} - [Theory] - [MemberData(nameof(GetCustomStruct))] - public void GivenCustomStructWhenTheAgainstExpressionEvaluatesToTrueDoesNothing(CustomStruct test) - { - Guard.Against.AgainstExpression((x) => x.FieldName == "FieldValue", test, "FieldValue is not matching"); - } + //[Theory] + //[MemberData(nameof(GetCustomStruct))] + //public void GivenCustomStructWhenTheAgainstExpressionEvaluatesToTrueDoesNothing(CustomStruct test) + //{ + // Guard.Against.AgainstExpression((x) => x.FieldName == "FieldValue", test, "FieldValue is not matching"); + //} - [Theory] - [MemberData(nameof(GetCustomStruct))] - public void GivenCustomStructWhenTheAgainstExpressionEvaluatesToFalseThrowsException(CustomStruct test) - { - Assert.Throws(() => Guard.Against.AgainstExpression((x) => x.FieldName == "FailThis", test, "FieldValue is not matching")); - } + //[Theory] + //[MemberData(nameof(GetCustomStruct))] + //public void GivenCustomStructWhenTheAgainstExpressionEvaluatesToFalseThrowsException(CustomStruct test) + //{ + // Assert.Throws(() => Guard.Against.AgainstExpression((x) => x.FieldName == "FailThis", test, "FieldValue is not matching")); + //} - [Theory] - [InlineData(null, "Value does not fall within the expected range.")] - [InlineData("Please provide correct value", "Please provide correct value")] - public void ErrorMessageMatchesAgainstExpected(string customMessage, string expectedMessage) - { - var exception = Assert.Throws(() => Guard.Against.AgainstExpression(x => x == 1, 2, customMessage)); - Assert.NotNull(exception); - Assert.NotNull(exception.Message); - Assert.Equal(expectedMessage, exception.Message); - } + //[Theory] + //[InlineData(null, "Value does not fall within the expected range.")] + //[InlineData("Please provide correct value", "Please provide correct value")] + //public void ErrorMessageMatchesAgainstExpected(string? customMessage, string expectedMessage) + //{ + // var exception = Assert.Throws(() => Guard.Against.AgainstExpression(x => x == 1, 2, customMessage)); + // Assert.NotNull(exception); + // Assert.NotNull(exception.Message); + // Assert.Equal(expectedMessage, exception.Message); + //} - [Fact] - public void ErrorIncludesParamNameIfProvidedInAgainstExpression() - { - string paramName = "testParamName"; - var exception = Assert.Throws(() => Guard.Against.AgainstExpression(x => x == 1, 2, "custom message", paramName)); - Assert.NotNull(exception); - Assert.NotNull(exception.Message); - Assert.Equal(paramName, exception.ParamName); - } + //[Fact] + //public void ErrorIncludesParamNameIfProvidedInAgainstExpression() + //{ + // string paramName = "testParamName"; + // var exception = Assert.Throws(() => Guard.Against.AgainstExpression(x => x == 1, 2, "custom message", paramName)); + // Assert.NotNull(exception); + // Assert.NotNull(exception.Message); + // Assert.Equal(paramName, exception.ParamName); + //} } diff --git a/test/GuardClauses.UnitTests/GuardAgainstInvalidFormatTests.cs b/test/GuardClauses.UnitTests/GuardAgainstInvalidFormatTests.cs index 15c45a12..6abe98c1 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstInvalidFormatTests.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstInvalidFormatTests.cs @@ -33,7 +33,7 @@ public void ThrowsGivenGivenIncorrectFormat(string input, string regexPattern) [Theory] [InlineData(null, "Input parameterName was not in required format (Parameter 'parameterName')")] [InlineData("Please provide value in a correct format", "Please provide value in a correct format (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string? expectedMessage) { var exception = Assert.Throws(() => Guard.Against.InvalidFormat("aaa", "parameterName", "^b", customMessage)); Assert.NotNull(exception); @@ -46,9 +46,9 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string? expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.InvalidFormat("aaa", expectedParamName, "^b", customMessage)); + var exception = Assert.Throws(() => Guard.Against.InvalidFormat("aaa", expectedParamName!, "^b", customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstNegative.cs b/test/GuardClauses.UnitTests/GuardAgainstNegative.cs index 2f96b546..9bc21209 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstNegative.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstNegative.cs @@ -110,7 +110,7 @@ public void ReturnsExpectedValueGivenNonNegativeTimeSpanValue() [Theory] [InlineData(null, "Required input xyz cannot be negative. (Parameter 'xyz')")] [InlineData("Must be positive", "Must be positive (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenIntValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenIntValue(string? customMessage, string? expectedMessage) { var xyz = -1; @@ -124,7 +124,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenIntValu [Theory] [InlineData(null, "Required input xyz cannot be negative. (Parameter 'xyz')")] [InlineData("Must be positive", "Must be positive (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenLongValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenLongValue(string? customMessage, string? expectedMessage) { var xyz = -1L; @@ -138,7 +138,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenLongVal [Theory] [InlineData(null, "Required input xyz cannot be negative. (Parameter 'xyz')")] [InlineData("Must be positive", "Must be positive (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDecimalValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDecimalValue(string? customMessage, string? expectedMessage) { var xyz = -1.0M; @@ -152,7 +152,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDecimal [Theory] [InlineData(null, "Required input xyz cannot be negative. (Parameter 'xyz')")] [InlineData("Must be positive", "Must be positive (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenFloatValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenFloatValue(string? customMessage, string? expectedMessage) { var xyz = -1.0f; @@ -166,7 +166,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenFloatVa [Theory] [InlineData(null, "Required input xyz cannot be negative. (Parameter 'xyz')")] [InlineData("Must be positive", "Must be positive (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDoubleValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDoubleValue(string? customMessage, string? expectedMessage) { var xyz = -1.0; @@ -180,7 +180,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDoubleV [Theory] [InlineData(null, "Required input xyz cannot be negative. (Parameter 'xyz')")] [InlineData("Must be positive", "Must be positive (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenTimeSpanValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenTimeSpanValue(string? customMessage, string? expectedMessage) { var xyz = TimeSpan.FromSeconds(-1); @@ -194,7 +194,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenTimeSpa [Theory] [InlineData(null, "Required input parameterName cannot be negative. (Parameter 'parameterName')")] [InlineData("Must be positive", "Must be positive (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string? expectedMessage) { var clausesToEvaluate = new List { @@ -220,7 +220,7 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string? expectedParamName, string? customMessage) { var clausesToEvaluate = new List { diff --git a/test/GuardClauses.UnitTests/GuardAgainstNegativeOrZero.cs b/test/GuardClauses.UnitTests/GuardAgainstNegativeOrZero.cs index 7071bf44..2451cab8 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstNegativeOrZero.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstNegativeOrZero.cs @@ -113,7 +113,7 @@ public void ReturnsExpectedValueWhenGivenPositiveValue() [InlineData(-1, "Must be positive", "Must be positive (Parameter 'xyz')")] [InlineData(0, null, "Required input xyz cannot be zero or negative. (Parameter 'xyz')")] [InlineData(0, "Must be positive", "Must be positive (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenIntValue(int xyz, string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenIntValue(int xyz, string? customMessage, string? expectedMessage) { var exception = Assert.Throws(() => Guard.Against.NegativeOrZero(xyz, message: customMessage)); @@ -127,7 +127,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenIntValu [InlineData(-1L, "Must be positive", "Must be positive (Parameter 'xyz')")] [InlineData(0L, null, "Required input xyz cannot be zero or negative. (Parameter 'xyz')")] [InlineData(0L, "Must be positive", "Must be positive (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenLongValue(long xyz, string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenLongValue(long xyz, string? customMessage, string? expectedMessage) { var exception = Assert.Throws(() => Guard.Against.NegativeOrZero(xyz, message: customMessage)); @@ -141,7 +141,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenLongVal [InlineData(-1.0, "Must be positive", "Must be positive (Parameter 'xyz')")] [InlineData(0.0, null, "Required input xyz cannot be zero or negative. (Parameter 'xyz')")] [InlineData(0.0, "Must be positive", "Must be positive (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDecimalValue(decimal xyz, string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDecimalValue(decimal xyz, string? customMessage, string? expectedMessage) { var exception = Assert.Throws(() => Guard.Against.NegativeOrZero(xyz, message: customMessage)); @@ -155,7 +155,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDecimal [InlineData(-1.0, "Must be positive", "Must be positive (Parameter 'xyz')")] [InlineData(0.0, null, "Required input xyz cannot be zero or negative. (Parameter 'xyz')")] [InlineData(0.0, "Must be positive", "Must be positive (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenFloatValue(float xyz, string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenFloatValue(float xyz, string? customMessage, string? expectedMessage) { var exception = Assert.Throws(() => Guard.Against.NegativeOrZero(xyz, message: customMessage)); @@ -169,7 +169,8 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenFloatVa [InlineData(-1.0, "Must be positive", "Must be positive (Parameter 'xyz')")] [InlineData(0.0, null, "Required input xyz cannot be zero or negative. (Parameter 'xyz')")] [InlineData(0.0, "Must be positive", "Must be positive (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDoubleValue(double xyz, string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDoubleValue(double xyz, + string? customMessage, string? expectedMessage) { var exception = Assert.Throws(() => Guard.Against.NegativeOrZero(xyz, message: customMessage)); @@ -183,7 +184,8 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDoubleV [InlineData(-1.0, "Must be positive", "Must be positive (Parameter 'xyz')")] [InlineData(0.0, null, "Required input xyz cannot be zero or negative. (Parameter 'xyz')")] [InlineData(0.0, "Must be positive", "Must be positive (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenTimeSpanValue(double change, string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenTimeSpanValue(double change, + string? customMessage, string? expectedMessage) { var xyz = TimeSpan.FromSeconds(change); @@ -199,7 +201,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenTimeSpa [InlineData(-1, "Must be positive", "Must be positive (Parameter 'parameterName')")] [InlineData(0, null, "Required input parameterName cannot be zero or negative. (Parameter 'parameterName')")] [InlineData(0, "Must be positive", "Must be positive (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(int input, string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(int input, string? customMessage, string? expectedMessage) { var clausesToEvaluate = new List { @@ -229,7 +231,7 @@ public void ErrorMessageMatchesExpected(int input, string customMessage, string [InlineData(0, null, "Please provide correct value")] [InlineData(0, "SomeParameter", null)] [InlineData(0, "SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(int input, string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(int input, string? expectedParamName, string? customMessage) { var clausesToEvaluate = new List { diff --git a/test/GuardClauses.UnitTests/GuardAgainstNull.cs b/test/GuardClauses.UnitTests/GuardAgainstNull.cs index 149cdaf1..4888c58c 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstNull.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstNull.cs @@ -77,7 +77,7 @@ static bool IsNullableType(T value) [Theory] [InlineData(null, "Value cannot be null. (Parameter 'parameterName')")] [InlineData("Please provide correct value", "Please provide correct value (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string? expectedMessage) { string? nullString = null; var exception = Assert.Throws(() => Guard.Against.Null(nullString, "parameterName", customMessage)); @@ -103,7 +103,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvided() [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string? expectedParamName, string? customMessage) { string? nullString = null; var exception = Assert.Throws(() => Guard.Against.Null(nullString, expectedParamName, customMessage)); diff --git a/test/GuardClauses.UnitTests/GuardAgainstNullOrEmpty.cs b/test/GuardClauses.UnitTests/GuardAgainstNullOrEmpty.cs index 88516ea0..3bb9da61 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstNullOrEmpty.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstNullOrEmpty.cs @@ -83,7 +83,7 @@ public void ReturnsExpectedValueWhenGivenValidValue() [Theory] [InlineData(null, "Required input xyz was empty. (Parameter 'xyz')")] [InlineData("Value is empty", "Value is empty (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenStringValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenStringValue(string? customMessage, string expectedMessage) { string xyz = string.Empty; @@ -97,7 +97,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenStringV [Theory] [InlineData(null, "Required input xyz was empty. (Parameter 'xyz')")] [InlineData("Value is empty", "Value is empty (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenGuidValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenGuidValue(string? customMessage, string expectedMessage) { Guid xyz = Guid.Empty; @@ -111,7 +111,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenGuidVal [Theory] [InlineData(null, "Required input xyz was empty. (Parameter 'xyz')")] [InlineData("Value is empty", "Value is empty (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenIEnumerableValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenIEnumerableValue(string? customMessage, string expectedMessage) { IEnumerable xyz = Enumerable.Empty(); @@ -125,7 +125,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenIEnumer [Theory] [InlineData(null, "Required input parameterName was empty. (Parameter 'parameterName')")] [InlineData("Value is empty", "Value is empty (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenInputIsEmpty(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsEmpty(string? customMessage, string? expectedMessage) { string emptyString = string.Empty; Guid emptyGuid = Guid.Empty; @@ -150,7 +150,7 @@ public void ErrorMessageMatchesExpectedWhenInputIsEmpty(string customMessage, st [Theory] [InlineData(null, "Value cannot be null. (Parameter 'parameterName')")] [InlineData("Value must be correct", "Value must be correct (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenInputIsNull(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsNull(string? customMessage, string? expectedMessage) { string? nullString = null; Guid? nullGuid = null; @@ -177,7 +177,7 @@ public void ErrorMessageMatchesExpectedWhenInputIsNull(string customMessage, str [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedWhenInputIsEmpty(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedWhenInputIsEmpty(string? expectedParamName, string? customMessage) { string emptyString = string.Empty; Guid emptyGuid = Guid.Empty; @@ -203,7 +203,7 @@ public void ExceptionParamNameMatchesExpectedWhenInputIsEmpty(string expectedPar [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedWhenInputIsNull(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedWhenInputIsNull(string? expectedParamName, string? customMessage) { string? nullString = null; Guid? nullGuid = null; diff --git a/test/GuardClauses.UnitTests/GuardAgainstNullOrInvalidInput.cs b/test/GuardClauses.UnitTests/GuardAgainstNullOrInvalidInput.cs index bd209b8d..4765f02d 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstNullOrInvalidInput.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstNullOrInvalidInput.cs @@ -10,7 +10,7 @@ public class GuardAgainstNullOrInvalidInput { [Theory] [ClassData(typeof(ArgumentNullExceptionClassData))] - public void ThrowsArgumentNullExceptionWhenInputIsNull(string input, Func func) + public void ThrowsArgumentNullExceptionWhenInputIsNull(string? input, Func func) { Assert.Throws("string", () => Guard.Against.NullOrInvalidInput(input, "string", func)); @@ -18,7 +18,7 @@ public void ThrowsArgumentNullExceptionWhenInputIsNull(string input, Func func) + public void ThrowsArgumentExceptionWhenInputIsInvalid(string? input, Func func) { Assert.Throws("string", () => Guard.Against.NullOrInvalidInput(input, "string", func)); @@ -37,7 +37,7 @@ public void ReturnsExceptedValueWhenGivenValidInput(int input, Func f [InlineData("Evaluation failed", "Evaluation failed (Parameter 'parameterName')", typeof(ArgumentException), 10)] [InlineData(null, "Value cannot be null. (Parameter 'parameterName')", typeof(ArgumentNullException))] [InlineData("Please provide correct value", "Please provide correct value (Parameter 'parameterName')", typeof(ArgumentNullException))] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage, Type exceptionType, int? input = null) + public void ErrorMessageMatchesExpected(string? customMessage, string? expectedMessage, Type exceptionType, int? input = null) { var exception = Assert.Throws(exceptionType, () => Guard.Against.NullOrInvalidInput(input, "parameterName", x => x > 20, customMessage)); @@ -52,10 +52,10 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [InlineData(null, "Please provide correct value", typeof(ArgumentException), 10)] [InlineData("SomeParameter", null, typeof(ArgumentNullException))] [InlineData("SomeOtherParameter", "Value must be correct", typeof(ArgumentNullException))] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage, Type exceptionType, int? input = null) + public void ExceptionParamNameMatchesExpected(string? expectedParamName, string? customMessage, Type exceptionType, int? input = null) { var exception = Assert.Throws(exceptionType, - () => Guard.Against.NullOrInvalidInput(input, expectedParamName, x => x > 20, customMessage)); + () => Guard.Against.NullOrInvalidInput(input, expectedParamName!, x => x > 20, customMessage)); Assert.IsAssignableFrom(exception); Assert.NotNull(exception); diff --git a/test/GuardClauses.UnitTests/GuardAgainstNullOrOutOfRangeForInt.cs b/test/GuardClauses.UnitTests/GuardAgainstNullOrOutOfRangeForInt.cs index 9b8c9ff3..f4b6887d 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstNullOrOutOfRangeForInt.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstNullOrOutOfRangeForInt.cs @@ -47,7 +47,7 @@ public void ReturnsExpectedValueGivenInRangeValue(int input, int rangeFrom, int [Theory] [InlineData(null, "Input parameterName was out of range (Parameter 'parameterName')")] [InlineData("Int range", "Int range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string? expectedMessage) { var exception = Assert.Throws(() => Guard.Against.NullOrOutOfRange(3, "parameterName", 0, 1, customMessage)); Assert.NotNull(exception); diff --git a/test/GuardClauses.UnitTests/GuardAgainstNullOrOutOfSQLDateRange.cs b/test/GuardClauses.UnitTests/GuardAgainstNullOrOutOfSQLDateRange.cs index 47f131ba..69b83593 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstNullOrOutOfSQLDateRange.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstNullOrOutOfSQLDateRange.cs @@ -70,7 +70,7 @@ public void ReturnsExpectedValueWhenGivenValidSqlDateTime(DateTime input, string [Theory] [InlineData(null, "Input date was out of range (Parameter 'date')")] [InlineData("SQLDate range", "SQLDate range (Parameter 'date')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string expectedMessage) { DateTime date = SqlDateTime.MinValue.Value.AddSeconds(-1); var exception = Assert.Throws(() => Guard.Against.NullOrOutOfSQLDateRange(date, nameof(date), customMessage)); diff --git a/test/GuardClauses.UnitTests/GuardAgainstNullOrWhiteSpace.cs b/test/GuardClauses.UnitTests/GuardAgainstNullOrWhiteSpace.cs index 947fb069..2a5538eb 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstNullOrWhiteSpace.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstNullOrWhiteSpace.cs @@ -12,7 +12,7 @@ public class GuardAgainstNullOrWhiteSpace [InlineData("some text")] [InlineData(" leading whitespace")] [InlineData("trailing whitespace ")] - public void DoesNothingGivenNonEmptyStringValue(string nonEmptyString) + public void DoesNothingGivenNonEmptyStringValue(string? nonEmptyString) { Guard.Against.NullOrWhiteSpace(nonEmptyString, "string"); Guard.Against.WhiteSpace(nonEmptyString.AsSpan(), "stringSpan"); @@ -40,7 +40,7 @@ public void ThrowsGivenEmptyStringSpan() [Theory] [InlineData(" ")] [InlineData(" ")] - public void ThrowsGivenWhiteSpaceString(string whiteSpaceString) + public void ThrowsGivenWhiteSpaceString(string? whiteSpaceString) { Assert.Throws(() => Guard.Against.NullOrWhiteSpace(whiteSpaceString, "whitespacestring")); Assert.Throws(() => Guard.Against.WhiteSpace(whiteSpaceString.AsSpan(), "whiteSpaceStringSpan")); @@ -52,7 +52,7 @@ public void ThrowsGivenWhiteSpaceString(string whiteSpaceString) [InlineData("some text", "some text")] [InlineData(" leading whitespace", " leading whitespace")] [InlineData("trailing whitespace ", "trailing whitespace ")] - public void ReturnsExpectedValueGivenNonEmptyStringValue(string nonEmptyString, string expected) + public void ReturnsExpectedValueGivenNonEmptyStringValue(string? nonEmptyString, string? expected) { Assert.Equal(expected, Guard.Against.NullOrWhiteSpace(nonEmptyString, "string")); Assert.Equal(expected, Guard.Against.WhiteSpace(nonEmptyString.AsSpan(), "stringSpan").ToString()); @@ -62,7 +62,7 @@ public void ReturnsExpectedValueGivenNonEmptyStringValue(string nonEmptyString, [Theory] [InlineData(null, "Required input parameterName was empty. (Parameter 'parameterName')")] [InlineData("Value is empty", "Value is empty (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenInputIsWhiteSpace(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsWhiteSpace(string? customMessage, string? expectedMessage) { var exception = Assert.Throws(() => Guard.Against.NullOrWhiteSpace(" ", "parameterName", customMessage)); Assert.NotNull(exception); @@ -73,7 +73,7 @@ public void ErrorMessageMatchesExpectedWhenInputIsWhiteSpace(string customMessag [Theory] [InlineData(null, "Value cannot be null. (Parameter 'parameterName')")] [InlineData("Value is null", "Value is null (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenInputIsNull(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsNull(string? customMessage, string? expectedMessage) { string? nullString = null; var exception = Assert.Throws(() => Guard.Against.NullOrWhiteSpace(nullString, "parameterName", customMessage)); @@ -85,7 +85,7 @@ public void ErrorMessageMatchesExpectedWhenInputIsNull(string customMessage, str [Theory] [InlineData(null, "Value cannot be null. (Parameter 'xyz')")] [InlineData("Value is null", "Value is null (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvided(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvided(string? customMessage, string? expectedMessage) { string? xyz = null; var exception = Assert.Throws(() => Guard.Against.NullOrWhiteSpace(xyz, message: customMessage)); @@ -99,7 +99,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvided(string cust [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedWhenInputIsWhiteSpace(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedWhenInputIsWhiteSpace(string? expectedParamName, string? customMessage) { var exception = Assert.Throws(() => Guard.Against.NullOrWhiteSpace(" ", expectedParamName, customMessage)); Assert.NotNull(exception); @@ -111,7 +111,7 @@ public void ExceptionParamNameMatchesExpectedWhenInputIsWhiteSpace(string expect [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedWhenInputIsNull(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedWhenInputIsNull(string? expectedParamName, string? customMessage) { string? nullString = null; var exception = Assert.Throws(() => Guard.Against.NullOrWhiteSpace(nullString, expectedParamName, customMessage)); diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForDateTime.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForDateTime.cs index a0033430..c2b0913b 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForDateTime.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForDateTime.cs @@ -58,9 +58,10 @@ public void ReturnsExpectedValueGivenInRangeValue(int rangeFromOffset, int range [Theory] [InlineData(null, "Input parameterName was out of range (Parameter 'parameterName')")] [InlineData("DateTime range", "DateTime range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string? expectedMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange(DateTime.Today.AddDays(-1), "parameterName", + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(DateTime.Today.AddDays(-1), "parameterName", DateTime.Today, DateTime.Today.AddDays(1), customMessage)); Assert.NotNull(exception); Assert.NotNull(exception.Message); @@ -70,7 +71,7 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [Theory] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string expectedParamName, string? customMessage) { var exception = Assert.Throws(() => Guard.Against.OutOfRange(DateTime.Today.AddDays(-1), expectedParamName, DateTime.Today, DateTime.Today.AddDays(1), customMessage)); @@ -84,7 +85,8 @@ public void ExceptionParamNameMatchesExpected(string expectedParamName, string c [InlineData(null, "Please provide correct value")] public void ExceptionParamNameNull(string? expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange(DateTime.Today.AddDays(-1), expectedParamName, + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(DateTime.Today.AddDays(-1), expectedParamName!, DateTime.Today, DateTime.Today.AddDays(1), customMessage)); Assert.NotNull(exception); Assert.Equal("parameterName", exception.ParamName); diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForDecimal.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForDecimal.cs index da6a063c..f0f9d549 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForDecimal.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForDecimal.cs @@ -47,9 +47,10 @@ public void ReturnsExpectedValueGivenInRangeValue(decimal input, decimal rangeFr [Theory] [InlineData(null, "Input parameterName was out of range (Parameter 'parameterName')")] [InlineData("Decimal range", "Decimal range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string? expectedMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange(3.0, "parameterName", 0.0, 1.0, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(3.0, "parameterName", 0.0, 1.0, customMessage)); Assert.NotNull(exception); Assert.NotNull(exception.Message); Assert.Equal(expectedMessage, exception.Message); @@ -58,7 +59,7 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [Theory] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string expectedParamName, string? customMessage) { var exception = Assert.Throws(() => Guard.Against.OutOfRange(3.0, expectedParamName, 0.0, 1.0, customMessage)); Assert.NotNull(exception); @@ -70,7 +71,8 @@ public void ExceptionParamNameMatchesExpected(string expectedParamName, string c [InlineData(null, "Please provide correct value")] public void ExceptionParamNameNull(string? expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange(3.0, expectedParamName, 0.0, 1.0, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(3.0, expectedParamName!, 0.0, 1.0, customMessage)); Assert.NotNull(exception); Assert.Equal("parameterName", exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForDouble.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForDouble.cs index 3f19798f..f4174594 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForDouble.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForDouble.cs @@ -47,9 +47,10 @@ public void ReturnsExpectedValueGivenInRangeValue(double input, double rangeFrom [Theory] [InlineData(null, "Input parameterName was out of range (Parameter 'parameterName')")] [InlineData("Double range", "Double range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string expectedMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange(3.0d, "parameterName", 0.0d, 1.0d, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(3.0d, "parameterName", 0.0d, 1.0d, customMessage)); Assert.NotNull(exception); Assert.NotNull(exception.Message); Assert.Equal(expectedMessage, exception.Message); @@ -58,9 +59,10 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [Theory] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange(3.0d, expectedParamName, 0.0d, 1.0d, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(3.0d, expectedParamName, 0.0d, 1.0d, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } @@ -70,7 +72,8 @@ public void ExceptionParamNameMatchesExpected(string expectedParamName, string c [InlineData(null, "Please provide correct value")] public void ExceptionParamNameNull(string? expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange(3.0d, expectedParamName, 0.0d, 1.0d, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(3.0d, expectedParamName!, 0.0d, 1.0d, customMessage)); Assert.NotNull(exception); Assert.Equal("parameterName", exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnum.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnum.cs index 2c15fe5c..4860712c 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnum.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnum.cs @@ -81,7 +81,7 @@ public void ReturnsExpectedValueGivenInRangeEnum(TestEnum enumValue) [Theory] [InlineData(null, "The value of argument 'parameterName' (99) is invalid for Enum type 'TestEnum'. (Parameter 'parameterName')")] [InlineData("Invalid enum value", "Invalid enum value")] - public void ErrorMessageMatchesExpectedWhenInputIsEnum(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsEnum(string? customMessage, string? expectedMessage) { var exception = Assert.Throws( () => Guard.Against.EnumOutOfRange((TestEnum)99, "parameterName", customMessage)); @@ -93,7 +93,7 @@ public void ErrorMessageMatchesExpectedWhenInputIsEnum(string customMessage, str [Theory] [InlineData(null, "The value of argument 'xyz' (99) is invalid for Enum type 'TestEnum'. (Parameter 'xyz')")] [InlineData("Invalid enum value", "Invalid enum value")] - public void ErrorMessageMatchesExpectedWhenInputIsEnumAndParamNameNotExplicitlyProvided(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsEnumAndParamNameNotExplicitlyProvided(string? customMessage, string? expectedMessage) { var xyz = (TestEnum)99; var exception = Assert.Throws( @@ -109,7 +109,7 @@ public void ErrorMessageMatchesExpectedWhenInputIsEnumAndParamNameNotExplicitlyP [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData(null, "Value must be correct")] - public void ExceptionParamNameMatchesExpectedWhenInputIsEnum(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedWhenInputIsEnum(string? expectedParamName, string? customMessage) { var exception = Assert.Throws( () => Guard.Against.EnumOutOfRange((TestEnum)99, expectedParamName, customMessage)); @@ -120,7 +120,7 @@ public void ExceptionParamNameMatchesExpectedWhenInputIsEnum(string expectedPara [Theory] [InlineData(null, "The value of argument 'parameterName' (99) is invalid for Enum type 'TestEnum'. (Parameter 'parameterName')")] [InlineData("Invalid enum value", "Invalid enum value")] - public void ErrorMessageMatchesExpectedWhenInputIsInt(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsInt(string? customMessage, string? expectedMessage) { var exception = Assert.Throws( () => Guard.Against.EnumOutOfRange(99, "parameterName", customMessage)); @@ -134,7 +134,7 @@ public void ErrorMessageMatchesExpectedWhenInputIsInt(string customMessage, stri [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData(null, "Value must be correct")] - public void ExceptionParamNameMatchesExpectedWhenInputIsInt(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedWhenInputIsInt(string? expectedParamName, string? customMessage) { var exception = Assert.Throws( () => Guard.Against.EnumOutOfRange(99, expectedParamName, customMessage)); diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableDecimal.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableDecimal.cs index 49e12821..b749c1c3 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableDecimal.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableDecimal.cs @@ -40,7 +40,7 @@ public void ReturnsExpectedValueGivenInRangeValue(IEnumerable input, de [Theory] [InlineData(null, "rangeFrom should be less or equal than rangeTo (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string? customMessage, string? expectedMessage) { var input = new[] { 0m, 1m, 99m }; decimal rangeFrom = 2m; @@ -57,13 +57,14 @@ public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string? expectedParamName, string? customMessage) { var input = new[] { 0m, 1m, 99m }; decimal rangeFrom = 2m; decimal rangeTo = 1m; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } @@ -71,13 +72,14 @@ public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParam [Theory] [InlineData(null, "Input parameterName had out of range item(s) (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string? customMessage, string? expectedMessage) { var input = new[] { 0m, 1m, 99m }; decimal rangeFrom = 0m; decimal rangeTo = 1m; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, "parameterName", rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, "parameterName", rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.NotNull(exception.Message); Assert.Equal(expectedMessage, exception.Message); @@ -88,13 +90,14 @@ public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedInputIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedInputIsInvalid(string? expectedParamName, string? customMessage) { var input = new[] { 0m, 1m, 99m }; decimal rangeFrom = 0m; decimal rangeTo = 1m; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableDouble.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableDouble.cs index ce6e9938..c9a39d4b 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableDouble.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableDouble.cs @@ -40,7 +40,7 @@ public void ReturnsExpectedValueGivenInRangeValue(IEnumerable input, dou [Theory] [InlineData(null, "rangeFrom should be less or equal than rangeTo (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string? customMessage, string? expectedMessage) { var input = new[] { 0d, 1d, 99d }; double rangeFrom = 2d; @@ -57,13 +57,14 @@ public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string? expectedParamName, string? customMessage) { var input = new[] { 0d, 1d, 99d }; double rangeFrom = 2d; double rangeTo = 1d; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } @@ -71,13 +72,14 @@ public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParam [Theory] [InlineData(null, "Input parameterName had out of range item(s) (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string? customMessage, string? expectedMessage) { var input = new[] { 0d, 1d, 99d }; double rangeFrom = 0d; double rangeTo = 1d; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, "parameterName", rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, "parameterName", rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.NotNull(exception.Message); Assert.Equal(expectedMessage, exception.Message); @@ -88,13 +90,14 @@ public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedInputIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedInputIsInvalid(string? expectedParamName, string? customMessage) { var input = new[] { 0d, 1d, 99d }; double rangeFrom = 0d; double rangeTo = 1d; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableFloat.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableFloat.cs index e93d8a6d..dea2d39d 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableFloat.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableFloat.cs @@ -40,7 +40,7 @@ public void ReturnsExpectedValueGivenInRangeValue(IEnumerable input, floa [Theory] [InlineData(null, "rangeFrom should be less or equal than rangeTo (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string? customMessage, string? expectedMessage) { var input = new[] { 0f, 1f, 99f }; float rangeFrom = 2f; @@ -57,13 +57,14 @@ public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string? expectedParamName, string? customMessage) { var input = new[] { 0f, 1f, 99f }; float rangeFrom = 2f; float rangeTo = 1f; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } @@ -71,13 +72,14 @@ public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParam [Theory] [InlineData(null, "Input parameterName had out of range item(s) (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string? customMessage, string? expectedMessage) { var input = new[] { 0f, 1f, 99f }; float rangeFrom = 0f; float rangeTo = 1f; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, "parameterName", rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, "parameterName", rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.NotNull(exception.Message); Assert.Equal(expectedMessage, exception.Message); @@ -88,13 +90,14 @@ public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedInputIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedInputIsInvalid(string? expectedParamName, string? customMessage) { var input = new[] { 0f, 1f, 99f }; float rangeFrom = 0f; float rangeTo = 1f; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableInt.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableInt.cs index e3b37e9d..6c18ef86 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableInt.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableInt.cs @@ -40,7 +40,7 @@ public void ReturnsExpectedValueGivenInRangeValue(IEnumerable input, int ra [Theory] [InlineData(null, "rangeFrom should be less or equal than rangeTo (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string? customMessage, string? expectedMessage) { var input = new[] { 0, 1, 99 }; int rangeFrom = 2; @@ -57,13 +57,14 @@ public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string? expectedParamName, string? customMessage) { var input = new[] { 0, 1, 99 }; int rangeFrom = 2; int rangeTo = 1; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } @@ -71,13 +72,14 @@ public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParam [Theory] [InlineData(null, "Input parameterName had out of range item(s) (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string? customMessage, string? expectedMessage) { var input = new[] { 0, 1, 99 }; int rangeFrom = 0; int rangeTo = 1; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, "parameterName", rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, "parameterName", rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.NotNull(exception.Message); Assert.Equal(expectedMessage, exception.Message); @@ -88,13 +90,14 @@ public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedInputIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedInputIsInvalid(string? expectedParamName, string? customMessage) { var input = new[] { 0, 1, 99 }; int rangeFrom = 0; int rangeTo = 1; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableLong.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableLong.cs index d26339c9..e8e12b3e 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableLong.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableLong.cs @@ -40,7 +40,7 @@ public void ReturnsExpectedValueGivenInRangeValue(IEnumerable input, long [Theory] [InlineData(null, "rangeFrom should be less or equal than rangeTo (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string? customMessage, string? expectedMessage) { var input = new long[] { 0, 1, 99 }; long rangeFrom = 2; @@ -57,13 +57,13 @@ public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string? expectedParamName, string? customMessage) { var input = new long[] { 0, 1, 99 }; long rangeFrom = 2; long rangeTo = 1; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } @@ -71,7 +71,7 @@ public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParam [Theory] [InlineData(null, "Input parameterName had out of range item(s) (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string? customMessage, string? expectedMessage) { var input = new long[] { 0, 1, 99 }; long rangeFrom = 0; @@ -88,13 +88,14 @@ public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedInputIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedInputIsInvalid(string? expectedParamName, string? customMessage) { var input = new long[] { 0, 1, 99 }; long rangeFrom = 0; long rangeTo = 1; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableShort.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableShort.cs index 1ac0a087..29ac33aa 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableShort.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableShort.cs @@ -40,7 +40,7 @@ public void ReturnsExpectedValueGivenInRangeValue(IEnumerable input, shor [Theory] [InlineData(null, "rangeFrom should be less or equal than rangeTo (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string? customMessage, string? expectedMessage) { var input = new short[] { 0, 1, 99 }; short rangeFrom = 2; @@ -57,13 +57,14 @@ public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string? expectedParamName, string? customMessage) { var input = new short[] { 0, 1, 99 }; short rangeFrom = 2; short rangeTo = 1; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } @@ -71,13 +72,14 @@ public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParam [Theory] [InlineData(null, "Input parameterName had out of range item(s) (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string? customMessage, string? expectedMessage) { var input = new short[] { 0, 1, 99 }; short rangeFrom = 0; short rangeTo = 1; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, "parameterName", rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, "parameterName", rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.NotNull(exception.Message); Assert.Equal(expectedMessage, exception.Message); @@ -88,13 +90,14 @@ public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedInputIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedInputIsInvalid(string? expectedParamName, string? customMessage) { var input = new short[] { 0, 1, 99 }; short rangeFrom = 0; short rangeTo = 1; - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableTimeSpan.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableTimeSpan.cs index 317999e5..2769d3d9 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableTimeSpan.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForEnumerableTimeSpan.cs @@ -57,7 +57,7 @@ public void ReturnsExpectedValueGivenInRangeValue(IEnumerable input, int ra [Theory] [InlineData(null, "rangeFrom should be less or equal than rangeTo (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string? customMessage, string? expectedMessage) { var input = Enumerable.Range(0, 3).Select(i => TimeSpan.FromSeconds(i)); var rangeFrom = TimeSpan.FromSeconds(2); @@ -74,13 +74,14 @@ public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string? expectedParamName, string? customMessage) { var input = Enumerable.Range(0, 3).Select(i => TimeSpan.FromSeconds(i)); var rangeFrom = TimeSpan.FromSeconds(2); var rangeTo = TimeSpan.FromSeconds(1); - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } @@ -88,7 +89,7 @@ public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParam [Theory] [InlineData(null, "Input parameterName had out of range item(s) (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string? customMessage, string? expectedMessage) { var input = Enumerable.Range(0, 3).Select(i => TimeSpan.FromSeconds(i)); var rangeFrom = TimeSpan.FromSeconds(0); @@ -105,13 +106,14 @@ public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedInputIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedInputIsInvalid(string? expectedParamName, string? customMessage) { var input = Enumerable.Range(0, 3).Select(i => TimeSpan.FromSeconds(i)); var rangeFrom = TimeSpan.FromSeconds(0); var rangeTo = TimeSpan.FromSeconds(1); - var exception = Assert.Throws(() => Guard.Against.OutOfRange(input, expectedParamName, rangeFrom, rangeTo, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(input, expectedParamName!, rangeFrom, rangeTo, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForFloat.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForFloat.cs index 1f13a0a1..638a3ca9 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForFloat.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForFloat.cs @@ -47,9 +47,10 @@ public void ReturnsExpectedValueGivenInRangeValue(float input, float rangeFrom, [Theory] [InlineData(null, "Input parameterName was out of range (Parameter 'parameterName')")] [InlineData("Float range", "Float range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string? expectedMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange(3.0f, "parameterName", 0.0f, 1.0f, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(3.0f, "parameterName", 0.0f, 1.0f, customMessage)); Assert.NotNull(exception); Assert.NotNull(exception.Message); Assert.Equal(expectedMessage, exception.Message); @@ -58,9 +59,10 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [Theory] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange(3.0f, expectedParamName, 0.0f, 1.0f, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(3.0f, expectedParamName, 0.0f, 1.0f, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } @@ -70,7 +72,8 @@ public void ExceptionParamNameMatchesExpected(string expectedParamName, string c [InlineData(null, "Please provide correct value")] public void ExceptionParamNameNull(string? expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange(3.0f, expectedParamName, 0.0f, 1.0f, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(3.0f, expectedParamName!, 0.0f, 1.0f, customMessage)); Assert.NotNull(exception); Assert.Equal("parameterName", exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForInt.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForInt.cs index 401993bd..c9c8bb6f 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForInt.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForInt.cs @@ -47,7 +47,7 @@ public void ReturnsExpectedValueGivenInRangeValue(int input, int rangeFrom, int [Theory] [InlineData(null, "Input parameterName was out of range (Parameter 'parameterName')")] [InlineData("Int range", "Int range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string? expectedMessage) { var exception = Assert.Throws(() => Guard.Against.OutOfRange(3, "parameterName", 0, 1, customMessage)); Assert.NotNull(exception); @@ -58,7 +58,7 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [Theory] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string expectedParamName, string? customMessage) { var exception = Assert.Throws(() => Guard.Against.OutOfRange(3, expectedParamName, 0, 1, customMessage)); Assert.NotNull(exception); @@ -70,7 +70,8 @@ public void ExceptionParamNameMatchesExpected(string expectedParamName, string c [InlineData(null, "Please provide correct value")] public void ExceptionParamNameNull(string? expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange(3, expectedParamName, 0, 1, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(3, expectedParamName!, 0, 1, customMessage)); Assert.NotNull(exception); Assert.Equal("parameterName", exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForInvalidInput.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForInvalidInput.cs index 98e654ba..ce8f94bc 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForInvalidInput.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForInvalidInput.cs @@ -57,7 +57,7 @@ public async Task ReturnsExpectedValueGivenInRangeValueAsync(T input, Func(() => Guard.Against.InvalidInput(10, "parameterName", x => x > 20, customMessage)); Assert.NotNull(exception); @@ -68,7 +68,7 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [Theory] [InlineData(null, "Input parameterName did not satisfy the options (Parameter 'parameterName')")] [InlineData("Evaluation failed", "Evaluation failed (Parameter 'parameterName')")] - public async Task ErrorMessageMatchesExpectedAsync(string customMessage, string expectedMessage) + public async Task ErrorMessageMatchesExpectedAsync(string? customMessage, string? expectedMessage) { var exception = await Assert.ThrowsAsync(async () => await Guard.Against.InvalidInputAsync(10, "parameterName", x => Task.FromResult(x > 20), customMessage)); Assert.NotNull(exception); @@ -81,9 +81,10 @@ public async Task ErrorMessageMatchesExpectedAsync(string customMessage, string [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string? expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.InvalidInput(10, expectedParamName, x => x > 20, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.InvalidInput(10, expectedParamName!, x => x > 20, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } @@ -93,9 +94,10 @@ public void ExceptionParamNameMatchesExpected(string expectedParamName, string c [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public async Task ExceptionParamNameMatchesExpectedAsync(string expectedParamName, string customMessage) + public async Task ExceptionParamNameMatchesExpectedAsync(string? expectedParamName, string? customMessage) { - var exception = await Assert.ThrowsAsync(async () => await Guard.Against.InvalidInputAsync(10, expectedParamName, x => Task.FromResult(x > 20), customMessage)); + var exception = await Assert.ThrowsAsync(async () => + await Guard.Against.InvalidInputAsync(10, expectedParamName!, x => Task.FromResult(x > 20), customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForShort.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForShort.cs index e9e81fff..83932d0c 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForShort.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForShort.cs @@ -47,7 +47,7 @@ public void ReturnsExpectedValueGivenInRangeValue(short input, short rangeFrom, [Theory] [InlineData(null, "Input parameterName was out of range (Parameter 'parameterName')")] [InlineData("Short range", "Short range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string expectedMessage) { var exception = Assert.Throws(() => Guard.Against.OutOfRange((short)3, "parameterName", (short)0, (short)1, customMessage)); Assert.NotNull(exception); @@ -58,9 +58,10 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [Theory] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange((short)3, expectedParamName, (short)0, (short)1, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange((short)3, expectedParamName, (short)0, (short)1, customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } @@ -70,8 +71,9 @@ public void ExceptionParamNameMatchesExpected(string expectedParamName, string c [InlineData(null, "Please provide correct value")] public void ExceptionParamNameNull(string? expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange((short)3, expectedParamName, (short)0, (short)1, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange((short)3, expectedParamName!, (short)0, (short)1, customMessage)); Assert.NotNull(exception); Assert.Equal("parameterName", exception.ParamName); } -} \ No newline at end of file +} diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForStructIComparable.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForStructIComparable.cs index e61ad225..e9e3bab2 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForStructIComparable.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForStructIComparable.cs @@ -52,9 +52,10 @@ public void ReturnsExpectedValueGivenInRangeValue(int input1, int input2, int ra [Theory] [InlineData(null, "Input parameterName was out of range (Parameter 'parameterName')")] [InlineData("Tuple range", "Tuple range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string? expectedMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange((1, 2), "parameterName", (3, 3), (9, 9), customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange((1, 2), "parameterName", (3, 3), (9, 9), customMessage)); Assert.NotNull(exception); Assert.NotNull(exception.Message); Assert.Equal(expectedMessage, exception.Message); @@ -63,9 +64,10 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [Theory] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange((1, 2), expectedParamName, (3, 3), (9, 9), customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange((1, 2), expectedParamName, (3, 3), (9, 9), customMessage)); Assert.NotNull(exception); Assert.Equal(expectedParamName, exception.ParamName); } @@ -75,8 +77,9 @@ public void ExceptionParamNameMatchesExpected(string expectedParamName, string c [InlineData(null, "Please provide correct value")] public void ExceptionParamNameNull(string? expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange((1, 2), expectedParamName, (3, 3), (9, 9), customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange((1, 2), expectedParamName!, (3, 3), (9, 9), customMessage)); Assert.NotNull(exception); Assert.Equal("parameterName", exception.ParamName); } -} \ No newline at end of file +} diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForTimeSpan.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForTimeSpan.cs index b5162ccc..f6774145 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForTimeSpan.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForTimeSpan.cs @@ -64,7 +64,7 @@ public void ReturnsExpectedValueGivenInRangeValue(int input, int rangeFrom, int [Theory] [InlineData(null, "rangeFrom should be less or equal than rangeTo (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string? customMessage, string expectedMessage) { var inputTimeSpan = TimeSpan.FromSeconds(-1); var rangeFromTimeSpan = TimeSpan.FromSeconds(3); @@ -79,7 +79,7 @@ public void ErrorMessageMatchesExpectedWhenRangeIsInvalid(string customMessage, [Theory] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedRangeIsInvalid(string expectedParamName, string? customMessage) { var inputTimeSpan = TimeSpan.FromSeconds(-1); var rangeFromTimeSpan = TimeSpan.FromSeconds(3); @@ -99,7 +99,9 @@ public void ExceptionParamNameNull(string? expectedParamName, string? customMess var rangeFromTimeSpan = TimeSpan.FromSeconds(3); var rangeToTimeSpan = TimeSpan.FromSeconds(1); - var exception = Assert.Throws(() => Guard.Against.OutOfRange(inputTimeSpan, expectedParamName, rangeFromTimeSpan, rangeToTimeSpan, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(inputTimeSpan, expectedParamName!, + rangeFromTimeSpan, rangeToTimeSpan, customMessage)); Assert.NotNull(exception); Assert.Equal("parameterName", exception.ParamName); } @@ -107,7 +109,7 @@ public void ExceptionParamNameNull(string? expectedParamName, string? customMess [Theory] [InlineData(null, "Input parameterName was out of range (Parameter 'parameterName')")] [InlineData("Timespan range", "Timespan range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string? customMessage, string expectedMessage) { var inputTimeSpan = TimeSpan.FromSeconds(-1); var rangeFromTimeSpan = TimeSpan.FromSeconds(0); @@ -122,7 +124,7 @@ public void ErrorMessageMatchesExpectedWhenInputIsInvalid(string customMessage, [Theory] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpectedInputIsInvalid(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpectedInputIsInvalid(string expectedParamName, string? customMessage) { var inputTimeSpan = TimeSpan.FromSeconds(-1); var rangeFromTimeSpan = TimeSpan.FromSeconds(0); @@ -142,8 +144,9 @@ public void ExceptionParamNameNull2(string? expectedParamName, string? customMes var rangeFromTimeSpan = TimeSpan.FromSeconds(0); var rangeToTimeSpan = TimeSpan.FromSeconds(1); - var exception = Assert.Throws(() => Guard.Against.OutOfRange(inputTimeSpan, expectedParamName, rangeFromTimeSpan, rangeToTimeSpan, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange(inputTimeSpan, expectedParamName!, rangeFromTimeSpan, rangeToTimeSpan, customMessage)); Assert.NotNull(exception); Assert.Equal("parameterName", exception.ParamName); } -} \ No newline at end of file +} diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForUint.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForUint.cs index c63a29f6..b1d9360a 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForUint.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForUint.cs @@ -46,7 +46,7 @@ public void ReturnsExpectedValueGivenInRangeValue(uint input, uint rangeFrom, ui [Theory] [InlineData(null, "Input parameterName was out of range (Parameter 'parameterName')")] [InlineData("Uint range", "Uint range (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string? expectedMessage) { var exception = Assert.Throws(() => Guard.Against.OutOfRange((uint)3.0d, "parameterName", (uint)0.0d, (uint)1.0d, customMessage)); Assert.NotNull(exception); @@ -57,7 +57,7 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [Theory] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string expectedParamName, string? customMessage) { var exception = Assert.Throws(() => Guard.Against.OutOfRange((uint)3.0d, expectedParamName, (uint)0.0d, (uint)1.0d, customMessage)); Assert.NotNull(exception); @@ -69,7 +69,8 @@ public void ExceptionParamNameMatchesExpected(string expectedParamName, string c [InlineData(null, "Please provide correct value")] public void ExceptionParamNameNull(string? expectedParamName, string? customMessage) { - var exception = Assert.Throws(() => Guard.Against.OutOfRange((uint)3.0d, expectedParamName, (uint)0.0d, (uint)1.0d, customMessage)); + var exception = Assert.Throws(() => + Guard.Against.OutOfRange((uint)3.0d, expectedParamName!, (uint)0.0d, (uint)1.0d, customMessage)); Assert.NotNull(exception); Assert.Equal("parameterName", exception.ParamName); } diff --git a/test/GuardClauses.UnitTests/GuardAgainstOutOfSQLDateRange.cs b/test/GuardClauses.UnitTests/GuardAgainstOutOfSQLDateRange.cs index a5e83084..0b64e76a 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstOutOfSQLDateRange.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstOutOfSQLDateRange.cs @@ -62,7 +62,7 @@ public void DoNothingGivenSqlMaxValue(int offsetInSeconds) [Theory] [MemberData(nameof(GetSqlDateTimeTestVectors))] - public void ReturnsExpectedValueWhenGivenValidSqlDateTime(DateTime input, string name, DateTime expected) + public void ReturnsExpectedValueWhenGivenValidSqlDateTime(DateTime input, string? name, DateTime expected) { Assert.Equal(expected, Guard.Against.OutOfSQLDateRange(input, name)); } @@ -70,7 +70,7 @@ public void ReturnsExpectedValueWhenGivenValidSqlDateTime(DateTime input, string [Theory] [InlineData(null, "Input date was out of range (Parameter 'date')")] [InlineData("SQLDate range", "SQLDate range (Parameter 'date')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string? expectedMessage) { DateTime date = SqlDateTime.MinValue.Value.AddSeconds(-1); var exception = Assert.Throws(() => Guard.Against.OutOfSQLDateRange(date, nameof(date), customMessage)); @@ -83,7 +83,7 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [Theory] [InlineData(null, "Input date was out of range (Parameter 'date')")] [InlineData("SQLDate range", "SQLDate range (Parameter 'date')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvided(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvided(string? customMessage, string? expectedMessage) { DateTime date = SqlDateTime.MinValue.Value.AddSeconds(-1); var exception = Assert.Throws(() => Guard.Against.OutOfSQLDateRange(date, message: customMessage)); @@ -96,7 +96,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvided(string cust [Theory] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string? expectedParamName, string? customMessage) { DateTime date = SqlDateTime.MinValue.Value.AddSeconds(-1); var exception = Assert.Throws(() => Guard.Against.OutOfSQLDateRange(date, expectedParamName, customMessage)); diff --git a/test/GuardClauses.UnitTests/GuardAgainstZero.cs b/test/GuardClauses.UnitTests/GuardAgainstZero.cs index 5c0b43b3..e8c846b7 100644 --- a/test/GuardClauses.UnitTests/GuardAgainstZero.cs +++ b/test/GuardClauses.UnitTests/GuardAgainstZero.cs @@ -113,7 +113,7 @@ public void ReturnsExpectedValueWhenGivenNonZeroValue() [Theory] [InlineData(null, "Required input parameterName cannot be zero. (Parameter 'parameterName')")] [InlineData("Value is ZERO", "Value is ZERO (Parameter 'parameterName')")] - public void ErrorMessageMatchesExpected(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpected(string? customMessage, string expectedMessage) { var clausesToEvaluate = new List { @@ -137,7 +137,7 @@ public void ErrorMessageMatchesExpected(string customMessage, string expectedMes [Theory] [InlineData(null, "Required input xyz cannot be zero. (Parameter 'xyz')")] [InlineData("Value is ZERO", "Value is ZERO (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenIntValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenIntValue(string? customMessage, string expectedMessage) { var xyz = 0; var exception = Assert.Throws(() => Guard.Against.Zero(xyz, message: customMessage)); @@ -150,7 +150,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenIntValu [Theory] [InlineData(null, "Required input xyz cannot be zero. (Parameter 'xyz')")] [InlineData("Value is ZERO", "Value is ZERO (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenLongValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenLongValue(string? customMessage, string expectedMessage) { var xyz = 0L; var exception = Assert.Throws(() => Guard.Against.Zero(xyz, message: customMessage)); @@ -163,7 +163,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenLongVal [Theory] [InlineData(null, "Required input xyz cannot be zero. (Parameter 'xyz')")] [InlineData("Value is ZERO", "Value is ZERO (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDecimalValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDecimalValue(string? customMessage, string expectedMessage) { var xyz = 0.0M; var exception = Assert.Throws(() => Guard.Against.Zero(xyz, message: customMessage)); @@ -176,7 +176,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDecimal [Theory] [InlineData(null, "Required input xyz cannot be zero. (Parameter 'xyz')")] [InlineData("Value is ZERO", "Value is ZERO (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenFloatValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenFloatValue(string? customMessage, string expectedMessage) { var xyz = 0.0f; var exception = Assert.Throws(() => Guard.Against.Zero(xyz, message: customMessage)); @@ -189,7 +189,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenFloatVa [Theory] [InlineData(null, "Required input xyz cannot be zero. (Parameter 'xyz')")] [InlineData("Value is ZERO", "Value is ZERO (Parameter 'xyz')")] - public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDoubleValue(string customMessage, string expectedMessage) + public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDoubleValue(string? customMessage, string expectedMessage) { var xyz = 0.0; var exception = Assert.Throws(() => Guard.Against.Zero(xyz, message: customMessage)); @@ -204,7 +204,7 @@ public void ErrorMessageMatchesExpectedWhenNameNotExplicitlyProvidedGivenDoubleV [InlineData(null, "Please provide correct value")] [InlineData("SomeParameter", null)] [InlineData("SomeOtherParameter", "Value must be correct")] - public void ExceptionParamNameMatchesExpected(string expectedParamName, string customMessage) + public void ExceptionParamNameMatchesExpected(string? expectedParamName, string? customMessage) { var clausesToEvaluate = new List {