Skip to content

feat!: remove unnecessary And from delegate DoesNotThrow #665

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
vbreuss merged 1 commit into from
Jun 28, 2025
Merged

feat!: remove unnecessary And from delegate DoesNotThrow #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions Source/aweXpect.Core/Delegates/ThatDelegate.WithValue.DoesNotThrow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,22 @@ public sealed partial class WithValue<T>
/// </summary>
public DelegateWithValueResult<T> DoesNotThrow()
=> new(ExpectationBuilder.AddConstraint((it, grammars) =>
new DoesNotThrowConstraint(it, grammars, typeof(Exception))),
this);
new DoesNotThrowConstraint(it, grammars, typeof(Exception))));

/// <summary>
/// Verifies that the delegate does not throw an exception of type <typeparamref name="TException" />.
/// </summary>
public DelegateWithValueResult<T> DoesNotThrow<TException>()
where TException : Exception
=> new(ExpectationBuilder.AddConstraint((it, grammars) =>
new DoesNotThrowConstraint(it, grammars, typeof(TException))),
this);
new DoesNotThrowConstraint(it, grammars, typeof(TException))));

/// <summary>
/// Verifies that the delegate does not throw an exception of type <paramref name="exceptionType" />.
/// </summary>
public DelegateWithValueResult<T> DoesNotThrow(Type exceptionType)
=> new(ExpectationBuilder.AddConstraint((it, grammars) =>
new DoesNotThrowConstraint(it, grammars, exceptionType)),
this);
new DoesNotThrowConstraint(it, grammars, exceptionType)));

private sealed class DoesNotThrowConstraint(
string it,
Expand Down
6 changes: 2 additions & 4 deletions Source/aweXpect.Core/Delegates/ThatDelegate.WithValue.DoesNotThrowExactly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,14 @@ public sealed partial class WithValue<T>
public DelegateWithValueResult<T> DoesNotThrowExactly<TException>()
where TException : Exception
=> new(ExpectationBuilder.AddConstraint((it, grammars) =>
new DoesNotThrowExactlyConstraint(it, grammars, typeof(TException))),
this);
new DoesNotThrowExactlyConstraint(it, grammars, typeof(TException))));

/// <summary>
/// Verifies that the delegate does not throw an exception of type <paramref name="exceptionType" />.
/// </summary>
public DelegateWithValueResult<T> DoesNotThrowExactly(Type exceptionType)
=> new(ExpectationBuilder.AddConstraint((it, grammars) =>
new DoesNotThrowExactlyConstraint(it, grammars, exceptionType)),
this);
new DoesNotThrowExactlyConstraint(it, grammars, exceptionType)));

private sealed class DoesNotThrowExactlyConstraint(
string it,
Expand Down
15 changes: 6 additions & 9 deletions Source/aweXpect.Core/Delegates/ThatDelegate.WithoutValue.DoesNotThrow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,24 @@ public sealed partial class WithoutValue
/// <summary>
/// Verifies that the delegate does not throw any exception.
/// </summary>
public AndResult<WithoutValue> DoesNotThrow()
public ExpectationResult DoesNotThrow()
=> new(ExpectationBuilder.AddConstraint((it, grammars)
=> new DoesNotThrowConstraint(it, grammars, typeof(Exception))),
this);
=> new DoesNotThrowConstraint(it, grammars, typeof(Exception))));

/// <summary>
/// Verifies that the delegate does not throw an exception of type <typeparamref name="TException" />.
/// </summary>
public AndResult<WithoutValue> DoesNotThrow<TException>()
public ExpectationResult DoesNotThrow<TException>()
where TException : Exception
=> new(ExpectationBuilder.AddConstraint((it, grammars) =>
new DoesNotThrowConstraint(it, grammars, typeof(TException))),
this);
new DoesNotThrowConstraint(it, grammars, typeof(TException))));

/// <summary>
/// Verifies that the delegate does not throw an exception of type <paramref name="exceptionType" />.
/// </summary>
public AndResult<WithoutValue> DoesNotThrow(Type exceptionType)
public ExpectationResult DoesNotThrow(Type exceptionType)
=> new(ExpectationBuilder.AddConstraint((it, grammars) =>
new DoesNotThrowConstraint(it, grammars, exceptionType)),
this);
new DoesNotThrowConstraint(it, grammars, exceptionType)));

