Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Improve ambiguity when using .IsEqualTo(...) #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomhurst merged 3 commits into from
Oct 19, 2024
Merged

Improve ambiguity when using .IsEqualTo(...) #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c2aa3e
Improve ambiguity when using `.IsEqualTo(...)`
thomhurst Oct 19, 2024
b658522
Merge branch 'main' into feature/isequalto-improvements
thomhurst Oct 19, 2024
fb2d078
Fix tests
thomhurst Oct 19, 2024
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
34 changes: 17 additions & 17 deletions 34 TUnit.Assertions.UnitTests/AssertMultipleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,39 +30,39 @@ public void MultipleFailures()
NUnitAssert.That(exception1.Message, Is.EqualTo("""
Expected 1 to be equal to 2

but the received value 1 is different
but found 1

at Assert.That(1).IsEqualTo(2)
"""));

NUnitAssert.That(exception2.Message, Is.EqualTo("""
Expected 2 to be equal to 3

but the received value 2 is different
but found 2

at Assert.That(2).IsEqualTo(3)
"""));

NUnitAssert.That(exception3.Message, Is.EqualTo("""
Expected 3 to be equal to 4

but the received value 3 is different
but found 3

at Assert.That(3).IsEqualTo(4)
"""));

NUnitAssert.That(exception4.Message, Is.EqualTo("""
Expected 4 to be equal to 5

but the received value 4 is different
but found 4

at Assert.That(4).IsEqualTo(5)
"""));

NUnitAssert.That(exception5.Message, Is.EqualTo("""
Expected 5 to be equal to 6

but the received value 5 is different
but found 5

at Assert.That(5).IsEqualTo(6)
"""));
Expand Down Expand Up @@ -93,7 +93,7 @@ public void MultipleFailures_With_Connectors()
Expected 1 to be equal to 2
or to be equal to 3

but the received value 1 is different
but found 1

at Assert.That(1).IsEqualTo(2).Or.IsEqualTo(3)
"""));
Expand All @@ -102,7 +102,7 @@ at Assert.That(1).IsEqualTo(2).Or.IsEqualTo(3)
Expected 2 to be equal to 3
and to be equal to 4

but the received value 2 is different
but found 2

at Assert.That(2).IsEqualTo(3).And.IsEqualTo(4)
"""));
Expand All @@ -111,7 +111,7 @@ at Assert.That(2).IsEqualTo(3).And.IsEqualTo(4)
Expected 3 to be equal to 4
or to be equal to 5

but the received value 3 is different
but found 3

at Assert.That(3).IsEqualTo(4).Or.IsEqualTo(5)
"""));
Expand All @@ -120,7 +120,7 @@ at Assert.That(3).IsEqualTo(4).Or.IsEqualTo(5)
Expected 4 to be equal to 5
and to be equal to 6

but the received value 4 is different
but found 4

at Assert.That(4).IsEqualTo(5).And.IsEqualTo(6)
"""));
Expand All @@ -129,7 +129,7 @@ at Assert.That(4).IsEqualTo(5).And.IsEqualTo(6)
Expected 5 to be equal to 6
or to be equal to 7

but the received value 5 is different
but found 5

at Assert.That(5).IsEqualTo(6).Or.IsEqualTo(7)
"""));
Expand Down Expand Up @@ -179,55 +179,55 @@ public void Nested_Multiples()
NUnitAssert.That(assertionException1.Message, Is.EqualTo("""
Expected 1 to be equal to 2

but the received value 1 is different
but found 1

at Assert.That(1).IsEqualTo(2)
"""));

NUnitAssert.That(assertionException2.Message, Is.EqualTo("""
Expected 2 to be equal to 3

but the received value 2 is different
but found 2

at Assert.That(2).IsEqualTo(3)
"""));

NUnitAssert.That(assertionException3.Message, Is.EqualTo("""
Expected 3 to be equal to 4

but the received value 3 is different
but found 3

at Assert.That(3).IsEqualTo(4)
"""));

NUnitAssert.That(assertionException4.Message, Is.EqualTo("""
Expected 4 to be equal to 5

but the received value 4 is different
but found 4

at Assert.That(4).IsEqualTo(5)
"""));

NUnitAssert.That(assertionException5.Message, Is.EqualTo("""
Expected 5 to be equal to 6

but the received value 5 is different
but found 5

at Assert.That(5).IsEqualTo(6)
"""));

NUnitAssert.That(assertionException6.Message, Is.EqualTo("""
Expected 6 to be equal to 7

but the received value 6 is different
but found 6

at Assert.That(6).IsEqualTo(7)
"""));

NUnitAssert.That(assertionException7.Message, Is.EqualTo("""
Expected 7 to be equal to 8

but the received value 7 is different
but found 7

