diff --git a/tests/Squidex.Domain.Apps.Read.Tests/Squidex.Domain.Apps.Read.Tests.csproj b/tests/Squidex.Domain.Apps.Read.Tests/Squidex.Domain.Apps.Read.Tests.csproj index c8c9c7fe0..b694924eb 100644 --- a/tests/Squidex.Domain.Apps.Read.Tests/Squidex.Domain.Apps.Read.Tests.csproj +++ b/tests/Squidex.Domain.Apps.Read.Tests/Squidex.Domain.Apps.Read.Tests.csproj @@ -21,7 +21,6 @@ - diff --git a/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs b/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs index 693f474c4..5ab20d03a 100644 --- a/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs +++ b/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs @@ -9,7 +9,7 @@ using System; using System.IO; using System.Threading.Tasks; -using Moq; +using FakeItEasy; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Tasks; using Xunit; @@ -18,13 +18,13 @@ namespace Squidex.Domain.Users { public class AssetUserPictureStoreTests { - private readonly Mock assetStore = new Mock(); + private readonly IAssetStore assetStore = A.Fake(); private readonly AssetUserPictureStore sut; private readonly string userId = Guid.NewGuid().ToString(); public AssetUserPictureStoreTests() { - sut = new AssetUserPictureStore(assetStore.Object); + sut = new AssetUserPictureStore(assetStore); } [Fact] @@ -32,29 +32,29 @@ namespace Squidex.Domain.Users { var stream = new MemoryStream(); - assetStore.Setup(x => x.UploadAsync(userId, 0, "picture", stream)) - .Returns(TaskHelper.Done) - .Verifiable(); + A.CallTo(() => assetStore.UploadAsync(userId, 0, "picture", stream)) + .Returns(TaskHelper.Done); await sut.UploadAsync(userId, stream); - assetStore.VerifyAll(); + A.CallTo(() => assetStore.UploadAsync(userId, 0, "picture", stream)).MustHaveHappened(); } [Fact] public async Task Should_invoke_asset_store_to_download_picture() { - assetStore.Setup(x => x.DownloadAsync(userId, 0, "picture", It.IsAny())) - .Callback((id, version, suffix, stream) => stream.Write(new byte[] { 1, 2, 3, 4 }, 0, 4 )) - .Returns(TaskHelper.Done) - .Verifiable(); + A.CallTo(() => assetStore.DownloadAsync(userId, 0, "picture", A.Ignored)) + .Invokes(async (string id, long version, string suffix, Stream stream) => + { + await stream.WriteAsync(new byte[] { 1, 2, 3, 4 }, 0, 4); + }); var result = await sut.DownloadAsync(userId); Assert.Equal(0, result.Position); Assert.Equal(4, result.Length); - assetStore.VerifyAll(); + A.CallTo(() => assetStore.DownloadAsync(userId, 0, "picture", A.Ignored)).MustHaveHappened(); } } } diff --git a/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj b/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj index 3de23b34c..ff2f9ef94 100644 --- a/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj +++ b/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj @@ -12,9 +12,9 @@ + -