Merge pull request #163 from cjblomqvist/assembly-issue-updated

Fix for #154

Author: koenbeuk

src/EntityFrameworkCore.Triggered.Extensions/ServiceCollectionExtensions.cs

@@ -105,7 +105,7 @@ public static IServiceCollection AddAssemblyTriggers(this IServiceCollection ser
                         registered = true;
                     }
 
-                    services.TryAdd(new ServiceDescriptor(triggerType, sp => sp.GetRequiredService(assemblyType), ServiceLifetime.Transient));
+                    services.Add(new ServiceDescriptor(triggerType, sp => sp.GetRequiredService(assemblyType), ServiceLifetime.Transient));
                 }
             }
 

test/EntityFrameworkCore.Triggered.Extensions.Tests/SampleTriggerClone.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EntityFrameworkCore.Triggered.Lifecycles;
+
+namespace EntityFrameworkCore.Triggered.Extensions.Tests
+{
+    public class SampleTriggerClone : Trigger<object>, IBeforeSaveStartingAsyncTrigger
+    {
+        public int BeforeSaveCalls;
+        public int BeforeSaveAsyncCalls;
+
+        public int AfterSaveCalls;
+        public int AfterSaveAsyncCalls;
+
+        public int AfterSaveFailedCalls;
+        public int AfterSaveFailedAsyncCalls;
+
+        public int BeforeSaveStartingTriggerCalls;
+
+
+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
+        public override void BeforeSave(ITriggerContext<object> context) => BeforeSaveCalls += 1;
+        public override async Task BeforeSaveAsync(ITriggerContext<object> context, CancellationToken cancellationToken) => BeforeSaveAsyncCalls += 1;
+
+        public override void AfterSave(ITriggerContext<object> context) => AfterSaveCalls += 1;
+        public override async Task AfterSaveAsync(ITriggerContext<object> context, CancellationToken cancellationToken) => AfterSaveAsyncCalls += 1;
+
+        public override void AfterSaveFailed(ITriggerContext<object> context, Exception exception) => AfterSaveFailedCalls += 1;
+        public override async Task AfterSaveFailedAsync(ITriggerContext<object> context, Exception exception, CancellationToken cancellationToken) => AfterSaveFailedAsyncCalls += 1;
+        public async Task BeforeSaveStartingAsync(CancellationToken cancellationToken) => BeforeSaveStartingTriggerCalls += 1;
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
+    }
+}

test/EntityFrameworkCore.Triggered.Extensions.Tests/ServiceCollectionExtensionsTests.cs

@@ -86,7 +86,7 @@ public void AddAssemblyTriggers_WithAssembly_RegistersWithThatAssembly()
             var serviceCollection = new ServiceCollection()
                 .AddAssemblyTriggers(typeof(ServiceCollectionExtensionsTests).Assembly);
 
-            Assert.Equal(8, serviceCollection.Count);
+            Assert.Equal(16, serviceCollection.Count);
         }
 
         protected async Task SaveChanges_TriggeredAddedThroughDI_Template(Func<IServiceCollection, IServiceCollection> transform)
@@ -108,18 +108,29 @@ protected async Task SaveChanges_TriggeredAddedThroughDI_Template(Func<IServiceC
             await dbContext.SaveChangesAsync();
 
             var trigger = serviceProvider.GetRequiredService<SampleTrigger>();
+            var triggerClone = serviceProvider.GetRequiredService<SampleTriggerClone>();
 
             Assert.Equal(1, trigger.BeforeSaveStartingTriggerCalls);
             Assert.Equal(1, trigger.BeforeSaveCalls);
             Assert.Equal(1, trigger.BeforeSaveAsyncCalls);
             Assert.Equal(1, trigger.AfterSaveCalls);
             Assert.Equal(1, trigger.AfterSaveAsyncCalls);
+
+            Assert.Equal(1, triggerClone.BeforeSaveStartingTriggerCalls);
+            Assert.Equal(1, triggerClone.BeforeSaveCalls);
+            Assert.Equal(1, triggerClone.BeforeSaveAsyncCalls);
+            Assert.Equal(1, triggerClone.AfterSaveCalls);
+            Assert.Equal(1, triggerClone.AfterSaveAsyncCalls);
         }
 
         [Fact]
         public Task SaveChanges_ExplicitlyAddedTriggerThroughDI_RaisesAllTriggerTypes()
-            => SaveChanges_TriggeredAddedThroughDI_Template(x => x.AddTrigger<SampleTrigger>());
-
+            => SaveChanges_TriggeredAddedThroughDI_Template(x => {
+                x.AddTrigger<SampleTrigger>();
+                x.AddTrigger<SampleTriggerClone>();
+                
+                return x;
+            });
 
         [Fact]
         public Task SaveChanges_DiscoveredTriggerThroughDI_RaisesAllTriggerTypes()
@@ -141,9 +152,10 @@ public void AddTrigger_Multiple_AddsRegistrationForAll(ServiceLifetime lifetime)
         {
             var serviceCollection = new ServiceCollection()
                 .AddTrigger<SampleTrigger>(lifetime)
+                .AddTrigger<SampleTriggerClone>(lifetime)
                 .AddTrigger<Trigger<object>>(lifetime);
 
-            Assert.Equal(15, serviceCollection.Count);
+            Assert.Equal(23, serviceCollection.Count);
         }
 
         [Theory]
@@ -152,9 +164,10 @@ public void AddAssemblyTriggers_Multiple_AddsRegistrationForAll(ServiceLifetime
         {
             var serviceCollection = new ServiceCollection()
                 .AddTrigger<SampleTrigger>(lifetime)
+                .AddTrigger<SampleTriggerClone>(lifetime)
                 .AddAssemblyTriggers(typeof(Trigger<object>).Assembly);
 
-            Assert.Equal(15, serviceCollection.Count);
+            Assert.Equal(23, serviceCollection.Count);
         }
 
         [Fact]
@@ -228,9 +241,10 @@ public void AddAssemblyTriggers_WhenExplicitlyRegisteredAsAService_OnlyAddsTheTr
         {
             var serviceCollection = new ServiceCollection()
                 .AddSingleton<SampleTrigger>()
+                .AddSingleton<SampleTriggerClone>()
                 .AddAssemblyTriggers();
 
-            Assert.Equal(8, serviceCollection.Count);
+            Assert.Equal(16, serviceCollection.Count);
         }
     }
 }