Improving test coverage

Version

@@ -1 +1 @@
-1.2.1-beta.1
+1.2.1

src/All/Constants.cs

@@ -10,4 +10,19 @@ internal static class C
 	internal const string NullValueFailureMessage = "Null value of type '{Type}'.";
 
 	internal const string TestFalseMessage = "Test returned false.";
+
+	internal static class GetSingle
+	{
+		internal const string EmptyList =
+			"Cannot get single value from an empty list.";
+
+		internal const string MultipleValues =
+			"Cannot get single value from a list with multiple values.";
+
+		internal const string IncorrectType =
+			"Cannot get single value of type '{ValueType}' from a list type '{ListType}'.";
+
+		internal const string NotAList =
+			"Result value type is not a list.";
+	}
 }

src/All/Extensions/Result/ResultExtensions.Filter.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Threading.Tasks;
-using Wrap.Exceptions;
 
 namespace Wrap.Extensions;
 
@@ -21,7 +20,7 @@ public static Result<T> Filter<T>(this Result<T> @this, Func<T, bool> fTest) =>
 		@this.Bind(x => fTest(x) switch
 		{
 			false =>
-				R.Fail<TestFalseException>(),
+				R.Fail(C.TestFalseMessage).Ctx(nameof(ResultExtensions), nameof(Filter)),
 
 			true =>
 				R.Wrap(x)
@@ -32,7 +31,7 @@ public static Task<Result<T>> FilterAsync<T>(this Result<T> @this, Func<T, Task<
 		@this.BindAsync(async x => await fTest(x) switch
 		{
 			false =>
-				R.Fail<TestFalseException>(),
+				R.Fail(C.TestFalseMessage).Ctx(nameof(ResultExtensions), nameof(FilterAsync)),
 
 			true =>
 				R.Wrap(x)
@@ -43,7 +42,7 @@ public static Task<Result<T>> FilterAsync<T>(this Task<Result<T>> @this, Func<T,
 		@this.BindAsync(x => fTest(x) switch
 		{
 			false =>
-				R.Fail<TestFalseException>(),
+				R.Fail(C.TestFalseMessage).Ctx(nameof(ResultExtensions), nameof(FilterAsync)),
 
 			true =>
 				R.Wrap(x)
@@ -54,7 +53,7 @@ public static Task<Result<T>> FilterAsync<T>(this Task<Result<T>> @this, Func<T,
 		@this.BindAsync(async x => await fTest(x) switch
 		{
 			false =>
-				R.Fail<TestFalseException>(),
+				R.Fail(C.TestFalseMessage).Ctx(nameof(ResultExtensions), nameof(FilterAsync)),
 
 			true =>
 				R.Wrap(x)

src/All/Extensions/Result/ResultExtensions.GetSingle.cs

@@ -11,18 +11,6 @@ namespace Wrap.Extensions;
 
 public static partial class ResultExtensions
 {
-	private const string EmptyList =
-		"Cannot get single value from an empty list.";
-
-	private const string MultipleValues =
-		"Cannot get single value from a list with multiple values.";
-
-	private const string IncorrectType =
-		"Cannot get single value of type '{ValueType}' from a list type '{ListType}'.";
-
-	private const string NotAList =
-		"Result value type is not a list.";
-
 	/// <inheritdoc cref="GetSingle{T, TSingle}(Result{T}, R.ErrorHandler?)"/>
 	public static Result<TSingle> GetSingle<T, TSingle>(this Result<T> @this)
 		where T : IEnumerable =>
@@ -51,19 +39,19 @@ IEnumerable<TSingle> list when list.Count() == 1 =>
 				R.Wrap(list.Single()),
 
 			IEnumerable<TSingle> list when !list.Any() =>
-				onError?.Invoke(EmptyList) ?? R.Fail(EmptyList)
+				onError?.Invoke(C.GetSingle.EmptyList) ?? R.Fail(C.GetSingle.EmptyList)
 					.Ctx(nameof(ResultExtensions), nameof(GetSingle)),
 
 			IEnumerable<TSingle> =>
-				onError?.Invoke(MultipleValues) ?? R.Fail(MultipleValues)
+				onError?.Invoke(C.GetSingle.MultipleValues) ?? R.Fail(C.GetSingle.MultipleValues)
 					.Ctx(nameof(ResultExtensions), nameof(GetSingle)),
 
 			IEnumerable =>
-				onError?.Invoke(IncorrectType, typeof(TSingle).Name, typeof(T).Name) ?? R.Fail(IncorrectType, typeof(TSingle).Name, typeof(T).Name)
+				onError?.Invoke(C.GetSingle.IncorrectType, typeof(TSingle).Name, typeof(T).Name) ?? R.Fail(C.GetSingle.IncorrectType, typeof(TSingle).Name, typeof(T).Name)
 					.Ctx(nameof(ResultExtensions), nameof(GetSingle)),
 
 			_ =>
-				onError?.Invoke(NotAList) ?? R.Fail(NotAList)
+				onError?.Invoke(C.GetSingle.NotAList) ?? R.Fail(C.GetSingle.NotAList)
 					.Ctx(nameof(ResultExtensions), nameof(GetSingle))
 		});
 

src/All/Extensions/Result/ResultExtensions.Unwrap.cs

@@ -22,7 +22,7 @@ public static Task<T> UnwrapAsync<T>(this Task<Result<T>> @this)
 	{
 		// use local functions to avoid function signature ambiguity
 		static Task<T> fail(FailureValue f) => R.ThrowFailure<Task<T>>(f);
-		static Task<T> ok(T x) => Task.FromResult(x);
+		static async Task<T> ok(T x) => x;
 		return R.MatchAsync(@this, fail, ok);
 	}
 
@@ -87,14 +87,49 @@ public static Task<T> UnwrapAsync<T>(this Task<Result<T>> @this, Func<FailureVal
 	/// <param name="ifFailed">Function to handle a FailureValue.</param>
 	/// <param name="returnThis">Function to return a value on a Failure.</param>
 	/// <returns>The value of <paramref name="this"/> or generated by <paramref name="returnThis"/>.</returns>
+	public static Task<T> UnwrapAsync<T>(this Result<T> @this, Func<FailureValue, Task> ifFailed, Func<Task<T>> returnThis) =>
+		R.MatchAsync(@this,
+			fFail: async f => { await ifFailed(f); return await returnThis(); },
+			fOk: x => x
+		);
+
+	/// <inheritdoc cref="UnwrapAsync{T}(Result{T}, Func{FailureValue, Task}, Func{Task{T}})"/>
 	public static Task<T> UnwrapAsync<T>(this Result<T> @this, Func<FailureValue, Task> ifFailed, Func<T> returnThis) =>
 		R.MatchAsync(@this,
 			fFail: async f => { await ifFailed(f); return returnThis(); },
 			fOk: x => x
 		);
 
+	/// <inheritdoc cref="UnwrapAsync{T}(Result{T}, Func{FailureValue, Task}, Func{Task{T}})"/>
+	public static Task<T> UnwrapAsync<T>(this Result<T> @this, Action<FailureValue> ifFailed, Func<Task<T>> returnThis) =>
+		R.MatchAsync(@this,
+			fFail: async f => { ifFailed(f); return await returnThis(); },
+			fOk: x => x
+		);
+
 	/// <inheritdoc cref="UnwrapAsync{T}(Result{T}, Func{FailureValue, Task}, Func{T})"/>
-	public static Task<T> UnwrapAsync<T>(this Result<T> @this, Func<FailureValue, Task> ifFailed, Func<Task<T>> returnThis) =>
+	public static Task<T> UnwrapAsync<T>(this Task<Result<T>> @this, Action<FailureValue> ifFailed, Func<T> returnThis) =>
+		R.MatchAsync(@this,
+			fFail: async f => { ifFailed(f); return returnThis(); },
+			fOk: x => x
+		);
+
+	/// <inheritdoc cref="UnwrapAsync{T}(Result{T}, Func{FailureValue, Task}, Func{T})"/>
+	public static Task<T> UnwrapAsync<T>(this Task<Result<T>> @this, Func<FailureValue, Task> ifFailed, Func<T> returnThis) =>
+		R.MatchAsync(@this,
+			fFail: async f => { await ifFailed(f); return returnThis(); },
+			fOk: x => x
+		);
+
+	/// <inheritdoc cref="UnwrapAsync{T}(Result{T}, Func{FailureValue, Task}, Func{T})"/>
+	public static Task<T> UnwrapAsync<T>(this Task<Result<T>> @this, Action<FailureValue> ifFailed, Func<Task<T>> returnThis) =>
+		R.MatchAsync(@this,
+			fFail: async f => { ifFailed(f); return await returnThis(); },
+			fOk: x => x
+		);
+
+	/// <inheritdoc cref="UnwrapAsync{T}(Result{T}, Func{FailureValue, Task}, Func{T})"/>
+	public static Task<T> UnwrapAsync<T>(this Task<Result<T>> @this, Func<FailureValue, Task> ifFailed, Func<Task<T>> returnThis) =>
 		R.MatchAsync(@this,
 			fFail: async f => { await ifFailed(f); return await returnThis(); },
 			fOk: x => x

src/Directory.Build.props

@@ -86,7 +86,7 @@
   <Import Project="$(LocalPackPath)" Condition="Exists('$(LocalPackPath)') and '$(Configuration)'=='Release'"/>
   <PropertyGroup Label="Local Package Validation" Condition="Exists('$(LocalPackPath)') and '$(Configuration)'=='Release'">
     <EnablePackageValidation>true</EnablePackageValidation>
-    <PackageValidationBaselineVersion>1.2.0</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion>1.2.1</PackageValidationBaselineVersion>
   </PropertyGroup>
   <Target Name="PackAndPushToLocalNuget" AfterTargets="DispatchToInnerBuilds" Condition="Exists('$(LocalPackPath)') and '$(Configuration)'=='Release'">
     <Exec Command="dotnet pack &quot;$(ProjectFileName)&quot; -p:PackageVersion=$(WrapVersion) --no-build --configuration Release"/>

tests/Tests.All/Extensions/DictionaryExtensions/GetValueOrNone_Tests.cs

@@ -0,0 +1,42 @@
+// Wrap: Unit Tests.
+// Copyright (c) bfren - licensed under https://mit.bfren.dev/2019
+
+namespace Wrap.Extensions.DictionaryExtensions_Tests;
+
+public class GetValueOrNone_Tests
+{
+	public class With_Key_Not_Found
+	{
+		[Fact]
+		public void Returns_None()
+		{
+			// Arrange
+			var dict = new Dictionary<string, int> { [Rnd.Str] = Rnd.Int };
+			var key = Rnd.Str;
+
+			// Act
+			var result = dict.GetValueOrNone(key);
+
+			// Assert
+			result.AssertNone();
+		}
+	}
+
+	public class With_Key_Found
+	{
+		[Fact]
+		public void Returns_Some_With_Value()
+		{
+			// Arrange
+			var key = Rnd.Str;
+			var value = Rnd.Int;
+			var dict = new Dictionary<string, int> { [key] = value };
+
+			// Act
+			var result = dict.GetValueOrNone(key);
+
+			// Assert
+			result.AssertSome(value);
+		}
+	}
+}