added a check to ensure that the service provider is set for the SubSonic Context

Author: kccarter76

SubSonic.Core.DataAccessLayer/src/SubSonicContext/SubSonicContext.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using SubSonic;
 using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -13,7 +12,7 @@
 
 namespace SubSonic
 {
-    using Collections;
+    using src;
     using Linq;
 
     public partial class SubSonicContext
@@ -53,6 +52,11 @@ private void ConfigureSubSonic(DbContextOptionsBuilder builder)
         {
             OnDbConfiguring(builder);
 
+            if (Instance is null)
+            {
+                throw Error.InvalidOperation(SubSonicErrorMessages.ConfigurationInvalid.Format(nameof(DbContextOptionsBuilder.SetServiceProvider)));
+            }
+
             IServiceCollection services = Instance.GetService<IServiceCollection>();
 
             if (services.IsNotNull())

SubSonic.Core.DataAccessLayer/src/SubSonicErrorMessages.Designer.cs

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ConfigurationInvalid" xml:space="preserve">
+    <value>Ensure that "{0}" is called during the configuration of the SubSonic Context.</value>
+  </data>
   <data name="DbExpressionMustBeOfType" xml:space="preserve">
     <value>DbExpression must be of {0}.</value>
   </data>

SubSonic.Core.DataAccessLayer/src/SubSonicErrorMessages.resx

@@ -15,7 +15,17 @@ namespace SubSonic.Tests.DAL.SUT
 {
     public class BaseTestFixture
     {
-        protected TestSubSonicContext Context { get => SetUpSubSonic.DbContext; }
+        protected TestSubSonicContext Context
+        {
+            get
+            {
+                if (SetUpSubSonic.DbContext is null)
+                {
+                    SetUpSubSonic.SetDbContext();
+                }
+                return SetUpSubSonic.DbContext;
+            }
+        }
 
         protected ISubSonicLogger Logger { get; set; }
 

SubSonic.Tests/DAL/SUT/BaseTestFixture.cs

@@ -0,0 +1,82 @@
+using SubSonic.Extensions;
+using SubSonic.Extensions.Test;
+using Models = SubSonic.Extensions.Test.Models;
+
+namespace SubSonic.Tests.DAL.SUT
+{
+    public class BadSubSonicContext
+        : SubSonic.SubSonicContext
+    {
+        public BadSubSonicContext()
+            : base()
+        {
+
+        }
+
+        public ISubSonicSetCollection<Models.RealEstateProperty> RealEstateProperties { get; private set; }
+
+        public ISubSonicSetCollection<Models.Status> Statuses { get; private set; }
+
+        public ISubSonicSetCollection<Models.Unit> Units { get; private set; }
+
+        public ISubSonicSetCollection<Models.Renter> Renters { get; private set; }
+
+        public ISubSonicSetCollection<Models.Person> People { get; private set; }
+
+        protected override void OnDbConfiguring(DbContextOptionsBuilder config)
+        {
+            config.UseMockDbClient((builder, options) =>
+                {
+                    builder
+                        .SetDatasource("localhost")
+                        .SetInitialCatalog("test")
+                        .SetIntegratedSecurity(true);
+                });
+        }
+
+        protected override void OnDbModeling(DbModelBuilder builder)
+        {
+            builder.AddEntityModel<Models.RealEstateProperty>();
+            builder.AddEntityModel<Models.Status>();
+            builder.AddEntityModel<Models.Unit>();
+            builder.AddEntityModel<Models.Renter>();
+            builder.AddEntityModel<Models.Person>();
+
+            builder.AddRelationshipFor<Models.RealEstateProperty>(() =>
+                builder.GetRelationshipFor<Models.RealEstateProperty>()
+                    .HasMany(Model => Model.Units)
+                    .WithOne(Model => Model.RealEstateProperty));
+
+            builder.AddRelationshipFor<Models.RealEstateProperty>(() =>
+                builder.GetRelationshipFor<Models.RealEstateProperty>()
+                    .HasOne(Model => Model.Status)
+                    .WithOne());
+
+            builder.AddRelationshipFor<Models.Unit>(() =>
+                builder.GetRelationshipFor<Models.Unit>()
+                    .HasOne(Model => Model.RealEstateProperty)
+                    .WithMany(Model => Model.Units));
+
+            builder.AddRelationshipFor<Models.Unit>(() =>
+                builder.GetRelationshipFor<Models.Unit>()
+                    .HasMany(Model => Model.Renters)
+                    .WithOne(Model => Model.Unit));
+
+            builder.AddRelationshipFor<Models.Unit>(() =>
+                builder.GetRelationshipFor<Models.Unit>()
+                    .HasOne(Model => Model.Status)
+                    .WithOne());
+
+            builder.AddRelationshipFor<Models.Person>(() =>
+                builder.GetRelationshipFor<Models.Person>()
+                    .HasMany(Model => Model.Renters)
+                    .WithOne(Model => Model.Person));
+
+            builder.AddRelationshipFor<Models.Person>(() =>
+                builder.GetRelationshipFor<Models.Person>()
+                    .HasMany(Model => Model.Units)
+                    .UsingLookup(Model => Model.Renters)
+                    .WithMany());
+        }
+    }
+}

SubSonic.Tests/DAL/SUT/MochClassDefinitions/BadSubSonicContext.cs

@@ -11,16 +11,12 @@ public class SetUpSubSonic
     {
         public static TestSubSonicContext DbContext { get; private set; }
 
-        [OneTimeSetUp]
-        public void OneTimeSetUp()
-        {
-            DbContext = new TestSubSonicContext();
-        }
+        public static void SetDbContext() => DbContext = new TestSubSonicContext();
 
         [OneTimeTearDown]
         public void OneTimeTearDown()
         {
-            DbContext.Dispose();
+            DbContext?.Dispose();
             DbContext = null;
         }
     }

SubSonic.Tests/DAL/SetUpSubSonicContext.cs

@@ -0,0 +1,19 @@
+using FluentAssertions;
+using NUnit.Framework;
+using SubSonic.src;
+using SubSonic.Tests.DAL.SUT;
+using System;
+
+namespace SubSonic.Tests.DAL
+{
+    [TestFixture]
+    [Order(-100)]
+    public class SubSonicContextInitializationTests
+    {
+        [Test]
+        public void SubSonicContextShouldFailIfServiceProviderIsNotSet()
+        {
+            FluentActions.Invoking(() => new BadSubSonicContext()).Should().Throw<InvalidOperationException>().WithMessage(SubSonicErrorMessages.ConfigurationInvalid.Format(nameof(DbContextOptionsBuilder.SetServiceProvider)));
+        }
+    }
+}

SubSonic.Tests/DAL/SubSonicContext/SubSonicContextInitializationTests.cs

@@ -11,6 +11,7 @@ namespace SubSonic.Tests.DAL
 {
     using SubSonic.Extensions.Test.Data.Builders;
     using SubSonic.Linq;
+    using SubSonic.src;
     using SUT;
     using Models = Extensions.Test.Models;