Revert changes in ContinuedAssertionScope.cs

fluentassertions · Jul 31, 2023 · 4423322 · 4423322
1 parent c35a1d7
commit 4423322
Showing 1 changed file with 81 additions and 18 deletions.
diff --git a/Src/FluentAssertions/Execution/ContinuedAssertionScope.cs b/Src/FluentAssertions/Execution/ContinuedAssertionScope.cs
@@ -21,32 +21,81 @@ internal ContinuedAssertionScope(AssertionScope predecessor, bool continueAssert
     }
 
     /// <inheritdoc/>
-    public GivenSelector<T> Given<T>(Func<T> selector) =>
-        continueAsserting ? predecessor.Given(selector) : new GivenSelector<T>(() => default, predecessor, continueAsserting: false);
+    public GivenSelector<T> Given<T>(Func<T> selector)
+    {
+        if (continueAsserting)
+        {
+            return predecessor.Given(selector);
+        }
+
+        return new GivenSelector<T>(() => default, predecessor, continueAsserting: false);
+    }
 
     /// <inheritdoc/>
-    public IAssertionScope ForCondition(bool condition) =>
-        continueAsserting ? predecessor.ForCondition(condition) : this;
+    public IAssertionScope ForCondition(bool condition)
+    {
+        if (continueAsserting)
+        {
+            return predecessor.ForCondition(condition);
+        }
+
+        return this;
+    }
 
     /// <inheritdoc/>
-    public Continuation FailWith(string message) =>
-        continueAsserting ? predecessor.FailWith(message) : new Continuation(predecessor, continueAsserting: false);
+    public Continuation FailWith(string message)
+    {
+        if (continueAsserting)
+        {
+            return predecessor.FailWith(message);
+        }
+
+        return new Continuation(predecessor, continueAsserting: false);
+    }
 
     /// <inheritdoc/>
-    public Continuation FailWith(string message, params Func<object>[] argProviders) =>
-        continueAsserting ? predecessor.FailWith(message, argProviders) : new Continuation(predecessor, continueAsserting: false);
+    public Continuation FailWith(string message, params Func<object>[] argProviders)
+    {
+        if (continueAsserting)
+        {
+            return predecessor.FailWith(message, argProviders);
+        }
+
+        return new Continuation(predecessor, continueAsserting: false);
+    }
 
     /// <inheritdoc/>
-    public Continuation FailWith(Func<FailReason> failReasonFunc) =>
-        continueAsserting ? predecessor.FailWith(failReasonFunc) : new Continuation(predecessor, continueAsserting: false);
+    public Continuation FailWith(Func<FailReason> failReasonFunc)
+    {
+        if (continueAsserting)
+        {
+            return predecessor.FailWith(failReasonFunc);
+        }
+
+        return new Continuation(predecessor, continueAsserting: false);
+    }
 
     /// <inheritdoc/>
-    public Continuation FailWith(string message, params object[] args) =>
-        continueAsserting ? predecessor.FailWith(message, args) : new Continuation(predecessor, continueAsserting: false);
+    public Continuation FailWith(string message, params object[] args)
+    {
+        if (continueAsserting)
+        {
+            return predecessor.FailWith(message, args);
+        }
+
+        return new Continuation(predecessor, continueAsserting: false);
+    }
 
     /// <inheritdoc/>
-    public IAssertionScope BecauseOf(string because, params object[] becauseArgs) =>
-        continueAsserting ? predecessor.BecauseOf(because, becauseArgs) : this;
+    public IAssertionScope BecauseOf(string because, params object[] becauseArgs)
+    {
+        if (continueAsserting)
+        {
+            return predecessor.BecauseOf(because, becauseArgs);
+        }
+
+        return this;
+    }
 
     /// <inheritdoc/>
     public Continuation ClearExpectation()
@@ -57,12 +106,26 @@ public Continuation ClearExpectation()
     }
 
     /// <inheritdoc/>
-    public IAssertionScope WithExpectation(string message, params object[] args) =>
-        continueAsserting ? predecessor.WithExpectation(message, args) : this;
+    public IAssertionScope WithExpectation(string message, params object[] args)
+    {
+        if (continueAsserting)
+        {
+            return predecessor.WithExpectation(message, args);
+        }
+
+        return this;
+    }
 
     /// <inheritdoc/>
-    public IAssertionScope WithDefaultIdentifier(string identifier) =>
-        continueAsserting ? predecessor.WithDefaultIdentifier(identifier) : this;
+    public IAssertionScope WithDefaultIdentifier(string identifier)
+    {
+        if (continueAsserting)
+        {
+            return predecessor.WithDefaultIdentifier(identifier);
+        }
+
+        return this;
+    }
 
     /// <inheritdoc/>
     public IAssertionScope UsingLineBreaks => predecessor.UsingLineBreaks;