From 4900dfd84659296221950026ae5b48da300bf601 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 4 Sep 2017 22:03:56 +0200 Subject: [PATCH] Tests simplified. --- .../Apps/CachingAppProviderTests.cs | 4 +- .../Contents/ContentQueryServiceTests.cs | 42 ++++++++++++------- .../Contents/GraphQLTests.cs | 20 ++++----- .../Schemas/CachingSchemaProviderTests.cs | 4 +- .../Webhooks/WebhookDequeuerTests.cs | 2 +- .../Webhooks/WebhookEnqueuerTests.cs | 2 +- .../Apps/AppCommandHandlerTests.cs | 12 +++--- .../Assets/AssetCommandHandlerTests.cs | 2 +- .../Contents/ContentCommandHandlerTests.cs | 37 ++++++++++------ .../Schemas/SchemaCommandHandlerTests.cs | 4 +- .../Webhooks/WebhookCommandMiddlewareTests.cs | 8 ++-- .../DefaultDomainObjectRepositoryTests.cs | 6 +-- .../CQRS/Events/EventReceiverTests.cs | 2 +- .../BackgroundUsageTrackerTests.cs | 4 +- 14 files changed, 87 insertions(+), 62 deletions(-) diff --git a/tests/Squidex.Domain.Apps.Read.Tests/Apps/CachingAppProviderTests.cs b/tests/Squidex.Domain.Apps.Read.Tests/Apps/CachingAppProviderTests.cs index be7a4cefc..929e77604 100644 --- a/tests/Squidex.Domain.Apps.Read.Tests/Apps/CachingAppProviderTests.cs +++ b/tests/Squidex.Domain.Apps.Read.Tests/Apps/CachingAppProviderTests.cs @@ -65,7 +65,7 @@ namespace Squidex.Domain.Apps.Read.Apps public async Task Should_also_retrieve_app_by_name_if_retrieved_by_id_before() { A.CallTo(() => repository.FindAppAsync(appId.Id)) - .Returns(Task.FromResult(appV1)); + .Returns(appV1); await ProvideAppByIdAsync(appV1); await ProvideAppByNameAsync(appV1); @@ -78,7 +78,7 @@ namespace Squidex.Domain.Apps.Read.Apps public async Task Should_also_retrieve_app_by_id_if_retrieved_by_name_before() { A.CallTo(() => repository.FindAppAsync(appId.Name)) - .Returns(Task.FromResult(appV1)); + .Returns(appV1); await ProvideAppByNameAsync(appV1); await ProvideAppByIdAsync(appV1); diff --git a/tests/Squidex.Domain.Apps.Read.Tests/Contents/ContentQueryServiceTests.cs b/tests/Squidex.Domain.Apps.Read.Tests/Contents/ContentQueryServiceTests.cs index 4c261f297..607e90490 100644 --- a/tests/Squidex.Domain.Apps.Read.Tests/Contents/ContentQueryServiceTests.cs +++ b/tests/Squidex.Domain.Apps.Read.Tests/Contents/ContentQueryServiceTests.cs @@ -54,7 +54,8 @@ namespace Squidex.Domain.Apps.Read.Contents [Fact] public async Task Should_return_schema_from_id_if_string_is_guid() { - A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)).Returns(schema); + A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)) + .Returns(schema); var result = await sut.FindSchemaAsync(app, schemaId.ToString()); @@ -64,7 +65,8 @@ namespace Squidex.Domain.Apps.Read.Contents [Fact] public async Task Should_return_schema_from_name_if_string_not_guid() { - A.CallTo(() => schemas.FindSchemaByNameAsync(appId, "my-schema")).Returns(schema); + A.CallTo(() => schemas.FindSchemaByNameAsync(appId, "my-schema")) + .Returns(schema); var result = await sut.FindSchemaAsync(app, "my-schema"); @@ -74,7 +76,8 @@ namespace Squidex.Domain.Apps.Read.Contents [Fact] public async Task Should_throw_if_schema_not_found() { - A.CallTo(() => schemas.FindSchemaByNameAsync(appId, "my-schema")).Returns(Task.FromResult(null)); + A.CallTo(() => schemas.FindSchemaByNameAsync(appId, "my-schema")) + .Returns((ISchemaEntity)null); await Assert.ThrowsAsync(() => sut.FindSchemaAsync(app, "my-schema")); } @@ -82,12 +85,16 @@ namespace Squidex.Domain.Apps.Read.Contents [Fact] public async Task Should_return_content_from_repository_and_transform() { - A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)).Returns(Task.FromResult(schema)); - A.CallTo(() => contentRepository.FindContentAsync(app, schema, contentId)).Returns(content); + A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)) + .Returns(schema); + A.CallTo(() => contentRepository.FindContentAsync(app, schema, contentId)) + .Returns(content); - A.CallTo(() => schema.ScriptQuery).Returns(""); + A.CallTo(() => schema.ScriptQuery) + .Returns(""); - A.CallTo(() => scriptEngine.Transform(A.That.Matches(x => x.User == user && x.ContentId == contentId && ReferenceEquals(x.Data, data)), "")).Returns(transformedData); + A.CallTo(() => scriptEngine.Transform(A.That.Matches(x => x.User == user && x.ContentId == contentId && ReferenceEquals(x.Data, data)), "")) + .Returns(transformedData); var result = await sut.FindContentAsync(app, schemaId.ToString(), user, contentId); @@ -99,8 +106,10 @@ namespace Squidex.Domain.Apps.Read.Contents [Fact] public async Task Should_throw_if_content_to_find_does_not_exist() { - A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)).Returns(Task.FromResult(schema)); - A.CallTo(() => contentRepository.FindContentAsync(app, schema, contentId)).Returns(Task.FromResult(null)); + A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)) + .Returns(schema); + A.CallTo(() => contentRepository.FindContentAsync(app, schema, contentId)) + .Returns((IContentEntity)null); await Assert.ThrowsAsync(async () => await sut.FindContentAsync(app, schemaId.ToString(), user, contentId)); } @@ -110,13 +119,18 @@ namespace Squidex.Domain.Apps.Read.Contents { var ids = new HashSet(); - A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)).Returns(Task.FromResult(schema)); - A.CallTo(() => contentRepository.QueryAsync(app, schema, false, ids, A.Ignored)).Returns(Task.FromResult>(new List { content })); - A.CallTo(() => contentRepository.CountAsync(app, schema, false, ids, A.Ignored)).Returns(123); + A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)) + .Returns(schema); + A.CallTo(() => contentRepository.QueryAsync(app, schema, false, ids, A.Ignored)) + .Returns(new List { content }); + A.CallTo(() => contentRepository.CountAsync(app, schema, false, ids, A.Ignored)) + .Returns(123); - A.CallTo(() => schema.ScriptQuery).Returns(""); + A.CallTo(() => schema.ScriptQuery) + .Returns(""); - A.CallTo(() => scriptEngine.Transform(A.That.Matches(x => x.User == user && x.ContentId == contentId && ReferenceEquals(x.Data, data)), "")).Returns(transformedData); + A.CallTo(() => scriptEngine.Transform(A.That.Matches(x => x.User == user && x.ContentId == contentId && ReferenceEquals(x.Data, data)), "")) + .Returns(transformedData); var result = await sut.QueryWithCountAsync(app, schemaId.ToString(), user, ids, null); diff --git a/tests/Squidex.Domain.Apps.Read.Tests/Contents/GraphQLTests.cs b/tests/Squidex.Domain.Apps.Read.Tests/Contents/GraphQLTests.cs index e89599ea4..401ae5c2b 100644 --- a/tests/Squidex.Domain.Apps.Read.Tests/Contents/GraphQLTests.cs +++ b/tests/Squidex.Domain.Apps.Read.Tests/Contents/GraphQLTests.cs @@ -81,7 +81,7 @@ namespace Squidex.Domain.Apps.Read.Contents var allSchemas = new List { schema }; - A.CallTo(() => schemaRepository.QueryAllAsync(appId)).Returns(Task.FromResult>(allSchemas)); + A.CallTo(() => schemaRepository.QueryAllAsync(appId)).Returns(allSchemas); sut = new CachingGraphQLService(cache, assetRepository, contentQuery, new FakeUrlGenerator(), schemaRepository); } @@ -116,7 +116,7 @@ namespace Squidex.Domain.Apps.Read.Contents var assets = new List { asset }; A.CallTo(() => assetRepository.QueryAsync(app.Id, null, null, "my-query", 30, 5)) - .Returns(Task.FromResult>(assets)); + .Returns(assets); var result = await sut.QueryAsync(app, user, new GraphQLQuery { Query = query }); @@ -181,7 +181,7 @@ namespace Squidex.Domain.Apps.Read.Contents }}"; A.CallTo(() => assetRepository.FindAssetAsync(assetId)) - .Returns(Task.FromResult(asset)); + .Returns(asset); var result = await sut.QueryAsync(app, user, new GraphQLQuery { Query = query }); @@ -255,7 +255,7 @@ namespace Squidex.Domain.Apps.Read.Contents var contents = new List { content }; A.CallTo(() => contentQuery.QueryWithCountAsync(app, schema.Id.ToString(), user, null, "?$top=30&$skip=5")) - .Returns(Task.FromResult((schema, 0L, (IReadOnlyList)contents))); + .Returns((schema, 0L, (IReadOnlyList)contents)); var result = await sut.QueryAsync(app, user, new GraphQLQuery { Query = query }); @@ -356,7 +356,7 @@ namespace Squidex.Domain.Apps.Read.Contents }}"; A.CallTo(() => contentQuery.FindContentAsync(app, schema.Id.ToString(), user, contentId)) - .Returns(Task.FromResult((schema, content))); + .Returns((schema, content)); var result = await sut.QueryAsync(app, user, new GraphQLQuery { Query = query }); @@ -440,10 +440,10 @@ namespace Squidex.Domain.Apps.Read.Contents var refContents = new List { contentRef }; A.CallTo(() => contentQuery.FindContentAsync(app, schema.Id.ToString(), user, contentId)) - .Returns(Task.FromResult((schema, content))); + .Returns((schema, content)); A.CallTo(() => contentQuery.QueryWithCountAsync(app, schema.Id.ToString(), user, A>.That.Matches(x => x.Contains(contentRefId)), null)) - .Returns(Task.FromResult((schema, 0L, (IReadOnlyList)refContents))); + .Returns((schema, 0L, (IReadOnlyList)refContents)); var result = await sut.QueryAsync(app, user, new GraphQLQuery { Query = query }); @@ -500,10 +500,10 @@ namespace Squidex.Domain.Apps.Read.Contents var refAssets = new List { assetRef }; A.CallTo(() => contentQuery.FindContentAsync(app, schema.Id.ToString(), user, contentId)) - .Returns(Task.FromResult((schema, content))); + .Returns((schema, content)); A.CallTo(() => assetRepository.QueryAsync(app.Id, null, A>.That.Matches(x => x.Contains(assetRefId)), null, int.MaxValue, 0)) - .Returns(Task.FromResult>(refAssets)); + .Returns(refAssets); var result = await sut.QueryAsync(app, user, new GraphQLQuery { Query = query }); @@ -559,7 +559,7 @@ namespace Squidex.Domain.Apps.Read.Contents }}"; A.CallTo(() => contentQuery.FindContentAsync(app, schema.Id.ToString(), user, contentId)) - .Returns(Task.FromResult((schema, content))); + .Returns((schema, content)); var result = await sut.QueryAsync(app, user, new GraphQLQuery { Query = query }); diff --git a/tests/Squidex.Domain.Apps.Read.Tests/Schemas/CachingSchemaProviderTests.cs b/tests/Squidex.Domain.Apps.Read.Tests/Schemas/CachingSchemaProviderTests.cs index a759f6c9b..56109e110 100644 --- a/tests/Squidex.Domain.Apps.Read.Tests/Schemas/CachingSchemaProviderTests.cs +++ b/tests/Squidex.Domain.Apps.Read.Tests/Schemas/CachingSchemaProviderTests.cs @@ -68,7 +68,7 @@ namespace Squidex.Domain.Apps.Read.Schemas public async Task Should_also_retrieve_schema_by_name_if_retrieved_by_id_before() { A.CallTo(() => repository.FindSchemaAsync(schemaId.Id, false)) - .Returns(Task.FromResult(schemaV1)); + .Returns(schemaV1); await ProvideSchemaById(schemaV1); await ProvideSchemaByName(schemaV1); @@ -81,7 +81,7 @@ namespace Squidex.Domain.Apps.Read.Schemas 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)); + .Returns(schemaV1); await ProvideSchemaByName(schemaV1); await ProvideSchemaById(schemaV1); diff --git a/tests/Squidex.Domain.Apps.Read.Tests/Webhooks/WebhookDequeuerTests.cs b/tests/Squidex.Domain.Apps.Read.Tests/Webhooks/WebhookDequeuerTests.cs index c9eb3d399..ec7eb53df 100644 --- a/tests/Squidex.Domain.Apps.Read.Tests/Webhooks/WebhookDequeuerTests.cs +++ b/tests/Squidex.Domain.Apps.Read.Tests/Webhooks/WebhookDequeuerTests.cs @@ -89,7 +89,7 @@ namespace Squidex.Domain.Apps.Read.Webhooks private void SetupSender(IWebhookEventEntity @event, string requestDump, WebhookResult requestResult, TimeSpan requestTime) { A.CallTo(() => webhookSender.SendAsync(@event.Job)) - .Returns(Task.FromResult((requestDump, requestResult, requestTime))); + .Returns((requestDump, requestResult, requestTime)); } private void SetupPendingEvents(IWebhookEventEntity @event) diff --git a/tests/Squidex.Domain.Apps.Read.Tests/Webhooks/WebhookEnqueuerTests.cs b/tests/Squidex.Domain.Apps.Read.Tests/Webhooks/WebhookEnqueuerTests.cs index b43d5bbb6..040a57376 100644 --- a/tests/Squidex.Domain.Apps.Read.Tests/Webhooks/WebhookEnqueuerTests.cs +++ b/tests/Squidex.Domain.Apps.Read.Tests/Webhooks/WebhookEnqueuerTests.cs @@ -77,7 +77,7 @@ namespace Squidex.Domain.Apps.Read.Webhooks var webhook2 = CreateWebhook(2); A.CallTo(() => webhookRepository.QueryByAppAsync(appId.Id)) - .Returns(Task.FromResult>(new List { webhook1, webhook2 })); + .Returns(new List { webhook1, webhook2 }); await sut.On(@event); diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Apps/AppCommandHandlerTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Apps/AppCommandHandlerTests.cs index a0a43b64a..711a3d35d 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Apps/AppCommandHandlerTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Apps/AppCommandHandlerTests.cs @@ -50,7 +50,7 @@ namespace Squidex.Domain.Apps.Write.Apps var context = CreateContextForCommand(new CreateApp { Name = AppName, AppId = AppId }); A.CallTo(() => appRepository.FindAppAsync(AppName)) - .Returns(Task.FromResult(A.Dummy())); + .Returns(A.Dummy()); await TestCreate(app, async _ => { @@ -66,7 +66,7 @@ namespace Squidex.Domain.Apps.Write.Apps var context = CreateContextForCommand(new CreateApp { Name = AppName, AppId = AppId }); A.CallTo(() => appRepository.FindAppAsync(AppName)) - .Returns(Task.FromResult(null)); + .Returns((IAppEntity)null); await TestCreate(app, async _ => { @@ -84,7 +84,7 @@ namespace Squidex.Domain.Apps.Write.Apps var context = CreateContextForCommand(new AssignContributor { ContributorId = contributorId }); A.CallTo(() => userResolver.FindByIdAsync(contributorId)) - .Returns(Task.FromResult(null)); + .Returns((IUser)null); await TestUpdate(app, async _ => { @@ -105,7 +105,7 @@ namespace Squidex.Domain.Apps.Write.Apps var context = CreateContextForCommand(new AssignContributor { ContributorId = contributorId }); A.CallTo(() => userResolver.FindByIdAsync(A.Ignored)) - .Returns(Task.FromResult(A.Dummy())); + .Returns(A.Dummy()); await TestUpdate(app, async _ => { @@ -121,7 +121,7 @@ namespace Squidex.Domain.Apps.Write.Apps var context = CreateContextForCommand(new AssignContributor { ContributorId = contributorId }); A.CallTo(() => userResolver.FindByIdAsync(contributorId)) - .Returns(Task.FromResult(null)); + .Returns((IUser)null); await TestUpdate(app, async _ => { @@ -140,7 +140,7 @@ namespace Squidex.Domain.Apps.Write.Apps var context = CreateContextForCommand(new AssignContributor { ContributorId = contributorId }); A.CallTo(() => userResolver.FindByIdAsync(contributorId)) - .Returns(Task.FromResult(A.Dummy())); + .Returns(A.Dummy()); await TestUpdate(app, async _ => { diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Assets/AssetCommandHandlerTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Assets/AssetCommandHandlerTests.cs index 0b41d3c19..db513bc4c 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Assets/AssetCommandHandlerTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Assets/AssetCommandHandlerTests.cs @@ -114,7 +114,7 @@ namespace Squidex.Domain.Apps.Write.Assets private void SetupImageInfo() { A.CallTo(() => assetThumbnailGenerator.GetImageInfoAsync(stream)) - .Returns(Task.FromResult(image)); + .Returns(image); } private void SetupStore(long version, Guid commitId) diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Contents/ContentCommandHandlerTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Contents/ContentCommandHandlerTests.cs index 7b075ce3d..f2c4e78c1 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Contents/ContentCommandHandlerTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Contents/ContentCommandHandlerTests.cs @@ -58,16 +58,17 @@ namespace Squidex.Domain.Apps.Write.Contents A.CallTo(() => app.LanguagesConfig).Returns(languagesConfig); A.CallTo(() => app.PartitionResolver).Returns(languagesConfig.ToResolver()); - A.CallTo(() => appProvider.FindAppByIdAsync(AppId)).Returns(Task.FromResult(app)); + A.CallTo(() => appProvider.FindAppByIdAsync(AppId)).Returns(app); A.CallTo(() => schema.SchemaDef).Returns(schemaDef); - A.CallTo(() => schemas.FindSchemaByIdAsync(SchemaId, false)).Returns(Task.FromResult(schema)); + A.CallTo(() => schemas.FindSchemaByIdAsync(SchemaId, false)).Returns(schema); } [Fact] public async Task Create_should_throw_exception_if_data_is_not_valid() { - A.CallTo(() => scriptEngine.ExecuteAndTransform(A.Ignored, A.Ignored, A.Ignored)).Returns(invalidData); + A.CallTo(() => scriptEngine.ExecuteAndTransform(A.Ignored, A.Ignored, A.Ignored)) + .Returns(invalidData); var context = CreateContextForCommand(new CreateContent { ContentId = contentId, Data = invalidData, User = user }); @@ -80,8 +81,10 @@ namespace Squidex.Domain.Apps.Write.Contents [Fact] public async Task Create_should_create_content() { - A.CallTo(() => scriptEngine.ExecuteAndTransform(A.Ignored, A.Ignored, A.Ignored)).Returns(data); - A.CallTo(() => schema.ScriptCreate).Returns(""); + A.CallTo(() => scriptEngine.ExecuteAndTransform(A.Ignored, A.Ignored, A.Ignored)) + .Returns(data); + A.CallTo(() => schema.ScriptCreate) + .Returns(""); var context = CreateContextForCommand(new CreateContent { ContentId = contentId, Data = data, User = user }); @@ -113,8 +116,10 @@ namespace Squidex.Domain.Apps.Write.Contents [Fact] public async Task Update_should_update_domain_object() { - A.CallTo(() => scriptEngine.ExecuteAndTransform(A.Ignored, A.Ignored, A.Ignored)).Returns(data); - A.CallTo(() => schema.ScriptUpdate).Returns(""); + A.CallTo(() => scriptEngine.ExecuteAndTransform(A.Ignored, A.Ignored, A.Ignored)) + .Returns(data); + A.CallTo(() => schema.ScriptUpdate) + .Returns(""); CreateContent(); @@ -133,7 +138,8 @@ namespace Squidex.Domain.Apps.Write.Contents [Fact] public async Task Patch_should_throw_exception_if_data_is_not_valid() { - A.CallTo(() => scriptEngine.ExecuteAndTransform(A.Ignored, A.Ignored, A.Ignored)).Returns(invalidData); + A.CallTo(() => scriptEngine.ExecuteAndTransform(A.Ignored, A.Ignored, A.Ignored)) + .Returns(invalidData); CreateContent(); @@ -148,8 +154,10 @@ namespace Squidex.Domain.Apps.Write.Contents [Fact] public async Task Patch_should_update_domain_object() { - A.CallTo(() => scriptEngine.ExecuteAndTransform(A.Ignored, A.Ignored, A.Ignored)).Returns(data); - A.CallTo(() => schema.ScriptUpdate).Returns(""); + A.CallTo(() => scriptEngine.ExecuteAndTransform(A.Ignored, A.Ignored, A.Ignored)) + .Returns(data); + A.CallTo(() => schema.ScriptUpdate) + .Returns(""); var patch = new NamedContentData().AddField("my-field", new ContentFieldData().SetValue(3)); @@ -172,7 +180,8 @@ namespace Squidex.Domain.Apps.Write.Contents [Fact] public async Task Publish_should_publish_domain_object() { - A.CallTo(() => schema.ScriptPublish).Returns(""); + A.CallTo(() => schema.ScriptPublish) + .Returns(""); CreateContent(); @@ -189,7 +198,8 @@ namespace Squidex.Domain.Apps.Write.Contents [Fact] public async Task Unpublish_should_unpublish_domain_object() { - A.CallTo(() => schema.ScriptUnpublish).Returns(""); + A.CallTo(() => schema.ScriptUnpublish) + .Returns(""); CreateContent(); @@ -206,7 +216,8 @@ namespace Squidex.Domain.Apps.Write.Contents [Fact] public async Task Delete_should_update_domain_object() { - A.CallTo(() => schema.ScriptDelete).Returns(""); + A.CallTo(() => schema.ScriptDelete) + .Returns(""); CreateContent(); diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaCommandHandlerTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaCommandHandlerTests.cs index 1e7f7f086..5670b7d6b 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaCommandHandlerTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaCommandHandlerTests.cs @@ -44,7 +44,7 @@ namespace Squidex.Domain.Apps.Write.Schemas var context = CreateContextForCommand(new CreateSchema { Name = SchemaName, SchemaId = SchemaId }); A.CallTo(() => schemas.FindSchemaByNameAsync(AppId, SchemaName)) - .Returns(Task.FromResult(A.Dummy())); + .Returns(A.Dummy()); await TestCreate(schema, async _ => { @@ -60,7 +60,7 @@ namespace Squidex.Domain.Apps.Write.Schemas var context = CreateContextForCommand(new CreateSchema { Name = SchemaName, SchemaId = SchemaId }); A.CallTo(() => schemas.FindSchemaByNameAsync(AppId, SchemaName)) - .Returns(Task.FromResult(null)); + .Returns((ISchemaEntity)null); await TestCreate(schema, async _ => { diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Webhooks/WebhookCommandMiddlewareTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Webhooks/WebhookCommandMiddlewareTests.cs index 0478e34cd..75eeadcd8 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Webhooks/WebhookCommandMiddlewareTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Webhooks/WebhookCommandMiddlewareTests.cs @@ -51,7 +51,7 @@ namespace Squidex.Domain.Apps.Write.Webhooks { var context = CreateContextForCommand(new CreateWebhook { Schemas = webhookSchemas, Url = url, WebhookId = webhookId }); - A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)).Returns(Task.FromResult(A.Fake())); + A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)).Returns(A.Fake()); await TestCreate(webhook, async _ => { @@ -66,7 +66,7 @@ namespace Squidex.Domain.Apps.Write.Webhooks { var context = CreateContextForCommand(new CreateWebhook { Schemas = webhookSchemas, Url = url, WebhookId = webhookId }); - A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)).Returns(Task.FromResult(null)); + A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)).Returns((ISchemaEntity)null); await Assert.ThrowsAsync(async () => { @@ -82,7 +82,7 @@ namespace Squidex.Domain.Apps.Write.Webhooks { var context = CreateContextForCommand(new UpdateWebhook { Schemas = webhookSchemas, Url = url, WebhookId = webhookId }); - A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)).Returns(Task.FromResult(A.Fake())); + A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)).Returns(A.Fake()); CreateWebhook(); @@ -99,7 +99,7 @@ namespace Squidex.Domain.Apps.Write.Webhooks { var context = CreateContextForCommand(new UpdateWebhook { Schemas = webhookSchemas, Url = url, WebhookId = webhookId }); - A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)).Returns(Task.FromResult(null)); + A.CallTo(() => schemas.FindSchemaByIdAsync(schemaId, false)).Returns((ISchemaEntity)null); CreateWebhook(); diff --git a/tests/Squidex.Infrastructure.Tests/CQRS/Commands/DefaultDomainObjectRepositoryTests.cs b/tests/Squidex.Infrastructure.Tests/CQRS/Commands/DefaultDomainObjectRepositoryTests.cs index 8492d4dba..352a8137b 100644 --- a/tests/Squidex.Infrastructure.Tests/CQRS/Commands/DefaultDomainObjectRepositoryTests.cs +++ b/tests/Squidex.Infrastructure.Tests/CQRS/Commands/DefaultDomainObjectRepositoryTests.cs @@ -75,7 +75,7 @@ namespace Squidex.Infrastructure.CQRS.Commands public async Task Should_throw_exception_when_event_store_returns_no_events() { A.CallTo(() => eventStore.GetEventsAsync(streamName)) - .Returns(Task.FromResult>(new List())); + .Returns(new List()); await Assert.ThrowsAsync(() => sut.LoadAsync(domainObject, -1)); } @@ -96,7 +96,7 @@ namespace Squidex.Infrastructure.CQRS.Commands }; A.CallTo(() => eventStore.GetEventsAsync(streamName)) - .Returns(Task.FromResult>(events)); + .Returns(events); A.CallTo(() => eventDataFormatter.Parse(eventData1)) .Returns(new Envelope(event1)); @@ -124,7 +124,7 @@ namespace Squidex.Infrastructure.CQRS.Commands }; A.CallTo(() => eventStore.GetEventsAsync(streamName)) - .Returns(Task.FromResult>(events)); + .Returns(events); A.CallTo(() => eventDataFormatter.Parse(eventData1)) .Returns(new Envelope(event1)); diff --git a/tests/Squidex.Infrastructure.Tests/CQRS/Events/EventReceiverTests.cs b/tests/Squidex.Infrastructure.Tests/CQRS/Events/EventReceiverTests.cs index a6f471d7e..3187c5332 100644 --- a/tests/Squidex.Infrastructure.Tests/CQRS/Events/EventReceiverTests.cs +++ b/tests/Squidex.Infrastructure.Tests/CQRS/Events/EventReceiverTests.cs @@ -127,7 +127,7 @@ namespace Squidex.Infrastructure.CQRS.Events var eventStore = new MyEventStore(events); A.CallTo(() => eventConsumer.Name).Returns(consumerName); - A.CallTo(() => eventConsumerInfoRepository.FindAsync(consumerName)).Returns(Task.FromResult(consumerInfo)); + A.CallTo(() => eventConsumerInfoRepository.FindAsync(consumerName)).Returns(consumerInfo); A.CallTo(() => formatter.Parse(eventData1)).Returns(envelope1); A.CallTo(() => formatter.Parse(eventData2)).Returns(envelope2); diff --git a/tests/Squidex.Infrastructure.Tests/UsageTracking/BackgroundUsageTrackerTests.cs b/tests/Squidex.Infrastructure.Tests/UsageTracking/BackgroundUsageTrackerTests.cs index af1e3f5ad..a0f4a49b6 100644 --- a/tests/Squidex.Infrastructure.Tests/UsageTracking/BackgroundUsageTrackerTests.cs +++ b/tests/Squidex.Infrastructure.Tests/UsageTracking/BackgroundUsageTrackerTests.cs @@ -66,7 +66,7 @@ namespace Squidex.Infrastructure.UsageTracking }; A.CallTo(() => usageStore.QueryAsync("key", new DateTime(2016, 1, 1), new DateTime(2016, 1, 31))) - .Returns(Task.FromResult(originalData)); + .Returns(originalData); var result = await sut.GetMonthlyCalls("key", date); @@ -88,7 +88,7 @@ namespace Squidex.Infrastructure.UsageTracking }; A.CallTo(() => usageStore.QueryAsync("key", dateFrom, dateTo)) - .Returns(Task.FromResult(originalData)); + .Returns(originalData); var result = await sut.QueryAsync("key", dateFrom, dateTo);