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
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -19,7 +20,8 @@ public static class DefaultValuesAssertionExtensions
/// </summary>
public static DefaultValuesAssertion<TValue> HasDefaultValues<TValue>(this IAssertionSource<TValue> source, bool boolValue = true, int intValue = 0, string stringValue = "default", [CallerArgumentExpression(nameof(boolValue))] string? boolValueExpression = null, [CallerArgumentExpression(nameof(intValue))] string? intValueExpression = null, [CallerArgumentExpression(nameof(stringValue))] string? stringValueExpression = null)
{
source.Context.ExpressionBuilder.Append($".HasDefaultValues({boolValueExpression}, {intValueExpression}, {stringValueExpression})");
source.Context.ExpressionBuilder.Append(".HasDefaultValues("
+ string.Join(", ", new[] { boolValueExpression, intValueExpression, stringValueExpression }.Where(e => e != null)) + ")");
return new DefaultValuesAssertion<TValue>(source.Context, boolValue, intValue, stringValue);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -19,7 +20,8 @@ public static class DefaultValuesAssertionExtensions
/// </summary>
public static DefaultValuesAssertion<TValue> HasDefaultValues<TValue>(this IAssertionSource<TValue> source, bool boolValue = true, int intValue = 0, string stringValue = "default", [CallerArgumentExpression(nameof(boolValue))] string? boolValueExpression = null, [CallerArgumentExpression(nameof(intValue))] string? intValueExpression = null, [CallerArgumentExpression(nameof(stringValue))] string? stringValueExpression = null)
{
source.Context.ExpressionBuilder.Append($".HasDefaultValues({boolValueExpression}, {intValueExpression}, {stringValueExpression})");
source.Context.ExpressionBuilder.Append(".HasDefaultValues("
+ string.Join(", ", new[] { boolValueExpression, intValueExpression, stringValueExpression }.Where(e => e != null)) + ")");
return new DefaultValuesAssertion<TValue>(source.Context, boolValue, intValue, stringValue);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -19,7 +20,8 @@ public static class DefaultValuesAssertionExtensions
/// </summary>
public static DefaultValuesAssertion<TValue> HasDefaultValues<TValue>(this IAssertionSource<TValue> source, bool boolValue = true, int intValue = 0, string stringValue = "default", [CallerArgumentExpression(nameof(boolValue))] string? boolValueExpression = null, [CallerArgumentExpression(nameof(intValue))] string? intValueExpression = null, [CallerArgumentExpression(nameof(stringValue))] string? stringValueExpression = null)
{
source.Context.ExpressionBuilder.Append($".HasDefaultValues({boolValueExpression}, {intValueExpression}, {stringValueExpression})");
source.Context.ExpressionBuilder.Append(".HasDefaultValues("
+ string.Join(", ", new[] { boolValueExpression, intValueExpression, stringValueExpression }.Where(e => e != null)) + ")");
return new DefaultValuesAssertion<TValue>(source.Context, boolValue, intValue, stringValue);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -19,7 +20,8 @@ public static class DefaultValuesAssertionExtensions
/// </summary>
public static DefaultValuesAssertion<TValue> HasDefaultValues<TValue>(this IAssertionSource<TValue> source, bool boolValue = true, int intValue = 0, string stringValue = "default", [CallerArgumentExpression(nameof(boolValue))] string? boolValueExpression = null, [CallerArgumentExpression(nameof(intValue))] string? intValueExpression = null, [CallerArgumentExpression(nameof(stringValue))] string? stringValueExpression = null)
{
source.Context.ExpressionBuilder.Append($".HasDefaultValues({boolValueExpression}, {intValueExpression}, {stringValueExpression})");
source.Context.ExpressionBuilder.Append(".HasDefaultValues("
+ string.Join(", ", new[] { boolValueExpression, intValueExpression, stringValueExpression }.Where(e => e != null)) + ")");
return new DefaultValuesAssertion<TValue>(source.Context, boolValue, intValue, stringValue);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -17,9 +18,10 @@ public static class StringComparisonAssertionExtensions
/// <summary>
/// Extension method for StringComparisonAssertion.
/// </summary>
public static StringComparisonAssertion IsEqualToWithComparison(this IAssertionSource<string> source, string expected, System.StringComparison comparison = System.StringComparison.4, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null, [CallerArgumentExpression(nameof(comparison))] string? comparisonExpression = null)
public static StringComparisonAssertion IsEqualToWithComparison(this IAssertionSource<string> source, string expected, System.StringComparison comparison = StringComparison.Ordinal, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null, [CallerArgumentExpression(nameof(comparison))] string? comparisonExpression = null)
{
source.Context.ExpressionBuilder.Append($".IsEqualToWithComparison({expectedExpression}, {comparisonExpression})");
source.Context.ExpressionBuilder.Append(".IsEqualToWithComparison("
+ string.Join(", ", new[] { expectedExpression, comparisonExpression }.Where(e => e != null)) + ")");
return new StringComparisonAssertion(source.Context, expected, comparison);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -17,9 +18,10 @@ public static class StringComparisonAssertionExtensions
/// <summary>
/// Extension method for StringComparisonAssertion.
/// </summary>
public static StringComparisonAssertion IsEqualToWithComparison(this IAssertionSource<string> source, string expected, System.StringComparison comparison = System.StringComparison.4, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null, [CallerArgumentExpression(nameof(comparison))] string? comparisonExpression = null)
public static StringComparisonAssertion IsEqualToWithComparison(this IAssertionSource<string> source, string expected, System.StringComparison comparison = StringComparison.Ordinal, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null, [CallerArgumentExpression(nameof(comparison))] string? comparisonExpression = null)
{
source.Context.ExpressionBuilder.Append($".IsEqualToWithComparison({expectedExpression}, {comparisonExpression})");
source.Context.ExpressionBuilder.Append(".IsEqualToWithComparison("
+ string.Join(", ", new[] { expectedExpression, comparisonExpression }.Where(e => e != null)) + ")");
return new StringComparisonAssertion(source.Context, expected, comparison);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -17,9 +18,10 @@ public static class StringComparisonAssertionExtensions
/// <summary>
/// Extension method for StringComparisonAssertion.
/// </summary>
public static StringComparisonAssertion IsEqualToWithComparison(this IAssertionSource<string> source, string expected, System.StringComparison comparison = System.StringComparison.4, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null, [CallerArgumentExpression(nameof(comparison))] string? comparisonExpression = null)
public static StringComparisonAssertion IsEqualToWithComparison(this IAssertionSource<string> source, string expected, System.StringComparison comparison = StringComparison.Ordinal, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null, [CallerArgumentExpression(nameof(comparison))] string? comparisonExpression = null)
{
source.Context.ExpressionBuilder.Append($".IsEqualToWithComparison({expectedExpression}, {comparisonExpression})");
source.Context.ExpressionBuilder.Append(".IsEqualToWithComparison("
+ string.Join(", ", new[] { expectedExpression, comparisonExpression }.Where(e => e != null)) + ")");
return new StringComparisonAssertion(source.Context, expected, comparison);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -17,9 +18,10 @@ public static class StringComparisonAssertionExtensions
/// <summary>
/// Extension method for StringComparisonAssertion.
/// </summary>
public static StringComparisonAssertion IsEqualToWithComparison(this IAssertionSource<string> source, string expected, System.StringComparison comparison = System.StringComparison.4, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null, [CallerArgumentExpression(nameof(comparison))] string? comparisonExpression = null)
public static StringComparisonAssertion IsEqualToWithComparison(this IAssertionSource<string> source, string expected, System.StringComparison comparison = StringComparison.Ordinal, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null, [CallerArgumentExpression(nameof(comparison))] string? comparisonExpression = null)
{
source.Context.ExpressionBuilder.Append($".IsEqualToWithComparison({expectedExpression}, {comparisonExpression})");
source.Context.ExpressionBuilder.Append(".IsEqualToWithComparison("
+ string.Join(", ", new[] { expectedExpression, comparisonExpression }.Where(e => e != null)) + ")");
return new StringComparisonAssertion(source.Context, expected, comparison);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -20,7 +21,8 @@ public static class GreaterThanAssertionExtensions
public static GreaterThanAssertion<TValue> IsGreaterThan<TValue>(this IAssertionSource<TValue> source, TValue expected, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null)
where TValue : System.IComparable<TValue>
{
source.Context.ExpressionBuilder.Append($".IsGreaterThan({expectedExpression})");
source.Context.ExpressionBuilder.Append(".IsGreaterThan("
+ string.Join(", ", new[] { expectedExpression }.Where(e => e != null)) + ")");
return new GreaterThanAssertion<TValue>(source.Context, expected);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -20,7 +21,8 @@ public static class GreaterThanAssertionExtensions
public static GreaterThanAssertion<TValue> IsGreaterThan<TValue>(this IAssertionSource<TValue> source, TValue expected, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null)
where TValue : System.IComparable<TValue>
{
source.Context.ExpressionBuilder.Append($".IsGreaterThan({expectedExpression})");
source.Context.ExpressionBuilder.Append(".IsGreaterThan("
+ string.Join(", ", new[] { expectedExpression }.Where(e => e != null)) + ")");
return new GreaterThanAssertion<TValue>(source.Context, expected);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -20,7 +21,8 @@ public static class GreaterThanAssertionExtensions
public static GreaterThanAssertion<TValue> IsGreaterThan<TValue>(this IAssertionSource<TValue> source, TValue expected, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null)
where TValue : System.IComparable<TValue>
{
source.Context.ExpressionBuilder.Append($".IsGreaterThan({expectedExpression})");
source.Context.ExpressionBuilder.Append(".IsGreaterThan("
+ string.Join(", ", new[] { expectedExpression }.Where(e => e != null)) + ")");
return new GreaterThanAssertion<TValue>(source.Context, expected);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -20,7 +21,8 @@ public static class GreaterThanAssertionExtensions
public static GreaterThanAssertion<TValue> IsGreaterThan<TValue>(this IAssertionSource<TValue> source, TValue expected, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null)
where TValue : System.IComparable<TValue>
{
source.Context.ExpressionBuilder.Append($".IsGreaterThan({expectedExpression})");
source.Context.ExpressionBuilder.Append(".IsGreaterThan("
+ string.Join(", ", new[] { expectedExpression }.Where(e => e != null)) + ")");
return new GreaterThanAssertion<TValue>(source.Context, expected);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -19,7 +20,8 @@ public static class EqualsAssertionExtensions
/// </summary>
public static EqualsAssertion<TValue> IsEqualTo<TValue>(this IAssertionSource<TValue> source, TValue expected, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null)
{
source.Context.ExpressionBuilder.Append($".IsEqualTo({expectedExpression})");
source.Context.ExpressionBuilder.Append(".IsEqualTo("
+ string.Join(", ", new[] { expectedExpression }.Where(e => e != null)) + ")");
return new EqualsAssertion<TValue>(source.Context, expected);
}

Expand All @@ -28,7 +30,8 @@ public static class EqualsAssertionExtensions
/// </summary>
public static EqualsAssertion<TValue> IsEqualTo<TValue>(this IAssertionSource<TValue> source, TValue expected, System.Collections.Generic.IEqualityComparer<TValue> comparer, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null, [CallerArgumentExpression(nameof(comparer))] string? comparerExpression = null)
{
source.Context.ExpressionBuilder.Append($".IsEqualTo({expectedExpression}, {comparerExpression})");
source.Context.ExpressionBuilder.Append(".IsEqualTo("
+ string.Join(", ", new[] { expectedExpression, comparerExpression }.Where(e => e != null)) + ")");
return new EqualsAssertion<TValue>(source.Context, expected, comparer);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -19,7 +20,8 @@ public static class EqualsAssertionExtensions
/// </summary>
public static EqualsAssertion<TValue> IsEqualTo<TValue>(this IAssertionSource<TValue> source, TValue expected, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null)
{
source.Context.ExpressionBuilder.Append($".IsEqualTo({expectedExpression})");
source.Context.ExpressionBuilder.Append(".IsEqualTo("
+ string.Join(", ", new[] { expectedExpression }.Where(e => e != null)) + ")");
return new EqualsAssertion<TValue>(source.Context, expected);
}

Expand All @@ -28,7 +30,8 @@ public static class EqualsAssertionExtensions
/// </summary>
public static EqualsAssertion<TValue> IsEqualTo<TValue>(this IAssertionSource<TValue> source, TValue expected, System.Collections.Generic.IEqualityComparer<TValue> comparer, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null, [CallerArgumentExpression(nameof(comparer))] string? comparerExpression = null)
{
source.Context.ExpressionBuilder.Append($".IsEqualTo({expectedExpression}, {comparerExpression})");
source.Context.ExpressionBuilder.Append(".IsEqualTo("
+ string.Join(", ", new[] { expectedExpression, comparerExpression }.Where(e => e != null)) + ")");
return new EqualsAssertion<TValue>(source.Context, expected, comparer);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Runtime.CompilerServices;
using TUnit.Assertions.Core;
using TUnit.Assertions.Enums;
using TUnit.Assertions.Tests.TestData;

namespace TUnit.Assertions.Extensions;
Expand All @@ -19,7 +20,8 @@ public static class EqualsAssertionExtensions
/// </summary>
public static EqualsAssertion<TValue> IsEqualTo<TValue>(this IAssertionSource<TValue> source, TValue expected, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null)
{
source.Context.ExpressionBuilder.Append($".IsEqualTo({expectedExpression})");
source.Context.ExpressionBuilder.Append(".IsEqualTo("
+ string.Join(", ", new[] { expectedExpression }.Where(e => e != null)) + ")");
return new EqualsAssertion<TValue>(source.Context, expected);
}

Expand All @@ -28,7 +30,8 @@ public static class EqualsAssertionExtensions
/// </summary>
public static EqualsAssertion<TValue> IsEqualTo<TValue>(this IAssertionSource<TValue> source, TValue expected, System.Collections.Generic.IEqualityComparer<TValue> comparer, [CallerArgumentExpression(nameof(expected))] string? expectedExpression = null, [CallerArgumentExpression(nameof(comparer))] string? comparerExpression = null)
{
source.Context.ExpressionBuilder.Append($".IsEqualTo({expectedExpression}, {comparerExpression})");
source.Context.ExpressionBuilder.Append(".IsEqualTo("
+ string.Join(", ", new[] { expectedExpression, comparerExpression }.Where(e => e != null)) + ")");
return new EqualsAssertion<TValue>(source.Context, expected, comparer);
}
}
Expand Down
Loading
Loading