diff --git a/extensions/Squidex.Extensions/Squidex.Extensions.csproj b/extensions/Squidex.Extensions/Squidex.Extensions.csproj index 1756e0c3e..4f8e9fcb0 100644 --- a/extensions/Squidex.Extensions/Squidex.Extensions.csproj +++ b/extensions/Squidex.Extensions/Squidex.Extensions.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/Scripts.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/Scripts.cs index 30914130d..93eeeb474 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/Scripts.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/Scripts.cs @@ -14,9 +14,10 @@ namespace Squidex.Domain.Apps.Core.Schemas { public const string Change = "Change"; public const string Create = "Create"; - public const string Query = "Query"; - public const string Update = "Update"; public const string Delete = "Delete"; + public const string Update = "Update"; + + public const string Query = "Query"; public static string GetChange(this IReadOnlyDictionary scripts) { diff --git a/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj b/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj index 3fc9981a9..a2f8491f7 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj +++ b/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj b/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj index 8472247c5..370001c52 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentGrain.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentGrain.cs index e2b4e6422..d09431545 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentGrain.cs @@ -8,6 +8,7 @@ using System; using System.Threading.Tasks; using Squidex.Domain.Apps.Core.Contents; +using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Scripting; using Squidex.Domain.Apps.Entities.Assets.Repositories; using Squidex.Domain.Apps.Entities.Contents.Commands; @@ -66,7 +67,7 @@ namespace Squidex.Domain.Apps.Entities.Contents GuardContent.CanCreate(ctx.Schema, c); - await ctx.ExecuteScriptAndTransformAsync(x => x.SchemaDef.Scripts.GetOrDefault("Create"), "Create", c, c.Data); + await ctx.ExecuteScriptAndTransformAsync(Scripts.Create, "Create", c, c.Data); await ctx.EnrichAsync(c.Data); if (!c.DoNotValidate) @@ -76,7 +77,7 @@ namespace Squidex.Domain.Apps.Entities.Contents if (c.Publish) { - await ctx.ExecuteScriptAsync(x => x.SchemaDef.Scripts.GetOrDefault("Change"), "Published", c, c.Data); + await ctx.ExecuteScriptAsync(Scripts.Change, "Published", c, c.Data); } Create(c); @@ -140,7 +141,7 @@ namespace Squidex.Domain.Apps.Entities.Contents reason = StatusChange.Restored; } - await ctx.ExecuteScriptAsync(x => x.SchemaDef.Scripts.GetOrDefault("Change"), reason, c, Snapshot.Data); + await ctx.ExecuteScriptAsync(Scripts.Change, reason, c, Snapshot.Data); ChangeStatus(c, reason); } @@ -166,7 +167,7 @@ namespace Squidex.Domain.Apps.Entities.Contents GuardContent.CanDelete(ctx.Schema, c); - await ctx.ExecuteScriptAsync(x => x.SchemaDef.Scripts.GetOrDefault("Delete"), "Delete", c, Snapshot.Data); + await ctx.ExecuteScriptAsync(Scripts.Delete, "Delete", c, Snapshot.Data); Delete(c); }); @@ -208,7 +209,7 @@ namespace Squidex.Domain.Apps.Entities.Contents await ctx.ValidateAsync(c.Data); } - newData = await ctx.ExecuteScriptAndTransformAsync(x => x.SchemaDef.Scripts.GetOrDefault("Update"), "Update", c, newData, Snapshot.Data); + newData = await ctx.ExecuteScriptAndTransformAsync(Scripts.Update, "Update", c, newData, Snapshot.Data); if (isProposal) { diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs index ca5c36a38..239cbbf91 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs @@ -17,6 +17,7 @@ using Squidex.Domain.Apps.Entities.Assets.Repositories; using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Domain.Apps.Entities.Contents.Repositories; using Squidex.Domain.Apps.Entities.Schemas; +using Squidex.Infrastructure; using Squidex.Infrastructure.Queries; using Squidex.Infrastructure.Tasks; @@ -86,20 +87,20 @@ namespace Squidex.Domain.Apps.Entities.Contents return data.ValidatePartialAsync(ctx, schemaEntity.SchemaDef, appEntity.PartitionResolver(), message); } - public Task ExecuteScriptAndTransformAsync(Func script, object operation, ContentCommand command, NamedContentData data, NamedContentData oldData = null) + public Task ExecuteScriptAndTransformAsync(string script, object operation, ContentCommand command, NamedContentData data, NamedContentData oldData = null) { var ctx = CreateScriptContext(operation, command, data, oldData); - var result = scriptEngine.ExecuteAndTransform(ctx, script(schemaEntity)); + var result = scriptEngine.ExecuteAndTransform(ctx, GetScript(script)); return Task.FromResult(result); } - public Task ExecuteScriptAsync(Func script, object operation, ContentCommand command, NamedContentData data, NamedContentData oldData = null) + public Task ExecuteScriptAsync(string script, object operation, ContentCommand command, NamedContentData data, NamedContentData oldData = null) { var ctx = CreateScriptContext(operation, command, data, oldData); - scriptEngine.Execute(ctx, script(schemaEntity)); + scriptEngine.Execute(ctx, GetScript(script)); return TaskHelper.Done; } @@ -123,5 +124,10 @@ namespace Squidex.Domain.Apps.Entities.Contents { return await contentRepository.QueryIdsAsync(appEntity.Id, filterSchemaId, filterNode); } + + private string GetScript(string script) + { + return schemaEntity.SchemaDef.Scripts.GetOrDefault(script); + } } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs index a81b6017e..af2e3ca91 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs @@ -14,6 +14,7 @@ using Microsoft.Extensions.Options; using Microsoft.OData; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Core.ConvertContent; +using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Scripting; using Squidex.Domain.Apps.Entities.Contents.Edm; using Squidex.Domain.Apps.Entities.Contents.Repositories; @@ -158,7 +159,7 @@ namespace Squidex.Domain.Apps.Entities.Contents { var converters = GenerateConverters(context, checkType).ToArray(); - var scriptText = schema.SchemaDef.Scripts.GetOrDefault("Query"); + var scriptText = schema.SchemaDef.Scripts.GetQuery(); var isScripting = !string.IsNullOrWhiteSpace(scriptText); diff --git a/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj b/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj index 5dd06b39a..6adb6a190 100644 --- a/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj +++ b/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj @@ -16,7 +16,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj b/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj index 0dbf9512a..351faafbf 100644 --- a/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj +++ b/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj b/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj index 8d568fa96..683baf450 100644 --- a/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj +++ b/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj index d1a86c1c2..5a7a3c178 100644 --- a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj +++ b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj @@ -12,12 +12,12 @@ - + all runtime; build; native; contentfiles; analyzers - + diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index 49cb6bcd3..cebe95677 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -62,7 +62,7 @@ - + @@ -85,15 +85,15 @@ - - - - + + + + - + diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/EventSynchronization/SchemaSynchronizerTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/EventSynchronization/SchemaSynchronizerTests.cs index e52c74a7e..caf692cce 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/EventSynchronization/SchemaSynchronizerTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/EventSynchronization/SchemaSynchronizerTests.cs @@ -61,7 +61,7 @@ namespace Squidex.Domain.Apps.Core.Operations.EventSynchronization { var scripts = new Dictionary { - ["Create"] = "Script" + [Scripts.Create] = "" }; var sourceSchema = new Schema("source"); diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj b/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj index c61057acd..7de203167 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj +++ b/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs index d4313212e..0f0f9d4a7 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs @@ -202,7 +202,7 @@ namespace Squidex.Domain.Apps.Entities.Contents Assert.Equal(content.Id, result.Id); A.CallTo(() => scriptEngine.Transform(A.Ignored, A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); } [Fact] @@ -301,7 +301,7 @@ namespace Squidex.Domain.Apps.Entities.Contents Assert.Equal(total, result.Total); A.CallTo(() => scriptEngine.Transform(A.Ignored, A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Times(count)); + .MustHaveHappened(count, Times.Exactly); } [Fact] @@ -377,7 +377,7 @@ namespace Squidex.Domain.Apps.Entities.Contents Assert.Equal(total, result.Total); A.CallTo(() => scriptEngine.Transform(A.Ignored, A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Times(count)); + .MustHaveHappened(count, Times.Exactly); } private void SetupClaims(bool isFrontend = false, bool allowSchema = true) diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj b/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj index b7df20bed..67f0203af 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj @@ -17,11 +17,11 @@ - - + + - + 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 ca2daac0e..7e52cf91e 100644 --- a/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj +++ b/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/Grains/EventConsumerGrainTests.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/Grains/EventConsumerGrainTests.cs index d1423f98c..6a95aac4b 100644 --- a/tests/Squidex.Infrastructure.Tests/EventSourcing/Grains/EventConsumerGrainTests.cs +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/Grains/EventConsumerGrainTests.cs @@ -116,7 +116,7 @@ namespace Squidex.Infrastructure.EventSourcing.Grains state.Should().BeEquivalentTo(new EventConsumerState { IsStopped = false, Position = initialPosition, Error = null }); A.CallTo(() => eventStore.CreateSubscription(A.Ignored, A.Ignored, A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); } [Fact] @@ -128,7 +128,7 @@ namespace Squidex.Infrastructure.EventSourcing.Grains state.Should().BeEquivalentTo(new EventConsumerState { IsStopped = false, Position = initialPosition, Error = null }); A.CallTo(() => eventStore.CreateSubscription(A.Ignored, A.Ignored, A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); } [Fact] @@ -142,10 +142,10 @@ namespace Squidex.Infrastructure.EventSourcing.Grains state.Should().BeEquivalentTo(new EventConsumerState { IsStopped = true, Position = initialPosition, Error = null }); A.CallTo(() => persistence.WriteSnapshotAsync(A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); A.CallTo(() => eventSubscription.StopAsync()) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); } [Fact] @@ -159,19 +159,19 @@ namespace Squidex.Infrastructure.EventSourcing.Grains state.Should().BeEquivalentTo(new EventConsumerState { IsStopped = false, Position = null, Error = null }); A.CallTo(() => persistence.WriteSnapshotAsync(A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Twice); + .MustHaveHappened(2, Times.Exactly); A.CallTo(() => eventConsumer.ClearAsync()) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); A.CallTo(() => eventSubscription.StopAsync()) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); A.CallTo(() => eventStore.CreateSubscription(A.Ignored, A.Ignored, state.Position)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); A.CallTo(() => eventStore.CreateSubscription(A.Ignored, A.Ignored, null)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); } [Fact] @@ -187,10 +187,10 @@ namespace Squidex.Infrastructure.EventSourcing.Grains state.Should().BeEquivalentTo(new EventConsumerState { IsStopped = false, Position = @event.EventPosition, Error = null }); A.CallTo(() => persistence.WriteSnapshotAsync(A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); A.CallTo(() => eventConsumer.On(envelope)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); } [Fact] @@ -209,7 +209,7 @@ namespace Squidex.Infrastructure.EventSourcing.Grains state.Should().BeEquivalentTo(new EventConsumerState { IsStopped = false, Position = @event.EventPosition, Error = null }); A.CallTo(() => persistence.WriteSnapshotAsync(A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); A.CallTo(() => eventConsumer.On(envelope)) .MustNotHaveHappened(); @@ -244,10 +244,10 @@ namespace Squidex.Infrastructure.EventSourcing.Grains state.Should().BeEquivalentTo(new EventConsumerState { IsStopped = true, Position = initialPosition, Error = ex.ToString() }); A.CallTo(() => persistence.WriteSnapshotAsync(A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); A.CallTo(() => eventSubscription.StopAsync()) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); } [Fact] @@ -292,10 +292,10 @@ namespace Squidex.Infrastructure.EventSourcing.Grains state.Should().BeEquivalentTo(new EventConsumerState { IsStopped = true, Position = initialPosition, Error = ex.ToString() }); A.CallTo(() => persistence.WriteSnapshotAsync(A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); A.CallTo(() => eventSubscription.StopAsync()) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); } [Fact] @@ -319,10 +319,10 @@ namespace Squidex.Infrastructure.EventSourcing.Grains .MustHaveHappened(); A.CallTo(() => persistence.WriteSnapshotAsync(A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); A.CallTo(() => eventSubscription.StopAsync()) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); } [Fact] @@ -346,10 +346,10 @@ namespace Squidex.Infrastructure.EventSourcing.Grains .MustNotHaveHappened(); A.CallTo(() => persistence.WriteSnapshotAsync(A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); A.CallTo(() => eventSubscription.StopAsync()) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); } [Fact] @@ -377,13 +377,13 @@ namespace Squidex.Infrastructure.EventSourcing.Grains .MustHaveHappened(); A.CallTo(() => persistence.WriteSnapshotAsync(A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Twice); + .MustHaveHappened(2, Times.Exactly); A.CallTo(() => eventSubscription.StopAsync()) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); A.CallTo(() => eventStore.CreateSubscription(A.Ignored, A.Ignored, A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Twice); + .MustHaveHappened(2, Times.Exactly); } private Task OnErrorAsync(IEventSubscription subscriber, Exception ex) diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/PollingSubscriptionTests.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/PollingSubscriptionTests.cs index 8f2e5ac6f..b62dab45d 100644 --- a/tests/Squidex.Infrastructure.Tests/EventSourcing/PollingSubscriptionTests.cs +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/PollingSubscriptionTests.cs @@ -27,7 +27,7 @@ namespace Squidex.Infrastructure.EventSourcing await WaitAndStopAsync(sut); A.CallTo(() => eventStore.QueryAsync(A>.Ignored, "^my-stream", position, A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); } [Fact] @@ -88,7 +88,7 @@ namespace Squidex.Infrastructure.EventSourcing await WaitAndStopAsync(sut); A.CallTo(() => eventStore.QueryAsync(A>.Ignored, "^my-stream", position, A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Twice); + .MustHaveHappened(2, Times.Exactly); } private static async Task WaitAndStopAsync(IEventSubscription sut) diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/RetrySubscriptionTests.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/RetrySubscriptionTests.cs index 10ad267e9..6231bc1b4 100644 --- a/tests/Squidex.Infrastructure.Tests/EventSourcing/RetrySubscriptionTests.cs +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/RetrySubscriptionTests.cs @@ -49,10 +49,10 @@ namespace Squidex.Infrastructure.EventSourcing await sut.StopAsync(); A.CallTo(() => eventSubscription.StopAsync()) - .MustHaveHappened(Repeated.Exactly.Twice); + .MustHaveHappened(2, Times.Exactly); A.CallTo(() => eventStore.CreateSubscription(A.Ignored, A.Ignored, A.Ignored)) - .MustHaveHappened(Repeated.Exactly.Twice); + .MustHaveHappened(2, Times.Exactly); A.CallTo(() => eventSubscriber.OnErrorAsync(A.Ignored, A.Ignored)) .MustNotHaveHappened(); diff --git a/tests/Squidex.Infrastructure.Tests/Migrations/MigratorTests.cs b/tests/Squidex.Infrastructure.Tests/Migrations/MigratorTests.cs index f9810e1fd..df56ca42b 100644 --- a/tests/Squidex.Infrastructure.Tests/Migrations/MigratorTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Migrations/MigratorTests.cs @@ -126,8 +126,8 @@ namespace Squidex.Infrastructure.Migrations await Task.WhenAll(Enumerable.Repeat(0, 10).Select(x => Task.Run(sut.MigrateAsync))); - A.CallTo(() => migrator_0_1.UpdateAsync()).MustHaveHappened(Repeated.Exactly.Once); - A.CallTo(() => migrator_1_2.UpdateAsync()).MustHaveHappened(Repeated.Exactly.Once); + A.CallTo(() => migrator_0_1.UpdateAsync()).MustHaveHappened(1, Times.Exactly); + A.CallTo(() => migrator_1_2.UpdateAsync()).MustHaveHappened(1, Times.Exactly); } private IMigration BuildMigration(int fromVersion, int toVersion) diff --git a/tests/Squidex.Infrastructure.Tests/Orleans/BootstrapTests.cs b/tests/Squidex.Infrastructure.Tests/Orleans/BootstrapTests.cs index 4131a1044..b2fb54fd8 100644 --- a/tests/Squidex.Infrastructure.Tests/Orleans/BootstrapTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Orleans/BootstrapTests.cs @@ -58,7 +58,7 @@ namespace Squidex.Infrastructure.Orleans await sut.Execute(CancellationToken.None); A.CallTo(() => grain.ActivateAsync()) - .MustHaveHappened(Repeated.Exactly.Twice); + .MustHaveHappened(2, Times.Exactly); } [Fact] @@ -70,7 +70,7 @@ namespace Squidex.Infrastructure.Orleans await Assert.ThrowsAsync(() => sut.Execute(CancellationToken.None)); A.CallTo(() => grain.ActivateAsync()) - .MustHaveHappened(Repeated.Exactly.Times(10)); + .MustHaveHappened(10, Times.Exactly); } } } diff --git a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj index d9b6cafc0..acc8be42c 100644 --- a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj +++ b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/tests/Squidex.Infrastructure.Tests/UsageTracking/CachingUsageTrackerTests.cs b/tests/Squidex.Infrastructure.Tests/UsageTracking/CachingUsageTrackerTests.cs index a8fa75b46..20208e0e3 100644 --- a/tests/Squidex.Infrastructure.Tests/UsageTracking/CachingUsageTrackerTests.cs +++ b/tests/Squidex.Infrastructure.Tests/UsageTracking/CachingUsageTrackerTests.cs @@ -57,7 +57,7 @@ namespace Squidex.Infrastructure.UsageTracking Assert.Equal(100, result2); A.CallTo(() => inner.GetMonthlyCallsAsync(key, DateTime.Today)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); } [Fact] @@ -76,7 +76,7 @@ namespace Squidex.Infrastructure.UsageTracking Assert.Equal(120, result2); A.CallTo(() => inner.GetPreviousCallsAsync(key, f, t)) - .MustHaveHappened(Repeated.Exactly.Once); + .MustHaveHappened(1, Times.Exactly); } } } diff --git a/tests/Squidex.Tests/Squidex.Tests.csproj b/tests/Squidex.Tests/Squidex.Tests.csproj index 4abb88d74..8f6b4e0df 100644 --- a/tests/Squidex.Tests/Squidex.Tests.csproj +++ b/tests/Squidex.Tests/Squidex.Tests.csproj @@ -12,11 +12,11 @@ - + - + diff --git a/tools/Migrate_00/Migrate_00.csproj b/tools/Migrate_00/Migrate_00.csproj index 950b9fce6..dd3d5eb4a 100644 --- a/tools/Migrate_00/Migrate_00.csproj +++ b/tools/Migrate_00/Migrate_00.csproj @@ -6,7 +6,7 @@ 7.3 - +