From 81d9ecc111babd04030d7a31ec805cd99239c5ca Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 10 Sep 2019 16:58:19 +1000
Subject: [PATCH] fixing tests

---
 .../Configurations/GlobalSettingsTests.cs     | 66 +--------------
 .../Routing/RoutableDocumentFilterTests.cs    | 80 +++++++++++++++++++
 .../Routing/UmbracoModuleTests.cs             |  8 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  3 +-
 4 files changed, 88 insertions(+), 69 deletions(-)
 create mode 100644 src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs

diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
index 54080f05de..a9dc94d239 100644
--- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
@@ -1,6 +1,4 @@
-using System.Web.Mvc;
-using System.Web.Routing;
-using Moq;
+using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
@@ -10,6 +8,7 @@ using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Configurations
 {
+
     [TestFixture]
     public class GlobalSettingsTests : BaseWebTest
     {
@@ -54,66 +53,9 @@ namespace Umbraco.Tests.Configurations
             Assert.AreEqual(outcome, Current.Configs.Global().GetUmbracoMvcArea());
         }
 
-        [TestCase("/umbraco/editContent.aspx")]
-        [TestCase("/install/default.aspx")]
-        [TestCase("/install/")]
-        [TestCase("/install")]
-        [TestCase("/install/?installStep=asdf")]
-        [TestCase("/install/test.aspx")]
-        public void Is_Reserved_Path_Or_Url(string url)
-        {
-            var globalSettings = TestObjects.GetGlobalSettings();
-            Assert.IsTrue(globalSettings.IsReservedPathOrUrl(url));
-        }
-
-        [TestCase("/base/somebasehandler")]
-        [TestCase("/")]
-        [TestCase("/home.aspx")]
-        [TestCase("/umbraco-test")]
-        [TestCase("/install-test")]
-        [TestCase("/install.aspx")]
-        public void Is_Not_Reserved_Path_Or_Url(string url)
-        {
-            var globalSettings = TestObjects.GetGlobalSettings();
-            Assert.IsFalse(globalSettings.IsReservedPathOrUrl(url));
-        }
+        
 
 
-        [TestCase("/Do/Not/match", false)]
-        [TestCase("/Umbraco/RenderMvcs", false)]
-        [TestCase("/Umbraco/RenderMvc", true)]
-        [TestCase("/Umbraco/RenderMvc/Index", true)]
-        [TestCase("/Umbraco/RenderMvc/Index/1234", true)]
-        [TestCase("/Umbraco/RenderMvc/Index/1234/9876", false)]
-        [TestCase("/api", true)]
-        [TestCase("/api/WebApiTest", true)]
-        [TestCase("/api/WebApiTest/1234", true)]
-        [TestCase("/api/WebApiTest/Index/1234", false)]
-        public void Is_Reserved_By_Route(string url, bool shouldMatch)
-        {
-            //reset the app config, we only want to test routes not the hard coded paths
-            var globalSettingsMock = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettingsMock.Setup(x => x.ReservedPaths).Returns("");
-            globalSettingsMock.Setup(x => x.ReservedUrls).Returns("");
-
-            var routes = new RouteCollection();
-
-            routes.MapRoute(
-                "Umbraco_default",
-                "Umbraco/RenderMvc/{action}/{id}",
-                new { controller = "RenderMvc", action = "Index", id = UrlParameter.Optional });
-            routes.MapRoute(
-                "WebAPI",
-                "api/{controller}/{id}",
-                new { controller = "WebApiTestController", action = "Index", id = UrlParameter.Optional });
-
-
-            var context = new FakeHttpContextFactory(url);
-
-
-            Assert.AreEqual(
-                shouldMatch,
-                globalSettingsMock.Object.IsReservedPathOrUrl(url, context.HttpContext, routes));
-        }
+        
     }
 }
