Merge pull request #171 from ivaylokenov/refactoring-unit-tests

Refactoring unit tests (#133)

Author: ivaylokenov

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

@@ -36,6 +36,7 @@
     public static class TestApplication
     {
         private const string TestFrameworkName = "MyTested.AspNetCore.Mvc";
+        private const string ReleaseDate = "2016-06-01";
 
         private static readonly RequestDelegate NullHandler = c => TaskCache.CompletedTask;
         private static readonly ISet<IDefaultRegistrationPlugin> DefaultRegistrationPlugins = new HashSet<IDefaultRegistrationPlugin>();
@@ -161,6 +162,22 @@ internal static TestConfiguration TestConfiguration
             TestConfiguration.ApplicationName
                 ?? TestAssemblyName
                 ?? PlatformServices.Default.Application.ApplicationName;
+        
+        public static void TryInitialize()
+        {
+            lock(Sync)
+            {
+                if (!initialiazed && TestConfiguration.AutomaticStartup)
+                {
+                    startupType = TryFindDefaultStartupType();
+
+                    if (startupType != null)
+                    {
+                        Initialize();
+                    }
+                }
+            }
+        }
 
         internal static void LoadPlugins()
         {
@@ -194,19 +211,6 @@ internal static void LoadPlugins()
                 });
         }
 
-        internal static void TryInitialize()
-        {
-            if (!initialiazed && TestConfiguration.AutomaticStartup)
-            {
-                startupType = TryFindDefaultStartupType();
-
-                if (startupType != null)
-                {
-                    Initialize();
-                }
-            }
-        }
-
         internal static Type TryFindDefaultStartupType()
         {
             var applicationAssembly = Assembly.Load(new AssemblyName(testAssemblyName));
@@ -256,7 +260,7 @@ private static void PrepareLicensing()
         {
             TestCounter.SetLicenseData(
                 TestConfiguration.Licenses,
-                DateTime.ParseExact(MyMvc.ReleaseDate, "yyyy-MM-dd", CultureInfo.InvariantCulture),
+                DateTime.ParseExact(ReleaseDate, "yyyy-MM-dd", CultureInfo.InvariantCulture),
                 TestAssemblyName);
         }
 

src/MyTested.AspNetCore.Mvc.Core/MyApplication.cs

@@ -0,0 +1,36 @@
+namespace MyTested.AspNetCore.Mvc
+{
+    using Builders;
+    using Builders.Contracts.Application;
+    using Internal.Application;
+    using System;
+
+    public class MyApplication : ApplicationConfigurationBuilder
+    {
+        static MyApplication()
+        {
+            TestApplication.TryInitialize();
+        }
+
+        public MyApplication()
+            : this(null)
+        {
+        }
+
+        public MyApplication(Type startupType)
+            : base(startupType)
+        {
+        }
+        
+        public static IApplicationConfigurationBuilder IsUsingDefaultConfiguration()
+        {
+            return new MyApplication();
+        }
+
+        public static IApplicationConfigurationBuilder StartsFrom<TStartup>()
+            where TStartup : class
+        {
+            return new MyApplication(typeof(TStartup));
+        }
+    }
+}

src/MyTested.AspNetCore.Mvc.Core/MyController.cs

@@ -41,7 +41,7 @@ public static IControllerBuilder<TController> Instance(TController controller)
 
         public static IControllerBuilder<TController> Instance(Func<TController> construction)
         {
-            return new ControllerBuilder<TController>(new ControllerTestContext { ControllerConstruction = construction });
+            return new MyController<TController>(construction);
         }
     }
 }

src/MyTested.AspNetCore.Mvc.Core/MyRoutes.cs

@@ -0,0 +1,29 @@
+namespace MyTested.AspNetCore.Mvc
+{
+    using Builders.Contracts.Routes;
+    using Builders.Routes;
+    using Internal.Application;
+    using Internal.TestContexts;
+
+    public class MyRoutes : RouteTestBuilder
+    {
+        static MyRoutes()
+        {
+            TestApplication.TryInitialize();
+        }
+
+        public MyRoutes()
+            : base(new RouteTestContext
+            {
+                Router = TestApplication.Router,
+                Services = TestApplication.RouteServices
+            })
+        {
+        }
+
+        public static IRouteTestBuilder Configuration()
+        {
+            return new MyRoutes();
+        }
+    }
+}

src/MyTested.AspNetCore.Mvc.Core/MyMvc.cs src/MyTested.AspNetCore.Mvc/MyMvc.cssrc/MyTested.AspNetCore.Mvc.Core/MyMvc.cs renamed to src/MyTested.AspNetCore.Mvc/MyMvc.cs

@@ -1,21 +1,16 @@
 namespace MyTested.AspNetCore.Mvc
 {
     using System;
-    using Builders;
     using Builders.Contracts.Application;
     using Builders.Contracts.Controllers;
     using Builders.Contracts.Routes;
-    using Builders.Routes;
     using Internal.Application;
-    using Internal.TestContexts;
 
     /// <summary>
     /// Starting point of the ASP.NET Core MVC testing framework. Provides methods to specify a test case.
     /// </summary>
     public static class MyMvc
     {
-        internal const string ReleaseDate = "2016-06-01";
-
         static MyMvc()
         {
             TestApplication.TryInitialize();
@@ -27,7 +22,7 @@ static MyMvc()
         /// <returns>Builder of <see cref="IApplicationConfigurationBuilder"/> type.</returns>
         public static IApplicationConfigurationBuilder IsUsingDefaultConfiguration()
         {
-            return new ApplicationConfigurationBuilder(null);
+            return new MyApplication();
         }
 
         /// <summary>
@@ -36,9 +31,9 @@ public static IApplicationConfigurationBuilder IsUsingDefaultConfiguration()
         /// <typeparam name="TStartup">Type of startup class.</typeparam>
         /// <returns>Builder of <see cref="IApplicationConfigurationBuilder"/> type.</returns>
         public static IApplicationConfigurationBuilder StartsFrom<TStartup>()
-            where TStartup : class, new()
+            where TStartup : class
         {
-            return new ApplicationConfigurationBuilder(typeof(TStartup));
+            return new MyApplication(typeof(TStartup));
         }
 
         /// <summary>
@@ -47,11 +42,7 @@ public static IApplicationConfigurationBuilder StartsFrom<TStartup>()
         /// <returns>Test builder of <see cref="IRouteTestBuilder"/> type.</returns>
         public static IRouteTestBuilder Routes()
         {
-            return new RouteTestBuilder(new RouteTestContext
-            {
-                Router = TestApplication.Router,
-                Services = TestApplication.RouteServices
-            });
+            return new MyRoutes();
         }
 
         /// <summary>