Skip to content

Commit

Permalink
Merge pull request #2105 from jnyrup/revert_personal_preference_for_e…
Browse files Browse the repository at this point in the history 
…arly_returns

Revert early returns for project consistency
  • Loading branch information
@jnyrup
jnyrup committed Jan 16, 2023
2 parents aa14724 + 045d28b commit 6644745
Show file tree
Hide file tree
Showing 4 changed files with 163 additions and 173 deletions.
114 changes: 55 additions & 59 deletions Src/FluentAssertions/Specialized/AsyncFunctionAssertions.cs
View file
Expand Up @@ -132,21 +132,21 @@ public AsyncFunctionAssertions(Func<TTask> subject, IExtractExceptions extractor
.BecauseOf(because, becauseArgs)
.FailWith("Expected {context} to throw exactly {0}{reason}, but found <null>.", expectedType);

if (!success)
if (success)
{
return new ExceptionAssertions<TException>(Array.Empty<TException>());
}
Exception exception = await InvokeWithInterceptionAsync(Subject);

Exception exception = await InvokeWithInterceptionAsync(Subject);
Execute.Assertion
.ForCondition(exception is not null)
.BecauseOf(because, becauseArgs)
.FailWith("Expected {0}{reason}, but no exception was thrown.", expectedType);

Execute.Assertion
.ForCondition(exception is not null)
.BecauseOf(because, becauseArgs)
.FailWith("Expected {0}{reason}, but no exception was thrown.", expectedType);
exception.Should().BeOfType(expectedType, because, becauseArgs);

exception.Should().BeOfType(expectedType, because, becauseArgs);
return new ExceptionAssertions<TException>(new[] { exception as TException });
}

return new ExceptionAssertions<TException>(new[] { exception as TException });
return new ExceptionAssertions<TException>(Array.Empty<TException>());
}

/// <summary>
Expand All @@ -168,13 +168,13 @@ public AsyncFunctionAssertions(Func<TTask> subject, IExtractExceptions extractor
.BecauseOf(because, becauseArgs)
.FailWith("Expected {context} to throw {0}{reason}, but found <null>.", typeof(TException));

if (!success)
if (success)
{
return new ExceptionAssertions<TException>(Array.Empty<TException>());
Exception exception = await InvokeWithInterceptionAsync(Subject);
return ThrowInternal<TException>(exception, because, becauseArgs);
}

Exception exception = await InvokeWithInterceptionAsync(Subject);
return ThrowInternal<TException>(exception, because, becauseArgs);
return new ExceptionAssertions<TException>(Array.Empty<TException>());
}

