Trigger lifetime test and fixes

Author: koenbeuk

src/EntityFrameworkCore.Triggered/Internal/TriggerDiscoveryService.cs

@@ -44,7 +44,7 @@ public IEnumerable<TriggerDescriptor> DiscoverTriggers(Type openTriggerType, Typ
                     {
                         if (triggerDescriptors == null)
                         {
-                            triggerDescriptors = new List<TriggerDescriptor>(triggers.Count());
+                            triggerDescriptors = new List<TriggerDescriptor>();
                         }
 
                         if (trigger != null)

test/EntityFrameworkCore.Triggered.IntegrationTests/LifetimeTests/ApplicationDbContext.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+
+namespace EntityFrameworkCore.Triggered.IntegrationTests.LifetimeTests
+{
+    public class ApplicationDbContext
+#if EFCORETRIGGERED1
+        : TriggeredDbContext
+#else
+        : DbContext
+#endif
+    {
+        public ApplicationDbContext(DbContextOptions options) : base(options)
+        {
+        }
+
+        public DbSet<User> Users { get; set; }
+    }
+}

test/EntityFrameworkCore.Triggered.IntegrationTests/LifetimeTests/TriggerLifetimeTestScenario.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using EntityFrameworkCore.Triggered.Extensions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using ScenarioTests;
+using Xunit;
+
+namespace EntityFrameworkCore.Triggered.IntegrationTests.LifetimeTests
+{
+    public partial class TriggerLifetimeTestScenario
+    {
+        public int SingletonTriggerInstances { get; set; }
+        public int ScopedTriggerInstances { get; set; }
+        public int TransientTriggerInstances { get; set; }
+
+        [Scenario(NamingPolicy = ScenarioTestMethodNamingPolicy.Test)]
+        public void Scenario(ScenarioContext scenario)
+        {
+            const int iterations = 5;
+            const int usersPerIteration = 5;
+
+            using var serviceProvider = new ServiceCollection()
+                .AddDbContext<ApplicationDbContext>(options => {
+                    options.UseInMemoryDatabase(scenario.TargetName);
+                    options.UseTriggers(triggerOptions => {
+                        triggerOptions.AddTrigger<Triggers.Users.SingletonTrigger>(ServiceLifetime.Singleton);
+                        triggerOptions.AddTrigger<Triggers.Users.ScopedTrigger>(ServiceLifetime.Scoped);
+                        triggerOptions.AddTrigger<Triggers.Users.TransientTrigger>();
+                    });
+                })
+                .AddSingleton(this)
+                .BuildServiceProvider();
+
+            for (var iteration = 0; iteration < iterations; iteration++)
+            {
+                using var serviceScope = serviceProvider.CreateScope();
+
+                var dbContext = serviceScope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+                
+                for (var i = 0; i < usersPerIteration; i++)
+                {
+                    dbContext.Users.Add(new User { });
+                }
+
+                dbContext.SaveChanges();
+            }
+
+            scenario.Fact("1: There is only 1 singleton trigger instance", () => {
+                Assert.Equal(1, SingletonTriggerInstances);
+            });
+
+            scenario.Fact("2: There are 5 scoped trigger instances", () => {
+                Assert.Equal(5, ScopedTriggerInstances);
+            });
+
+            scenario.Fact("3: There are 25 transient trigger instances", () => {
+                Assert.Equal(25, TransientTriggerInstances);
+            });
+        }
+    }
+}

test/EntityFrameworkCore.Triggered.IntegrationTests/LifetimeTests/Triggers/Users/ScopedTrigger.cs

@@ -0,0 +1,16 @@
+using System.Threading;
+using System.Threading.Tasks;
+using EntityFrameworkCore.Triggered.Extensions;
+
+namespace EntityFrameworkCore.Triggered.IntegrationTests.LifetimeTests.Triggers.Users
+{
+    class ScopedTrigger : IBeforeSaveTrigger<object>
+    {
+        public ScopedTrigger(TriggerLifetimeTestScenario triggerLifetimeTestScenario)
+        {
+            triggerLifetimeTestScenario.ScopedTriggerInstances++;
+        }
+
+        public Task BeforeSave(ITriggerContext<object> context, CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

test/EntityFrameworkCore.Triggered.IntegrationTests/LifetimeTests/Triggers/Users/SingletonTrigger.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using EntityFrameworkCore.Triggered.Extensions;
+
+namespace EntityFrameworkCore.Triggered.IntegrationTests.LifetimeTests.Triggers.Users
+{
+
+    class SingletonTrigger : IBeforeSaveTrigger<object>
+    {
+        public SingletonTrigger(TriggerLifetimeTestScenario triggerLifetimeTestScenario)
+        {
+            triggerLifetimeTestScenario.SingletonTriggerInstances++;
+        }
+
+        public Task BeforeSave(ITriggerContext<object> context, CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

test/EntityFrameworkCore.Triggered.IntegrationTests/LifetimeTests/Triggers/Users/TransientTrigger.cs

@@ -0,0 +1,16 @@
+using System.Threading;
+using System.Threading.Tasks;
+using EntityFrameworkCore.Triggered.Extensions;
+
+namespace EntityFrameworkCore.Triggered.IntegrationTests.LifetimeTests.Triggers.Users
+{
+    class TransientTrigger : IBeforeSaveTrigger<object>
+    {
+        public TransientTrigger(TriggerLifetimeTestScenario triggerLifetimeTestScenario)
+        {
+            triggerLifetimeTestScenario.TransientTriggerInstances++;
+        }
+
+        public Task BeforeSave(ITriggerContext<object> context, CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

test/EntityFrameworkCore.Triggered.IntegrationTests/LifetimeTests/User.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EntityFrameworkCore.Triggered.IntegrationTests.LifetimeTests
+{
+    public class User
+    {
+        public int Id { get; set; }
+    }
+}

…IntegrationTests/ApplicationDbContext.cs …ests/SampleStore/ApplicationDbContext.cstest/EntityFrameworkCore.Triggered.IntegrationTests/ApplicationDbContext.cs renamed to test/EntityFrameworkCore.Triggered.IntegrationTests/SampleStore/ApplicationDbContext.cs test/EntityFrameworkCore.Triggered.IntegrationTests/ApplicationDbContext.cs renamed to test/EntityFrameworkCore.Triggered.IntegrationTests/SampleStore/ApplicationDbContext.cs

@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using EntityFrameworkCore.Triggered.IntegrationTests.Models;
+using EntityFrameworkCore.Triggered.IntegrationTests.SampleStore.Models;
 using Microsoft.EntityFrameworkCore;
 
-namespace EntityFrameworkCore.Triggered.IntegrationTests
+namespace EntityFrameworkCore.Triggered.IntegrationTests.SampleStore
 {
     public class ApplicationDbContext
 #if EFCORETRIGGERED1
@@ -26,14 +26,10 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             optionsBuilder.UseInMemoryDatabase(_databaseName);
             optionsBuilder.UseTriggers(triggerOptions => {
-                triggerOptions.AddAssemblyTriggers();
+                triggerOptions.AddTrigger<Triggers.Users.SoftDeleteUsers>();
             });
         }
 
         public DbSet<User> Users { get; set; }
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-        }
     }
 }

…riggered.IntegrationTests/Models/User.cs …egrationTests/SampleStore/Models/User.cstest/EntityFrameworkCore.Triggered.IntegrationTests/Models/User.cs renamed to test/EntityFrameworkCore.Triggered.IntegrationTests/SampleStore/Models/User.cs test/EntityFrameworkCore.Triggered.IntegrationTests/Models/User.cs renamed to test/EntityFrameworkCore.Triggered.IntegrationTests/SampleStore/Models/User.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace EntityFrameworkCore.Triggered.IntegrationTests.Models
+namespace EntityFrameworkCore.Triggered.IntegrationTests.SampleStore.Models
 {
     public class User
     {

…iggered.IntegrationTests/TestScenario.cs …grationTests/SampleStore/TestScenario.cstest/EntityFrameworkCore.Triggered.IntegrationTests/TestScenario.cs renamed to test/EntityFrameworkCore.Triggered.IntegrationTests/SampleStore/TestScenario.cs test/EntityFrameworkCore.Triggered.IntegrationTests/TestScenario.cs renamed to test/EntityFrameworkCore.Triggered.IntegrationTests/SampleStore/TestScenario.cs

@@ -3,13 +3,13 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using EntityFrameworkCore.Triggered.IntegrationTests.Models;
+using EntityFrameworkCore.Triggered.IntegrationTests.SampleStore.Models;
 using ScenarioTests;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
-namespace EntityFrameworkCore.Triggered.IntegrationTests
+namespace EntityFrameworkCore.Triggered.IntegrationTests.SampleStore
 {
     public partial class TestScenario
     {