Separated configuration into sections (#165)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplication.cs

@@ -6,6 +6,7 @@
     using System.Globalization;
     using System.Linq;
     using System.Reflection;
+    using Configuration;
     using Licensing;
     using Logging;
     using Microsoft.AspNetCore.Builder;
@@ -163,21 +164,21 @@ public static TestConfiguration TestConfiguration
         }
 
         internal static string ApplicationName =>
-            TestConfiguration.ApplicationName
+            TestConfiguration.General.ApplicationName
                 ?? TestAssemblyName
                 ?? PlatformServices.Default.Application.ApplicationName;
 
         public static void TryInitialize()
         {
             lock (Sync)
             {
-                if (!initialiazed && TestConfiguration.AutomaticStartup)
+                if (!initialiazed && TestConfiguration.General.AutomaticStartup)
                 {
                     var defaultStartupType = TryFindDefaultStartupType();
 
                     if (defaultStartupType == null)
                     {
-                        throw new InvalidOperationException($"{Environment.EnvironmentName}Startup class could not be found at the root of the test project. Either add it or set 'AutomaticStartup' in the 'testconfig.json' file to 'false'.");
+                        throw new InvalidOperationException($"{Environment.EnvironmentName}Startup class could not be found at the root of the test project. Either add it or set 'General.AutomaticStartup' in the 'testconfig.json' file to 'false'.");
                     }
 
                     startupType = defaultStartupType;
@@ -240,7 +241,7 @@ internal static Type TryFindDefaultStartupType()
         {
             var applicationAssembly = Assembly.Load(new AssemblyName(testAssemblyName));
 
-            var startupName = TestConfiguration.FullStartupName ?? $"{Environment.EnvironmentName}Startup";
+            var startupName = TestConfiguration.General.FullStartupName ?? $"{Environment.EnvironmentName}Startup";
 
             // check root of the test project
             var startup =
@@ -274,7 +275,7 @@ private static IConfiguration PrepareTestConfiguration()
 
         private static void FindTestAssemblyName()
         {
-            testAssemblyName = TestConfiguration.TestAssemblyName ?? DependencyContext
+            testAssemblyName = TestConfiguration.General.TestAssemblyName ?? DependencyContext
                 .Default
                 .GetDefaultAssemblyNames()
                 .First()
@@ -294,7 +295,7 @@ private static IHostingEnvironment PrepareEnvironment()
             return new HostingEnvironment
             {
                 ApplicationName = ApplicationName,
-                EnvironmentName = TestConfiguration.EnvironmentName,
+                EnvironmentName = TestConfiguration.General.EnvironmentName,
                 ContentRootPath = PlatformServices.Default.Application.ApplicationBasePath
             };
         }

src/MyTested.AspNetCore.Mvc.Configuration/Internal/Configuration/BaseConfiguration.cs

@@ -0,0 +1,41 @@
+namespace MyTested.AspNetCore.Mvc.Internal.Configuration
+{
+    using System;
+    using Microsoft.Extensions.Configuration;
+
+    public abstract class BaseConfiguration
+    {
+        private IConfiguration configuration;
+
+        public BaseConfiguration(IConfiguration configuration)
+        {
+            this.Configuration = configuration;
+        }
+
+        protected IConfiguration Configuration
+        {
+            get
+            {
+                return this.configuration;
+            }
+
+            private set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException("Test configuration cannot be null.");
+                }
+
+                this.configuration = value;
+            }
+        }
+
+        protected string Prefix { get; set; }
+
+        protected string GetValue(string key)
+            => this.GetValue<string>(key, null);
+
+        protected T GetValue<T>(string key, T defaultValue)
+            => this.Configuration.GetSection(this.Prefix).GetValue(key, defaultValue);
+    }
+}

src/MyTested.AspNetCore.Mvc.Configuration/Internal/Configuration/ControllersTestConfiguration.cs

@@ -0,0 +1,17 @@
+namespace MyTested.AspNetCore.Mvc.Internal.Configuration
+{
+    using Microsoft.Extensions.Configuration;
+
+    public class ControllersTestConfiguration : BaseConfiguration
+    {
+        private const string ModelStateValidationConfigKey = "ModelStateValidation";
+
+        public ControllersTestConfiguration(IConfiguration configuration)
+            : base(configuration)
+        {
+            this.Prefix = "Controllers";
+        }
+
+        public bool ModelStateValidation => this.GetValue(ModelStateValidationConfigKey, true);
+    }
+}

src/MyTested.AspNetCore.Mvc.Configuration/Internal/Configuration/GeneralTestConfiguration.cs

@@ -0,0 +1,29 @@
+namespace MyTested.AspNetCore.Mvc.Internal.Configuration
+{
+    using Microsoft.Extensions.Configuration;
+
+    public class GeneralTestConfiguration : BaseConfiguration
+    {
+        private const string TestAssemblyNameConfigKey = "TestAssemblyName";
+        private const string AutomaticStartupConfigKey = "AutomaticStartup";
+        private const string FullStartupNameConfigKey = "FullStartupName";
+        private const string ApplicationNameConfigKey = "ApplicationName";
+        private const string EnvironmentNameConfigKey = "Environment";
+
+        public GeneralTestConfiguration(IConfiguration configuration) 
+            : base(configuration)
+        {
+            this.Prefix = "General";
+        }
+        
+        public string TestAssemblyName => this.GetValue(TestAssemblyNameConfigKey);
+
+        public string ApplicationName => this.GetValue(ApplicationNameConfigKey);
+
+        public string EnvironmentName => this.GetValue(EnvironmentNameConfigKey, "Test");
+
+        public bool AutomaticStartup => this.GetValue(AutomaticStartupConfigKey, true);
+
+        public string FullStartupName => this.GetValue(FullStartupNameConfigKey);
+    }
+}

src/MyTested.AspNetCore.Mvc.Configuration/Internal/Configuration/TestConfiguration.cs

@@ -0,0 +1,43 @@
+namespace MyTested.AspNetCore.Mvc.Internal.Configuration
+{
+    using System.Collections.Generic;
+    using Microsoft.Extensions.Configuration;
+
+    public class TestConfiguration : BaseConfiguration
+    {
+        private const string LicenseConfigKey = "License";
+        private const string LicensesConfigKey = "Licenses";
+        
+        private TestConfiguration(IConfiguration configuration)
+            : base(configuration)
+        {
+            this.General = new GeneralTestConfiguration(this.Configuration);
+            this.Controllers = new ControllersTestConfiguration(this.Configuration);
+        }
+        
+        public GeneralTestConfiguration General { get; private set; }
+
+        public ControllersTestConfiguration Controllers { get; private set; }
+
+        public IEnumerable<string> Licenses
+        {
+            get
+            {
+                var license = this.Configuration[LicenseConfigKey];
+                if (license != null)
+                {
+                    return new[] { license };
+                }
+
+                var licenses = new List<string>();
+                this.Configuration.GetSection(LicensesConfigKey).Bind(licenses);
+                return licenses;
+            }
+        }
+
+        public static TestConfiguration With(IConfiguration configuration)
+        {
+            return new TestConfiguration(configuration);
+        }
+    }
+}

src/MyTested.AspNetCore.Mvc.Configuration/Internal/TestConfiguration.cs

@@ -35,7 +35,7 @@ public ControllerBuilder(ControllerTestContext testContext)
         {
             this.TestContext = testContext;
 
-            this.EnabledValidation = TestApplication.TestConfiguration.ModelStateValidation;
+            this.EnabledValidation = TestApplication.TestConfiguration.Controllers.ModelStateValidation;
 
 #if NETSTANDARD1_6
             this.ValidateControllerType();

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Controllers/ControllerBuilder.cs

@@ -1,3 +1,5 @@
 {
-  "AutomaticStartup": false
+  "General": {
+    "AutomaticStartup": false
+  }
 }

test/MyTested.AspNetCore.Mvc.Abstractions.Test/testconfig.json

@@ -1,3 +1,5 @@
 {
-  "AutomaticStartup": false
+  "General": {
+    "AutomaticStartup": false
+  }
 }

test/MyTested.AspNetCore.Mvc.Authentication.Test/testconfig.json

@@ -1,4 +1,6 @@
 {
-  "AutomaticStartup": false,
+  "General": {
+    "AutomaticStartup": false
+  },
   "License": "1-3i7E5P3qX5IUWHIAfcXG6DSbOwUBidygp8bnYY/2Rd9zA15SwRWP6QDDp+m/dDTZNBFX2eIHcU/gdcdm83SL695kf3VyvMPw+iyPN6QBh/WnfQwGLqBecrQw+WNPJMz6UgXi2q4e4s/D8/iSjMlwCnzJvC2Yv3zSuADdWObQsygxOjk5OTktMTItMzE6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLk12YyBUZXN0czpGdWxsOk15VGVzdGVkLkFzcE5ldENvcmUuTXZjLg=="
 }