/// <summary>
Expand All @@ -194,18 +194,16 @@ public async Task<AndConstraint<TAssertions>> NotThrowAsync(string because = "",
.BecauseOf(because, becauseArgs)
.FailWith("Expected {context} not to throw{reason}, but found <null>.");

if (!success)
{
return new AndConstraint<TAssertions>((TAssertions)this);
}

try
{
await Subject.Invoke();
}
catch (Exception exception)
if (success)
{
NotThrowInternal(exception, because, becauseArgs);
try
{
await Subject.Invoke();
}
catch (Exception exception)
{
return NotThrowInternal(exception, because, becauseArgs);
}
}

return new AndConstraint<TAssertions>((TAssertions)this);
Expand All @@ -229,18 +227,16 @@ public async Task<AndConstraint<TAssertions>> NotThrowAsync<TException>(string b
.BecauseOf(because, becauseArgs)
.FailWith("Expected {context} not to throw{reason}, but found <null>.");

if (!success)
{
return new AndConstraint<TAssertions>((TAssertions)this);
}

try
{
await Subject.Invoke();
}
catch (Exception exception)
if (success)
{
NotThrowInternal<TException>(exception, because, becauseArgs);
try
{
await Subject.Invoke();
}
catch (Exception exception)
{
return NotThrowInternal<TException>(exception, because, becauseArgs);
}
}

return new AndConstraint<TAssertions>((TAssertions)this);
Expand Down Expand Up @@ -279,37 +275,37 @@ public Task<AndConstraint<TAssertions>> NotThrowAfterAsync(TimeSpan waitTime, Ti
.BecauseOf(because, becauseArgs)
.FailWith("Expected {context} not to throw any exceptions after {0}{reason}, but found <null>.", waitTime);

if (!success)
{
return Task.FromResult(new AndConstraint<TAssertions>((TAssertions)this));
}

return AssertionTaskAsync();

async Task<AndConstraint<TAssertions>> AssertionTaskAsync()
if (success)
{
TimeSpan? invocationEndTime = null;
Exception exception = null;
ITimer timer = Clock.StartTimer();
return AssertionTaskAsync();

while (invocationEndTime is null || invocationEndTime < waitTime)
async Task<AndConstraint<TAssertions>> AssertionTaskAsync()
{
exception = await InvokeWithInterceptionAsync(Subject);
if (exception is null)
TimeSpan? invocationEndTime = null;
Exception exception = null;
ITimer timer = Clock.StartTimer();

while (invocationEndTime is null || invocationEndTime < waitTime)
{
return new AndConstraint<TAssertions>((TAssertions)this);
exception = await InvokeWithInterceptionAsync(Subject);
if (exception is null)
{
return new AndConstraint<TAssertions>((TAssertions)this);
}

await Clock.DelayAsync(pollInterval, CancellationToken.None);
invocationEndTime = timer.Elapsed;
}

await Clock.DelayAsync(pollInterval, CancellationToken.None);
invocationEndTime = timer.Elapsed;
}

Execute.Assertion
.BecauseOf(because, becauseArgs)
.FailWith("Did not expect any exceptions after {0}{reason}, but found {1}.", waitTime, exception);
Execute.Assertion
.BecauseOf(because, becauseArgs)
.FailWith("Did not expect any exceptions after {0}{reason}, but found {1}.", waitTime, exception);

return new AndConstraint<TAssertions>((TAssertions)this);
return new AndConstraint<TAssertions>((TAssertions)this);
}
}

return Task.FromResult(new AndConstraint<TAssertions>((TAssertions)this));
}

/// <summary>
Expand Down
92 changes: 45 additions & 47 deletions Src/FluentAssertions/Specialized/DelegateAssertions.cs
View file
Expand Up @@ -43,14 +43,14 @@ public ExceptionAssertions<TException> Throw<TException>(string because = "", pa
.BecauseOf(because, becauseArgs)
.FailWith("Expected {context} to throw {0}{reason}, but found <null>.", typeof(TException));

if (!success)
if (success)
{
return new ExceptionAssertions<TException>(Array.Empty<TException>());
FailIfSubjectIsAsyncVoid();
Exception exception = InvokeSubjectWithInterception();
return ThrowInternal<TException>(exception, because, becauseArgs);
}

FailIfSubjectIsAsyncVoid();
Exception exception = InvokeSubjectWithInterception();
return ThrowInternal<TException>(exception, because, becauseArgs);
return new ExceptionAssertions<TException>(Array.Empty<TException>());
}

/// <summary>
Expand All @@ -71,14 +71,14 @@ public AndConstraint<TAssertions> NotThrow<TException>(string because = "", para
.BecauseOf(because, becauseArgs)
.FailWith("Expected {context} not to throw {0}{reason}, but found <null>.", typeof(TException));

if (!success)
if (success)
{
return new AndConstraint<TAssertions>((TAssertions)this);
FailIfSubjectIsAsyncVoid();
Exception exception = InvokeSubjectWithInterception();
return NotThrowInternal<TException>(exception, because, becauseArgs);
}

FailIfSubjectIsAsyncVoid();
Exception exception = InvokeSubjectWithInterception();
return NotThrowInternal<TException>(exception, because, becauseArgs);
return new AndConstraint<TAssertions>((TAssertions)this);
}

/// <summary>
Expand All @@ -98,14 +98,14 @@ public AndConstraint<TAssertions> NotThrow(string because = "", params object[]
.BecauseOf(because, becauseArgs)
.FailWith("Expected {context} not to throw{reason}, but found <null>.");

if (!success)
if (success)
{
return new AndConstraint<TAssertions>((TAssertions)this);
FailIfSubjectIsAsyncVoid();
Exception exception = InvokeSubjectWithInterception();
return NotThrowInternal(exception, because, becauseArgs);
}

FailIfSubjectIsAsyncVoid();
Exception exception = InvokeSubjectWithInterception();
return NotThrowInternal(exception, because, becauseArgs);
return new AndConstraint<TAssertions>((TAssertions)this);
}

/// <summary>
Expand Down Expand Up @@ -133,24 +133,24 @@ public AndConstraint<TAssertions> NotThrow(string because = "", params object[]
.BecauseOf(because, becauseArgs)
.FailWith("Expected {context} to throw exactly {0}{reason}, but found <null>.", typeof(TException));

if (!success)
if (success)
{
return new ExceptionAssertions<TException>(Array.Empty<TException>());
}
FailIfSubjectIsAsyncVoid();
Exception exception = InvokeSubjectWithInterception();

FailIfSubjectIsAsyncVoid();
Exception exception = InvokeSubjectWithInterception();
Type expectedType = typeof(TException);

Type expectedType = typeof(TException);
Execute.Assertion
.ForCondition(exception is not null)
.BecauseOf(because, becauseArgs)
.FailWith("Expected {0}{reason}, but no exception was thrown.", expectedType);

Execute.Assertion
.ForCondition(exception is not null)
.BecauseOf(because, becauseArgs)
.FailWith("Expected {0}{reason}, but no exception was thrown.", expectedType);
exception.Should().BeOfType(expectedType, because, becauseArgs);

exception.Should().BeOfType(expectedType, because, becauseArgs);
return new ExceptionAssertions<TException>(new[] { exception as TException });
}

return new ExceptionAssertions<TException>(new[] { exception as TException });
return new ExceptionAssertions<TException>(Array.Empty<TException>());
}

