Added Startup files where needed (#135 #168)

Author: ivaylokenov

samples/ApplicationParts/ApplicationParts.Test/project.lock.json

@@ -4179,7 +4179,8 @@
         "type": "project",
         "framework": ".NETStandard,Version=v1.6",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "1.0.0"
+          "Microsoft.Extensions.Configuration.Binder": "1.0.0",
+          "System.Collections.Concurrent": "4.0.12"
         },
         "compile": {
           "netstandard1.6/MyTested.AspNetCore.Mvc.Configuration.dll": {}

samples/MusicStore/MusicStore.Test/project.lock.json

@@ -4383,7 +4383,8 @@
         "type": "project",
         "framework": ".NETStandard,Version=v1.6",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "1.0.0"
+          "Microsoft.Extensions.Configuration.Binder": "1.0.0",
+          "System.Collections.Concurrent": "4.0.12"
         },
         "compile": {
           "netstandard1.6/MyTested.AspNetCore.Mvc.Configuration.dll": {}

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

@@ -115,9 +115,14 @@ internal static Type StartupType
 
             set
             {
+                if (value != null && Configuration().General().NoStartup())
+                {
+                    throw new InvalidOperationException($"The test configuration ('testconfig.json' file by default) contained 'true' value for the 'General.NoStartup' option but {value.GetName()} class was set through the 'StartsFrom<TStartup>()' method. Either do not set the class or change the option to 'false'.");
+                }
+
                 if (startupType != null && Configuration().General().AsynchronousTests())
                 {
-                    throw new InvalidOperationException("Multiple Startup types per test project while running asynchronous tests is not supported. Either set 'General.AsynchronousTests' in the 'testconfig.json' file to 'false' or separate your tests into different test projects. The latter is recommended. If you choose the first option, you may need to disable asynchronous testing in your preferred test runner too.");
+                    throw new InvalidOperationException("Multiple Startup types per test project while running asynchronous tests is not supported. Either set 'General.AsynchronousTests' in the test configuration ('testconfig.json' file by default) to 'false' or separate your tests into different test projects. The latter is recommended. If you choose the first option, you may need to disable asynchronous testing in your preferred test runner too.");
                 }
 
                 if (initialiazed)
@@ -163,8 +168,8 @@ internal static IHostingEnvironment Environment
             }
         }
 
-        internal static string ApplicationName =>
-            Configuration().General().ApplicationName()
+        internal static string ApplicationName
+            => Configuration().General().ApplicationName()
                 ?? TestAssembly?.GetName().Name
                 ?? StartupAssemblyName
                 ?? PlatformServices.Default.Application.ApplicationName;
@@ -192,6 +197,11 @@ public static TestConfiguration Configuration()
 
         public static void TryInitialize()
         {
+            if (Configuration().General().NoStartup())
+            {
+                return;
+            }
+
             lock (Sync)
             {
                 if (!initialiazed && Configuration().General().AutomaticStartup())
@@ -200,7 +210,11 @@ public static void TryInitialize()
 
                     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 'General.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 test configuration ('testconfig.json' file by default) to 'false'.");
+                    }
+                    else if (Configuration().General().NoStartup())
+                    {
+                        throw new InvalidOperationException($"The test configuration ('testconfig.json' file by default) contained 'true' value for the 'General.NoStartup' option but {Environment.EnvironmentName}Startup class was located at the root of the project. Either remove the class or change the option to 'false'.");
                     }
 
                     startupType = defaultStartupType;
@@ -210,10 +224,20 @@ public static void TryInitialize()
         }
 
         internal static DependencyContext LoadDependencyContext()
-            => TestAssembly != null
-            ? DependencyContext.Load(TestAssembly)
-            ?? DependencyContext.Default
-            : DependencyContext.Default;
+        {
+            DependencyContext dependencyContext = null;
+            if (TestAssembly != null)
+            {
+                dependencyContext = DependencyContext.Load(TestAssembly);
+            }
+
+            if (dependencyContext == null)
+            {
+                dependencyContext = DependencyContext.Default;
+            }
+
+            return dependencyContext;
+        }
 
         internal static void LoadPlugins(DependencyContext dependencyContext)
         {
@@ -286,6 +310,11 @@ internal static Type TryFindDefaultStartupType()
 
         private static void Initialize()
         {
+            if (StartupType == null && !Configuration().General().NoStartup())
+            {
+                throw new InvalidOperationException($"The test configuration ('testconfig.json' file by default) contained 'false' value for the 'General.NoStartup' option but a Startup class was not provided. Either add {Environment.EnvironmentName}Startup class to the root of the test project or set it by calling 'StartsFrom<TStartup>(). Additionally, if you do not want to use a global test application for all test cases in this project, you may change the test configuration option to 'true'.");
+            }
+
             PrepareLicensing();
 
             var dependencyContext = LoadDependencyContext();
@@ -316,18 +345,20 @@ private static void PrepareLicensing()
             TestCounter.SetLicenseData(
                 Configuration().Licenses(),
                 DateTime.ParseExact(ReleaseDate, "yyyy-MM-dd", CultureInfo.InvariantCulture),
-                TestAssembly?.GetName().Name ?? StartupAssemblyName);
+                TestAssembly?.GetName().Name ?? StartupAssemblyName ?? DependencyContext
+                    .Default
+                    .GetDefaultAssemblyNames()
+                    .First()
+                    .Name);
         }
 
         private static IHostingEnvironment PrepareEnvironment()
-        {
-            return new HostingEnvironment
+            => new HostingEnvironment
             {
                 ApplicationName = ApplicationName,
                 EnvironmentName = Configuration().General().EnvironmentName(),
                 ContentRootPath = PlatformServices.Default.Application.ApplicationBasePath
             };
-        }
 
         private static IServiceCollection GetInitialServiceCollection()
         {
@@ -530,7 +561,7 @@ private static void Reset()
             InitializationPlugins.Clear();
             LicenseValidator.ClearLicenseDetails();
         }
