Moving controllers out of stock Orchard.Web app. Updating standard route provider to use package manager active entry information. (removes hardcoded entries.)

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4039327

src/Orchard.Tests/Mvc/Routes/StandardPackageRouteProviderTests.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web.Routing;
+using NUnit.Framework;
+using Orchard.Mvc.Routes;
+using Orchard.Packages;
+
+namespace Orchard.Tests.Mvc.Routes {
+    [TestFixture]
+    public class StandardPackageRouteProviderTests {
+        [Test]
+        public void PackageDisplayNameShouldBeUsedInBothStandardRoutes() {
+            var stubManager = new StubPackageManager();
+            var routeProvider = new StandardPackageRouteProvider(stubManager);
+
+            var routes = new List<RouteDescriptor>();
+            routeProvider.GetRoutes(routes);
+
+            Assert.That(routes, Has.Count.EqualTo(4));
+            var fooAdmin = routes.Select(x => x.Route).OfType<Route>()
+                .Single(x => x.Url == "Admin/Foo/{action}/{id}");
+            var fooRoute = routes.Select(x => x.Route).OfType<Route>()
+                .Single(x => x.Url == "Foo/{controller}/{action}/{id}");
+            var barAdmin = routes.Select(x => x.Route).OfType<Route>()
+                .Single(x => x.Url == "Admin/Bar/{action}/{id}");
+            var barRoute = routes.Select(x => x.Route).OfType<Route>()
+                .Single(x => x.Url == "Bar/{controller}/{action}/{id}");
+
+            Assert.That(fooAdmin.DataTokens["area"], Is.EqualTo("Long.Name.Foo"));
+            Assert.That(fooRoute.DataTokens["area"], Is.EqualTo("Long.Name.Foo"));
+            Assert.That(barAdmin.DataTokens["area"], Is.EqualTo("Long.Name.Bar"));
+            Assert.That(barRoute.DataTokens["area"], Is.EqualTo("Long.Name.Bar"));
+        }
+
+        public class StubPackageManager : IPackageManager {
+            public IEnumerable<PackageDescriptor> AvailablePackages() {
+                throw new NotImplementedException();
+            }
+
+            public IEnumerable<PackageEntry> ActivePackages() {
+                yield return new PackageEntry {
+                    Descriptor = new PackageDescriptor {
+                        Name = "Long.Name.Foo",
+                        DisplayName = "Foo",
+                    }
+                };
+                yield return new PackageEntry {
+                    Descriptor = new PackageDescriptor {
+                        Name = "Long.Name.Bar",
+                        DisplayName = "Bar",
+                    }
+                };
+            }
+        }
+    }
+}

src/Orchard.Tests/Orchard.Tests.csproj

@@ -122,6 +122,7 @@
     <Compile Include="Mvc\OrchardControllerFactoryTests.cs" />
     <Compile Include="Mvc\OrchardControllerIdentificationStrategyTests.cs" />
     <Compile Include="Mvc\RouteCollectionPublisherTests.cs" />
+    <Compile Include="Mvc\Routes\StandardPackageRouteProviderTests.cs" />
     <Compile Include="Notify\NotifierTests.cs" />
     <Compile Include="Notify\NotifyFilterTests.cs" />
     <Compile Include="Packages\PackageFoldersTests.cs" />

src/Orchard.Tests/Packages/PackageManagerTests.cs

@@ -74,5 +74,6 @@ version: 2.x
             Assert.That(descriptor.Description, Is.EqualTo("This is the description"));
             Assert.That(descriptor.Version, Is.EqualTo("2.x"));
         }
+
     }
 }