Added extension methods for cleaner arrange code. (#13)

Added extension methods for cleaner arrange code
hhoangnl · May 18, 2021 · d8d23c8 · d8d23c8
1 parent 08bd029
commit d8d23c8
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 10 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: 5.0.203
 
     - name: Install dependencies
       run: dotnet restore -s https://api.nuget.org/v3/index.json

diff --git a/FluentArrange.NSubstitute.Tests/ArrangeTests.cs b/FluentArrange.NSubstitute.Tests/ArrangeTests.cs
@@ -41,7 +41,7 @@ public void Sut_Action_ShouldInvokeAction()
             var invoked = false;
 
             // Act
-            _ = Arrange.Sut<AccountService>(service => invoked = true);
+            _ = Arrange.Sut<AccountService>(_ => invoked = true);
 
             // Assert
             invoked.Should().BeTrue();

diff --git a/FluentArrange.NSubstitute.Tests/FluentArrange.NSubstitute.Tests.csproj b/FluentArrange.NSubstitute.Tests/FluentArrange.NSubstitute.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8.0</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
+    <LangVersion>9.0</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/FluentArrange.NSubstitute/FluentArrange.NSubstitute.csproj b/FluentArrange.NSubstitute/FluentArrange.NSubstitute.csproj
@@ -3,11 +3,11 @@
   <PropertyGroup>
     <TargetFramework>netstandard1.3</TargetFramework>
     <LangVersion>8.0</LangVersion>
-    <Version>0.7.0-alpha</Version>
+    <Version>0.8</Version>
     <Description>FluentArrange using NSubstitute as mocking framework.</Description>
     <PackageProjectUrl>https://github.com/hhoangnl/FluentArrange</PackageProjectUrl>
     <RepositoryUrl>https://github.com/hhoangnl/FluentArrange</RepositoryUrl>
-    <PackageReleaseNotes>Add a new signature for `WithDependency{T2}` to inject a `FluentArrangeContext{T}` into an Action</PackageReleaseNotes>
+    <PackageReleaseNotes>Added extension methods `Returns{T}(Action{T})` for cleaner arrange code.</PackageReleaseNotes>
     <PackageTags>AAA TDD mocking unit-testing nsubstitute</PackageTags>
     <Authors>Huy Hoang</Authors>
     <Copyright>Huy Hoang</Copyright>

diff --git a/FluentArrange.Tests/ExtensionMethods.cs b/FluentArrange.Tests/ExtensionMethods.cs
@@ -0,0 +1,36 @@
+using System.Threading.Tasks;
+using FluentArrange.Tests.TestClasses;
+using FluentAssertions;
+using Xunit;
+
+namespace FluentArrange.Tests
+{
+    public class ExtensionMethods
+    {
+        [Fact]
+        public void Returns_ActionT_ShouldInvokeAction()
+        {
+            // Arrange
+            Foo foo = new();
+
+            // Act
+            foo.Returns(e => e.Id = 1);
+
+            // Assert
+            foo.Id.Should().Be(1);
+        }
+
+        [Fact]
+        public void Returns_ActionTaskT_ShouldInvokeAction()
+        {
+            // Arrange
+            Task<Foo> foo = Task.FromResult(new Foo());
+
+            // Act
+            foo.Returns(e => e.Id = 2);
+
+            // Assert
+            foo.Result.Id.Should().Be(2);
+        }
+    }
+}
diff --git a/FluentArrange.Tests/FluentArrange.Tests.csproj b/FluentArrange.Tests/FluentArrange.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8.0</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
+    <LangVersion>9.0</LangVersion>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/FluentArrange.Tests/TestClasses/Foo.cs b/FluentArrange.Tests/TestClasses/Foo.cs
@@ -5,5 +5,6 @@ namespace FluentArrange.Tests.TestClasses
 {
     public class Foo : IFoo
     {
+        public int Id { get; set; }
     }
 }
diff --git a/FluentArrange/ExtensionMethods.cs b/FluentArrange/ExtensionMethods.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Threading.Tasks;
+
+namespace FluentArrange
+{
+    public static class ExtensionMethods
+    {
+        public static void Returns<T>(this Task<T> @object, Action<T> configure)
+        {
+            configure.Invoke(@object.GetAwaiter().GetResult());
+        }
+
+        public static void Returns<T>(this T @object, Action<T> configure)
+        {
+            configure.Invoke(@object);
+        }
+    }
+}
diff --git a/FluentArrange/FluentArrange.csproj b/FluentArrange/FluentArrange.csproj
@@ -3,11 +3,11 @@
   <PropertyGroup>
     <TargetFramework>netstandard1.3</TargetFramework>
     <LangVersion>8.0</LangVersion>
-    <Version>0.7.0-alpha</Version>
+    <Version>0.8</Version>
     <Description>Write clean Arrange code using Fluent syntax.</Description>
     <PackageProjectUrl>https://github.com/hhoangnl/FluentArrange</PackageProjectUrl>
     <RepositoryUrl>https://github.com/hhoangnl/FluentArrange</RepositoryUrl>
-    <PackageReleaseNotes>Add a new signature for `WithDependency{T2}` to inject a `FluentArrangeContext{T}` into an Action</PackageReleaseNotes>
+    <PackageReleaseNotes>Added extension methods `Returns{T}(Action{T})` for cleaner arrange code.</PackageReleaseNotes>
     <PackageTags>AAA TDD mocking unit-testing</PackageTags>
     <Authors>Huy Hoang</Authors>
     <Copyright>Huy Hoang</Copyright>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,5 +5,6 @@ namespace FluentArrange.Tests.TestClasses @@
     {
         public class Foo : IFoo
         {
+            public int Id { get; set; }
         }
     }