at Assert.That(7).IsEqualTo(8)
"""));
Expand Down
3 changes: 1 addition & 2 deletions 3 TUnit.Assertions/Assert.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;
using System.Runtime.CompilerServices;
using TUnit.Assertions.AssertionBuilders;
using TUnit.Assertions.Exceptions;
using TUnit.Assertions.Extensions;
Expand Down
2 changes: 1 addition & 1 deletion 2 TUnit.Assertions/AssertConditions/ExpectedValueAssertCondition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public abstract class ExpectedValueAssertCondition<TActual, TExpected>(TExpected

private readonly List<Func<TActual?, TExpected?, AssertionDecision>> _customComparers = [];

protected TExpected? ExpectedValue { get; } = expected;
public TExpected? ExpectedValue { get; } = expected;

public void WithTransform(Func<TActual?, TActual?> actualTransformation,
Func<TExpected?, TExpected?> expectedTransformation)
Expand Down
8 changes: 8 additions & 0 deletions 8 TUnit.Assertions/AssertionBuilders/Wrappers/GenericEqualToAssertionBuilderWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace TUnit.Assertions.AssertionBuilders.Wrappers;

public class GenericEqualToAssertionBuilderWrapper<TActual> : InvokableValueAssertionBuilder<TActual>
{
internal GenericEqualToAssertionBuilderWrapper(InvokableAssertionBuilder<TActual> invokableAssertionBuilder) : base(invokableAssertionBuilder)
{
}
}
8 changes: 8 additions & 0 deletions 8 TUnit.Assertions/AssertionBuilders/Wrappers/GenericNotEqualToAssertionBuilderWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace TUnit.Assertions.AssertionBuilders.Wrappers;

public class GenericNotEqualToAssertionBuilderWrapper<TActual> : InvokableValueAssertionBuilder<TActual>
{
internal GenericNotEqualToAssertionBuilderWrapper(InvokableAssertionBuilder<TActual> invokableAssertionBuilder) : base(invokableAssertionBuilder)
{
}
}
23 changes: 0 additions & 23 deletions 23 TUnit.Assertions/AssertionBuilders/Wrappers/NumberEqualToAssertionBuilderWrapper.cs
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions 23 TUnit.Assertions/AssertionBuilders/Wrappers/NumberNotEqualToAssertionBuilderWrapper.cs
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions 7 TUnit.Assertions/Assertions/Generics/GenericIsExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ namespace TUnit.Assertions.Extensions;

public static class GenericIsExtensions
{
public static InvokableValueAssertionBuilder<TActual> IsEqualTo<TActual>(this IValueSource<TActual> valueSource, TActual expected, [CallerArgumentExpression("expected")] string doNotPopulateThisValue1 = "")
where TActual : class
public static GenericEqualToAssertionBuilderWrapper<TActual> IsEqualTo<TActual>(this IValueSource<TActual> valueSource, TActual expected, [CallerArgumentExpression("expected")] string doNotPopulateThisValue1 = "")
{
return valueSource
var assertionBuilder = valueSource
.RegisterAssertion(new EqualsExpectedValueAssertCondition<TActual>(expected), [doNotPopulateThisValue1]);

return new GenericEqualToAssertionBuilderWrapper<TActual>(assertionBuilder);
}

public static InvokableValueAssertionBuilder<TActual> IsEquatableOrEqualTo<TActual>(this IValueSource<TActual> valueSource, TActual expected, [CallerArgumentExpression("expected")] string doNotPopulateThisValue1 = "")
Expand Down
8 changes: 5 additions & 3 deletions 8 TUnit.Assertions/Assertions/Generics/GenericIsNotExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@
using TUnit.Assertions.AssertConditions;
using TUnit.Assertions.AssertConditions.Interfaces;
using TUnit.Assertions.AssertionBuilders;
using TUnit.Assertions.AssertionBuilders.Wrappers;
using TUnit.Assertions.Assertions.Generics.Conditions;

namespace TUnit.Assertions.Extensions;

public static class GenericIsNotExtensions
{
public static InvokableValueAssertionBuilder<TActual> IsNotEqualTo<TActual>(this IValueSource<TActual> valueSource, TActual expected, [CallerArgumentExpression("expected")] string doNotPopulateThisValue = "")
where TActual : class
public static GenericNotEqualToAssertionBuilderWrapper<TActual> IsNotEqualTo<TActual>(this IValueSource<TActual> valueSource, TActual expected, [CallerArgumentExpression("expected")] string doNotPopulateThisValue = "")
{
return valueSource.RegisterAssertion(new NotEqualsExpectedValueAssertCondition<TActual>(expected)
var assertionBuilder = valueSource.RegisterAssertion(new NotEqualsExpectedValueAssertCondition<TActual>(expected)
, [doNotPopulateThisValue]);

return new GenericNotEqualToAssertionBuilderWrapper<TActual>(assertionBuilder);
}

public static InvokableValueAssertionBuilder<TActual> IsNotNull<TActual>(this IValueSource<TActual> valueSource)
Expand Down
61 changes: 0 additions & 61 deletions 61 TUnit.Assertions/Assertions/Numbers/Conditions/NumericEqualsExpectedValueAssertCondition.cs
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions 49 ...t.Assertions/Assertions/Numbers/Conditions/NumericNotEqualExpectedValueAssertCondition.cs
View file
Open in desktop

This file was deleted.

Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.