Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions TUnit.Assertions/Assertions/Enums/EnumAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TEnum> 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}"));
Expand Down Expand Up @@ -75,7 +75,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TEnum> me

if (!enumValue.HasFlag(enumFlag))
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"value {value} has flag {_unexpectedFlag}"));
Expand Down Expand Up @@ -112,7 +112,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TEnum> 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}"));
Expand Down Expand Up @@ -149,7 +149,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TEnum> 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}"));
Expand Down Expand Up @@ -189,7 +189,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TEnum> me

if (valueName == otherName)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"value name \"{valueName}\" does not equal \"{otherName}\""));
Expand Down Expand Up @@ -230,7 +230,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TEnum> me

if (valueAsInt == otherAsInt)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"value {valueAsInt} does not equal {otherAsInt}"));
Expand Down Expand Up @@ -270,7 +270,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TEnum> me

if (valueName != otherName)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"value name \"{valueName}\" equals \"{otherName}\""));
Expand Down Expand Up @@ -310,7 +310,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TEnum> me

if (valueAsInt != otherAsInt)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"value {valueAsInt} equals {otherAsInt}"));
Expand Down
2 changes: 1 addition & 1 deletion TUnit.Assertions/Assertions/Regex/MatchIndexAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<RegexMatc
}

// If we have a match, the assertion passed
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

protected override string GetExpectation() => $"match at index {_index} to exist";
Expand Down
8 changes: 4 additions & 4 deletions TUnit.Assertions/Assertions/Strings/ParseAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<string> 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}"));
Expand Down Expand Up @@ -146,12 +146,12 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<string> 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}"));
Expand Down Expand Up @@ -330,7 +330,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<T> 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}";
Expand Down
2 changes: 1 addition & 1 deletion TUnit.Assertions/Collections/MemoryAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TMemory>

if (passed)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"found {actualCount}"));
Expand Down
2 changes: 1 addition & 1 deletion TUnit.Assertions/Conditions/BetweenAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TValue> m

if (minOk && maxOk)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"found {value}"));
Expand Down
8 changes: 4 additions & 4 deletions TUnit.Assertions/Conditions/CollectionAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TCollecti

if (enumerated.SequenceEqual(ordered))
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

for (int i = 1; i < enumerated.Length; i++)
Expand All @@ -716,7 +716,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TCollecti
}
}

return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

protected override string GetExpectation() => "to be ordered by key selector in ascending order";
Expand Down Expand Up @@ -764,7 +764,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TCollecti

if (enumerated.SequenceEqual(ordered))
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

for (int i = 1; i < enumerated.Length; i++)
Expand All @@ -778,7 +778,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TCollecti
}
}

return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

protected override string GetExpectation() => "to be ordered by key selector in descending order";
Expand Down
2 changes: 1 addition & 1 deletion TUnit.Assertions/Conditions/CollectionNullAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TCollecti

if (value != null)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed("value is null"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<DateTime>
{
if (metadata.Value == _expected)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed(
Expand Down
4 changes: 2 additions & 2 deletions TUnit.Assertions/Conditions/DictionaryAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TDictiona

if (found)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"key {_expectedKey} not found"));
Expand Down Expand Up @@ -112,7 +112,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TDictiona

if (!value.ContainsKey(_expectedKey))
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"key {_expectedKey} was found"));
Expand Down
4 changes: 2 additions & 2 deletions TUnit.Assertions/Conditions/EqualsAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TValue> 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}"));
Expand All @@ -100,7 +100,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TValue> m

if (comparer.Equals(value!, _expected!))
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"found {value}"));
Expand Down
4 changes: 2 additions & 2 deletions TUnit.Assertions/Conditions/EquatableAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TActual>
// Use IEquatable<TExpected>.Equals for comparison
if (value.Equals(_expected))
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"found {value}"));
Expand Down Expand Up @@ -85,7 +85,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TActual?>
// Use IEquatable<TExpected>.Equals for comparison
if (value.Value.Equals(_expected))
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"found {value.Value}"));
Expand Down
12 changes: 6 additions & 6 deletions TUnit.Assertions/Conditions/ExceptionPropertyAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TExceptio

if (exception.Message.Contains(_expectedSubstring, _comparison))
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"exception message was \"{exception.Message}\""));
Expand Down Expand Up @@ -91,7 +91,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TExceptio

if (string.Equals(exception.Message, _expectedMessage, _comparison))
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"exception message was \"{exception.Message}\""));
Expand Down Expand Up @@ -141,7 +141,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TExceptio
$"exception message \"{exception.Message}\" should not contain \"{_notExpectedSubstring}\""));
}

return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

protected override string GetExpectation() =>
Expand Down Expand Up @@ -187,7 +187,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TExceptio

if (MatchesPattern(exception.Message, _pattern))
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed(
Expand Down Expand Up @@ -249,7 +249,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TExceptio

if (_matcher.IsMatch(exception.Message))
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed(
Expand Down Expand Up @@ -305,7 +305,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TExceptio
{
if (argumentException.ParamName == _expectedParameterName)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed(
Expand Down
8 changes: 4 additions & 4 deletions TUnit.Assertions/Conditions/FileSystemAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<Directory
return Task.FromResult(AssertionResult.Failed($"directory '{value.FullName}' has no files"));
}

return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

protected override string GetExpectation() => "to have files";
Expand Down Expand Up @@ -84,7 +84,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<Directory
return Task.FromResult(AssertionResult.Failed($"directory '{value.FullName}' has {subdirectories.Length} subdirectories"));
}

return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

protected override string GetExpectation() => "to have no subdirectories";
Expand Down Expand Up @@ -126,7 +126,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<FileInfo>
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";
Expand Down Expand Up @@ -170,7 +170,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<FileInfo>
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";
Expand Down
4 changes: 2 additions & 2 deletions TUnit.Assertions/Conditions/GreaterThanAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TValue> m

if (value.CompareTo(_minimum) > 0)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"found {value}"));
Expand Down Expand Up @@ -72,7 +72,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TValue> m

if (value.CompareTo(_minimum) >= 0)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"found {value}"));
Expand Down
4 changes: 2 additions & 2 deletions TUnit.Assertions/Conditions/LessThanAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TValue> m

if (value.CompareTo(_maximum) < 0)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"found {value}"));
Expand Down Expand Up @@ -71,7 +71,7 @@ protected override Task<AssertionResult> CheckAsync(EvaluationMetadata<TValue> m

if (value.CompareTo(_maximum) <= 0)
{
return Task.FromResult(AssertionResult.Passed);
return AssertionResult._passedTask;
}

return Task.FromResult(AssertionResult.Failed($"found {value}"));
Expand Down
Loading
Loading