private sealed class DoesNotThrowConstraint(string it, ExpectationGrammars grammars, Type exceptionType)
: ConstraintResult(grammars),
Expand Down
10 changes: 4 additions & 6 deletions Source/aweXpect.Core/Delegates/ThatDelegate.WithoutValue.DoesNotThrowExactly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,17 @@ public sealed partial class WithoutValue
/// <summary>
/// Verifies that the delegate does not throw an exception of type <typeparamref name="TException" />.
/// </summary>
public AndResult<WithoutValue> DoesNotThrowExactly<TException>()
public ExpectationResult DoesNotThrowExactly<TException>()
where TException : Exception
=> new(ExpectationBuilder.AddConstraint((it, grammars) =>
new DoesNotThrowExactlyConstraint(it, grammars, typeof(TException))),
this);
new DoesNotThrowExactlyConstraint(it, grammars, typeof(TException))));

/// <summary>
/// Verifies that the delegate does not throw an exception of type <paramref name="exceptionType" />.
/// </summary>
public AndResult<WithoutValue> DoesNotThrowExactly(Type exceptionType)
public ExpectationResult DoesNotThrowExactly(Type exceptionType)
=> new(ExpectationBuilder.AddConstraint((it, grammars) =>
new DoesNotThrowExactlyConstraint(it, grammars, exceptionType)),
this);
new DoesNotThrowExactlyConstraint(it, grammars, exceptionType)));

