diff --git a/TUnit.Assertions/Assertions/Enums/EnumAssertions.cs b/TUnit.Assertions/Assertions/Enums/EnumAssertions.cs index 9aec4b26ff..1cdba9bf7f 100644 --- a/TUnit.Assertions/Assertions/Enums/EnumAssertions.cs +++ b/TUnit.Assertions/Assertions/Enums/EnumAssertions.cs @@ -35,7 +35,7 @@ protected override Task CheckAsync(EvaluationMetadata me if (enumValue.HasFlag(enumFlag)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value {value} does not have flag {_expectedFlag}")); @@ -75,7 +75,7 @@ protected override Task CheckAsync(EvaluationMetadata me if (!enumValue.HasFlag(enumFlag)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value {value} has flag {_unexpectedFlag}")); @@ -112,7 +112,7 @@ protected override Task CheckAsync(EvaluationMetadata me if (Enum.IsDefined(typeof(TEnum), value)) #endif { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value {value} is not defined in {typeof(TEnum).Name}")); @@ -149,7 +149,7 @@ protected override Task CheckAsync(EvaluationMetadata me if (!Enum.IsDefined(typeof(TEnum), value)) #endif { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value {value} is defined in {typeof(TEnum).Name}")); @@ -189,7 +189,7 @@ protected override Task CheckAsync(EvaluationMetadata me if (valueName == otherName) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value name \"{valueName}\" does not equal \"{otherName}\"")); @@ -230,7 +230,7 @@ protected override Task CheckAsync(EvaluationMetadata me if (valueAsInt == otherAsInt) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value {valueAsInt} does not equal {otherAsInt}")); @@ -270,7 +270,7 @@ protected override Task CheckAsync(EvaluationMetadata me if (valueName != otherName) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value name \"{valueName}\" equals \"{otherName}\"")); @@ -310,7 +310,7 @@ protected override Task CheckAsync(EvaluationMetadata me if (valueAsInt != otherAsInt) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value {valueAsInt} equals {otherAsInt}")); diff --git a/TUnit.Assertions/Assertions/Regex/MatchIndexAssertion.cs b/TUnit.Assertions/Assertions/Regex/MatchIndexAssertion.cs index 65a19913d5..fa6867476f 100644 --- a/TUnit.Assertions/Assertions/Regex/MatchIndexAssertion.cs +++ b/TUnit.Assertions/Assertions/Regex/MatchIndexAssertion.cs @@ -52,7 +52,7 @@ protected override Task CheckAsync(EvaluationMetadata $"match at index {_index} to exist"; diff --git a/TUnit.Assertions/Assertions/Strings/ParseAssertions.cs b/TUnit.Assertions/Assertions/Strings/ParseAssertions.cs index 944333a3f2..6de293bcf0 100644 --- a/TUnit.Assertions/Assertions/Strings/ParseAssertions.cs +++ b/TUnit.Assertions/Assertions/Strings/ParseAssertions.cs @@ -47,7 +47,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (TryParse(value, _formatProvider, out _)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"\"{value}\" cannot be parsed into {typeof(T).Name}")); @@ -146,12 +146,12 @@ protected override Task CheckAsync(EvaluationMetadata m if (value == null) { - return Task.FromResult(AssertionResult.Passed); // null cannot be parsed + return AssertionResult._passedTask; // null cannot be parsed } if (!TryParse(value, _formatProvider, out _)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"\"{value}\" can be parsed into {typeof(T).Name}")); @@ -330,7 +330,7 @@ protected override Task CheckAsync(EvaluationMetadata metada return Task.FromResult(AssertionResult.Failed($"parsing failed: {exception.Message}")); } - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } protected override string GetExpectation() => $"to be parsable into {typeof(T).Name}"; diff --git a/TUnit.Assertions/Collections/MemoryAssertions.cs b/TUnit.Assertions/Collections/MemoryAssertions.cs index 81f05ed5f8..2748581bfa 100644 --- a/TUnit.Assertions/Collections/MemoryAssertions.cs +++ b/TUnit.Assertions/Collections/MemoryAssertions.cs @@ -565,7 +565,7 @@ protected override Task CheckAsync(EvaluationMetadata if (passed) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {actualCount}")); diff --git a/TUnit.Assertions/Conditions/BetweenAssertion.cs b/TUnit.Assertions/Conditions/BetweenAssertion.cs index 2028338b09..3ca1336df0 100644 --- a/TUnit.Assertions/Conditions/BetweenAssertion.cs +++ b/TUnit.Assertions/Conditions/BetweenAssertion.cs @@ -89,7 +89,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (minOk && maxOk) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}")); diff --git a/TUnit.Assertions/Conditions/CollectionAssertions.cs b/TUnit.Assertions/Conditions/CollectionAssertions.cs index b719bcb783..4117e4b0d3 100644 --- a/TUnit.Assertions/Conditions/CollectionAssertions.cs +++ b/TUnit.Assertions/Conditions/CollectionAssertions.cs @@ -702,7 +702,7 @@ protected override Task CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata "to be ordered by key selector in ascending order"; @@ -764,7 +764,7 @@ protected override Task CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata "to be ordered by key selector in descending order"; diff --git a/TUnit.Assertions/Conditions/CollectionNullAssertion.cs b/TUnit.Assertions/Conditions/CollectionNullAssertion.cs index ee06226da5..94b09acee7 100644 --- a/TUnit.Assertions/Conditions/CollectionNullAssertion.cs +++ b/TUnit.Assertions/Conditions/CollectionNullAssertion.cs @@ -22,7 +22,7 @@ protected override Task CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata { if (metadata.Value == _expected) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed( diff --git a/TUnit.Assertions/Conditions/DictionaryAssertions.cs b/TUnit.Assertions/Conditions/DictionaryAssertions.cs index f2c9c06ab3..b0b7ffeb53 100644 --- a/TUnit.Assertions/Conditions/DictionaryAssertions.cs +++ b/TUnit.Assertions/Conditions/DictionaryAssertions.cs @@ -67,7 +67,7 @@ protected override Task CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata m var result = DeepEquals(value, _expected, _ignoredTypes, visited); if (result.IsSuccess) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed(result.Message ?? $"found {value}")); @@ -100,7 +100,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (comparer.Equals(value!, _expected!)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}")); diff --git a/TUnit.Assertions/Conditions/EquatableAssertion.cs b/TUnit.Assertions/Conditions/EquatableAssertion.cs index 98b5b42775..c54b065405 100644 --- a/TUnit.Assertions/Conditions/EquatableAssertion.cs +++ b/TUnit.Assertions/Conditions/EquatableAssertion.cs @@ -40,7 +40,7 @@ protected override Task CheckAsync(EvaluationMetadata // Use IEquatable.Equals for comparison if (value.Equals(_expected)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}")); @@ -85,7 +85,7 @@ protected override Task CheckAsync(EvaluationMetadata // Use IEquatable.Equals for comparison if (value.Value.Equals(_expected)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value.Value}")); diff --git a/TUnit.Assertions/Conditions/ExceptionPropertyAssertions.cs b/TUnit.Assertions/Conditions/ExceptionPropertyAssertions.cs index a07fb9ddd1..457859cb14 100644 --- a/TUnit.Assertions/Conditions/ExceptionPropertyAssertions.cs +++ b/TUnit.Assertions/Conditions/ExceptionPropertyAssertions.cs @@ -45,7 +45,7 @@ protected override Task CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata @@ -187,7 +187,7 @@ protected override Task CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata "to have files"; @@ -84,7 +84,7 @@ protected override Task CheckAsync(EvaluationMetadata "to have no subdirectories"; @@ -126,7 +126,7 @@ protected override Task CheckAsync(EvaluationMetadata return Task.FromResult(AssertionResult.Failed($"file '{value.FullName}' is a system file")); } - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } protected override string GetExpectation() => "to not be a system file"; @@ -170,7 +170,7 @@ protected override Task CheckAsync(EvaluationMetadata return Task.FromResult(AssertionResult.Failed($"file '{value.FullName}' is executable (extension: {value.Extension})")); } - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } protected override string GetExpectation() => "to not be executable"; diff --git a/TUnit.Assertions/Conditions/GreaterThanAssertion.cs b/TUnit.Assertions/Conditions/GreaterThanAssertion.cs index 7169bee85e..51b35ba6ae 100644 --- a/TUnit.Assertions/Conditions/GreaterThanAssertion.cs +++ b/TUnit.Assertions/Conditions/GreaterThanAssertion.cs @@ -34,7 +34,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (value.CompareTo(_minimum) > 0) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}")); @@ -72,7 +72,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (value.CompareTo(_minimum) >= 0) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}")); diff --git a/TUnit.Assertions/Conditions/LessThanAssertion.cs b/TUnit.Assertions/Conditions/LessThanAssertion.cs index ffc16c368e..4d05d64630 100644 --- a/TUnit.Assertions/Conditions/LessThanAssertion.cs +++ b/TUnit.Assertions/Conditions/LessThanAssertion.cs @@ -33,7 +33,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (value.CompareTo(_maximum) < 0) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}")); @@ -71,7 +71,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (value.CompareTo(_maximum) <= 0) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}")); diff --git a/TUnit.Assertions/Conditions/ListAssertions.cs b/TUnit.Assertions/Conditions/ListAssertions.cs index cee882bc85..eee34331dc 100644 --- a/TUnit.Assertions/Conditions/ListAssertions.cs +++ b/TUnit.Assertions/Conditions/ListAssertions.cs @@ -48,7 +48,7 @@ protected override Task CheckAsync(EvaluationMetadata me if (comparer.Equals(actualItem, _expected)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"item at index {_index} was {actualItem}")); @@ -309,12 +309,12 @@ protected override Task CheckAsync(EvaluationMetadata me { return areEqual ? Task.FromResult(AssertionResult.Failed($"item at index {_index} was {actualItem}")) - : Task.FromResult(AssertionResult.Passed); + : AssertionResult._passedTask; } else { return areEqual - ? Task.FromResult(AssertionResult.Passed) + ? AssertionResult._passedTask : Task.FromResult(AssertionResult.Failed($"item at index {_index} was {actualItem}")); } } @@ -368,14 +368,14 @@ protected override Task CheckAsync(EvaluationMetadata me if (_expectNull) { return isNull - ? Task.FromResult(AssertionResult.Passed) + ? AssertionResult._passedTask : Task.FromResult(AssertionResult.Failed($"item at index {_index} was {actualItem}")); } else { return isNull ? Task.FromResult(AssertionResult.Failed($"item at index {_index} was null")) - : Task.FromResult(AssertionResult.Passed); + : AssertionResult._passedTask; } } @@ -489,12 +489,12 @@ protected override Task CheckAsync(EvaluationMetadata me { return areEqual ? Task.FromResult(AssertionResult.Failed($"last item was {lastItem}")) - : Task.FromResult(AssertionResult.Passed); + : AssertionResult._passedTask; } else { return areEqual - ? Task.FromResult(AssertionResult.Passed) + ? AssertionResult._passedTask : Task.FromResult(AssertionResult.Failed($"last item was {lastItem}")); } } @@ -544,14 +544,14 @@ protected override Task CheckAsync(EvaluationMetadata me if (_expectNull) { return isNull - ? Task.FromResult(AssertionResult.Passed) + ? AssertionResult._passedTask : Task.FromResult(AssertionResult.Failed($"last item was {lastItem}")); } else { return isNull ? Task.FromResult(AssertionResult.Failed("last item was null")) - : Task.FromResult(AssertionResult.Passed); + : AssertionResult._passedTask; } } diff --git a/TUnit.Assertions/Conditions/MutableDictionaryAssertions.cs b/TUnit.Assertions/Conditions/MutableDictionaryAssertions.cs index 46eedbd020..967079cccc 100644 --- a/TUnit.Assertions/Conditions/MutableDictionaryAssertions.cs +++ b/TUnit.Assertions/Conditions/MutableDictionaryAssertions.cs @@ -59,7 +59,7 @@ protected override Task CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata.Default; if (comparer.Equals(actualValue, _expectedValue)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"key {_expectedKey} has value {actualValue}, not {_expectedValue}")); @@ -271,7 +271,7 @@ protected override Task CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata m var result = DeepEquals(value, _notExpected, _ignoredTypes); if (!result.IsSuccess) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"both values are equivalent")); @@ -74,7 +74,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (!comparer.Equals(value!, _notExpected)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"both values are {value}")); diff --git a/TUnit.Assertions/Conditions/NotStructuralEquivalencyAssertion.cs b/TUnit.Assertions/Conditions/NotStructuralEquivalencyAssertion.cs index 2d8c30306a..b3ae71f028 100644 --- a/TUnit.Assertions/Conditions/NotStructuralEquivalencyAssertion.cs +++ b/TUnit.Assertions/Conditions/NotStructuralEquivalencyAssertion.cs @@ -104,7 +104,7 @@ protected override Task CheckAsync(EvaluationMetadata m return Task.FromResult(AssertionResult.Failed("objects are equivalent but should not be")); } - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } protected override string GetExpectation() diff --git a/TUnit.Assertions/Conditions/NullAssertion.cs b/TUnit.Assertions/Conditions/NullAssertion.cs index c9fcdb2ed5..263baf9c02 100644 --- a/TUnit.Assertions/Conditions/NullAssertion.cs +++ b/TUnit.Assertions/Conditions/NullAssertion.cs @@ -24,7 +24,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (value == null) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}")); @@ -50,7 +50,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (value != null) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed("value is null")); @@ -95,7 +95,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (EqualityComparer.Default.Equals(value!, default!)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value is {value}")); @@ -128,7 +128,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (!EqualityComparer.Default.Equals(value!, default!)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value is default({typeof(TValue).Name})")); @@ -162,7 +162,7 @@ protected override Task CheckAsync(EvaluationMetadata if (!value.HasValue) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value is {value}")); @@ -196,7 +196,7 @@ protected override Task CheckAsync(EvaluationMetadata if (value.HasValue) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value is default({typeof(TValue).Name}?)")); @@ -230,7 +230,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (EqualityComparer.Default.Equals(value!, default!)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value is {value}")); @@ -264,7 +264,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (!EqualityComparer.Default.Equals(value!, default!)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value is default({typeof(TValue).Name})")); diff --git a/TUnit.Assertions/Conditions/PredicateAssertions.cs b/TUnit.Assertions/Conditions/PredicateAssertions.cs index 4d43ee668d..64a6e44f4b 100644 --- a/TUnit.Assertions/Conditions/PredicateAssertions.cs +++ b/TUnit.Assertions/Conditions/PredicateAssertions.cs @@ -35,7 +35,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (_predicate(value)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"value {value} does not satisfy predicate")); @@ -87,7 +87,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (comparer.Equals(value!, _expected)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}")); diff --git a/TUnit.Assertions/Conditions/ReadOnlyListAssertions.cs b/TUnit.Assertions/Conditions/ReadOnlyListAssertions.cs index 4699277ded..ead5c113ff 100644 --- a/TUnit.Assertions/Conditions/ReadOnlyListAssertions.cs +++ b/TUnit.Assertions/Conditions/ReadOnlyListAssertions.cs @@ -50,7 +50,7 @@ protected override Task CheckAsync(EvaluationMetadata me if (comparer.Equals(actualItem, _expected)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"item at index {_index} was {actualItem}")); @@ -311,12 +311,12 @@ protected override Task CheckAsync(EvaluationMetadata me { return areEqual ? Task.FromResult(AssertionResult.Failed($"item at index {_index} was {actualItem}")) - : Task.FromResult(AssertionResult.Passed); + : AssertionResult._passedTask; } else { return areEqual - ? Task.FromResult(AssertionResult.Passed) + ? AssertionResult._passedTask : Task.FromResult(AssertionResult.Failed($"item at index {_index} was {actualItem}")); } } @@ -370,14 +370,14 @@ protected override Task CheckAsync(EvaluationMetadata me if (_expectNull) { return isNull - ? Task.FromResult(AssertionResult.Passed) + ? AssertionResult._passedTask : Task.FromResult(AssertionResult.Failed($"item at index {_index} was {actualItem}")); } else { return isNull ? Task.FromResult(AssertionResult.Failed($"item at index {_index} was null")) - : Task.FromResult(AssertionResult.Passed); + : AssertionResult._passedTask; } } @@ -491,12 +491,12 @@ protected override Task CheckAsync(EvaluationMetadata me { return areEqual ? Task.FromResult(AssertionResult.Failed($"last item was {lastItem}")) - : Task.FromResult(AssertionResult.Passed); + : AssertionResult._passedTask; } else { return areEqual - ? Task.FromResult(AssertionResult.Passed) + ? AssertionResult._passedTask : Task.FromResult(AssertionResult.Failed($"last item was {lastItem}")); } } @@ -546,14 +546,14 @@ protected override Task CheckAsync(EvaluationMetadata me if (_expectNull) { return isNull - ? Task.FromResult(AssertionResult.Passed) + ? AssertionResult._passedTask : Task.FromResult(AssertionResult.Failed($"last item was {lastItem}")); } else { return isNull ? Task.FromResult(AssertionResult.Failed("last item was null")) - : Task.FromResult(AssertionResult.Passed); + : AssertionResult._passedTask; } } diff --git a/TUnit.Assertions/Conditions/ReferenceEqualityAssertions.cs b/TUnit.Assertions/Conditions/ReferenceEqualityAssertions.cs index 56b870381c..c32c237a72 100644 --- a/TUnit.Assertions/Conditions/ReferenceEqualityAssertions.cs +++ b/TUnit.Assertions/Conditions/ReferenceEqualityAssertions.cs @@ -32,7 +32,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (ReferenceEquals(value, _expected)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed("references are different")); @@ -69,7 +69,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (!ReferenceEquals(value, _expected)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed("references are the same")); diff --git a/TUnit.Assertions/Conditions/SpecializedEqualityAssertions.cs b/TUnit.Assertions/Conditions/SpecializedEqualityAssertions.cs index 4ed908fb22..e3883889e6 100644 --- a/TUnit.Assertions/Conditions/SpecializedEqualityAssertions.cs +++ b/TUnit.Assertions/Conditions/SpecializedEqualityAssertions.cs @@ -254,7 +254,7 @@ protected override Task CheckAsync(EvaluationMetadata meta var diff = Math.Abs(value - _expected); if (diff <= _tolerance.Value) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}, which differs by {diff}")); @@ -262,7 +262,7 @@ protected override Task CheckAsync(EvaluationMetadata meta if (value == _expected) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}")); @@ -418,7 +418,7 @@ protected override Task CheckAsync(EvaluationMetadata var diff = value > _expected ? value - _expected : _expected - value; if (diff <= _tolerance.Value) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}, which differs by {diff}")); @@ -426,7 +426,7 @@ protected override Task CheckAsync(EvaluationMetadata if (value == _expected) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}")); diff --git a/TUnit.Assertions/Conditions/StringAssertions.cs b/TUnit.Assertions/Conditions/StringAssertions.cs index 744e629eb5..629d7195ad 100644 --- a/TUnit.Assertions/Conditions/StringAssertions.cs +++ b/TUnit.Assertions/Conditions/StringAssertions.cs @@ -95,7 +95,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (actualValue.Contains(expectedValue, _comparison)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found \"{value}\"")); @@ -199,7 +199,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (!value.Contains(_expected, _comparison)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found \"{_expected}\" in \"{value}\"")); @@ -266,7 +266,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (value.StartsWith(_expected, _comparison)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found \"{value}\"")); @@ -333,7 +333,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (value.EndsWith(_expected, _comparison)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found \"{value}\"")); @@ -400,7 +400,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (!value.StartsWith(_expected, _comparison)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found \"{value}\"")); @@ -467,7 +467,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (!value.EndsWith(_expected, _comparison)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found \"{value}\"")); @@ -505,7 +505,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (!string.IsNullOrEmpty(value)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found \"{value}\"")); @@ -543,7 +543,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (value == string.Empty) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found \"{value}\"")); @@ -584,7 +584,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (value.Length == _expectedLength) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found length {value.Length}")); @@ -694,7 +694,7 @@ protected override Task CheckAsync(EvaluationMetadata CheckAsync(EvaluationMetadata m if (!isMatch) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"The regex \"{_pattern}\" matches with \"{value}\"")); diff --git a/TUnit.Assertions/Conditions/StringEqualsAssertion.cs b/TUnit.Assertions/Conditions/StringEqualsAssertion.cs index 15b267ca0d..5196ff2c76 100644 --- a/TUnit.Assertions/Conditions/StringEqualsAssertion.cs +++ b/TUnit.Assertions/Conditions/StringEqualsAssertion.cs @@ -113,7 +113,7 @@ protected override Task CheckAsync(EvaluationMetadata if (string.Equals(actualValue, expectedValue, _comparison)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } // Build detailed error message for string comparison failures diff --git a/TUnit.Assertions/Conditions/ThrowsAssertion.cs b/TUnit.Assertions/Conditions/ThrowsAssertion.cs index 9f66e8d2c3..f2ab5a44b6 100644 --- a/TUnit.Assertions/Conditions/ThrowsAssertion.cs +++ b/TUnit.Assertions/Conditions/ThrowsAssertion.cs @@ -53,7 +53,7 @@ protected sealed override Task CheckAsync(EvaluationMetadata @@ -366,7 +366,7 @@ protected override Task CheckAsync(EvaluationMetadata m $"threw {exception.GetType().FullName}: {exception.Message}")); } - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } protected override string GetExpectation() => "to not throw any exception"; @@ -419,7 +419,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (string.Equals(exceptionToCheck.Message, _expectedMessage, _comparison)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"message was \"{exceptionToCheck.Message}\"")); @@ -475,7 +475,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (exceptionToCheck.Message.StartsWith(_expectedPrefix, _comparison)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"message was \"{exceptionToCheck.Message}\"")); @@ -531,7 +531,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (exceptionToCheck.Message.Contains(_expectedSubstring, _comparison)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"message was \"{exceptionToCheck.Message}\"")); diff --git a/TUnit.Assertions/Conditions/ToleranceBasedEqualsAssertion.cs b/TUnit.Assertions/Conditions/ToleranceBasedEqualsAssertion.cs index 97da7207fe..c5a5f57692 100644 --- a/TUnit.Assertions/Conditions/ToleranceBasedEqualsAssertion.cs +++ b/TUnit.Assertions/Conditions/ToleranceBasedEqualsAssertion.cs @@ -46,7 +46,7 @@ protected override Task CheckAsync(EvaluationMetadata m { if (IsWithinTolerance(value!, _expected, _tolerance)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } var difference = CalculateDifference(value!, _expected); @@ -56,7 +56,7 @@ protected override Task CheckAsync(EvaluationMetadata m // No tolerance - exact equality check if (AreExactlyEqual(value!, _expected)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"found {value}")); diff --git a/TUnit.Assertions/Conditions/TypeOfAssertion.cs b/TUnit.Assertions/Conditions/TypeOfAssertion.cs index 4121c14e25..50a1ebeb0a 100644 --- a/TUnit.Assertions/Conditions/TypeOfAssertion.cs +++ b/TUnit.Assertions/Conditions/TypeOfAssertion.cs @@ -42,7 +42,7 @@ protected override Task CheckAsync(EvaluationMetadata meta return Task.FromResult(AssertionResult.Failed(exception.Message)); } - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } protected override string GetExpectation() => $"to be of type {_expectedType.Name}"; @@ -81,7 +81,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (actualType != _expectedType) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"type was {actualType.Name}")); @@ -131,7 +131,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (_targetType.IsAssignableFrom(actualType)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"type {actualType.Name} is not assignable to {_targetType.Name}")); @@ -181,7 +181,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (!_targetType.IsAssignableFrom(actualType)) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"type {actualType.Name} is assignable to {_targetType.Name}")); @@ -224,7 +224,7 @@ protected override Task CheckAsync(EvaluationMetadata m if (actualType == _expectedType) { - return Task.FromResult(AssertionResult.Passed); + return AssertionResult._passedTask; } return Task.FromResult(AssertionResult.Failed($"type was {actualType.Name}")); diff --git a/TUnit.Assertions/Core/AssertionResult.cs b/TUnit.Assertions/Core/AssertionResult.cs index c9f405e66e..e50b4d9424 100644 --- a/TUnit.Assertions/Core/AssertionResult.cs +++ b/TUnit.Assertions/Core/AssertionResult.cs @@ -5,6 +5,8 @@ namespace TUnit.Assertions.Core; /// public readonly struct AssertionResult { + internal static readonly Task _passedTask = Task.FromResult(Passed); + public bool IsPassed { get; } public string Message { get; }