Removed IsUsingDefaultServices (#135 #168)

Author: ivaylokenov

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

@@ -14,6 +14,9 @@
     using Microsoft.AspNetCore.Hosting.Builder;
     using Microsoft.AspNetCore.Hosting.Internal;
     using Microsoft.AspNetCore.Http;
+#if NET451
+    using Microsoft.AspNetCore.Mvc.ApplicationParts;
+#endif
     using Microsoft.AspNetCore.Mvc.Internal;
     using Microsoft.AspNetCore.Routing;
     using Microsoft.DotNet.InternalAbstractions;
@@ -72,7 +75,6 @@ static TestApplication()
 
             PrepareTestConfiguration();
             FindTestAssemblyName();
-            PrepareLicensing();
         }
 
         public static IServiceProvider Services
@@ -196,7 +198,7 @@ public static void TryInitialize()
         }
 
         internal static DependencyContext LoadDependencyContext()
-            => TestAssembly != null 
+            => TestAssembly != null
             ? DependencyContext.Load(TestAssembly)
             ?? DependencyContext.Default
             : DependencyContext.Default;
@@ -213,7 +215,7 @@ internal static void LoadPlugins(DependencyContext dependencyContext)
             {
                 throw new InvalidOperationException("Test plugins could not be loaded. Depending on your project's configuration you may need to set the 'preserveCompilationContext' property under 'buildOptions' to 'true' in the test assembly's 'project.json' file and/or may need to call '.StartsFrom<TStartup>().WithTestAssembly(this)'.");
             }
-                
+
             plugins.ForEach(t =>
             {
                 var plugin = Activator.CreateInstance(t);
@@ -265,13 +267,15 @@ internal static Type TryFindDefaultStartupType()
             // check root of the test project
             var startup =
                 applicationAssembly.GetType(defaultStartupType) ??
-                applicationAssembly.GetType($"{testAssemblyName}.{defaultStartupType}");
+                applicationAssembly.GetType($"{applicationAssembly.GetName().Name}.{defaultStartupType}");
 
             return startup;
         }
 
         private static void Initialize()
         {
+            PrepareLicensing();
+
             var dependencyContext = LoadDependencyContext();
             LoadPlugins(dependencyContext);
 
@@ -297,7 +301,7 @@ private static IConfiguration PrepareTestConfiguration()
 
         private static void FindTestAssemblyName()
         {
-            testAssemblyName = TestConfiguration.General.TestAssemblyName 
+            testAssemblyName = TestConfiguration.General.TestAssemblyName
                 ?? TestAssembly?.GetName().Name
                 ?? DependencyContext
                     .Default
@@ -401,7 +405,7 @@ private static void PrepareServices(IServiceCollection serviceCollection, Startu
 
 #if NET451
             var baseStartupType = StartupType;
-            while(baseStartupType?.BaseType != typeof(object))
+            while (baseStartupType?.BaseType != typeof(object))
             {
                 baseStartupType = baseStartupType.BaseType;
             }
@@ -517,29 +521,34 @@ private static void Reset()
             TestAssembly = null;
             TestServiceProvider.Current = null;
             TestServiceProvider.ClearServiceLifetimes();
-        }
+            DefaultRegistrationPlugins.Clear();
+            ServiceRegistrationPlugins.Clear();
+            RoutingServiceRegistrationPlugins.Clear();
+            InitializationPlugins.Clear();
+            LicenseValidator.ClearLicenseDetails();
+    }
 
 #if NET451
-        private static void FindTestAssembly()
-        {
-            var executingAssembly = Assembly.GetExecutingAssembly();
+    private static void FindTestAssembly()
+    {
+        var executingAssembly = Assembly.GetExecutingAssembly();
 
-            var stackTrace = new StackTrace(false);
+        var stackTrace = new StackTrace(false);
 
-            foreach (var frame in stackTrace.GetFrames())
-            {
-                var method = frame.GetMethod();
-                var methodAssembly = method?.DeclaringType?.Assembly;
+        foreach (var frame in stackTrace.GetFrames())
+        {
+            var method = frame.GetMethod();
+            var methodAssembly = method?.DeclaringType?.Assembly;
 
-                if (methodAssembly != null
-                    && methodAssembly != executingAssembly
-                    && !methodAssembly.FullName.StartsWith(TestFrameworkName))
-                {
-                    TestAssembly = methodAssembly;
-                    return;
-                }
+            if (methodAssembly != null
+                && methodAssembly != executingAssembly
+                && !methodAssembly.FullName.StartsWith(TestFrameworkName))
+            {
+                TestAssembly = methodAssembly;
+                return;
             }
         }
-#endif
     }
+#endif
+}
 }

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

@@ -21,12 +21,7 @@ public MyApplication(Type startupType)
             : base(startupType)
         {
         }
-
-        public static IApplicationConfigurationBuilder IsUsingDefaultConfiguration()
-        {
-            return new MyApplication();
-        }
-
+        
         public static IApplicationConfigurationBuilder StartsFrom<TStartup>()
             where TStartup : class
         {

src/MyTested.AspNetCore.Mvc/MyMvc.cs

@@ -16,16 +16,7 @@ static MyMvc()
         {
             TestApplication.TryInitialize();
         }
-
-        /// <summary>
-        /// Sets default configuration on the tested application. Calls 'AddMvc' on the services collection and 'UseMvcWithDefaultRoute' on the application builder.
-        /// </summary>
-        /// <returns>Builder of <see cref="IApplicationConfigurationBuilder"/> type.</returns>
-        public static IApplicationConfigurationBuilder IsUsingDefaultConfiguration()
-        {
-            return new MyApplication();
-        }
-
+        
         /// <summary>
         /// Configures the tested application with the provided startup class.
         /// </summary>