-
+        
 #if NET451
         private static void FindTestAssembly()
         {

…onfiguration/GeneralTestConfiguration.cs …onfiguration/GeneralTestConfiguration.cssrc/MyTested.AspNetCore.Mvc.Configuration/Internal/Configuration/GeneralTestConfiguration.cs renamed to src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Configuration/GeneralTestConfiguration.cs src/MyTested.AspNetCore.Mvc.Configuration/Internal/Configuration/GeneralTestConfiguration.cs renamed to src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Configuration/GeneralTestConfiguration.cs

@@ -7,6 +7,7 @@ public class GeneralTestConfiguration : BaseConfiguration
         private const string AsynchronousTestsConfigKey = "AsynchronousTests";
         private const string WebAssemblyNameConfigKey = "WebAssemblyName";
         private const string TestAssemblyNameConfigKey = "TestAssemblyName";
+        private const string NoStartupConfigKey = "NoStartup";
         private const string AutomaticStartupConfigKey = "AutomaticStartup";
         private const string StartupTypeConfigKey = "StartupType";
         private const string ApplicationNameConfigKey = "ApplicationName";
@@ -26,6 +27,8 @@ public GeneralTestConfiguration(IConfiguration configuration)
 
         public bool AutomaticStartup() => this.GetValue(AutomaticStartupConfigKey, true);
 
+        public bool NoStartup() => this.GetValue(NoStartupConfigKey, false);
+
         public string StartupType() => this.GetValue(StartupTypeConfigKey);
 
         public string ApplicationName() => this.GetValue(ApplicationNameConfigKey);

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Configuration/TestConfigurationAbstractionsExtensions.cs

@@ -0,0 +1,8 @@
+namespace MyTested.AspNetCore.Mvc.Internal.Configuration
+{
+    public static class TestConfigurationAbstractionsExtensions
+    {
+        public static GeneralTestConfiguration General(this TestConfiguration testConfiguration)
+            => testConfiguration.GetConfiguration(() => new GeneralTestConfiguration(testConfiguration.Configuration));
+    }
+}

src/MyTested.AspNetCore.Mvc.Abstractions/project.lock.json

@@ -2865,7 +2865,8 @@
         "type": "project",
         "framework": ".NETStandard,Version=v1.6",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "1.0.0"
+          "Microsoft.Extensions.Configuration.Binder": "1.0.0",
+          "System.Collections.Concurrent": "4.0.12"
         },
         "compile": {
           "netstandard1.6/MyTested.AspNetCore.Mvc.Configuration.dll": {}

src/MyTested.AspNetCore.Mvc.Authentication/project.lock.json

@@ -3027,7 +3027,8 @@
         "type": "project",
         "framework": ".NETStandard,Version=v1.6",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "1.0.0"
+          "Microsoft.Extensions.Configuration.Binder": "1.0.0",
+          "System.Collections.Concurrent": "4.0.12"
         },
         "compile": {
           "netstandard1.6/MyTested.AspNetCore.Mvc.Configuration.dll": {}

src/MyTested.AspNetCore.Mvc.Caching/project.lock.json

@@ -2959,7 +2959,8 @@
         "type": "project",
         "framework": ".NETStandard,Version=v1.6",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "1.0.0"
+          "Microsoft.Extensions.Configuration.Binder": "1.0.0",
+          "System.Collections.Concurrent": "4.0.12"
         },
         "compile": {
           "netstandard1.6/MyTested.AspNetCore.Mvc.Configuration.dll": {}

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

@@ -2,24 +2,22 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Collections.Concurrent;
     using Microsoft.Extensions.Configuration;
 
     public class TestConfiguration : BaseConfiguration
     {
         private const string LicenseConfigKey = "License";
         private const string LicensesConfigKey = "Licenses";
 
-        private readonly IDictionary<Type, BaseConfiguration> configurationTypes;
+        private readonly ConcurrentDictionary<Type, BaseConfiguration> configurationTypes;
 
         private TestConfiguration(IConfiguration configuration)
             : base(configuration)
         {
-            this.configurationTypes = new Dictionary<Type, BaseConfiguration>();
+            this.configurationTypes = new ConcurrentDictionary<Type, BaseConfiguration>();
         }
 
-        public GeneralTestConfiguration General()
-            => this.GetConfiguration(() => new GeneralTestConfiguration(this.Configuration));
-        
         public IEnumerable<string> Licenses()
         {
             var license = this.Configuration[LicenseConfigKey];
@@ -35,15 +33,8 @@ public IEnumerable<string> Licenses()
 
         public TConfiguration GetConfiguration<TConfiguration>(Func<TConfiguration> configurationFactory)
             where TConfiguration : BaseConfiguration
-        {
-            var typeOfConfiguration = typeof(TConfiguration);
-            if (!this.configurationTypes.ContainsKey(typeOfConfiguration))
-            {
-                this.configurationTypes[typeOfConfiguration] = configurationFactory();
-            }
-
-            return (TConfiguration)this.configurationTypes[typeOfConfiguration];
-        }
+            => (TConfiguration)this.configurationTypes
+                .GetOrAdd(typeof(TConfiguration), _ => configurationFactory());
 
         public static TestConfiguration With(IConfiguration configuration)
         {

src/MyTested.AspNetCore.Mvc.Configuration/project.json

@@ -32,6 +32,10 @@
 
   "frameworks": {
     "net451": {},
-    "netstandard1.6": {}
+    "netstandard1.6": {
+      "dependencies": {
+        "System.Collections.Concurrent": "4.0.12"
+      }
+    }
   }
 }