Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
4 changes: 1 addition & 3 deletions TUnit.Assertions/Sources/ArrayAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ internal ArrayAssertion(AssertionContext<TItem[]> context)

private static StringBuilder CreateExpressionBuilder(string? expression)
{
var builder = new StringBuilder();
builder.Append($"Assert.That({expression ?? "?"})");
return builder;
return new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
}
}
6 changes: 2 additions & 4 deletions TUnit.Assertions/Sources/AsyncDelegateAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ public class AsyncDelegateAssertion : IAssertionSource<object?>, IDelegateAssert
public AsyncDelegateAssertion(Func<Task> action, string? expression)
{
AsyncAction = action ?? throw new ArgumentNullException(nameof(action));
var expressionBuilder = new StringBuilder();
expressionBuilder.Append($"Assert.That({expression ?? "?"})");
var expressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
var evaluationContext = new EvaluationContext<object?>(async () =>
{
try
Expand All @@ -42,8 +41,7 @@ public AsyncDelegateAssertion(Func<Task> action, string? expression)
Context = new AssertionContext<object?>(evaluationContext, expressionBuilder);

// DO NOT await the task here - we want to check its state synchronously
var taskExpressionBuilder = new StringBuilder();
taskExpressionBuilder.Append(expressionBuilder.ToString());
var taskExpressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
var taskEvaluationContext = new EvaluationContext<Task>(() =>
{
// This allows IsCompleted, IsCanceled, IsFaulted, etc. to check task properties synchronously
Expand Down
3 changes: 1 addition & 2 deletions TUnit.Assertions/Sources/AsyncEnumerableAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ private static AssertionContext<IAsyncEnumerable<TItem>> CreateContext(
IAsyncEnumerable<TItem> value,
string? expression)
{
var expressionBuilder = new StringBuilder();
expressionBuilder.Append($"Assert.That({expression ?? "?"})");
var expressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
return new AssertionContext<IAsyncEnumerable<TItem>>(value, expressionBuilder);
}
}
3 changes: 1 addition & 2 deletions TUnit.Assertions/Sources/AsyncFuncAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ public class AsyncFuncAssertion<TValue> : IAssertionSource<TValue>, IDelegateAss

public AsyncFuncAssertion(Func<Task<TValue?>> func, string? expression)
{
var expressionBuilder = new StringBuilder();
expressionBuilder.Append($"Assert.That({expression ?? "?"})");
var expressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
var evaluationContext = new EvaluationContext<TValue>(async () =>
{
try
Expand Down
3 changes: 1 addition & 2 deletions TUnit.Assertions/Sources/AsyncFuncCollectionAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ public AsyncFuncCollectionAssertion(Func<Task<IEnumerable<TItem>?>> func, string

private static AssertionContext<IEnumerable<TItem>> CreateContext(Func<Task<IEnumerable<TItem>?>> func, string? expression)
{
var expressionBuilder = new StringBuilder();
expressionBuilder.Append($"Assert.That({expression ?? "?"})");
var expressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
var evaluationContext = new EvaluationContext<IEnumerable<TItem>>(async () =>
{
try
Expand Down
4 changes: 1 addition & 3 deletions TUnit.Assertions/Sources/CollectionAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ internal CollectionAssertion(AssertionContext<IEnumerable<TItem>> context)

private static StringBuilder CreateExpressionBuilder(string? expression)
{
var builder = new StringBuilder();
builder.Append($"Assert.That({expression ?? "?"})");
return builder;
return new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
}
}
3 changes: 1 addition & 2 deletions TUnit.Assertions/Sources/DelegateAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ public class DelegateAssertion : IAssertionSource<object?>, IDelegateAssertionSo
public DelegateAssertion(Action action, string? expression)
{
Action = action ?? throw new ArgumentNullException(nameof(action));
var expressionBuilder = new StringBuilder();
expressionBuilder.Append($"Assert.That({expression ?? "?"})");
var expressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
var evaluationContext = new EvaluationContext<object?>(() =>
{
try
Expand Down
3 changes: 1 addition & 2 deletions TUnit.Assertions/Sources/DictionaryAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ private static AssertionContext<IReadOnlyDictionary<TKey, TValue>> CreateContext
IReadOnlyDictionary<TKey, TValue>? value,
string? expression)
{
var expressionBuilder = new StringBuilder();
expressionBuilder.Append($"Assert.That({expression ?? "?"})");
var expressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
return new AssertionContext<IReadOnlyDictionary<TKey, TValue>>(value!, expressionBuilder);
}
}
3 changes: 1 addition & 2 deletions TUnit.Assertions/Sources/FuncAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ public class FuncAssertion<TValue> : IAssertionSource<TValue>, IDelegateAssertio

public FuncAssertion(Func<TValue?> func, string? expression)
{
var expressionBuilder = new StringBuilder();
expressionBuilder.Append($"Assert.That({expression ?? "?"})");
var expressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
var evaluationContext = new EvaluationContext<TValue>(() =>
{
try
Expand Down
3 changes: 1 addition & 2 deletions TUnit.Assertions/Sources/FuncCollectionAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ public FuncCollectionAssertion(Func<IEnumerable<TItem>?> func, string? expressio

private static AssertionContext<IEnumerable<TItem>> CreateContext(Func<IEnumerable<TItem>?> func, string? expression)
{
var expressionBuilder = new StringBuilder();
expressionBuilder.Append($"Assert.That({expression ?? "?"})");
var expressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
var evaluationContext = new EvaluationContext<IEnumerable<TItem>>(() =>
{
try
Expand Down
3 changes: 1 addition & 2 deletions TUnit.Assertions/Sources/ListAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ private static AssertionContext<IList<TItem>> CreateContext(
IList<TItem>? value,
string? expression)
{
var expressionBuilder = new StringBuilder();
expressionBuilder.Append($"Assert.That({expression ?? "?"})");
var expressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
return new AssertionContext<IList<TItem>>(value!, expressionBuilder);
}
}
8 changes: 2 additions & 6 deletions TUnit.Assertions/Sources/MemoryAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ private protected MemoryAssertion(AssertionContext<Memory<TItem>> context)

private static StringBuilder CreateExpressionBuilder(string? expression)
{
var builder = new StringBuilder();
builder.Append($"Assert.That({expression ?? "?"})");
return builder;
return new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
}
}

Expand Down Expand Up @@ -74,9 +72,7 @@ private protected ReadOnlyMemoryAssertion(AssertionContext<ReadOnlyMemory<TItem>

private static StringBuilder CreateExpressionBuilder(string? expression)
{
var builder = new StringBuilder();
builder.Append($"Assert.That({expression ?? "?"})");
return builder;
return new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
}
}
#endif
3 changes: 1 addition & 2 deletions TUnit.Assertions/Sources/MutableDictionaryAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ private static AssertionContext<IDictionary<TKey, TValue>> CreateContext(
IDictionary<TKey, TValue>? value,
string? expression)
{
var expressionBuilder = new StringBuilder();
expressionBuilder.Append($"Assert.That({expression ?? "?"})");
var expressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
return new AssertionContext<IDictionary<TKey, TValue>>(value!, expressionBuilder);
}
}
3 changes: 1 addition & 2 deletions TUnit.Assertions/Sources/ReadOnlyListAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ private static AssertionContext<IReadOnlyList<TItem>> CreateContext(
IReadOnlyList<TItem>? value,
string? expression)
{
var expressionBuilder = new StringBuilder();
expressionBuilder.Append($"Assert.That({expression ?? "?"})");
var expressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
return new AssertionContext<IReadOnlyList<TItem>>(value!, expressionBuilder);
}
}
12 changes: 3 additions & 9 deletions TUnit.Assertions/Sources/SetAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ private protected SetAssertion(AssertionContext<ISet<TItem>> context)

private static StringBuilder CreateExpressionBuilder(string? expression)
{
var builder = new StringBuilder();
builder.Append($"Assert.That({expression ?? "?"})");
return builder;
return new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
}
}

Expand Down Expand Up @@ -88,9 +86,7 @@ private protected ReadOnlySetAssertion(AssertionContext<IReadOnlySet<TItem>> con

private static StringBuilder CreateExpressionBuilder(string? expression)
{
var builder = new StringBuilder();
builder.Append($"Assert.That({expression ?? "?"})");
return builder;
return new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
}
}
#endif
Expand Down Expand Up @@ -133,8 +129,6 @@ private protected HashSetAssertion(AssertionContext<HashSet<TItem>> context)

private static StringBuilder CreateExpressionBuilder(string? expression)
{
var builder = new StringBuilder();
builder.Append($"Assert.That({expression ?? "?"})");
return builder;
return new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
}
}
6 changes: 2 additions & 4 deletions TUnit.Assertions/Sources/TaskAssertion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ public class TaskAssertion<TValue> : IAssertionSource<TValue>, IDelegateAssertio

public TaskAssertion(Task<TValue?> task, string? expression)
{
var expressionBuilder = new StringBuilder();
expressionBuilder.Append($"Assert.That({expression ?? "?"})");
var expressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');

// Context for result assertions (e.g., IsEqualTo on the TValue result)
var evaluationContext = new EvaluationContext<TValue>(async () =>
Expand All @@ -41,8 +40,7 @@ public TaskAssertion(Task<TValue?> task, string? expression)

// Context for task state assertions (e.g., IsCompleted on the Task<TValue>)
// DO NOT await the task here - we want to check its state synchronously
var taskExpressionBuilder = new StringBuilder();
taskExpressionBuilder.Append(expressionBuilder.ToString());
var taskExpressionBuilder = new StringBuilder("Assert.That(").Append(expression ?? "?").Append(')');
var taskEvaluationContext = new EvaluationContext<Task<TValue?>>(() =>
{
// Return the task object itself without awaiting it
Expand Down
Loading