Add ThenWhenIt options for SUT actions without arrangements and SUT f…

…unctions with arrangements
JonnyOrman · May 5, 2022 · 003f1c9 · 003f1c9
1 parent 91bc125
commit 003f1c9
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 4 deletions.
diff --git a/...ting.UnitTests/GivebANamedObjectSetter.cs → ...ting.UnitTests/GivenANamedObjectSetter.cs b/...ting.UnitTests/GivebANamedObjectSetter.cs → ...ting.UnitTests/GivenANamedObjectSetter.cs
@@ -3,7 +3,7 @@
 
 namespace XpressTest.Testing.UnitTests;
 
-public class GivebANamedObjectSetter
+public class GivenANamedObjectSetter
 {
     [Fact]
     public void WhenItSetsANamedObjectThenItAddsTheNamedObjectToTheArrangement()

diff --git a/Code/XpressTest.Testing.UnitTests/GivenAVoidAsserter.cs b/Code/XpressTest.Testing.UnitTests/GivenAVoidAsserter.cs
@@ -100,6 +100,28 @@ public void WhenItVerifiesASutArrangementActionThenItInvokesTheAction()
         actionInvoked.Should().BeTrue();
     }
 
+    [Fact]
+    public void WhenItVerifiesAnotherSutActionThenItInvokesTheActionAndReturnsTheVoidAsserter()
+    {
+        var actionInvoked = false;
+
+        Action<object> action = sutArrangement => { actionInvoked = true; };
+
+        var sutArrangement = Substitute.For<ISutArrangement<object>>();
+
+        var sut = new VoidAsserter<object>(
+            sutArrangement,
+            null,
+            null
+        );
+
+        var result = sut.ThenWhenIt(action);
+
+        actionInvoked.Should().BeTrue();
+
+        result.Should().Be(sut);
+    }
+
     [Fact]
     public void WhenItVerifiesAnotherSutArrangementActionThenItInvokesTheActionAndReturnsTheVoidAsserter()
     {
@@ -123,7 +145,7 @@ public void WhenItVerifiesAnotherSutArrangementActionThenItInvokesTheActionAndRe
     }
 
     [Fact]
-    public void WhenItVerifiesAFuncThenItReturnsAResultAsserter()
+    public void WhenItVerifiesASutFuncThenItReturnsAResultAsserter()
     {
         Func<object, object> func = obj => new object();
 
@@ -141,6 +163,26 @@ public void WhenItVerifiesAFuncThenItReturnsAResultAsserter()
 
         result.Should().BeOfType<ResultAsserter<object, object>>();
     }
+
+    [Fact]
+    public void WhenItVerifiesASutArrangementFuncThenItReturnsAResultAsserter()
+    {
+        Func<ISutArrangement<object>, object> func = obj => new object();
+
+        var sutArrangement = Substitute.For<ISutArrangement<object>>();
+
+        var exceptionAsserter = Substitute.For<IExceptionAsserter>();
+
+        var sut = new VoidAsserter<object>(
+            sutArrangement,
+            null,
+            exceptionAsserter
+        );
+
+        var result = sut.ThenWhenIt(func);
+
+        result.Should().BeOfType<ResultAsserter<object, object>>();
+    }
 
     [Fact]
     public void WhenItVerifiesAnExceptionIsThrownThenItVerifiesTheExceptionIsThrown()

diff --git a/Code/XpressTest/IThenWhenItAsserter.cs b/Code/XpressTest/IThenWhenItAsserter.cs
@@ -2,11 +2,19 @@ namespace XpressTest;
 
 public interface IThenWhenItAsserter<TSut>
 {
+    IVoidAsserter<TSut> ThenWhenIt(
+        Action<TSut> action
+    );
+
     IVoidAsserter<TSut> ThenWhenIt(
         Action<ISutArrangement<TSut>> action
     );
 
     IResultAsserter<TSut, TActionResult> ThenWhenIt<TActionResult>(
         Func<TSut, TActionResult> func
     );
+
+    IResultAsserter<TSut, TActionResult> ThenWhenIt<TActionResult>(
+        Func<ISutArrangement<TSut>, TActionResult> func
+    );
 }
diff --git a/Code/XpressTest/VoidAsserter.cs b/Code/XpressTest/VoidAsserter.cs
@@ -65,6 +65,13 @@ Action<ISutArrangement<TSut>> action
         action.Invoke(assertion);
     }
 
+    public IVoidAsserter<TSut> ThenWhenIt(Action<TSut> action)
+    {
+        action.Invoke(_sutArrangement.Sut);
+
+        return this;
+    }
+
     public IVoidAsserter<TSut> ThenWhenIt(Action<ISutArrangement<TSut>> action)
     {
         action.Invoke(_sutArrangement);
@@ -107,6 +114,41 @@ Func<TSut, TResult> func
         );
     }
 
+    public IResultAsserter<TSut, TResult> ThenWhenIt<TResult>(
+        Func<ISutArrangement<TSut>, TResult> func
+        )
+    {
+        var result = func.Invoke(_sutArrangement);
+
+        var resultPropertyTargeter = new ResultPropertyTargeter<TSut, TResult>(
+            result,
+            _sutArrangement
+        );
+
+        var mockCounterVerifierCreatorComposer =
+            new MockCountVerifierCreatorComposer<TSut, IResultAsserter<TSut, TResult>>(
+                _sutArrangement
+            );
+
+        var asyncMockCounterVerifierCreatorComposer =
+            new AsyncMockCounterVerifierCreatorComposer<TSut, IAsyncResultAsserter<TSut, TResult>>(
+                _sutArrangement
+            );
+
+        var resultMockVerifierCreator = new ResultMockVerifierCreator<TSut, TResult>(
+            mockCounterVerifierCreatorComposer,
+            asyncMockCounterVerifierCreatorComposer
+        );
+
+        return new ResultAsserter<TSut, TResult>(
+            result,
+            _sutArrangement,
+            resultPropertyTargeter,
+            resultMockVerifierCreator,
+            _exceptionAsserter
+        );
+    }
+
     public void ThenItShouldThrow<TException>()
         where TException : Exception
     {

diff --git a/Code/XpressTest/XpressTest.csproj b/Code/XpressTest/XpressTest.csproj
@@ -4,11 +4,12 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>1.0.0</Version>
+    <Version>1.1.0</Version>
     <IsTestProject>false</IsTestProject>
     <Authors>Jonathan Orman</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <ProjectUrl>https://github.com/JonnyOrman/XpressTest</ProjectUrl>
+    <PackageProjectUrl>https://github.com/JonnyOrman/XpressTest</PackageProjectUrl>
+    <PackageDescription>Write expressive, fluent BDD style unit tests in C# .NET</PackageDescription>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>