Fixed calling TryInitialize twice (#135 #168)

ivaylokenov · ivaylokenov · commit ef0a4c9774f4 · 2016-09-15T10:40:04.000+03:00
diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplication.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplication.cs
@@ -197,14 +197,14 @@ public static TestConfiguration Configuration()
 
         public static void TryInitialize()
         {
-            if (Configuration().General().NoStartup())
-            {
-                return;
-            }
-
             lock (Sync)
             {
-                if (!initialiazed && Configuration().General().AutomaticStartup())
+                var configuration = Configuration().General();
+
+                if (!initialiazed
+                    && StartupType == null
+                    && !configuration.NoStartup()
+                    && configuration.AutomaticStartup())
                 {
                     var defaultStartupType = TryFindDefaultStartupType();
 

Original file line number	Diff line number	Diff line change
`@@ -197,14 +197,14 @@ public static TestConfiguration Configuration()`
`197`	`197`
`198`	`198`	`public static void TryInitialize()`
`199`	`199`	`{`
`200`		`- if (Configuration().General().NoStartup())`
`201`		`- {`
`202`		`- return;`
`203`		`- }`
`204`		`-`
`205`	`200`	`lock (Sync)`
`206`	`201`	`{`
`207`		`- if (!initialiazed && Configuration().General().AutomaticStartup())`
	`202`	`+ var configuration = Configuration().General();`
	`203`	`+`
	`204`	`+ if (!initialiazed`
	`205`	`+ && StartupType == null`
	`206`	`+ && !configuration.NoStartup()`
	`207`	`+ && configuration.AutomaticStartup())`
`208`	`208`	`{`
`209`	`209`	`var defaultStartupType = TryFindDefaultStartupType();`
`210`	`210`