.

dominikus1993 · Jan 26, 2024 · 24d4912 · 24d4912
1 parent 3cabd88
commit 24d4912
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 56 deletions.
diff --git a/src/BuildingBlocks/Common/Types/Result.cs b/src/BuildingBlocks/Common/Types/Result.cs
@@ -17,6 +17,16 @@ public static Result<T> Failure<T>(Exception exception)
     }
 
     public static readonly Result<Unit> UnitResult = new Success<Unit>(Unit.Value);
+
+    public static Result<B> ToError<A, B>(this Result<A> res)
+    {
+        if (res.IsSuccess)
+        {
+            throw new ValueIsSuccessException<A>(res.Value);
+        }
+
+        return Failure<B>(res.ErrorValue);
+    }
 }
 
 public abstract class Result<T>

diff --git a/tests/BuildingBlocks/Common.Tests/Types/ResultTests.cs b/tests/BuildingBlocks/Common.Tests/Types/ResultTests.cs
@@ -51,7 +51,7 @@ public void TestResultErValueIfIsResultIsError(Exception error)
     {
         var result = Result.Failure<string>(error);
 
-        var ex = Assert.Throws<ValueIsErrorException>(() => result.Value());
+        var ex = Assert.Throws<ValueIsErrorException>(() => result.Value);
         Assert.NotNull(ex);
         Assert.Equivalent(error, ex.InnerException);
     }
@@ -72,9 +72,9 @@ public void TestResultToErrorIfResultIsError(Exception error)
     {
         var result = Result.Failure<string>(error);
 
-        var ex = result.ToError<int>();
+        var ex = result.ToError<string, int>();
         Assert.False(ex.IsSuccess);
-        Assert.Equivalent(error, ex.ErrorValue());
+        Assert.Equivalent(error, ex.ErrorValue);
     }
 
     [Theory]
@@ -83,7 +83,7 @@ public void TestResultToErrorIfResultIsSuccess(string value)
     {
         var result = Result.Ok(value);
 
-        var ex = Assert.Throws<ValueIsSuccessException<string>>(() => result.ToError<int>());
+        var ex = Assert.Throws<ValueIsSuccessException<string>>(() => result.ToError<string, int>());
         Assert.NotNull(ex);
         Assert.Equal(value, ex.CurrentValue);
     }
@@ -96,7 +96,7 @@ public void TestResultMapIfResultIsError(Exception error)
 
         var ex = result.Map((x) => x + 10);
         Assert.False(ex.IsSuccess);
-        Assert.Equivalent(error, ex.ErrorValue());
+        Assert.Equivalent(error, ex.ErrorValue);
     }
 
     [Theory]
@@ -107,7 +107,7 @@ public void TestResultMapIfResultIsSuccess(int value, int newValue)
 
         var subject = result.Map(_ => newValue);
         Assert.NotNull(subject);
-        Assert.Equal(newValue, subject.Value());
+        Assert.Equal(newValue, subject.Value);
     }
 
     [Theory]
@@ -116,9 +116,9 @@ public void TestResultMapWithClosureDependencyIfResultIsError(Exception error, i
     {
         var result = Result.Failure<int>(error);
 
-        var ex = result.Map((x, val) => x + val, newValue);
+        var ex = result.Map((x) => x + newValue);
         Assert.False(ex.IsSuccess);
-        Assert.Equivalent(error, ex.ErrorValue());
+        Assert.Equivalent(error, ex.ErrorValue);
     }
 
     [Theory]
@@ -127,54 +127,8 @@ public void TestResultMapWithClosureDependencyIfResultIsSuccess(int value, int n
     {
         var result = Result.Ok(value);
 
-        var subject = result.Map((_, newVal) => newVal, newValue);
+        var subject = result.Map((_) => newValue);
         Assert.NotNull(subject);
-        Assert.Equal(newValue, subject.Value());
-    }
-
-    // spierdlaak
-
-    [Theory]
-    [AutoData]
-    public void TestResultBindIfResultIsError(Exception error)
-    {
-        var result = Result.Failure<int>(error);
-
-        var ex = result.Bind((x) => Result.Ok(x));
-        Assert.False(ex.IsSuccess);
-        Assert.Equivalent(error, ex.ErrorValue());
-    }
-
-    [Theory]
-    [AutoData]
-    public void TestResultBindIfResultIsSuccess(int value, int newValue)
-    {
-        var result = Result.Ok(value);
-
-        var subject = result.Bind(_ => Result.Ok(newValue));
-        Assert.NotNull(subject);
-        Assert.Equal(newValue, subject.Value());
-    }
-
-    [Theory]
-    [AutoData]
-    public void TestResultBindWithClosureDependencyIfResultIsError(Exception error, int newValue)
-    {
-        var result = Result.Failure<int>(error);
-
-        var ex = result.Map((x, val) => Result.Ok(x + val), newValue);
-        Assert.False(ex.IsSuccess);
-        Assert.Equivalent(error, ex.ErrorValue());
-    }
-
-    [Theory]
-    [AutoData]
-    public void TestResultBindWithClosureDependencyIfResultIsSuccess(int value, int newValue)
-    {
-        var result = Result.Ok(value);
-
-        var subject = result.Bind((_, newVal) => Result.Ok(newVal), newValue);
-        Assert.NotNull(subject);
-        Assert.Equal(newValue, subject.Value());
+        Assert.Equal(newValue, subject.Value);
     }
 }