All unit tests are now passing after all packages have been moved (#125)

ivaylokenov · ivaylokenov · commit 0fc1935228b6 · 2016-08-04T15:42:41.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
@@ -173,10 +173,11 @@ public static void TryInitialize()
             {
                 if (!initialiazed && TestConfiguration.AutomaticStartup)
                 {
-                    startupType = TryFindDefaultStartupType();
+                    var defaultStartupType = TryFindDefaultStartupType();
 
-                    if (startupType != null)
+                    if (defaultStartupType != null)
                     {
+                        startupType = defaultStartupType;
                         Initialize();
                     }
                 }
diff --git a/src/MyTested.AspNetCore.Mvc.Controllers/Builders/Controllers/ControllerActionCallBuilder.cs b/src/MyTested.AspNetCore.Mvc.Controllers/Builders/Controllers/ControllerActionCallBuilder.cs
@@ -115,6 +115,8 @@ private ActionTestContext<TActionResult> GetAndValidateActionResult<TActionResul
         private string GetAndValidateAction(LambdaExpression actionCall)
         {
             this.BuildControllerIfNotExists();
+
+            this.TestContext.MethodCall = actionCall;
             this.TestContext.PreMethodInvocationAction?.Invoke();
 
             var methodInfo = ExpressionParser.GetMethodInfo(actionCall);
diff --git a/src/MyTested.AspNetCore.Mvc.ViewFeatures/Builders/ViewComponents/ViewComponentBuilder.cs b/src/MyTested.AspNetCore.Mvc.ViewFeatures/Builders/ViewComponents/ViewComponentBuilder.cs
@@ -3,6 +3,7 @@
     using Base;
     using Contracts.ViewComponents;
     using Internal.TestContexts;
+    using Microsoft.AspNetCore.Mvc;
 
     public class ViewComponentBuilder<TViewComponent> : BaseTestBuilder, IAndViewComponentBuilder<TViewComponent>
         where TViewComponent : class
diff --git a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/ServicesTests.cs b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/ServicesTests.cs
@@ -334,72 +334,6 @@ public void WithCustomStartupAndAdditionalRoutesShouldWorkCorrectly()
             MyApplication.IsUsingDefaultConfiguration();
         }
 
-        [Fact]
-        public void WithoutAdditionalServicesTheDefaultActionInvokersShouldBeSet()
-        {
-            MyApplication.IsUsingDefaultConfiguration();
-
-            var services = TestApplication.Services;
-            var actionInvokerProviders = services.GetServices<IActionInvokerProvider>();
-            var modelBindingActionInvokerFactory = services.GetService<IModelBindingActionInvokerFactory>();
-
-            Assert.Equal(1, actionInvokerProviders.Count());
-            Assert.True(actionInvokerProviders.Any(a => a.GetType() == typeof(ControllerActionInvokerProvider)));
-            Assert.Null(modelBindingActionInvokerFactory);
-
-            var routeServices = TestApplication.RoutingServices;
-            var routeActionInvokerProviders = routeServices.GetServices<IActionInvokerProvider>();
-            var routeModelBindingActionInvokerFactory = routeServices.GetService<IModelBindingActionInvokerFactory>();
-
-            Assert.Equal(2, routeActionInvokerProviders.Count());
-
-            var routeActionInvokerProvidersList = routeActionInvokerProviders.OrderByDescending(r => r.Order).ToList();
-
-            Assert.True(routeActionInvokerProvidersList[0].GetType() == typeof(ModelBindingActionInvokerProvider));
-            Assert.True(routeActionInvokerProvidersList[1].GetType() == typeof(ControllerActionInvokerProvider));
-            Assert.NotNull(routeModelBindingActionInvokerFactory);
-            Assert.IsAssignableFrom<ModelBindingActionInvokerFactory>(routeModelBindingActionInvokerFactory);
-
-            MyApplication.IsUsingDefaultConfiguration();
-        }
-
-        [Fact]
-        public void WithCustomImplementationsForTheRouteTestingTheCorrectServicesShouldBeSet()
-        {
-            MyApplication
-                .IsUsingDefaultConfiguration()
-                .WithServices(customServices =>
-                {
-                    customServices.TryAddEnumerable(
-                        ServiceDescriptor.Transient<IActionInvokerProvider, CustomActionInvokerProvider>());
-                    customServices.TryAddSingleton<IModelBindingActionInvokerFactory, CustomModelBindingActionInvokerFactory>();
-                });
-
-            var services = TestApplication.Services;
-            var actionInvokerProviders = services.GetServices<IActionInvokerProvider>();
-            var modelBindingActionInvokerFactory = services.GetService<IModelBindingActionInvokerFactory>();
-
-            Assert.Equal(2, actionInvokerProviders.Count());
-            Assert.True(actionInvokerProviders.Any(a => a.GetType() == typeof(ControllerActionInvokerProvider)));
-            Assert.True(actionInvokerProviders.Any(a => a.GetType() == typeof(CustomActionInvokerProvider)));
-            Assert.NotNull(modelBindingActionInvokerFactory);
-
-            var routeServices = TestApplication.RoutingServices;
-            var routeActionInvokerProviders = routeServices.GetServices<IActionInvokerProvider>();
-            var routeModelBindingActionInvokerFactory = routeServices.GetService<IModelBindingActionInvokerFactory>();
-
-            Assert.Equal(2, routeActionInvokerProviders.Count());
-
-            var routeActionInvokerProvidersList = routeActionInvokerProviders.OrderByDescending(r => r.Order).ToList();
-
-            Assert.True(routeActionInvokerProvidersList[0].GetType() == typeof(CustomActionInvokerProvider));
-            Assert.True(routeActionInvokerProvidersList[1].GetType() == typeof(ControllerActionInvokerProvider));
-            Assert.NotNull(routeModelBindingActionInvokerFactory);
-            Assert.IsAssignableFrom<CustomModelBindingActionInvokerFactory>(routeModelBindingActionInvokerFactory);
-
-            MyApplication.IsUsingDefaultConfiguration();
-        }
-        
         [Fact]
         public void WithoutHttpContextFactoryTheDefaultMockedHttpContextShouldBeProvided()
         {
diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Test/testconfig.json b/test/MyTested.AspNetCore.Mvc.Controllers.Test/testconfig.json
diff --git a/test/MyTested.AspNetCore.Mvc.Core.Test/project.json b/test/MyTested.AspNetCore.Mvc.Core.Test/project.json
@@ -1,12 +1,7 @@
 {
   "buildOptions": {
     "warningsAsErrors": true,
-    "keyFile": "../../tools/Key.snk",
-    "copyToOutput": {
-      "include": [
-        "testconfig.json"
-      ]
-    }
+    "keyFile": "../../tools/Key.snk"
   },
 
   "testRunner": "xunit",
diff --git a/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/InternalTests/RoutesTests/MvcRouteResolverTests.cs b/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/InternalTests/RoutesTests/MvcRouteResolverTests.cs
@@ -10,7 +10,7 @@
     using Setups.Routing;
     using Xunit;
 
-    public class InternalRouteResolverTests
+    public class MvcRouteResolverTests
     {
         [Fact]
         public void ResolveShouldResolveCorrectlyWithPartialJsonContentBody()
diff --git a/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/BuildersTests/ControllersTests/ControllerBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/BuildersTests/ControllersTests/ControllerBuilderTests.cs
@@ -301,7 +301,7 @@ public void WithResolvedDependencyForShouldThrowExceptionWhenSameDependenciesAre
                             .With<IInjectedService>(new InjectedService())
                             .With<IAnotherInjectedService>(new AnotherInjectedService()));
                 },
-                "Dependency AnotherInjectedService is already registered for FullPocoController controller.");
+                "Dependency AnotherInjectedService is already registered.");
         }
 
         [Fact]