diff --git a/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs b/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs
new file mode 100644
index 0000000000..4079ea6c84
--- /dev/null
+++ b/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs
@@ -0,0 +1,80 @@
+using System.Web.Mvc;
+using System.Web.Routing;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Web;
+
+namespace Umbraco.Tests.Routing
+{
+    [TestFixture]
+    public class RoutableDocumentFilterTests : BaseWebTest
+    {
+        [TestCase("/umbraco/editContent.aspx")]
+        [TestCase("/install/default.aspx")]
+        [TestCase("/install/")]
+        [TestCase("/install")]
+        [TestCase("/install/?installStep=asdf")]
+        [TestCase("/install/test.aspx")]
+        public void Is_Reserved_Path_Or_Url(string url)
+        {
+            var globalSettings = TestObjects.GetGlobalSettings();
+            var routableDocFilter = new RoutableDocumentFilter(globalSettings);
+            Assert.IsTrue(routableDocFilter.IsReservedPathOrUrl(url));
+        }
+
+        [TestCase("/base/somebasehandler")]
+        [TestCase("/")]
+        [TestCase("/home.aspx")]
+        [TestCase("/umbraco-test")]
+        [TestCase("/install-test")]
+        [TestCase("/install.aspx")]
+        public void Is_Not_Reserved_Path_Or_Url(string url)
+        {
+            var globalSettings = TestObjects.GetGlobalSettings();
+            var routableDocFilter = new RoutableDocumentFilter(globalSettings);
+            Assert.IsFalse(routableDocFilter.IsReservedPathOrUrl(url));
+        }
+
+        [TestCase("/Do/Not/match", false)]
+        [TestCase("/Umbraco/RenderMvcs", false)]
+        [TestCase("/Umbraco/RenderMvc", true)]
+        [TestCase("/Umbraco/RenderMvc/Index", true)]
+        [TestCase("/Umbraco/RenderMvc/Index/1234", true)]
+        [TestCase("/Umbraco/RenderMvc/Index/1234/9876", false)]
+        [TestCase("/api", true)]
+        [TestCase("/api/WebApiTest", true)]
+        [TestCase("/api/WebApiTest/1234", true)]
+        [TestCase("/api/WebApiTest/Index/1234", false)]
+        public void Is_Reserved_By_Route(string url, bool shouldMatch)
+        {
+            //reset the app config, we only want to test routes not the hard coded paths
+            var globalSettingsMock = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
+            globalSettingsMock.Setup(x => x.ReservedPaths).Returns("");
+            globalSettingsMock.Setup(x => x.ReservedUrls).Returns("");
+
+            var routableDocFilter = new RoutableDocumentFilter(globalSettingsMock.Object);
+
+            var routes = new RouteCollection();
+
+            routes.MapRoute(
+                "Umbraco_default",
+                "Umbraco/RenderMvc/{action}/{id}",
+                new { controller = "RenderMvc", action = "Index", id = UrlParameter.Optional });
+            routes.MapRoute(
+                "WebAPI",
+                "api/{controller}/{id}",
+                new { controller = "WebApiTestController", action = "Index", id = UrlParameter.Optional });
+
+
+            var context = new FakeHttpContextFactory(url);
+
+
+            Assert.AreEqual(
+                shouldMatch,
+                routableDocFilter.IsReservedPathOrUrl(url, context.HttpContext, routes));
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index 34ac79a219..325f6860fd 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -38,19 +38,15 @@ namespace Umbraco.Tests.Routing
             _module = new UmbracoInjectedModule
             (
                 globalSettings,
-                Mock.Of<IUmbracoContextAccessor>(),
-                Factory.GetInstance<IPublishedSnapshotService>(),
-                Factory.GetInstance<IUserService>(),
-                new UrlProviderCollection(new IUrlProvider[0]),
                 runtime,
                 logger,
                 null, // FIXME: PublishedRouter complexities...
-                Mock.Of<IVariationContextAccessor>(),
                 Mock.Of<IUmbracoContextFactory>(),
                 new Umbraco.Web.Cache.BackgroundPublishedSnapshotNotifier(
                     Factory.GetInstance<IPublishedModelFactory>(),
                     Factory.GetInstance<IPublishedSnapshotService>(),
-                    Logger)
+                    Logger),
+                new RoutableDocumentFilter(globalSettings)
             );
 
             runtime.Level = RuntimeLevel.Run;
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index f788168ddc..fcf73fbffa 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -120,6 +120,7 @@
     <Compile Include="Composing\CompositionTests.cs" />
     <Compile Include="Composing\LightInjectValidation.cs" />
     <Compile Include="Composing\ContainerConformingTests.cs" />
+    <Compile Include="Configurations\GlobalSettingsTests.cs" />
     <Compile Include="CoreThings\CallContextTests.cs" />
     <Compile Include="Components\ComponentTests.cs" />
     <Compile Include="CoreThings\EnumExtensionsTests.cs" />
@@ -145,6 +146,7 @@
     <Compile Include="PublishedContent\SolidPublishedSnapshot.cs" />
     <Compile Include="PublishedContent\NuCacheTests.cs" />
     <Compile Include="Routing\MediaUrlProviderTests.cs" />
+    <Compile Include="Routing\RoutableDocumentFilterTests.cs" />
     <Compile Include="Runtimes\StandaloneTests.cs" />
     <Compile Include="Routing\GetContentUrlsTests.cs" />
     <Compile Include="Services\AmbiguousEventTests.cs" />
@@ -455,7 +457,6 @@
     <Compile Include="Cache\DistributedCache\DistributedCacheTests.cs" />
     <Compile Include="TestHelpers\TestWithDatabaseBase.cs" />
     <Compile Include="TestHelpers\SettingsForTests.cs" />
-    <Compile Include="Configurations\GlobalSettingsTests.cs" />
     <Compile Include="Routing\ContentFinderByAliasTests.cs" />
     <Compile Include="Routing\ContentFinderByIdTests.cs" />
     <Compile Include="Routing\ContentFinderByPageIdQueryTests.cs" />