Finished unit test coding for #100

src/HitUnitTests/Configurations/ConfSetting.cs

@@ -1,7 +1,9 @@
 namespace HitUnitTests.Configurations
 {
-    public class ConfSetting
+    public abstract class ConfSetting
     {
         public string Name { get; set; }
+
+        public override string ToString() => $"{GetType().Name}_{Name}";
     }
 }

src/HitUnitTests/Configurations/ConfSetting1.cs

@@ -0,0 +1,6 @@
+namespace HitUnitTests.Configurations
+{
+    public class ConfSetting1 : ConfSetting
+    {
+    }
+}

src/HitUnitTests/Configurations/ConfSetting2.cs

@@ -0,0 +1,6 @@
+namespace HitUnitTests.Configurations
+{
+    public class ConfSetting2 : ConfSetting
+    {
+    }
+}

src/HitUnitTests/Configurations/ConfSetting3.cs

@@ -0,0 +1,6 @@
+namespace HitUnitTests.Configurations
+{
+    public class ConfSetting3 : ConfSetting
+    {
+    }
+}

src/HitUnitTests/Configurations/SystemConfiguration1.cs

@@ -1,6 +1,5 @@
 using Hit.Infrastructure.Attributes;
 using Hit.Infrastructure.User;
-using HitUnitTests.Worlds;
 
 namespace HitUnitTests.Configurations
 {

src/HitUnitTests/Configurations/SystemConfiguration2.cs

@@ -1,6 +1,5 @@
 using Hit.Infrastructure.Attributes;
 using Hit.Infrastructure.User;
-using HitUnitTests.Worlds;
 
 namespace HitUnitTests.Configurations
 {

src/HitUnitTests/Configurations/SystemConfiguration3.cs

@@ -1,6 +1,5 @@
 using Hit.Infrastructure.Attributes;
 using Hit.Infrastructure.User;
-using HitUnitTests.Worlds;
 
 namespace HitUnitTests.Configurations
 {

src/HitUnitTests/Configurations/SystemConfigurationForTestingReadingOfConfiguration.cs

@@ -1,21 +1,20 @@
 using Hit.Infrastructure.Attributes;
 using Hit.Infrastructure.User;
-using HitUnitTests.Worlds;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace HitUnitTests.Configurations
 {
     [SysCon("system-with-configuration-no-sections-1", JsonPath = "configuration-no-sections-1.json")]
     [SysCon("system-with-configuration-no-sections-2", JsonPath = "configuration-no-sections-2.json")]
-    [SysCon("system-with-configuration-sections-part1", JsonPath = "configuration-sections.json", ConfigurationSections = "Part1")]
-    [SysCon("system-with-configuration-sections-part2", JsonPath = "configuration-sections.json", ConfigurationSections = "Part2")]
-    public class SystemConfigurationForTestingReadingOfConfiguration : DefaultSystemConfigurationAdapter<World4>
+    [SysCon("system-with-configuration-sections-part1", JsonPath = "configuration-sections-1.json", ConfigurationSections = "Part1")]
+    [SysCon("system-with-configuration-sections-part2", JsonPath = "configuration-sections-1.json", ConfigurationSections = "Part2")]
+    public class SystemConfigurationForTestingReadingOfConfiguration1 : DefaultSystemConfigurationAdapter<World4>
     {
         public override IServiceCollection ConfigureServices(IServiceCollection services, IConfiguration configuration, SysCon meta, string currentLayer)
         {
-            var section = configuration.GetSection("ConfSetting");
-            var confSetting = section.Get<ConfSetting>();
+            var section = configuration.GetSection("ConfSetting1");
+            var confSetting = section.Get<ConfSetting1>();
             if (confSetting != null)
             {
                 services.AddSingleton(confSetting);
@@ -26,4 +25,22 @@ public override IServiceCollection ConfigureServices(IServiceCollection services
 
     }
 
+    [SysCon("system-with-configuration-sections-multi", JsonPath = "configuration-sections-2.json", ConfigurationSections = "Part1, Part2")]
+    public class SystemConfigurationForTestingReadingOfConfiguration2 : DefaultSystemConfigurationAdapter<World6>
+    {
+        public override IServiceCollection ConfigureServices(IServiceCollection services, IConfiguration configuration, SysCon meta, string currentLayer)
+        {
+            var section1 = configuration.GetSection("ConfSetting1");
+            var confSetting1 = section1.Get<ConfSetting1>();
+            services.AddSingleton(confSetting1);
+
+            var section2 = configuration.GetSection("ConfSetting2");
+            var confSetting2 = section2.Get<ConfSetting2>();
+            services.AddSingleton(confSetting2);
+
+            return services;
+        }
+
+    }
+
 }

src/HitUnitTests/Configurations/SystemConfigurationForTestingReadingOfConfigurationUserSecrets.cs

@@ -1,6 +1,5 @@
 using Hit.Infrastructure.Attributes;
 using Hit.Infrastructure.User;
-using HitUnitTests.Worlds;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -9,12 +8,12 @@ namespace HitUnitTests.Configurations
     [SysCon("system-with-configuration-user-secret", UserSecrets = true)]
     [SysCon("system-with-configuration-user-secret-part1", UserSecrets = true, ConfigurationSections = "Part1")]
     [SysCon("system-with-configuration-user-secret-part2", UserSecrets = true, ConfigurationSections = "Part2")]
-    public class SystemConfigurationForTestingReadingOfConfigurationUserSecrets : DefaultSystemConfigurationAdapter<World5>
+    public class SystemConfigurationForTestingReadingOfConfigurationUserSecrets1 : DefaultSystemConfigurationAdapter<World5>
     {
         public override IServiceCollection ConfigureServices(IServiceCollection services, IConfiguration configuration, SysCon meta, string currentLayer)
         {
-            var section = configuration.GetSection("ConfSetting");
-            var confSetting = section.Get<ConfSetting>();
+            var section = configuration.GetSection("ConfSetting1");
+            var confSetting = section.Get<ConfSetting1>();
             if (confSetting != null)
             {
                 services.AddSingleton(confSetting);
@@ -25,4 +24,22 @@ public override IServiceCollection ConfigureServices(IServiceCollection services
 
     }
 
+    [SysCon("system-with-configuration-sections-file-and-user", UserSecrets = true, JsonPath = "configuration-sections-2.json", ConfigurationSections = "Part2, Part3")]
+    public class SystemConfigurationForTestingReadingOfConfigurationUserSecrets2 : DefaultSystemConfigurationAdapter<World7>
+    {
+        public override IServiceCollection ConfigureServices(IServiceCollection services, IConfiguration configuration, SysCon meta, string currentLayer)
+        {
+            var section2 = configuration.GetSection("ConfSetting2");
+            var confSetting2 = section2.Get<ConfSetting2>();
+            services.AddSingleton(confSetting2);
+
+            var section3 = configuration.GetSection("ConfSetting3");
+            var confSetting3 = section3.Get<ConfSetting3>();
+            services.AddSingleton(confSetting3);
+
+            return services;
+        }
+
+    }
+
 }

src/HitUnitTests/HitUnitTests.csproj

@@ -28,7 +28,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="configuration-sections.json">
+    <None Update="configuration-sections-2.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="configuration-sections-1.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Update="configuration-no-sections-2.json">

src/HitUnitTests/TestLogic/TestHierarchies.cs

@@ -2,7 +2,6 @@
 using Hit.Infrastructure.User;
 using Hit.Specification.Infrastructure;
 using HitUnitTests.Configurations;
-using HitUnitTests.Worlds;
 using Xunit;
 
 namespace HitUnitTests.TestLogic
@@ -85,9 +84,9 @@ public class TestLogicImpl3 : UnitAsyncTestLogic<World3>
     [UseAs("AppSettingTest4", Options = "name = configuration-sections-part-2", UnitTest = "!")]
     public class TestLogicImpl4 : TestLogicBase<World4>
     {
-        private readonly ConfSetting _setting;
+        private readonly ConfSetting1 _setting;
 
-        public TestLogicImpl4(ConfSetting setting) => _setting = setting;
+        public TestLogicImpl4(ConfSetting1 setting) => _setting = setting;
 
         public override void Test(ITestContext<World4> context)
         {
@@ -103,9 +102,9 @@ public override void Test(ITestContext<World4> context)
     [UseAs("AppSettingUserSecretTest3", Options = "name = configuration-user-secret-sections-part-2", UnitTest = "!")]
     public class TestLogicImpl5 : TestLogicBase<World5>
     {
-        private readonly ConfSetting _setting;
+        private readonly ConfSetting1 _setting;
 
-        public TestLogicImpl5(ConfSetting setting) => _setting = setting;
+        public TestLogicImpl5(ConfSetting1 setting) => _setting = setting;
 
         public override void Test(ITestContext<World5> context)
         {
@@ -116,4 +115,56 @@ public override void Test(ITestContext<World5> context)
 
     }
 
+    [UseAs("AppSettingTest1", Options = "name1 = config1, name2 = config2", UnitTest = "!")]
+    public class TestLogicImpl6 : TestLogicBase<World6>
+    {
+        private readonly ConfSetting1 _setting1;
+        private readonly ConfSetting2 _setting2;
+
+        public TestLogicImpl6(ConfSetting1 setting1,
+            ConfSetting2 setting2)
+        {
+            _setting1 = setting1;
+            _setting2 = setting2;
+        }
+
+        public override void Test(ITestContext<World6> context)
+        {
+            Assert.NotNull(_setting1);
+            Assert.NotNull(_setting2);
+
+            var expected1 = context.Options.Get("name1");
+            Assert.Equal(expected1, _setting1.Name);
+            var expected2 = context.Options.Get("name2");
+            Assert.Equal(expected2, _setting2.Name);
+        }
+
+    }
+
+    [UseAs("AppSettingTest1", Options = "name2 = config2, name3 = config3", UnitTest = "!")]
+    public class TestLogicImpl7 : TestLogicBase<World7>
+    {
+        private readonly ConfSetting2 _setting2;
+        private readonly ConfSetting3 _setting3;
+
+        public TestLogicImpl7(ConfSetting2 setting2,
+            ConfSetting3 setting3)
+        {
+            _setting2 = setting2;
+            _setting3 = setting3;
+        }
+
+        public override void Test(ITestContext<World7> context)
+        {
+            Assert.NotNull(_setting2);
+            Assert.NotNull(_setting3);
+
+            var expected2 = context.Options.Get("name2");
+            Assert.Equal(expected2, _setting2.Name);
+            var expected3 = context.Options.Get("name3");
+            Assert.Equal(expected3, _setting3.Name);
+        }
+
+    }
+
 }

src/HitUnitTests/UnitTest1_runningUnitTests.cs

@@ -1,7 +1,6 @@
 using Hit.Infrastructure;
 using Hit.Specification.Infrastructure;
 using HitUnitTests.Assertions;
-using HitUnitTests.Worlds;
 using System.Threading.Tasks;
 using Xunit;
 

src/HitUnitTests/UnitTest2_runningSyncUnitTests.cs

@@ -1,7 +1,6 @@
 using Hit.Infrastructure;
 using Hit.Specification.Infrastructure;
 using HitUnitTests.Assertions;
-using HitUnitTests.Worlds;
 using System.Threading.Tasks;
 using Xunit;
 

src/HitUnitTests/UnitTest3_runningUnitTests.cs

@@ -1,7 +1,6 @@
 using Hit.Infrastructure;
 using Hit.Specification.Infrastructure;
 using HitUnitTests.Assertions;
-using HitUnitTests.Worlds;
 using System.Threading.Tasks;
 using Xunit;
 

src/HitUnitTests/UnitTests1_space.cs

@@ -1,6 +1,5 @@
 using Hit.Infrastructure;
 using Hit.Specification.Infrastructure;
-using HitUnitTests.Worlds;
 using System.Linq;
 using Xunit;
 

src/HitUnitTests/UnitTests2_space.cs

@@ -1,6 +1,5 @@
 using Hit.Infrastructure;
 using Hit.Specification.Infrastructure;
-using HitUnitTests.Worlds;
 using System.Linq;
 using Xunit;
 

src/HitUnitTests/UnitTests3_space.cs

@@ -1,6 +1,5 @@
 using Hit.Infrastructure;
 using Hit.Specification.Infrastructure;
-using HitUnitTests.Worlds;
 using System.Linq;
 using Xunit;
 

src/HitUnitTests/UnitTests4.cs

@@ -1,6 +1,5 @@
 using Hit.Infrastructure;
 using Hit.Specification.Infrastructure;
-using HitUnitTests.Worlds;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -19,6 +18,7 @@ public async Task UnitTestShouldNotFailAsync(string system, string unitTest)
         {
             var result = await _unitTestsSpace.RunUnitTestAsync(system, unitTest);
             UnitTestsUtil.AssertResult(result, system, string.Empty, unitTest);
+            UnitTestsUtil.AssertResult(result, system, string.Empty, unitTest);
         }
     }
 }

src/HitUnitTests/UnitTests5.cs

@@ -1,6 +1,5 @@
 using Hit.Infrastructure;
 using Hit.Specification.Infrastructure;
-using HitUnitTests.Worlds;
 using System.Threading.Tasks;
 using Xunit;
 

src/HitUnitTests/UnitTests6.cs

@@ -0,0 +1,20 @@
+using Hit.Infrastructure;
+using Hit.Specification.Infrastructure;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace HitUnitTests
+{
+    public class UnitTests6
+    {
+        private static readonly IUnitTestsSpace<World6> _unitTestsSpace = new UnitTestsSpace<World6>();
+
+        [Theory]
+        [InlineData("system-with-configuration-sections-multi", "AppSettingTest1")]
+        public async Task UnitTestShouldNotFailAsync(string system, string unitTest)
+        {
+            var result = await _unitTestsSpace.RunUnitTestAsync(system, unitTest);
+            UnitTestsUtil.AssertResult(result, system, string.Empty, unitTest);
+        }
+    }
+}

src/HitUnitTests/UnitTests7.cs

@@ -0,0 +1,23 @@
+using Hit.Infrastructure;
+using Hit.Specification.Infrastructure;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace HitUnitTests
+{
+    public class UnitTests7
+    {
+        private static readonly IUnitTestsSpace<World7> _unitTestsSpace = new UnitTestsSpace<World7>();
+
+        [Theory]
+        [InlineData("system-with-configuration-sections-file-and-user", "AppSettingTest1")]
+        public async Task UnitTestShouldNotFailAsync(string system, string unitTest)
+        {
+            if (UnitTestsUtil.InDevelopment)
+            {
+                var result = await _unitTestsSpace.RunUnitTestAsync(system, unitTest);
+                UnitTestsUtil.AssertResult(result, system, string.Empty, unitTest);
+            }
+        }
+    }
+}