@@ -340,7 +340,7 @@ public void WithResolvedDependencyForShouldThrowExceptionWhenSameDependenciesAre
                             .With<IInjectedService>(new InjectedService())
                             .With<IAnotherInjectedService>(new AnotherInjectedService()));
                 },
-                "Dependency AnotherInjectedService is already registered for MvcController controller.");
+                "Dependency AnotherInjectedService is already registered.");
         }
 
         [Fact]
@@ -359,7 +359,7 @@ public void WithResolvedDependencyForShouldThrowExceptionWhenNoConstructorExists
                         .ShouldReturn()
                         .Ok();
                 },
-                "NoParameterlessConstructorController could not be instantiated because it contains no constructor taking RequestModel, AnotherInjectedService, ResponseModel as parameters.");
+                "NoParameterlessConstructorController could not be instantiated because it contains no constructor taking RequestModel, ResponseModel, AnotherInjectedService as parameters.");
         }
         
         [Fact]
@@ -378,7 +378,7 @@ public void WithResolvedDependencyForShouldThrowExceptionWhenNoConstructorExists
                         .ShouldReturn()
                         .Ok();
                 },
-                "NoParameterlessConstructorController could not be instantiated because it contains no constructor taking RequestModel, AnotherInjectedService, ResponseModel as parameters.");
+                "NoParameterlessConstructorController could not be instantiated because it contains no constructor taking RequestModel, ResponseModel, AnotherInjectedService as parameters.");
         }
 
         [Fact]
