Skip to content

Commit 272f729

Browse files
MorleyDevMorleyDev
committed
Fixed tests
1 parent 77b03ae commit 272f729

File tree

5 files changed

+26
-25
lines changed

5 files changed

+26
-25
lines changed

‎src/MorleyDev.Reactive.Monad/Extra/EitherIO.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public static IO<Either<UL, UR>> MatchManyMap<UL, UR, L, R>(this IO<Either<L, R>
5757
.SelectMany(either => IO<Either<UL, UR>>.From(either
5858
.MatchMap(lhs, rhs)
5959
.Match(
60-
lhs2 => lhs2.Select(v => Either<UL, UR>.MakeLeft(Maybe.Just(v))),
61-
rhs2 => rhs2.Select(v => Either<UL,UR>.MakeRight(Maybe.Just(v)))
60+
lhs2 => lhs2.Select(v => Either<UL, UR>.Left(Maybe.Just(v))),
61+
rhs2 => rhs2.Select(v => Either<UL,UR>.Right(Maybe.Just(v)))
6262
)
6363
.ToObservable()
6464
.SelectMany(v => v)

‎test/MorleyDev.Reactive.Monad.UnitTests/EitherTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Linq;
33
using System.Reactive.Linq;
44
using Xunit;
5+
using MorleyDev.Reactive.Monad.Extra;
56

67
namespace MorleyDev.Reactive.Monad.UnitTests
78
{

‎test/MorleyDev.Reactive.Monad.UnitTests/IOTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ public class IOTests
1212
[Fact]
1313
public async Task Basic()
1414
{
15-
(await IO.From(() => 10).RunUnsafeIO()).Should().Be(10);
15+
(await IO.Run(() => 10).RunUnsafeIO()).Should().Be(10);
1616
(await IO.Defer(() => Task.FromResult(10)).RunUnsafeIO()).Should().Be(10);
1717
(await IO.Run(() => 10).RunUnsafeIO()).Should().Be(10);
18-
(await IO.From(() => 10).Select(m => m * 10)).Should().Be(100);
18+
(await IO.Run(() => 10).Select(m => m * 10)).Should().Be(100);
1919
(await Observable.Return(10).ToIO()).Should().Be(10);
2020
}
2121
}

‎test/MorleyDev.Reactive.Monad.UnitTests/LinqExtensionsTests.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,32 @@ public class LinqExtensionsTests
1010
[Fact]
1111
public async Task IOTests()
1212
{
13-
var io = IO.From(() => 10)
13+
var io = IO.Run(() => 10)
1414
.Select(v => v * 10.0)
15-
.SelectMany(v => IO.From(() => v * 10));
15+
.SelectMany(v => IO.Run(() => v * 10));
1616

1717
(await io.IsEmpty()).Should().Be(false);
1818
(await io).Should().Be(1000.0);
1919
(await io.Where(v => v == 1000.0)).Should().Be(1000.0);
2020
(await io.Where(v => v != 1000.0).IsEmpty()).Should().Be(true);
2121
(await io.SelectMany(v => Maybe.Just(v * 10))).Should().Be(10000);
22-
(await io.SelectMany(v => MaybeIO.Defer(() => Maybe.Just((int)(v * 10))))).Should().Be(10000);
23-
(await io.SelectMany(v => IO.From(() => Maybe.Just((int)(v * 10))))).Should().Be(10000);
22+
(await io.SelectMany(v => MaybeIO.Run(() => Maybe.Just((int)(v * 10))))).Should().Be(10000);
23+
(await io.SelectMany(v => IO.Run(() => Maybe.Just((int)(v * 10))))).Should().Be(10000);
2424
(await io.SelectMany(v => (Maybe<int>)Maybe.None).IsEmpty()).Should().Be(true);
25-
(await io.SelectMany(v => IO.From(() => (Maybe<int>)Maybe.None)).IsEmpty()).Should().Be(true);
26-
(await io.SelectMany(v => MaybeIO.Defer(() => (Maybe<int>)Maybe.None)).IsEmpty()).Should().Be(true);
25+
(await io.SelectMany(v => IO.Run(() => (Maybe<int>)Maybe.None)).IsEmpty()).Should().Be(true);
26+
(await io.SelectMany(v => MaybeIO.Run(() => (Maybe<int>)Maybe.None)).IsEmpty()).Should().Be(true);
2727
(await io.SelectMany(v => new[] { (int)v * 1, (int)v * 2, (int)v * 3 }.ToObservable()).ToListIO()).Should().BeEquivalentTo(new[] { 1000, 2000, 3000 });
2828
}
2929

3030
[Fact]
3131
public async Task MaybeIOTests()
3232
{
33-
var some = MaybeIO.Defer(() => Maybe.Just(10.0))
33+
var some = MaybeIO.Run(() => Maybe.Just(10.0))
3434
.Select(v => (int)v * 10)
35-
.SelectMany(v => IO.From(() => v * 10.0));
36-
var none = MaybeIO.Defer(() => (Maybe<int>)Maybe.None)
35+
.SelectMany(v => IO.Run(() => v * 10.0));
36+
var none = MaybeIO.Run(() => (Maybe<int>)Maybe.None)
3737
.Select(v => (decimal)v * 10)
38-
.SelectMany(v => IO.From(() => (double)v * 10));
38+
.SelectMany(v => IO.Run(() => (double)v * 10));
3939

4040
(await some).Should().Be(1000.0);
4141
(await none.IsEmpty()).Should().Be(true);
@@ -45,14 +45,14 @@ public async Task MaybeIOTests()
4545

4646
(await some.SelectMany(v => Maybe.Just((int)(v * 2.5)))).Should().Be(2500);
4747
(await some.SelectMany(v => (Maybe<int>)Maybe.None).IsEmpty()).Should().Be(true);
48-
(await some.SelectMany(v => LazyValue.From(v * 2))).Should().Be(2000);
49-
(await none.SelectMany(v => LazyValue.From(v * 2)).IsEmpty()).Should().Be(true);
48+
(await some.SelectMany(v => LazyValue.Return(v * 2))).Should().Be(2000);
49+
(await none.SelectMany(v => LazyValue.Return(v * 2)).IsEmpty()).Should().Be(true);
5050

51-
(await some.SelectMany(v => IO.From(() => Maybe.Just((int)(v * 2.5))))).Should().Be(2500);
52-
(await some.SelectMany(v => IO.From(() => (Maybe<int>)Maybe.None)).IsEmpty()).Should().Be(true);
51+
(await some.SelectMany(v => IO.Run(() => Maybe.Just((int)(v * 2.5))))).Should().Be(2500);
52+
(await some.SelectMany(v => IO.Run(() => (Maybe<int>)Maybe.None)).IsEmpty()).Should().Be(true);
5353

54-
(await some.SelectMany(v => MaybeIO.Defer(() => Maybe.Just((int)(v * 2.5))))).Should().Be(2500);
55-
(await some.SelectMany(v => MaybeIO.Defer(() => (Maybe<int>)Maybe.None)).IsEmpty()).Should().Be(true);
54+
(await some.SelectMany(v => MaybeIO.Run(() => Maybe.Just((int)(v * 2.5))))).Should().Be(2500);
55+
(await some.SelectMany(v => MaybeIO.Run(() => (Maybe<int>)Maybe.None)).IsEmpty()).Should().Be(true);
5656

5757
(await some.SelectMany(v => (new[] { (int)v * 1, (int)v * 2, (int)v * 3 }.ToObservable())).ToListIO()).Should().BeEquivalentTo(new[] { 1000, 2000, 3000 });
5858
(await none.SelectMany(v => (new[] { (int)v * 1, (int)v * 2, (int)v * 3 }.ToObservable())).IsEmptyIO()).Should().Be(true);

‎test/MorleyDev.Reactive.Monad.UnitTests/MaybeIOTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ public class MaybeIOTests
1212
[Fact]
1313
public async Task Basic()
1414
{
15-
(await MaybeIO.Defer(() => Maybe.Just(10)).ToMaybeIO()).Should().Be(10);
16-
(await IO.From(() => Maybe.Just(10)).ToMaybeIO()).Should().Be(10);
17-
(await IO.From(() => 10).ToMaybeIO()).Should().Be(10);
15+
(await MaybeIO.Run(() => Maybe.Just(10))).Should().Be(10);
16+
(await IO.Run(() => Maybe.Just(10)).ToMaybeIO()).Should().Be(10);
17+
(await IO.Run(() => 10)).Should().Be(10);
1818
(await Observable.Return(10).ToMaybeIO()).Should().Be(10);
1919
(await MaybeIO.From(Observable.Return(10))).Should().Be(10);
2020

2121
(await Observable.Empty<int>().ToMaybeIO().IsEmpty()).Should().Be(true);
22-
(await MaybeIO.From<int>(() => Maybe.None).IsEmpty()).Should().Be(true);
23-
(await IO.From(() => (Maybe<int>)Maybe.None).ToMaybeIO().IsEmpty()).Should().Be(true);
22+
(await MaybeIO.Run<int>(() => Maybe.None).IsEmpty()).Should().Be(true);
23+
(await IO.Run(() => (Maybe<int>)Maybe.None).ToMaybeIO().IsEmpty()).Should().Be(true);
2424
(await MaybeIO.From(Observable.Empty<int>()).IsEmpty()).Should().Be(true);
2525

2626

0 commit comments

Comments
 (0)