Merge pull request #105 from IntelliTect/add-overload

Additional AddService and AddInstance methods

Author: GrantErickson

IntelliTect.TestTools.TestFramework/IntelliTect.TestTools.TestFramework.Tests/ExampleDataThing.cs

@@ -1,6 +1,11 @@
 namespace IntelliTect.TestTools.TestFramework.Tests
 {
-    public class ExampleDataThing
+    public interface IExampleDataInterface
+    {
+        string Testing { get; set; }
+    }
+
+    public class ExampleDataThing : IExampleDataInterface
     {
         public string Testing { get; set; } = "Testing";
     }

IntelliTect.TestTools.TestFramework/IntelliTect.TestTools.TestFramework.Tests/TestBuilderTests.cs

@@ -105,6 +105,26 @@ public void FetchByServiceForExecuteArg()
                 .ExecuteTestCase();
         }
 
+        [Fact]
+        public void FetchByImplementationForExecuteArg()
+        {
+            TestBuilder builder = new TestBuilder();
+            builder
+                .AddDependencyInstance<IExampleDataInterface>(new ExampleDataThing())
+                .AddTestBlock<ExampleTestBlockWithExecuteArgForInterface>()
+                .ExecuteTestCase();
+        }
+
+        [Fact]
+        public void FetchByImplementationAndTypeForExecuteArg()
+        {
+            TestBuilder builder = new TestBuilder();
+            builder
+                .AddDependencyService<IExampleDataInterface, ExampleDataThing>()
+                .AddTestBlock<ExampleTestBlockWithExecuteArgForInterface>()
+                .ExecuteTestCase();
+        }
+
         // This test probably isn't necessary. This is MS DI out-of-the-box functionality
         [Fact]
         public void FetchByFactoryForConstructor()
@@ -375,6 +395,15 @@ public void Execute(ExampleDataThing input)
         }
     }
 
+    public class ExampleTestBlockWithExecuteArgForInterface : ITestBlock
+    {
+        public void Execute(IExampleDataInterface input)
+        {
+            if (input == null) throw new ArgumentNullException(nameof(input));
+            Assert.Equal("Testing", input.Testing);
+        }
+    }
+
     public class ExampleTestBlockWithPropertyForOwnType : ITestBlock
     {
         public ExampleDataThing Input { get; set; }

IntelliTect.TestTools.TestFramework/IntelliTect.TestTools.TestFramework/TestBuilder.cs

@@ -79,6 +79,12 @@ public TestBuilder AddDependencyService<T>()
             return this;
         }
 
+        public TestBuilder AddDependencyService<TServiceType,TImplementationType>()
+        {
+            Services.AddScoped(typeof(TServiceType), typeof(TImplementationType));
+            return this;
+        }
+
         /// <summary>
         /// Adds an instance of a Type to the container that is needed for a TestBlock to execute
         /// </summary>
@@ -92,6 +98,12 @@ public TestBuilder AddDependencyInstance(object objToAdd)
             return this;
         }
 
+        public TestBuilder AddDependencyInstance<T>(object objToAdd)
+        {
+            Services.AddSingleton(typeof(T), objToAdd);
+            return this;
+        }
+
         // Are there other cases where we'll need to add something at this level?
         // If so, this shouldn't be called "AddLogger".
         // Might need to make this scoped. It's behaving oddly when running tests in parallel