From 18254f8e47084fccb1b245e6557bfd6002f4dc6f Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sat, 5 Aug 2017 18:39:55 +0200 Subject: [PATCH] Formatting improved. --- .../Apps/CachingAppProviderTests.cs | 18 ++++-- .../Schemas/CachingSchemaProviderTests.cs | 18 ++++-- .../Apps/AppCommandHandlerTests.cs | 62 +++++++++++-------- .../Assets/AssetCommandHandlerTests.cs | 46 ++++++++------ .../Contents/ContentCommandHandlerTests.cs | 22 +++---- .../Schemas/SchemaCommandHandlerTests.cs | 20 +++--- .../Squidex.Domain.Apps.Write.Tests.csproj | 2 +- .../TestHelpers/HandlerTestBase.cs | 2 +- .../DefaultDomainObjectFactoryTests.cs | 6 +- .../Caching/InvalidatingMemoryCacheTest.cs | 6 +- 10 files changed, 117 insertions(+), 85 deletions(-) diff --git a/tests/Squidex.Domain.Apps.Read.Tests/Apps/CachingAppProviderTests.cs b/tests/Squidex.Domain.Apps.Read.Tests/Apps/CachingAppProviderTests.cs index 3379edfac..7c23fffd1 100644 --- a/tests/Squidex.Domain.Apps.Read.Tests/Apps/CachingAppProviderTests.cs +++ b/tests/Squidex.Domain.Apps.Read.Tests/Apps/CachingAppProviderTests.cs @@ -64,7 +64,8 @@ namespace Squidex.Domain.Apps.Read.Apps [Fact] public async Task Should_also_retrieve_app_by_name_if_retrieved_by_id_before() { - A.CallTo(() => repository.FindAppAsync(appId.Id)).Returns(Task.FromResult(appV1)); + A.CallTo(() => repository.FindAppAsync(appId.Id)) + .Returns(Task.FromResult(appV1)); await ProvideAppById(appV1); await ProvideAppByName(appV1); @@ -76,7 +77,8 @@ namespace Squidex.Domain.Apps.Read.Apps [Fact] public async Task Should_also_retrieve_app_by_id_if_retrieved_by_name_before() { - A.CallTo(() => repository.FindAppAsync(appId.Name)).Returns(Task.FromResult(appV1)); + A.CallTo(() => repository.FindAppAsync(appId.Name)) + .Returns(Task.FromResult(appV1)); await ProvideAppByName(appV1); await ProvideAppById(appV1); @@ -88,8 +90,10 @@ namespace Squidex.Domain.Apps.Read.Apps [Fact] public async Task Should_clear_cache_for_id_after_update_event() { - A.CallTo(() => repository.FindAppAsync(appId.Id)).Returns(appV2); - A.CallTo(() => repository.FindAppAsync(appId.Id)).Returns(appV1).Once(); + A.CallTo(() => repository.FindAppAsync(appId.Id)) + .Returns(appV2); + A.CallTo(() => repository.FindAppAsync(appId.Id)) + .Returns(appV1).Once(); await ProvideAppById(appV1); @@ -103,8 +107,10 @@ namespace Squidex.Domain.Apps.Read.Apps [Fact] public async Task Should_clear_cache_for_name_after_update_event() { - A.CallTo(() => repository.FindAppAsync(appId.Name)).Returns(appV2); - A.CallTo(() => repository.FindAppAsync(appId.Name)).Returns(appV1).Once(); + A.CallTo(() => repository.FindAppAsync(appId.Name)) + .Returns(appV2); + A.CallTo(() => repository.FindAppAsync(appId.Name)) + .Returns(appV1).Once(); await ProvideAppByName(appV1); diff --git a/tests/Squidex.Domain.Apps.Read.Tests/Schemas/CachingSchemaProviderTests.cs b/tests/Squidex.Domain.Apps.Read.Tests/Schemas/CachingSchemaProviderTests.cs index 708c254f9..e5f494784 100644 --- a/tests/Squidex.Domain.Apps.Read.Tests/Schemas/CachingSchemaProviderTests.cs +++ b/tests/Squidex.Domain.Apps.Read.Tests/Schemas/CachingSchemaProviderTests.cs @@ -67,7 +67,8 @@ namespace Squidex.Domain.Apps.Read.Schemas [Fact] public async Task Should_also_retrieve_schema_by_name_if_retrieved_by_id_before() { - A.CallTo(() => repository.FindSchemaAsync(schemaId.Id)).Returns(Task.FromResult(schemaV1)); + A.CallTo(() => repository.FindSchemaAsync(schemaId.Id)) + .Returns(Task.FromResult(schemaV1)); await ProvideSchemaById(schemaV1); await ProvideSchemaByName(schemaV1); @@ -79,7 +80,8 @@ namespace Squidex.Domain.Apps.Read.Schemas [Fact] public async Task Should_also_retrieve_schema_by_id_if_retrieved_by_name_before() { - A.CallTo(() => repository.FindSchemaAsync(appId.Id, schemaId.Name)).Returns(Task.FromResult(schemaV1)); + A.CallTo(() => repository.FindSchemaAsync(appId.Id, schemaId.Name)) + .Returns(Task.FromResult(schemaV1)); await ProvideSchemaByName(schemaV1); await ProvideSchemaById(schemaV1); @@ -91,8 +93,10 @@ namespace Squidex.Domain.Apps.Read.Schemas [Fact] public async Task Should_clear_cache_for_id_after_update_event() { - A.CallTo(() => repository.FindSchemaAsync(schemaId.Id)).Returns(schemaV2); - A.CallTo(() => repository.FindSchemaAsync(schemaId.Id)).Returns(schemaV1).Once(); + A.CallTo(() => repository.FindSchemaAsync(schemaId.Id)) + .Returns(schemaV2); + A.CallTo(() => repository.FindSchemaAsync(schemaId.Id)) + .Returns(schemaV1).Once(); await ProvideSchemaById(schemaV1); @@ -106,8 +110,10 @@ namespace Squidex.Domain.Apps.Read.Schemas [Fact] public async Task Should_clear_cache_for_name_after_update_event() { - A.CallTo(() => repository.FindSchemaAsync(appId.Id, schemaId.Name)).Returns(schemaV2); - A.CallTo(() => repository.FindSchemaAsync(appId.Id, schemaId.Name)).Returns(schemaV1).Once(); + A.CallTo(() => repository.FindSchemaAsync(appId.Id, schemaId.Name)) + .Returns(schemaV2); + A.CallTo(() => repository.FindSchemaAsync(appId.Id, schemaId.Name)) + .Returns(schemaV1).Once(); await ProvideSchemaByName(schemaV1); diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Apps/AppCommandHandlerTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Apps/AppCommandHandlerTests.cs index 458f4867e..ac6c14327 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Apps/AppCommandHandlerTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Apps/AppCommandHandlerTests.cs @@ -8,7 +8,7 @@ using System; using System.Threading.Tasks; -using Moq; +using FakeItEasy; using Squidex.Domain.Apps.Read.Apps; using Squidex.Domain.Apps.Read.Apps.Repositories; using Squidex.Domain.Apps.Read.Apps.Services; @@ -27,10 +27,10 @@ namespace Squidex.Domain.Apps.Write.Apps { public class AppCommandHandlerTests : HandlerTestBase { - private readonly Mock appRepository = new Mock(); - private readonly Mock appPlansProvider = new Mock(); - private readonly Mock appPlansBillingManager = new Mock(); - private readonly Mock userResolver = new Mock(); + private readonly IAppRepository appRepository = A.Fake(); + private readonly IAppPlansProvider appPlansProvider = A.Fake(); + private readonly IAppPlanBillingManager appPlansBillingManager = A.Fake(); + private readonly IUserResolver userResolver = A.Fake(); private readonly AppCommandHandler sut; private readonly AppDomainObject app; private readonly Language language = Language.DE; @@ -41,7 +41,7 @@ namespace Squidex.Domain.Apps.Write.Apps { app = new AppDomainObject(AppId, -1); - sut = new AppCommandHandler(Handler, appRepository.Object, appPlansProvider.Object, appPlansBillingManager.Object, userResolver.Object); + sut = new AppCommandHandler(Handler, appRepository, appPlansProvider, appPlansBillingManager, userResolver); } [Fact] @@ -49,16 +49,15 @@ namespace Squidex.Domain.Apps.Write.Apps { var context = CreateContextForCommand(new CreateApp { Name = AppName, AppId = AppId }); - appRepository.Setup(x => x.FindAppAsync(AppName)) - .Returns(Task.FromResult(new Mock().Object)) - .Verifiable(); + A.CallTo(() => appRepository.FindAppAsync(AppName)) + .Returns(Task.FromResult(A.Dummy())); await TestCreate(app, async _ => { await Assert.ThrowsAsync(async () => await sut.HandleAsync(context)); }, false); - appRepository.VerifyAll(); + A.CallTo(() => appRepository.FindAppAsync(AppName)).MustHaveHappened(); } [Fact] @@ -66,9 +65,8 @@ namespace Squidex.Domain.Apps.Write.Apps { var context = CreateContextForCommand(new CreateApp { Name = AppName, AppId = AppId }); - appRepository.Setup(x => x.FindAppAsync(AppName)) - .Returns(Task.FromResult(null)) - .Verifiable(); + A.CallTo(() => appRepository.FindAppAsync(AppName)) + .Returns(Task.FromResult(null)); await TestCreate(app, async _ => { @@ -85,7 +83,8 @@ namespace Squidex.Domain.Apps.Write.Apps var context = CreateContextForCommand(new AssignContributor { ContributorId = contributorId }); - userResolver.Setup(x => x.FindByIdAsync(contributorId)).Returns(Task.FromResult(null)); + A.CallTo(() => userResolver.FindByIdAsync(contributorId)) + .Returns(Task.FromResult(null)); await TestUpdate(app, async _ => { @@ -96,7 +95,8 @@ namespace Squidex.Domain.Apps.Write.Apps [Fact] public async Task AssignContributor_throw_exception_if_reached_max_contributor_size() { - appPlansProvider.Setup(x => x.GetPlan(null)).Returns(new ConfigAppLimitsPlan { MaxContributors = 2 }); + A.CallTo(() => appPlansProvider.GetPlan(null)) + .Returns(new ConfigAppLimitsPlan { MaxContributors = 2 }); CreateApp() .AssignContributor(CreateCommand(new AssignContributor { ContributorId = "1" })) @@ -104,7 +104,8 @@ namespace Squidex.Domain.Apps.Write.Apps var context = CreateContextForCommand(new AssignContributor { ContributorId = contributorId }); - userResolver.Setup(x => x.FindByIdAsync(It.IsAny())).Returns(Task.FromResult(new Mock().Object)); + A.CallTo(() => userResolver.FindByIdAsync(A.Ignored)) + .Returns(Task.FromResult(A.Dummy())); await TestUpdate(app, async _ => { @@ -119,7 +120,8 @@ namespace Squidex.Domain.Apps.Write.Apps var context = CreateContextForCommand(new AssignContributor { ContributorId = contributorId }); - userResolver.Setup(x => x.FindByIdAsync(contributorId)).Returns(Task.FromResult(null)); + A.CallTo(() => userResolver.FindByIdAsync(contributorId)) + .Returns(Task.FromResult(null)); await TestUpdate(app, async _ => { @@ -130,13 +132,15 @@ namespace Squidex.Domain.Apps.Write.Apps [Fact] public async Task AssignContributor_should_assign_if_user_found() { - appPlansProvider.Setup(x => x.GetPlan(null)).Returns(new ConfigAppLimitsPlan { MaxContributors = -1 }); + A.CallTo(() => appPlansProvider.GetPlan(null)) + .Returns(new ConfigAppLimitsPlan { MaxContributors = -1 }); CreateApp(); var context = CreateContextForCommand(new AssignContributor { ContributorId = contributorId }); - userResolver.Setup(x => x.FindByIdAsync(contributorId)).Returns(Task.FromResult(new Mock().Object)); + A.CallTo(() => userResolver.FindByIdAsync(contributorId)) + .Returns(Task.FromResult(A.Dummy())); await TestUpdate(app, async _ => { @@ -174,7 +178,8 @@ namespace Squidex.Domain.Apps.Write.Apps [Fact] public async Task ChangePlan_should_throw_if_plan_not_found() { - appPlansProvider.Setup(x => x.IsConfiguredPlan("my-plan")).Returns(false); + A.CallTo(() => appPlansProvider.IsConfiguredPlan("my-plan")) + .Returns(false); CreateApp() .AttachClient(CreateCommand(new AttachClient { Id = clientName })); @@ -218,7 +223,8 @@ namespace Squidex.Domain.Apps.Write.Apps [Fact] public async Task ChangePlan_should_update_domain_object() { - appPlansProvider.Setup(x => x.IsConfiguredPlan("my-plan")).Returns(true); + A.CallTo(() => appPlansProvider.IsConfiguredPlan("my-plan")) + .Returns(true); CreateApp(); @@ -229,14 +235,17 @@ namespace Squidex.Domain.Apps.Write.Apps await sut.HandleAsync(context); }); - appPlansBillingManager.Verify(x => x.ChangePlanAsync(User.Identifier, app.Id, app.Name, "my-plan"), Times.Once()); + A.CallTo(() => appPlansBillingManager.ChangePlanAsync(User.Identifier, app.Id, app.Name, "my-plan")).MustHaveHappened(); } [Fact] public async Task ChangePlan_should_not_make_update_for_redirect_result() { - appPlansProvider.Setup(x => x.IsConfiguredPlan("my-plan")).Returns(true); - appPlansBillingManager.Setup(x => x.ChangePlanAsync(User.Identifier, app.Id, app.Name, "my-plan")).Returns(CreateRedirectResult()); + A.CallTo(() => appPlansProvider.IsConfiguredPlan("my-plan")) + .Returns(true); + + A.CallTo(() => appPlansBillingManager.ChangePlanAsync(User.Identifier, app.Id, app.Name, "my-plan")) + .Returns(CreateRedirectResult()); CreateApp(); @@ -253,7 +262,8 @@ namespace Squidex.Domain.Apps.Write.Apps [Fact] public async Task ChangePlan_should_not_call_billing_manager_for_callback() { - appPlansProvider.Setup(x => x.IsConfiguredPlan("my-plan")).Returns(true); + A.CallTo(() => appPlansProvider.IsConfiguredPlan("my-plan")) + .Returns(true); CreateApp(); @@ -264,7 +274,7 @@ namespace Squidex.Domain.Apps.Write.Apps await sut.HandleAsync(context); }); - appPlansBillingManager.Verify(x => x.ChangePlanAsync(User.Identifier, app.Id, app.Name, "my-plan"), Times.Never()); + A.CallTo(() => appPlansBillingManager.ChangePlanAsync(User.Identifier, app.Id, app.Name, "my-plan")).MustNotHaveHappened(); } [Fact] diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Assets/AssetCommandHandlerTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Assets/AssetCommandHandlerTests.cs index f3c15f709..22ce4578f 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Assets/AssetCommandHandlerTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Assets/AssetCommandHandlerTests.cs @@ -9,7 +9,7 @@ using System; using System.IO; using System.Threading.Tasks; -using Moq; +using FakeItEasy; using Squidex.Domain.Apps.Write.Assets.Commands; using Squidex.Domain.Apps.Write.TestHelpers; using Squidex.Infrastructure.Assets; @@ -24,8 +24,8 @@ namespace Squidex.Domain.Apps.Write.Assets { public class AssetCommandHandlerTests : HandlerTestBase { - private readonly Mock assetThumbnailGenerator = new Mock(); - private readonly Mock assetStore = new Mock(); + private readonly IAssetThumbnailGenerator assetThumbnailGenerator = A.Fake(); + private readonly IAssetStore assetStore = A.Fake(); private readonly AssetCommandHandler sut; private readonly AssetDomainObject asset; private readonly Guid assetId = Guid.NewGuid(); @@ -39,7 +39,7 @@ namespace Squidex.Domain.Apps.Write.Assets asset = new AssetDomainObject(assetId, -1); - sut = new AssetCommandHandler(Handler, assetStore.Object, assetThumbnailGenerator.Object); + sut = new AssetCommandHandler(Handler, assetStore, assetThumbnailGenerator); } [Fact] @@ -57,8 +57,8 @@ namespace Squidex.Domain.Apps.Write.Assets Assert.Equal(assetId, context.Result>().IdOrValue); - assetStore.VerifyAll(); - assetThumbnailGenerator.VerifyAll(); + VerifyStore(0, context.ContextId); + VerifyImageInfo(); } [Fact] @@ -76,8 +76,8 @@ namespace Squidex.Domain.Apps.Write.Assets await sut.HandleAsync(context); }); - assetStore.VerifyAll(); - assetThumbnailGenerator.VerifyAll(); + VerifyStore(1, context.ContextId); + VerifyImageInfo(); } [Fact] @@ -113,24 +113,30 @@ namespace Squidex.Domain.Apps.Write.Assets private void SetupImageInfo() { - assetThumbnailGenerator - .Setup(x => x.GetImageInfoAsync(stream)).Returns(Task.FromResult(image)) - .Verifiable(); + A.CallTo(() => assetThumbnailGenerator.GetImageInfoAsync(stream)) + .Returns(Task.FromResult(image)); } private void SetupStore(long version, Guid commitId) { - assetStore - .Setup(x => x.UploadTemporaryAsync(commitId.ToString(), stream)).Returns(TaskHelper.Done) - .Verifiable(); + A.CallTo(() => assetStore.UploadTemporaryAsync(commitId.ToString(), stream)) + .Returns(TaskHelper.Done); + A.CallTo(() => assetStore.CopyTemporaryAsync(commitId.ToString(), assetId.ToString(), version, null)) + .Returns(TaskHelper.Done); + A.CallTo(() => assetStore.DeleteTemporaryAsync(commitId.ToString())) + .Returns(TaskHelper.Done); + } - assetStore - .Setup(x => x.CopyTemporaryAsync(commitId.ToString(), assetId.ToString(), version, null)).Returns(TaskHelper.Done) - .Verifiable(); + private void VerifyImageInfo() + { + A.CallTo(() => assetThumbnailGenerator.GetImageInfoAsync(stream)).MustHaveHappened(); + } - assetStore - .Setup(x => x.DeleteTemporaryAsync(commitId.ToString())).Returns(TaskHelper.Done) - .Verifiable(); + private void VerifyStore(long version, Guid commitId) + { + A.CallTo(() => assetStore.UploadTemporaryAsync(commitId.ToString(), stream)).MustHaveHappened(); + A.CallTo(() => assetStore.CopyTemporaryAsync(commitId.ToString(), assetId.ToString(), version, null)).MustHaveHappened(); + A.CallTo(() => assetStore.DeleteTemporaryAsync(commitId.ToString())).MustHaveHappened(); } } } diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Contents/ContentCommandHandlerTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Contents/ContentCommandHandlerTests.cs index 1a5a550ac..d34ed8895 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Contents/ContentCommandHandlerTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Contents/ContentCommandHandlerTests.cs @@ -8,7 +8,7 @@ using System; using System.Threading.Tasks; -using Moq; +using FakeItEasy; using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Core.Schemas; @@ -32,10 +32,10 @@ namespace Squidex.Domain.Apps.Write.Contents { private readonly ContentCommandHandler sut; private readonly ContentDomainObject content; - private readonly Mock schemaProvider = new Mock(); - private readonly Mock appProvider = new Mock(); - private readonly Mock schemaEntity = new Mock(); - private readonly Mock appEntity = new Mock(); + private readonly ISchemaProvider schemaProvider = A.Fake(); + private readonly ISchemaEntity schemaEntity = A.Fake(); + private readonly IAppProvider appProvider = A.Fake(); + private readonly IAppEntity appEntity = A.Fake(); private readonly NamedContentData data = new NamedContentData().AddField("my-field", new ContentFieldData().SetValue(1)); private readonly LanguagesConfig languagesConfig = LanguagesConfig.Create(Language.DE); private readonly Guid contentId = Guid.NewGuid(); @@ -49,14 +49,14 @@ namespace Squidex.Domain.Apps.Write.Contents content = new ContentDomainObject(contentId, -1); - sut = new ContentCommandHandler(Handler, appProvider.Object, new Mock().Object, schemaProvider.Object, new Mock().Object); + sut = new ContentCommandHandler(Handler, appProvider, A.Dummy(), schemaProvider, A.Dummy()); - appEntity.Setup(x => x.LanguagesConfig).Returns(languagesConfig); - appEntity.Setup(x => x.PartitionResolver).Returns(languagesConfig.ToResolver()); - appProvider.Setup(x => x.FindAppByIdAsync(AppId)).Returns(Task.FromResult(appEntity.Object)); + A.CallTo(() => appEntity.LanguagesConfig).Returns(languagesConfig); + A.CallTo(() => appEntity.PartitionResolver).Returns(languagesConfig.ToResolver()); + A.CallTo(() => appProvider.FindAppByIdAsync(AppId)).Returns(Task.FromResult(appEntity)); - schemaEntity.Setup(x => x.Schema).Returns(schema); - schemaProvider.Setup(x => x.FindSchemaByIdAsync(SchemaId, false)).Returns(Task.FromResult(schemaEntity.Object)); + A.CallTo(() => schemaEntity.Schema).Returns(schema); + A.CallTo(() => schemaProvider.FindSchemaByIdAsync(SchemaId, false)).Returns(Task.FromResult(schemaEntity)); } [Fact] diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaCommandHandlerTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaCommandHandlerTests.cs index 9a7f31c88..4571376ae 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaCommandHandlerTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaCommandHandlerTests.cs @@ -9,7 +9,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Moq; +using FakeItEasy; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Read.Schemas; using Squidex.Domain.Apps.Read.Schemas.Services; @@ -25,7 +25,7 @@ namespace Squidex.Domain.Apps.Write.Schemas { public class SchemaCommandHandlerTests : HandlerTestBase { - private readonly Mock schemaProvider = new Mock(); + private readonly ISchemaProvider schemaProvider = A.Fake(); private readonly SchemaCommandHandler sut; private readonly SchemaDomainObject schema; private readonly FieldRegistry registry = new FieldRegistry(new TypeNameRegistry()); @@ -35,7 +35,7 @@ namespace Squidex.Domain.Apps.Write.Schemas { schema = new SchemaDomainObject(SchemaId, -1, registry); - sut = new SchemaCommandHandler(Handler, schemaProvider.Object); + sut = new SchemaCommandHandler(Handler, schemaProvider); } [Fact] @@ -43,16 +43,15 @@ namespace Squidex.Domain.Apps.Write.Schemas { var context = CreateContextForCommand(new CreateSchema { Name = SchemaName, SchemaId = SchemaId }); - schemaProvider.Setup(x => x.FindSchemaByNameAsync(AppId, SchemaName)) - .Returns(Task.FromResult(new Mock().Object)) - .Verifiable(); + A.CallTo(() => schemaProvider.FindSchemaByNameAsync(AppId, SchemaName)) + .Returns(Task.FromResult(A.Dummy())); await TestCreate(schema, async _ => { await Assert.ThrowsAsync(async () => await sut.HandleAsync(context)); }, false); - schemaProvider.VerifyAll(); + A.CallTo(() => schemaProvider.FindSchemaByNameAsync(AppId, SchemaName)).MustHaveHappened(); } [Fact] @@ -60,9 +59,8 @@ namespace Squidex.Domain.Apps.Write.Schemas { var context = CreateContextForCommand(new CreateSchema { Name = SchemaName, SchemaId = SchemaId }); - schemaProvider.Setup(x => x.FindSchemaByNameAsync(AppId, SchemaName)) - .Returns(Task.FromResult(null)) - .Verifiable(); + A.CallTo(() => schemaProvider.FindSchemaByNameAsync(AppId, SchemaName)) + .Returns(Task.FromResult(null)); await TestCreate(schema, async _ => { @@ -70,6 +68,8 @@ namespace Squidex.Domain.Apps.Write.Schemas }); Assert.Equal(SchemaId, context.Result>().IdOrValue); + + A.CallTo(() => schemaProvider.FindSchemaByNameAsync(AppId, SchemaName)).MustHaveHappened(); } [Fact] diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj b/tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj index 72630cddc..011efc695 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj +++ b/tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj @@ -11,9 +11,9 @@ + - diff --git a/tests/Squidex.Domain.Apps.Write.Tests/TestHelpers/HandlerTestBase.cs b/tests/Squidex.Domain.Apps.Write.Tests/TestHelpers/HandlerTestBase.cs index 2387ceb06..cd562312c 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/TestHelpers/HandlerTestBase.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/TestHelpers/HandlerTestBase.cs @@ -57,7 +57,7 @@ namespace Squidex.Domain.Apps.Write.TestHelpers } } - private readonly MockupHandler handler = new MockupHandler(); + private readonly MockupHandler handler = A.DummyupHandler(); protected RefToken User { get; } = new RefToken("subject", Guid.NewGuid().ToString()); diff --git a/tests/Squidex.Infrastructure.Tests/CQRS/Commands/DefaultDomainObjectFactoryTests.cs b/tests/Squidex.Infrastructure.Tests/CQRS/Commands/DefaultDomainObjectFactoryTests.cs index e7ce1e3ba..234c6d0ea 100644 --- a/tests/Squidex.Infrastructure.Tests/CQRS/Commands/DefaultDomainObjectFactoryTests.cs +++ b/tests/Squidex.Infrastructure.Tests/CQRS/Commands/DefaultDomainObjectFactoryTests.cs @@ -39,7 +39,8 @@ namespace Squidex.Infrastructure.CQRS.Commands return new DO(passedId, -1); }); - serviceProvider.Setup(x => x.GetService(typeof(DomainObjectFactoryFunction))).Returns(factoryFunction); + serviceProvider.Setup(x => x.GetService(typeof(DomainObjectFactoryFunction))) + .Returns(factoryFunction); var sut = new DefaultDomainObjectFactory(serviceProvider.Object); @@ -61,7 +62,8 @@ namespace Squidex.Infrastructure.CQRS.Commands return new DO(passedId, 0); }); - serviceProvider.Setup(x => x.GetService(typeof(DomainObjectFactoryFunction))).Returns(factoryFunction); + serviceProvider.Setup(x => x.GetService(typeof(DomainObjectFactoryFunction))) + .Returns(factoryFunction); var sut = new DefaultDomainObjectFactory(serviceProvider.Object); diff --git a/tests/Squidex.Infrastructure.Tests/Caching/InvalidatingMemoryCacheTest.cs b/tests/Squidex.Infrastructure.Tests/Caching/InvalidatingMemoryCacheTest.cs index 859189a20..3fd30ef49 100644 --- a/tests/Squidex.Infrastructure.Tests/Caching/InvalidatingMemoryCacheTest.cs +++ b/tests/Squidex.Infrastructure.Tests/Caching/InvalidatingMemoryCacheTest.cs @@ -87,7 +87,8 @@ namespace Squidex.Infrastructure.Caching { var cacheEntry = new Mock(); - cache.Setup(x => x.CreateEntry("a-key")).Returns(cacheEntry.Object); + cache.Setup(x => x.CreateEntry("a-key")) + .Returns(cacheEntry.Object); var result = sut.CreateEntry("a-key"); @@ -99,7 +100,8 @@ namespace Squidex.Infrastructure.Caching { object currentOut = 123; - cache.Setup(x => x.TryGetValue("a-key", out currentOut)).Returns(true); + cache.Setup(x => x.TryGetValue("a-key", out currentOut)) + .Returns(true); var exists = sut.TryGetValue("a-key", out object result);