diff --git a/CSharpFunctionalExtensions.Tests/CSharpFunctionalExtensions.Tests.csproj b/CSharpFunctionalExtensions.Tests/CSharpFunctionalExtensions.Tests.csproj index 4171ce8b..0bc0f97e 100644 --- a/CSharpFunctionalExtensions.Tests/CSharpFunctionalExtensions.Tests.csproj +++ b/CSharpFunctionalExtensions.Tests/CSharpFunctionalExtensions.Tests.csproj @@ -133,9 +133,6 @@ TapTests.cs - - TryTests.cs - TryTests.cs @@ -283,15 +280,6 @@ OnFailureTests.cs - - OnSuccessTryTests.ValueTask.cs - - - OnSuccessTryTests.ValueTask.cs - - - OnSuccessTryTests.cs - TapTests.ValueTask.cs diff --git a/CSharpFunctionalExtensions.Tests/ResultTests/Extensions/OnSuccessTryTests.ValueTask.Left.cs b/CSharpFunctionalExtensions.Tests/ResultTests/Extensions/OnSuccessTryTests.ValueTask.Left.cs deleted file mode 100644 index c64af4a8..00000000 --- a/CSharpFunctionalExtensions.Tests/ResultTests/Extensions/OnSuccessTryTests.ValueTask.Left.cs +++ /dev/null @@ -1,189 +0,0 @@ -using System.Threading.Tasks; -using CSharpFunctionalExtensions.Tests.ResultTests.Methods.Try; -using CSharpFunctionalExtensions.ValueTasks; -using FluentAssertions; -using Xunit; - -namespace CSharpFunctionalExtensions.Tests.ResultTests.Extensions -{ - public class OnSuccessTryTests_ValueTask_Left : TryTestBaseTask - { - [Fact] - public async Task OnSuccessTry_ValueTask_Left_execute_action_success_without_error_handler_function_result_expected() - { - var success = Result.Success().AsValueTask(); - var result = await success.OnSuccessTry(Action); - - result.IsSuccess.Should().BeTrue(); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_execute_action_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success().AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Action); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_execute_action_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success().AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Action, ErrorHandler); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorHandlerMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_execute_function_success_without_error_handler_function_result_expected() - { - var success = Result.Success().AsValueTask(); - var result = await success.OnSuccessTry(Func_T); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(T.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_execute_function_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success().AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_execute_function_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success().AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T, ErrorHandler); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorHandlerMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_execute_action_success_without_error_handler_function_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Action_T); - - result.IsSuccess.Should().BeTrue(); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_execute_action_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Action_T); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_execute_action_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Action_T, ErrorHandler); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorHandlerMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_K_execute_function_success_without_error_handler_function_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Func_T_K); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(K.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_K_execute_function_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T_K); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_K_execute_function_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T_K, ErrorHandler); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorHandlerMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_E_execute_function_success_without_error_handler_function_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Func_T, ErrorHandler_E); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(T.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_E_execute_function_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_E_execute_function_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_K_E_execute_function_success_without_error_handler_function_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Func_T_K, ErrorHandler_E); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(K.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_K_E_execute_function_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T_K, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_Left_T_K_E_execute_function_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T_K, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - } -} \ No newline at end of file diff --git a/CSharpFunctionalExtensions.Tests/ResultTests/Extensions/OnSuccessTryTests.ValueTask.Right.cs b/CSharpFunctionalExtensions.Tests/ResultTests/Extensions/OnSuccessTryTests.ValueTask.Right.cs deleted file mode 100644 index 533842ce..00000000 --- a/CSharpFunctionalExtensions.Tests/ResultTests/Extensions/OnSuccessTryTests.ValueTask.Right.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System.Threading.Tasks; -using CSharpFunctionalExtensions.Tests.ResultTests.Methods.Try; -using CSharpFunctionalExtensions.ValueTasks; -using FluentAssertions; -using Xunit; - -namespace CSharpFunctionalExtensions.Tests.ResultTests.Extensions -{ - public class OnSuccessTryTests_ValueTask_Right : TryTestBaseTask - { - - [Fact] - public async Task OnSuccess_ValueTask_Right_T_execute_function_success_without_error_handler_function_result_expected() - { - var success = Result.Success(); - var result = await success.OnSuccessTry(valueTask: Func_ValueTask_T); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(T.Value); - } - - [Fact] - public async Task OnSuccess_ValueTask_Right_T_execute_function_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success(); - var result = await success.OnSuccessTry(valueTask: Throwing_Func_ValueTask_T); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorMessage); - } - - [Fact] - public async Task OnSuccess_ValueTask_Right_T_execute_function_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success(); - var result = await success.OnSuccessTry(valueTask: Throwing_Func_ValueTask_T, ErrorHandler); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorHandlerMessage); - } - - [Fact] - public async Task OnSuccess_ValueTask_Right_T_K_execute_function_success_without_error_handler_function_result_expected() - { - var success = Result.Success(T.Value); - var result = await success.OnSuccessTry(valueTask: Func_T_ValueTask_K); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(K.Value); - } - - [Fact] - public async Task OnSuccess_ValueTask_Right_T_K_execute_function_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value); - var result = await success.OnSuccessTry(valueTask: Throwing_Func_T_ValueTask_K); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorMessage); - } - - [Fact] - public async Task OnSuccess_ValueTask_Right_T_K_execute_function_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value); - var result = await success.OnSuccessTry(valueTask: Throwing_Func_T_ValueTask_K, ErrorHandler); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorHandlerMessage); - } - - [Fact] - public async Task OnSuccess_ValueTask_Right_T_E_execute_function_success_without_error_handler_function_result_expected() - { - var success = Result.Success(T.Value); - var result = await success.OnSuccessTry(Func_ValueTask_T, ErrorHandler_E); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(T.Value); - } - - [Fact] - public async Task OnSuccess_ValueTask_Right_T_E_execute_function_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value); - var result = await success.OnSuccessTry(Throwing_Func_ValueTask_T, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - - [Fact] - public async Task OnSuccess_ValueTask_Right_T_E_execute_function_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value); - var result = await success.OnSuccessTry(Throwing_Func_ValueTask_T, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - - [Fact] - public async Task OnSuccess_ValueTask_Right_T_K_E_execute_function_success_without_error_handler_function_result_expected() - { - var success = Result.Success(T.Value); - var result = await success.OnSuccessTry(valueTask: Func_T_ValueTask_K, ErrorHandler_E); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(K.Value); - } - - [Fact] - public async Task OnSuccess_ValueTask_Right_T_K_E_execute_function_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value); - var result = await success.OnSuccessTry(valueTask: Throwing_Func_T_ValueTask_K, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - - [Fact] - public async Task OnSuccess_ValueTask_Right_T_K_E_execute_function_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value); - var result = await success.OnSuccessTry(valueTask: Throwing_Func_T_ValueTask_K, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - } -} \ No newline at end of file diff --git a/CSharpFunctionalExtensions.Tests/ResultTests/Extensions/OnSuccessTryTests.ValueTask.cs b/CSharpFunctionalExtensions.Tests/ResultTests/Extensions/OnSuccessTryTests.ValueTask.cs deleted file mode 100644 index f8f244f4..00000000 --- a/CSharpFunctionalExtensions.Tests/ResultTests/Extensions/OnSuccessTryTests.ValueTask.cs +++ /dev/null @@ -1,202 +0,0 @@ -using System.Threading.Tasks; -using CSharpFunctionalExtensions.Tests.ResultTests.Methods.Try; -using CSharpFunctionalExtensions.ValueTasks; -using FluentAssertions; -using Xunit; - -namespace CSharpFunctionalExtensions.Tests.ResultTests.Extensions -{ - public class OnSuccessTryTests_ValueTask_Tests : TryTestBaseTask - { - [Fact] - public async Task OnSuccessTry_ValueTask_execute_action_success_without_error_handler_function_result_expected() - { - var success = Result.Success().AsValueTask(); - var result = await success.OnSuccessTry(Func_ValueTask); - - result.IsSuccess.Should().BeTrue(); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_execute_action_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success().AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_ValueTask); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_execute_action_failed_with_configured_default_error_handler_failed_result_expected() - { - var defaultTryErrorHandler = Result.Configuration.DefaultTryErrorHandler; - Result.Configuration.DefaultTryErrorHandler = ErrorHandler; - var success = Result.Success().AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_ValueTask); - Result.Configuration.DefaultTryErrorHandler = defaultTryErrorHandler; - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorHandlerMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_execute_action_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success().AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_ValueTask, ErrorHandler); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorHandlerMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_execute_function_success_without_error_handler_function_result_expected() - { - var success = Result.Success().AsValueTask(); - var result = await success.OnSuccessTry(Func_ValueTask_T); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(T.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_execute_function_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success().AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_ValueTask_T); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_execute_function_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success().AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_ValueTask_T, ErrorHandler); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorHandlerMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_execute_action_success_without_error_handler_function_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Func_T_ValueTask); - - result.IsSuccess.Should().BeTrue(); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_execute_action_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T_ValueTask); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_execute_action_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T_ValueTask, ErrorHandler); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorHandlerMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_K_execute_function_success_without_error_handler_function_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Func_T_ValueTask_K); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(K.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_K_execute_function_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T_ValueTask_K); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_K_execute_function_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T_ValueTask_K, ErrorHandler); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorHandlerMessage); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_E_execute_function_success_without_error_handler_function_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Func_ValueTask_T, ErrorHandler_E); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(T.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_E_execute_function_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_ValueTask_T, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_E_execute_function_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_ValueTask_T, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_K_E_execute_function_success_without_error_handler_function_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Func_T_ValueTask_K, ErrorHandler_E); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(K.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_K_E_execute_function_failed_without_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T_ValueTask_K, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - - [Fact] - public async Task OnSuccessTry_ValueTask_T_K_E_execute_function_failed_with_error_handler_failed_result_expected() - { - var success = Result.Success(T.Value).AsValueTask(); - var result = await success.OnSuccessTry(Throwing_Func_T_ValueTask_K, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - } -} \ No newline at end of file diff --git a/CSharpFunctionalExtensions.Tests/ResultTests/Methods/TryTests.ValueTask.cs b/CSharpFunctionalExtensions.Tests/ResultTests/Methods/TryTests.ValueTask.cs deleted file mode 100644 index 65ca5f83..00000000 --- a/CSharpFunctionalExtensions.Tests/ResultTests/Methods/TryTests.ValueTask.cs +++ /dev/null @@ -1,92 +0,0 @@ -using System.Threading.Tasks; -using FluentAssertions; -using Xunit; - -namespace CSharpFunctionalExtensions.Tests.ResultTests.Methods.Try -{ - public class TryTestBaseTestsValueTask : TryTestBaseValueTask - { - [Fact] - public async ValueTask Try_ValueTask_execute_action_success_without_error_handler_function_result_expected() - { - var result = await Result.Try(Func_ValueTask); - - result.IsSuccess.Should().BeTrue(); - FuncExecuted.Should().BeTrue(); - } - - [Fact] - public async ValueTask Try_ValueTask_execute_action_failed_without_error_handler_failed_result_expected() - { - var result = await Result.Try(Throwing_Func_ValueTask); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorMessage); - } - - [Fact] - public async ValueTask Try_ValueTask_execute_action_failed_with_error_handler_failed_result_expected() - { - var result = await Result.Try(Throwing_Func_ValueTask, ErrorHandler); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorHandlerMessage); - } - - [Fact] - public async ValueTask Try_ValueTask_T_execute_function_success_without_error_handler_function_result_expected() - { - var result = await Result.Try(Func_ValueTask_T); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(T.Value); - FuncExecuted.Should().BeTrue(); - } - - [Fact] - public async ValueTask Try_ValueTask_T_execute_function_failed_without_error_handler_failed_result_expected() - { - var result = await Result.Try(Throwing_Func_ValueTask_T); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorMessage); - } - - [Fact] - public async ValueTask Try_ValueTask_T_execute_function_failed_with_error_handler_failed_result_expected() - { - var result = await Result.Try(Throwing_Func_ValueTask_T, ErrorHandler); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(ErrorHandlerMessage); - } - - [Fact] - public async ValueTask Try_ValueTask_T_E_execute_function_success_without_error_handler_function_result_expected() - { - var result = await Result.Try(Func_ValueTask_T, ErrorHandler_E); - - result.IsSuccess.Should().BeTrue(); - result.Value.Should().Be(T.Value); - FuncExecuted.Should().BeTrue(); - } - - [Fact] - public async ValueTask Try_ValueTask_T_E_execute_function_failed_without_error_handler_failed_result_expected() - { - var result = await Result.Try(Throwing_Func_ValueTask_T, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - - [Fact] - public async ValueTask Try_ValueTask_T_E_execute_function_failed_with_error_handler_failed_result_expected() - { - var result = await Result.Try(Throwing_Func_ValueTask_T, ErrorHandler_E); - - result.IsFailure.Should().BeTrue(); - result.Error.Should().Be(E.Value); - } - } -} \ No newline at end of file diff --git a/CSharpFunctionalExtensions/CSharpFunctionalExtensions.csproj b/CSharpFunctionalExtensions/CSharpFunctionalExtensions.csproj index e09e70f9..9586c8b0 100644 --- a/CSharpFunctionalExtensions/CSharpFunctionalExtensions.csproj +++ b/CSharpFunctionalExtensions/CSharpFunctionalExtensions.csproj @@ -474,18 +474,9 @@ OnSuccessTry.Task.cs - - OnSuccessTry.ValueTask.cs - - - OnSuccessTry.ValueTask.cs - OnSuccessTry.cs - - OnSuccessTry.cs - SelectMany.Task.cs @@ -528,9 +519,6 @@ FailureIf.cs - - Try.cs - Try.cs diff --git a/CSharpFunctionalExtensions/Result/Methods/Extensions/OnSuccessTry.ValueTask.Left.cs b/CSharpFunctionalExtensions/Result/Methods/Extensions/OnSuccessTry.ValueTask.Left.cs deleted file mode 100644 index df2900ca..00000000 --- a/CSharpFunctionalExtensions/Result/Methods/Extensions/OnSuccessTry.ValueTask.Left.cs +++ /dev/null @@ -1,52 +0,0 @@ -#if NET5_0_OR_GREATER -using System; -using System.Threading.Tasks; - -namespace CSharpFunctionalExtensions.ValueTasks -{ - public static partial class ResultExtensions - { - public static async ValueTask OnSuccessTry(this ValueTask task, Action action, - Func errorHandler = null) - { - var result = await task; - return result.OnSuccessTry(action, errorHandler); - } - - public static async ValueTask> OnSuccessTry(this ValueTask task, Func func, - Func errorHandler = null) - { - var result = await task; - return result.OnSuccessTry(func, errorHandler); - } - - public static async ValueTask> OnSuccessTry(this ValueTask> task, Func func, - Func errorHandler = null) - { - var result = await task; - return result.OnSuccessTry(func, errorHandler); - } - - public static async ValueTask OnSuccessTry(this ValueTask> task, Action action, - Func errorHandler = null) - { - var result = await task; - return result.OnSuccessTry(action, errorHandler); - } - - public static async ValueTask> OnSuccessTry(this ValueTask> task, Func action, - Func errorHandler = null) - { - var result = await task; - return result.OnSuccessTry(action, errorHandler); - } - - public static async ValueTask> OnSuccessTry(this ValueTask> task, Func action, - Func errorHandler = null) - { - var result = await task; - return result.OnSuccessTry(action, errorHandler); - } - } -} -#endif \ No newline at end of file diff --git a/CSharpFunctionalExtensions/Result/Methods/Extensions/OnSuccessTry.ValueTask.Right.cs b/CSharpFunctionalExtensions/Result/Methods/Extensions/OnSuccessTry.ValueTask.Right.cs deleted file mode 100644 index 5c6f92d3..00000000 --- a/CSharpFunctionalExtensions/Result/Methods/Extensions/OnSuccessTry.ValueTask.Right.cs +++ /dev/null @@ -1,59 +0,0 @@ -#if NET5_0_OR_GREATER -using System; -using System.Threading.Tasks; - -namespace CSharpFunctionalExtensions.ValueTasks -{ - public static partial class ResultExtensions - { - public static async ValueTask OnSuccessTry(this Result result, Func valueTask, - Func errorHandler = null) - { - return result.IsFailure - ? result - : await Result.Try(valueTask, errorHandler); - } - - public static async ValueTask> OnSuccessTry(this Result result, Func> valueTask, - Func errorHandler = null) - { - return result.IsFailure - ? Result.Failure(result.Error) - : await Result.Try(valueTask, errorHandler); - } - - public static async ValueTask> OnSuccessTry(this Result result, Func> valueTask, - Func errorHandler = null) - { - return result.IsFailure - ? Result.Failure(result.Error) - : await Result.Try(valueTask, errorHandler); - } - - public static async ValueTask OnSuccessTry(this Result result, Func valueTask, - Func errorHandler = null) - { - return result.IsFailure - ? Result.Failure(result.Error) - : await Result.Try(() => valueTask.Invoke(result.Value), errorHandler); - } - - public static async ValueTask> OnSuccessTry(this Result result, Func> valueTask, - Func errorHandler = null) - { - return result.IsFailure - ? Result.Failure(result.Error) - : await Result.Try(() => valueTask.Invoke(result.Value), errorHandler); - } - - public static async ValueTask> OnSuccessTry(this Result result, Func> valueTask, - Func errorHandler = null) - { - return result.IsFailure - ? Result.Failure(result.Error) - : await Result.Try(() => valueTask.Invoke(result.Value), errorHandler); - } - } -} - -#endif diff --git a/CSharpFunctionalExtensions/Result/Methods/Extensions/OnSuccessTry.ValueTask.cs b/CSharpFunctionalExtensions/Result/Methods/Extensions/OnSuccessTry.ValueTask.cs deleted file mode 100644 index ccf5fcce..00000000 --- a/CSharpFunctionalExtensions/Result/Methods/Extensions/OnSuccessTry.ValueTask.cs +++ /dev/null @@ -1,52 +0,0 @@ -#if NET5_0_OR_GREATER -using System; -using System.Threading.Tasks; - -namespace CSharpFunctionalExtensions.ValueTasks -{ - public static partial class ResultExtensions - { - public static async ValueTask OnSuccessTry(this ValueTask task, Func valueTask, - Func errorHandler = null) - { - var result = await task; - return await result.OnSuccessTry(valueTask, errorHandler); - } - - public static async ValueTask> OnSuccessTry(this ValueTask task, Func> valueTask, - Func errorHandler = null) - { - var result = await task; - return await result.OnSuccessTry(valueTask, errorHandler); - } - - public static async ValueTask> OnSuccessTry(this ValueTask> task, Func> valueTask, - Func errorHandler = null) - { - var result = await task; - return await result.OnSuccessTry(valueTask, errorHandler); - } - - public static async ValueTask OnSuccessTry(this ValueTask> task, Func valueTask, - Func errorHandler = null) - { - var result = await task; - return await result.OnSuccessTry(valueTask, errorHandler); - } - - public static async ValueTask> OnSuccessTry(this ValueTask> task, Func> valueTask, - Func errorHandler = null) - { - var result = await task; - return await result.OnSuccessTry(valueTask, errorHandler); - } - - public static async ValueTask> OnSuccessTry(this ValueTask> task, Func> valueTask, - Func errorHandler = null) - { - var result = await task; - return await result.OnSuccessTry(valueTask, errorHandler); - } - } -} -#endif diff --git a/CSharpFunctionalExtensions/Result/Methods/Try.ValueTask.cs b/CSharpFunctionalExtensions/Result/Methods/Try.ValueTask.cs deleted file mode 100644 index 6d176468..00000000 --- a/CSharpFunctionalExtensions/Result/Methods/Try.ValueTask.cs +++ /dev/null @@ -1,67 +0,0 @@ -#if NET5_0_OR_GREATER -using System; -using System.Threading.Tasks; - -namespace CSharpFunctionalExtensions -{ - public partial struct Result - { - /// - /// Attempts to execute the supplied action. Returns a Result indicating whether the action executed successfully. - /// - public static async ValueTask Try(Func valueTask, Func errorHandler = null) - { - errorHandler ??= Configuration.DefaultTryErrorHandler; - - try - { - await valueTask(); - return Success(); - } - catch (Exception exc) - { - string message = errorHandler(exc); - return Failure(message); - } - } - - /// - /// Attempts to execute the supplied valueTask action. Returns a Result indicating whether the valueTask action executed successfully. - /// If the valueTask action executed successfully, the result contains its return value. - /// - public static async ValueTask> Try(Func> valueTask, Func errorHandler = null) - { - errorHandler ??= Configuration.DefaultTryErrorHandler; - - try - { - var result = await valueTask(); - return Success(result); - } - catch (Exception exc) - { - string message = errorHandler(exc); - return Failure(message); - } - } - - /// - /// Attempts to execute the supplied valueTask action. Returns a Result indicating whether the valueTask action executed successfully. - /// If the valueTask action executed successfully, the result contains its return value. - /// - public static async ValueTask> Try(Func> valueTask, Func errorHandler) - { - try - { - var result = await valueTask(); - return Success(result); - } - catch (Exception exc) - { - E error = errorHandler(exc); - return Failure(error); - } - } - } -} -#endif \ No newline at end of file diff --git a/version.txt b/version.txt index e9429438..123ceadf 100644 --- a/version.txt +++ b/version.txt @@ -1,6 +1,7 @@ -2.33.2 +2.33.3 New features: * None Fixed issues: -* #437 Added missing TapIf ValueTask \ No newline at end of file +* #433 Removed Result.Try overloads for ValueTasks to preserve backward compatibility +* #441 IReadOnlyDictionary.TryFind() not working in .NET 6 \ No newline at end of file