diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs index d785225ad2..60185a1846 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs @@ -24,7 +24,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing [TestFixture] public class BackOfficeAreaRoutesTests { - [TestCase(RuntimeLevel.Install)] + [TestCase(RuntimeLevel.BootFailed)] [TestCase(RuntimeLevel.Unknown)] [TestCase(RuntimeLevel.Boot)] @@ -38,22 +38,12 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing } [Test] - public void RuntimeState_Upgrade() + [TestCase(RuntimeLevel.Run)] + [TestCase(RuntimeLevel.Upgrade)] + [TestCase(RuntimeLevel.Install)] + public void RuntimeState_All_Routes(RuntimeLevel level) { - BackOfficeAreaRoutes routes = GetBackOfficeAreaRoutes(RuntimeLevel.Upgrade); - var endpoints = new TestRouteBuilder(); - routes.CreateRoutes(endpoints); - - Assert.AreEqual(1, endpoints.DataSources.Count); - EndpointDataSource route = endpoints.DataSources.First(); - Assert.AreEqual(2, route.Endpoints.Count); - AssertMinimalBackOfficeRoutes(route); - } - - [Test] - public void RuntimeState_Run() - { - BackOfficeAreaRoutes routes = GetBackOfficeAreaRoutes(RuntimeLevel.Run); + BackOfficeAreaRoutes routes = GetBackOfficeAreaRoutes(level); var endpoints = new TestRouteBuilder(); routes.CreateRoutes(endpoints); diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs index e4da74c707..e87f1a297c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs @@ -22,11 +22,9 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing [TestFixture] public class PreviewRoutesTests { - [TestCase(RuntimeLevel.Install)] [TestCase(RuntimeLevel.BootFailed)] [TestCase(RuntimeLevel.Unknown)] [TestCase(RuntimeLevel.Boot)] - [TestCase(RuntimeLevel.Upgrade)] public void RuntimeState_No_Routes(RuntimeLevel level) { PreviewRoutes routes = GetRoutes(level); @@ -36,10 +34,12 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing Assert.AreEqual(0, endpoints.DataSources.Count); } - [Test] - public void RuntimeState_Run() + [TestCase(RuntimeLevel.Run)] + [TestCase(RuntimeLevel.Upgrade)] + [TestCase(RuntimeLevel.Install)] + public void RuntimeState_All_Routes(RuntimeLevel level) { - PreviewRoutes routes = GetRoutes(RuntimeLevel.Run); + PreviewRoutes routes = GetRoutes(level); var endpoints = new TestRouteBuilder(); routes.CreateRoutes(endpoints);