@@ -458,7 +458,7 @@ public void WithServiceSetupForShouldThrowExceptionWithNoScopedService()
                         .Ok()
                         .WithModel("TestValue");
                 },
-                "The 'WithServiceSetupFor' method can be used only for services with scoped lifetime.");
+                "The 'WithSetupFor' method can be used only for services with scoped lifetime.");
 
             MyApplication.IsUsingDefaultConfiguration();
         }
diff --git a/test/MyTested.AspNetCore.Mvc.Http.Test/TestStartup.cs b/test/MyTested.AspNetCore.Mvc.Http.Test/TestStartup.cs
@@ -1,4 +1,4 @@
-﻿namespace MyTested.AspNetCore.Mvc.Test
+﻿namespace MyTested.AspNetCore.Mvc.Http.Test
 {
     using Microsoft.AspNetCore.Builder;
     using Microsoft.Extensions.DependencyInjection;
diff --git a/test/MyTested.AspNetCore.Mvc.Routing.Test/InternalTests/RoutingTests/MvcRouteResolverTests.cs b/test/MyTested.AspNetCore.Mvc.Routing.Test/InternalTests/RoutingTests/MvcRouteResolverTests.cs
@@ -311,7 +311,7 @@ public void ResolveShouldReturnProperErrorWhenTwoActionsAreMatched()
 
             Assert.False(routeInfo.IsResolved);
             Assert.Equal(
-                "exception was thrown when trying to select an action: 'Multiple actions matched. The following actions matched route data and had all constraints satisfied:\r\n\r\nMyTested.AspNetCore.Mvc.Test.Setups.Routing.NormalController.ActionWithOverloads (MyTested.AspNetCore.Mvc.Test)\r\nMyTested.AspNetCore.Mvc.Test.Setups.Routing.NormalController.ActionWithOverloads (MyTested.AspNetCore.Mvc.Test)'",
+                "exception was thrown when trying to select an action: 'Multiple actions matched. The following actions matched route data and had all constraints satisfied:\r\n\r\nMyTested.AspNetCore.Mvc.Test.Setups.Routing.NormalController.ActionWithOverloads (MyTested.AspNetCore.Mvc.Test.Setups)\r\nMyTested.AspNetCore.Mvc.Test.Setups.Routing.NormalController.ActionWithOverloads (MyTested.AspNetCore.Mvc.Test.Setups)'",
                 routeInfo.UnresolvedError);
             Assert.Null(routeInfo.ControllerType);
             Assert.Null(routeInfo.ControllerName);
diff --git a/test/MyTested.AspNetCore.Mvc.Routing.Test/InternalTests/RoutingTests/RouteExpressionParserTests.cs b/test/MyTested.AspNetCore.Mvc.Routing.Test/InternalTests/RoutingTests/RouteExpressionParserTests.cs
diff --git a/test/MyTested.AspNetCore.Mvc.Routing.Test/ServicesTests.cs b/test/MyTested.AspNetCore.Mvc.Routing.Test/ServicesTests.cs
@@ -0,0 +1,83 @@
+﻿namespace MyTested.AspNetCore.Mvc.Test
+{
+    using System.Linq;
+    using Internal.Application;
+    using Internal.Contracts;
+    using Internal.Routing;
+    using Microsoft.AspNetCore.Mvc.Abstractions;
+    using Microsoft.AspNetCore.Mvc.Internal;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.DependencyInjection.Extensions;
+    using Setups.Common;
+    using Xunit;
+
+    public class ServicesTests
+    {
+        [Fact]
+        public void WithoutAdditionalServicesTheDefaultActionInvokersShouldBeSet()
+        {
+            MyApplication.IsUsingDefaultConfiguration();
+
+            var services = TestApplication.Services;
+            var actionInvokerProviders = services.GetServices<IActionInvokerProvider>();
+            var modelBindingActionInvokerFactory = services.GetService<IModelBindingActionInvokerFactory>();
+
+            Assert.Equal(1, actionInvokerProviders.Count());
+            Assert.True(actionInvokerProviders.Any(a => a.GetType() == typeof(ControllerActionInvokerProvider)));
+            Assert.Null(modelBindingActionInvokerFactory);
+
+            var routeServices = TestApplication.RoutingServices;
+            var routeActionInvokerProviders = routeServices.GetServices<IActionInvokerProvider>();
+            var routeModelBindingActionInvokerFactory = routeServices.GetService<IModelBindingActionInvokerFactory>();
+
+            Assert.Equal(2, routeActionInvokerProviders.Count());
+
+            var routeActionInvokerProvidersList = routeActionInvokerProviders.OrderByDescending(r => r.Order).ToList();
+
+            Assert.True(routeActionInvokerProvidersList[0].GetType() == typeof(ModelBindingActionInvokerProvider));
+            Assert.True(routeActionInvokerProvidersList[1].GetType() == typeof(ControllerActionInvokerProvider));
+            Assert.NotNull(routeModelBindingActionInvokerFactory);
+            Assert.IsAssignableFrom<ModelBindingActionInvokerFactory>(routeModelBindingActionInvokerFactory);
+
+            MyApplication.IsUsingDefaultConfiguration();
+        }
+
+        [Fact]
+        public void WithCustomImplementationsForTheRouteTestingTheCorrectServicesShouldBeSet()
+        {
+            MyApplication
+                .IsUsingDefaultConfiguration()
+                .WithServices(customServices =>
+                {
+                    customServices.TryAddEnumerable(
+                        ServiceDescriptor.Transient<IActionInvokerProvider, CustomActionInvokerProvider>());
+                    customServices.TryAddSingleton<IModelBindingActionInvokerFactory, CustomModelBindingActionInvokerFactory>();
+                });
+
+            var services = TestApplication.Services;
+            var actionInvokerProviders = services.GetServices<IActionInvokerProvider>();
+            var modelBindingActionInvokerFactory = services.GetService<IModelBindingActionInvokerFactory>();
+
+            Assert.Equal(2, actionInvokerProviders.Count());
+            Assert.True(actionInvokerProviders.Any(a => a.GetType() == typeof(ControllerActionInvokerProvider)));
+            Assert.True(actionInvokerProviders.Any(a => a.GetType() == typeof(CustomActionInvokerProvider)));
+            Assert.NotNull(modelBindingActionInvokerFactory);
+
+            var routeServices = TestApplication.RoutingServices;
+            var routeActionInvokerProviders = routeServices.GetServices<IActionInvokerProvider>();
+            var routeModelBindingActionInvokerFactory = routeServices.GetService<IModelBindingActionInvokerFactory>();
+
+            Assert.Equal(2, routeActionInvokerProviders.Count());
+
+            var routeActionInvokerProvidersList = routeActionInvokerProviders.OrderByDescending(r => r.Order).ToList();
+
+            Assert.True(routeActionInvokerProvidersList[0].GetType() == typeof(CustomActionInvokerProvider));
+            Assert.True(routeActionInvokerProvidersList[1].GetType() == typeof(ControllerActionInvokerProvider));
+            Assert.NotNull(routeModelBindingActionInvokerFactory);
+            Assert.IsAssignableFrom<CustomModelBindingActionInvokerFactory>(routeModelBindingActionInvokerFactory);
+
+            MyApplication.IsUsingDefaultConfiguration();
+        }
+
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -173,10 +173,11 @@ public static void TryInitialize()`
`173`	`173`	`{`
`174`	`174`	`if (!initialiazed && TestConfiguration.AutomaticStartup)`
`175`	`175`	`{`
`176`		`- startupType = TryFindDefaultStartupType();`
	`176`	`+ var defaultStartupType = TryFindDefaultStartupType();`
`177`	`177`
`178`		`- if (startupType != null)`
	`178`	`+ if (defaultStartupType != null)`
`179`	`179`	`{`
	`180`	`+ startupType = defaultStartupType;`
`180`	`181`	`Initialize();`
`181`	`182`	`}`
`182`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,8 @@ private ActionTestContext<TActionResult> GetAndValidateActionResult<TActionResul`
`115`	`115`	`private string GetAndValidateAction(LambdaExpression actionCall)`
`116`	`116`	`{`
`117`	`117`	`this.BuildControllerIfNotExists();`
	`118`	`+`
	`119`	`+ this.TestContext.MethodCall = actionCall;`
`118`	`120`	`this.TestContext.PreMethodInvocationAction?.Invoke();`
`119`	`121`
`120`	`122`	`var methodInfo = ExpressionParser.GetMethodInfo(actionCall);`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`using Setups.Routing;`
`11`	`11`	`using Xunit;`
`12`	`12`
`13`		`- public class InternalRouteResolverTests`
	`13`	`+ public class MvcRouteResolverTests`
`14`	`14`	`{`
`15`	`15`	`[Fact]`
`16`	`16`	`public void ResolveShouldResolveCorrectlyWithPartialJsonContentBody()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace MyTested.AspNetCore.Mvc.Test`
	`1`	`+namespace MyTested.AspNetCore.Mvc.Http.Test`
`2`	`2`	`{`
`3`	`3`	`using Microsoft.AspNetCore.Builder;`
`4`	`4`	`using Microsoft.Extensions.DependencyInjection;`