/// <summary>
Expand Down Expand Up @@ -186,34 +186,32 @@ public AndConstraint<TAssertions> NotThrowAfter(TimeSpan waitTime, TimeSpan poll
.BecauseOf(because, becauseArgs)
.FailWith("Expected {context} not to throw after {0}{reason}, but found <null>.", waitTime);

if (!success)
if (success)
{
return new AndConstraint<TAssertions>((TAssertions)this);
}

FailIfSubjectIsAsyncVoid();
FailIfSubjectIsAsyncVoid();

TimeSpan? invocationEndTime = null;
Exception exception = null;
ITimer timer = Clock.StartTimer();
TimeSpan? invocationEndTime = null;
Exception exception = null;
ITimer timer = Clock.StartTimer();

while (invocationEndTime is null || invocationEndTime < waitTime)
{
exception = InvokeSubjectWithInterception();
if (exception is null)
while (invocationEndTime is null || invocationEndTime < waitTime)
{
break;
exception = InvokeSubjectWithInterception();
if (exception is null)
{
break;
}

Clock.Delay(pollInterval);
invocationEndTime = timer.Elapsed;
}

Clock.Delay(pollInterval);
invocationEndTime = timer.Elapsed;
Execute.Assertion
.BecauseOf(because, becauseArgs)
.ForCondition(exception is null)
.FailWith("Did not expect any exceptions after {0}{reason}, but found {1}.", waitTime, exception);
}

Execute.Assertion
.BecauseOf(because, becauseArgs)
.ForCondition(exception is null)
.FailWith("Did not expect any exceptions after {0}{reason}, but found {1}.", waitTime, exception);

return new AndConstraint<TAssertions>((TAssertions)this);
}

Expand Down

0 comments on commit 6644745

Please sign in to comment.