Fixing unit tests

--HG--
branch : 1.x

src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs

@@ -22,6 +22,7 @@ using Orchard.Mvc.Routes;
 using Orchard.Tests.Environment.TestDependencies;
 using Orchard.Tests.Stubs;
 using Orchard.Tests.Utility;
+using Orchard.WebApi.Routes;
 using IModelBinderProvider = Orchard.Mvc.ModelBinders.IModelBinderProvider;
 
 namespace Orchard.Tests.Environment {
@@ -60,6 +61,7 @@ namespace Orchard.Tests.Environment {
                     builder.RegisterAutoMocking()
                         .Ignore<IExtensionFolders>()
                         .Ignore<IRouteProvider>()
+                        .Ignore<IHttpRouteProvider>()
                         .Ignore<IModelBinderProvider>();
                 });
             _lifetime = _container.BeginLifetimeScope();

src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContainerFactoryTests.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Web.Http.Controllers;
 using System.Web.Mvc;
 using Autofac;
 using Autofac.Core;
@@ -36,7 +37,8 @@ namespace Orchard.Tests.Environment.ShellBuilders {
         ShellBlueprint CreateBlueprint(params ShellBlueprintItem[] items) {
             return new ShellBlueprint {
                 Dependencies = items.OfType<DependencyBlueprint>(),
-                Controllers = items.OfType<ControllerBlueprint>(),
+                Controllers = items.OfType<ControllerBlueprint>().Where(bp => typeof(IController).IsAssignableFrom(bp.Type)),
+                HttpControllers = items.OfType<ControllerBlueprint>().Where(bp => typeof(IHttpController).IsAssignableFrom(bp.Type)),
                 Records = items.OfType<RecordBlueprint>(),
             };
         }

src/Orchard.Tests/Orchard.Framework.Tests.csproj

@@ -106,6 +106,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\moq\Moq.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NHibernate, Version=2.1.2.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\nhibernate\NHibernate.dll</HintPath>
@@ -134,6 +137,7 @@
     <Reference Include="System.Web.Abstractions">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>

src/Orchard.Tests/Storage/FileSystemStorageProviderTests.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using NUnit.Framework;
 using System;
 using Orchard.Environment;
@@ -41,8 +42,15 @@ namespace Orchard.Tests.Storage {
 
         [TearDown]
         public void Term() {
+            try {
                 Directory.Delete(_folderPath, true);
             }
+            catch (IOException) {
+                // if a system handle is still active give some time to release it
+                Thread.Sleep(0);
+                Directory.Delete(_folderPath, true);
+            }
+        }
 
 
         private string _filePath;

src/Orchard/Mvc/Routes/RoutePublisher.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.ServiceModel.Activation;
 using System.Web.Routing;
 using Orchard.Environment;
 using Orchard.Environment.Configuration;

src/Orchard/Mvc/Routes/ShellRoute.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.Web;
+using System.Web.Http.WebHost.Routing;
 using System.Web.Mvc;
 using System.Web.Routing;
 using System.Web.SessionState;
@@ -49,8 +50,12 @@ namespace Orchard.Mvc.Routes {
 
             // otherwise wrap handler and return it
             routeData.RouteHandler = new RouteHandler(_workContextAccessor, routeData.RouteHandler);
-            routeData.Values["IWorkContextAccessor"] = _workContextAccessor; // for WebApi
             routeData.DataTokens["IWorkContextAccessor"] = _workContextAccessor;
+
+            if (_route is HttpWebRoute) {
+                routeData.Values["IWorkContextAccessor"] = _workContextAccessor; // for WebApi
+            }
+            
             return routeData;
         }
 

src/Orchard/WebApi/DefaultOrchardWebApiHttpControllerSelector.cs

@@ -49,7 +49,7 @@ namespace Orchard.WebApi {
             // Service name pattern matches the identification strategy
             var serviceKey = (areaName + "/" + controllerName).ToLowerInvariant();
 
-            HttpControllerContext controllerContext = new HttpControllerContext(_configuration, routeData, request);
+            var controllerContext = new HttpControllerContext(_configuration, routeData, request);
             
             // Now that the request container is known - try to resolve the controller information
             Meta<Lazy<IHttpController>> info;