private sealed class DoesNotThrowExactlyConstraint(string it, ExpectationGrammars grammars, Type exceptionType)
: ConstraintResult(grammars),
Expand Down
4 changes: 2 additions & 2 deletions Source/aweXpect.Core/Results/DelegateWithValueResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ namespace aweXpect.Results;
/// <summary>
/// Result for a delegate with a value that does not throw.
/// </summary>
public class DelegateWithValueResult<T>(ExpectationBuilder expectationBuilder, ThatDelegate.WithValue<T> returnValue)
: AndResult<T, ThatDelegate.WithValue<T>>(expectationBuilder, returnValue)
public class DelegateWithValueResult<T>(ExpectationBuilder expectationBuilder)
: ExpectationResult<T>(expectationBuilder)
{
private readonly ExpectationBuilder _expectationBuilder = expectationBuilder;
Comment thread
vbreuss marked this conversation as resolved.

Expand Down
14 changes: 7 additions & 7 deletions Tests/aweXpect.Core.Api.Tests/Expected/aweXpect.Core_net8.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,12 +475,12 @@ namespace aweXpect.Delegates
public sealed class WithoutValue : aweXpect.Delegates.ThatDelegate, aweXpect.Core.IExpectThat<aweXpect.Delegates.ThatDelegate.WithoutValue>, aweXpect.Core.IThat<aweXpect.Delegates.ThatDelegate.WithoutValue>
{
public WithoutValue(aweXpect.Core.ExpectationBuilder expectationBuilder) { }
public aweXpect.Results.AndResult<aweXpect.Delegates.ThatDelegate.WithoutValue> DoesNotThrow() { }
public aweXpect.Results.AndResult<aweXpect.Delegates.ThatDelegate.WithoutValue> DoesNotThrow(System.Type exceptionType) { }
public aweXpect.Results.AndResult<aweXpect.Delegates.ThatDelegate.WithoutValue> DoesNotThrow<TException>()
public aweXpect.Results.ExpectationResult DoesNotThrow() { }
public aweXpect.Results.ExpectationResult DoesNotThrow(System.Type exceptionType) { }
public aweXpect.Results.ExpectationResult DoesNotThrow<TException>()
where TException : System.Exception { }
public aweXpect.Results.AndResult<aweXpect.Delegates.ThatDelegate.WithoutValue> DoesNotThrowExactly(System.Type exceptionType) { }
public aweXpect.Results.AndResult<aweXpect.Delegates.ThatDelegate.WithoutValue> DoesNotThrowExactly<TException>()
public aweXpect.Results.ExpectationResult DoesNotThrowExactly(System.Type exceptionType) { }
public aweXpect.Results.ExpectationResult DoesNotThrowExactly<TException>()
where TException : System.Exception { }
public aweXpect.Results.ExecutesInResult<aweXpect.Results.AndResult<aweXpect.Delegates.ThatDelegate.WithoutValue>> ExecutesIn() { }
}
Expand Down Expand Up @@ -999,9 +999,9 @@ namespace aweXpect.Results
public TTarget Once() { }
public TTarget Twice() { }
}
public class DelegateWithValueResult<T> : aweXpect.Results.AndResult<T, aweXpect.Delegates.ThatDelegate.WithValue<T>>
public class DelegateWithValueResult<T> : aweXpect.Results.ExpectationResult<T>
{
public DelegateWithValueResult(aweXpect.Core.ExpectationBuilder expectationBuilder, aweXpect.Delegates.ThatDelegate.WithValue<T> returnValue) { }
public DelegateWithValueResult(aweXpect.Core.ExpectationBuilder expectationBuilder) { }
public aweXpect.Core.IThat<T> AndWhoseResult { get; }
}
public class ExecutesInResult<TResult>
Expand Down
14 changes: 7 additions & 7 deletions Tests/aweXpect.Core.Api.Tests/Expected/aweXpect.Core_netstandard2.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,12 +475,12 @@ namespace aweXpect.Delegates
public sealed class WithoutValue : aweXpect.Delegates.ThatDelegate, aweXpect.Core.IExpectThat<aweXpect.Delegates.ThatDelegate.WithoutValue>, aweXpect.Core.IThat<aweXpect.Delegates.ThatDelegate.WithoutValue>
{
public WithoutValue(aweXpect.Core.ExpectationBuilder expectationBuilder) { }
public aweXpect.Results.AndResult<aweXpect.Delegates.ThatDelegate.WithoutValue> DoesNotThrow() { }
public aweXpect.Results.AndResult<aweXpect.Delegates.ThatDelegate.WithoutValue> DoesNotThrow(System.Type exceptionType) { }
public aweXpect.Results.AndResult<aweXpect.Delegates.ThatDelegate.WithoutValue> DoesNotThrow<TException>()
public aweXpect.Results.ExpectationResult DoesNotThrow() { }
public aweXpect.Results.ExpectationResult DoesNotThrow(System.Type exceptionType) { }
public aweXpect.Results.ExpectationResult DoesNotThrow<TException>()
where TException : System.Exception { }
public aweXpect.Results.AndResult<aweXpect.Delegates.ThatDelegate.WithoutValue> DoesNotThrowExactly(System.Type exceptionType) { }
public aweXpect.Results.AndResult<aweXpect.Delegates.ThatDelegate.WithoutValue> DoesNotThrowExactly<TException>()
public aweXpect.Results.ExpectationResult DoesNotThrowExactly(System.Type exceptionType) { }
public aweXpect.Results.ExpectationResult DoesNotThrowExactly<TException>()
where TException : System.Exception { }
public aweXpect.Results.ExecutesInResult<aweXpect.Results.AndResult<aweXpect.Delegates.ThatDelegate.WithoutValue>> ExecutesIn() { }
}
Expand Down Expand Up @@ -982,9 +982,9 @@ namespace aweXpect.Results
public TTarget Once() { }
public TTarget Twice() { }
}
public class DelegateWithValueResult<T> : aweXpect.Results.AndResult<T, aweXpect.Delegates.ThatDelegate.WithValue<T>>
public class DelegateWithValueResult<T> : aweXpect.Results.ExpectationResult<T>
{
public DelegateWithValueResult(aweXpect.Core.ExpectationBuilder expectationBuilder, aweXpect.Delegates.ThatDelegate.WithValue<T> returnValue) { }
public DelegateWithValueResult(aweXpect.Core.ExpectationBuilder expectationBuilder) { }
public aweXpect.Core.IThat<T> AndWhoseResult { get; }
}
public class ExecutesInResult<TResult>
Expand Down