mirror of
https://github.com/lidarr/lidarr.git
synced 2025-08-14 18:57:39 -07:00
main app cleanup.
This commit is contained in:
parent
da2c0d1d65
commit
8900bbb3a1
20 changed files with 253 additions and 258 deletions
|
@ -11,14 +11,14 @@ namespace NzbDrone.App.Test
|
|||
[Test]
|
||||
public void Kernel_can_get_kernel()
|
||||
{
|
||||
CentralDispatch.Container.Should().NotBeNull();
|
||||
NzbDroneBootstrapper.Container.Should().NotBeNull();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Kernel_should_return_same_kernel()
|
||||
{
|
||||
var firstKernel = CentralDispatch.Container;
|
||||
var secondKernel = CentralDispatch.Container;
|
||||
var firstKernel = NzbDroneBootstrapper.Container;
|
||||
var secondKernel = NzbDroneBootstrapper.Container;
|
||||
|
||||
firstKernel.Should().BeSameAs(secondKernel);
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ namespace NzbDrone.App.Test
|
|||
[Test]
|
||||
public void Kernel_should_be_able_to_resolve_ApplicationServer()
|
||||
{
|
||||
var appServer = CentralDispatch.Container.Resolve<ApplicationServer>();
|
||||
var appServer = NzbDroneBootstrapper.Container.Resolve<ApplicationServer>();
|
||||
|
||||
appServer.Should().NotBeNull();
|
||||
}
|
||||
|
@ -34,8 +34,8 @@ namespace NzbDrone.App.Test
|
|||
[Test]
|
||||
public void Kernel_should_resolve_same_ApplicationServer_instance()
|
||||
{
|
||||
var appServer1 = CentralDispatch.Container.Resolve<ApplicationServer>();
|
||||
var appServer2 = CentralDispatch.Container.Resolve<ApplicationServer>();
|
||||
var appServer1 = NzbDroneBootstrapper.Container.Resolve<ApplicationServer>();
|
||||
var appServer2 = NzbDroneBootstrapper.Container.Resolve<ApplicationServer>();
|
||||
|
||||
appServer1.Should().BeSameAs(appServer2);
|
||||
}
|
||||
|
|
|
@ -7,7 +7,6 @@ using Moq;
|
|||
using NUnit.Framework;
|
||||
using NzbDrone.Common;
|
||||
using NzbDrone.Common.Model;
|
||||
using NzbDrone.Providers;
|
||||
using NzbDrone.Test.Common;
|
||||
|
||||
namespace NzbDrone.App.Test
|
||||
|
@ -24,14 +23,14 @@ namespace NzbDrone.App.Test
|
|||
|
||||
Mocker.GetMock<ProcessProvider>().Setup(c => c.GetProcessById(It.IsAny<int>())).Returns((ProcessInfo)null);
|
||||
|
||||
Mocker.Resolve<MonitoringProvider>().EnsurePriority(null);
|
||||
Mocker.Resolve<PriorityMonitor>().EnsurePriority(null);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Ensure_should_log_warn_exception_rather_than_throw()
|
||||
{
|
||||
Mocker.GetMock<ProcessProvider>().Setup(c => c.GetCurrentProcess()).Throws<InvalidOperationException>();
|
||||
Mocker.Resolve<MonitoringProvider>().EnsurePriority(null);
|
||||
Mocker.Resolve<PriorityMonitor>().EnsurePriority(null);
|
||||
|
||||
ExceptionVerification.ExpectedWarns(1);
|
||||
}
|
||||
|
|
|
@ -1,12 +1,9 @@
|
|||
using System.IO;
|
||||
using System.ServiceProcess;
|
||||
using System.ServiceProcess;
|
||||
using FluentAssertions;
|
||||
using Moq;
|
||||
using NUnit.Framework;
|
||||
using NzbDrone.Common;
|
||||
using NzbDrone.Model;
|
||||
using NzbDrone.Test.Common;
|
||||
using NzbDrone.Test.Common.AutoMoq;
|
||||
|
||||
namespace NzbDrone.App.Test
|
||||
{
|
||||
|
@ -14,34 +11,34 @@ namespace NzbDrone.App.Test
|
|||
public class RouterTest : TestBase
|
||||
{
|
||||
|
||||
[TestCase(null, ApplicationMode.Console)]
|
||||
[TestCase("", ApplicationMode.Console)]
|
||||
[TestCase("1", ApplicationMode.Help)]
|
||||
[TestCase("ii", ApplicationMode.Help)]
|
||||
[TestCase("uu", ApplicationMode.Help)]
|
||||
[TestCase("i", ApplicationMode.InstallService)]
|
||||
[TestCase("I", ApplicationMode.InstallService)]
|
||||
[TestCase("/I", ApplicationMode.InstallService)]
|
||||
[TestCase("/i", ApplicationMode.InstallService)]
|
||||
[TestCase("-I", ApplicationMode.InstallService)]
|
||||
[TestCase("-i", ApplicationMode.InstallService)]
|
||||
[TestCase("u", ApplicationMode.UninstallService)]
|
||||
[TestCase("U", ApplicationMode.UninstallService)]
|
||||
[TestCase("/U", ApplicationMode.UninstallService)]
|
||||
[TestCase("/u", ApplicationMode.UninstallService)]
|
||||
[TestCase("-U", ApplicationMode.UninstallService)]
|
||||
[TestCase("-u", ApplicationMode.UninstallService)]
|
||||
public void GetApplicationMode_single_arg(string arg, ApplicationMode mode)
|
||||
[TestCase(null, ApplicationModes.Console)]
|
||||
[TestCase("", ApplicationModes.Console)]
|
||||
[TestCase("1", ApplicationModes.Help)]
|
||||
[TestCase("ii", ApplicationModes.Help)]
|
||||
[TestCase("uu", ApplicationModes.Help)]
|
||||
[TestCase("i", ApplicationModes.InstallService)]
|
||||
[TestCase("I", ApplicationModes.InstallService)]
|
||||
[TestCase("/I", ApplicationModes.InstallService)]
|
||||
[TestCase("/i", ApplicationModes.InstallService)]
|
||||
[TestCase("-I", ApplicationModes.InstallService)]
|
||||
[TestCase("-i", ApplicationModes.InstallService)]
|
||||
[TestCase("u", ApplicationModes.UninstallService)]
|
||||
[TestCase("U", ApplicationModes.UninstallService)]
|
||||
[TestCase("/U", ApplicationModes.UninstallService)]
|
||||
[TestCase("/u", ApplicationModes.UninstallService)]
|
||||
[TestCase("-U", ApplicationModes.UninstallService)]
|
||||
[TestCase("-u", ApplicationModes.UninstallService)]
|
||||
public void GetApplicationMode_single_arg(string arg, ApplicationModes modes)
|
||||
{
|
||||
Router.GetApplicationMode(new[] { arg }).Should().Be(mode);
|
||||
Router.GetApplicationMode(new[] { arg }).Should().Be(modes);
|
||||
}
|
||||
|
||||
[TestCase("", "", ApplicationMode.Console)]
|
||||
[TestCase("", null, ApplicationMode.Console)]
|
||||
[TestCase("i", "n", ApplicationMode.Help)]
|
||||
public void GetApplicationMode_two_args(string a, string b, ApplicationMode mode)
|
||||
[TestCase("", "", ApplicationModes.Console)]
|
||||
[TestCase("", null, ApplicationModes.Console)]
|
||||
[TestCase("i", "n", ApplicationModes.Help)]
|
||||
public void GetApplicationMode_two_args(string a, string b, ApplicationModes modes)
|
||||
{
|
||||
Router.GetApplicationMode(new[] { a, b }).Should().Be(mode);
|
||||
Router.GetApplicationMode(new[] { a, b }).Should().Be(modes);
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
@ -53,7 +50,7 @@ namespace NzbDrone.App.Test
|
|||
serviceProviderMock.Setup(c => c.Start(ServiceProvider.NZBDRONE_SERVICE_NAME));
|
||||
Mocker.GetMock<EnvironmentProvider>().SetupGet(c => c.IsUserInteractive).Returns(true);
|
||||
|
||||
Mocker.Resolve<Router>().Route(ApplicationMode.InstallService);
|
||||
Mocker.Resolve<Router>().Route(ApplicationModes.InstallService);
|
||||
|
||||
serviceProviderMock.Verify(c => c.Install(ServiceProvider.NZBDRONE_SERVICE_NAME), Times.Once());
|
||||
}
|
||||
|
@ -67,7 +64,7 @@ namespace NzbDrone.App.Test
|
|||
Mocker.GetMock<EnvironmentProvider>().SetupGet(c => c.IsUserInteractive).Returns(true);
|
||||
serviceProviderMock.Setup(c => c.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME)).Returns(true);
|
||||
|
||||
Mocker.Resolve<Router>().Route(ApplicationMode.UninstallService);
|
||||
Mocker.Resolve<Router>().Route(ApplicationModes.UninstallService);
|
||||
|
||||
serviceProviderMock.Verify(c => c.UnInstall(ServiceProvider.NZBDRONE_SERVICE_NAME), Times.Once());
|
||||
}
|
||||
|
@ -81,17 +78,17 @@ namespace NzbDrone.App.Test
|
|||
appServerProvider.Setup(c => c.Start());
|
||||
Mocker.GetMock<EnvironmentProvider>().SetupGet(c => c.IsUserInteractive).Returns(true);
|
||||
|
||||
Mocker.Resolve<Router>().Route(ApplicationMode.Console);
|
||||
Mocker.Resolve<Router>().Route(ApplicationModes.Console);
|
||||
|
||||
consoleProvider.Verify(c => c.WaitForClose(), Times.Once());
|
||||
appServerProvider.Verify(c => c.Start(), Times.Once());
|
||||
}
|
||||
|
||||
[TestCase(ApplicationMode.Console)]
|
||||
[TestCase(ApplicationMode.InstallService)]
|
||||
[TestCase(ApplicationMode.UninstallService)]
|
||||
[TestCase(ApplicationMode.Help)]
|
||||
public void Route_should_call_service_start_when_run_in_service_more(ApplicationMode applicationMode)
|
||||
[TestCase(ApplicationModes.Console)]
|
||||
[TestCase(ApplicationModes.InstallService)]
|
||||
[TestCase(ApplicationModes.UninstallService)]
|
||||
[TestCase(ApplicationModes.Help)]
|
||||
public void Route_should_call_service_start_when_run_in_service_more(ApplicationModes applicationModes)
|
||||
{
|
||||
var envMock = Mocker.GetMock<EnvironmentProvider>();
|
||||
var serviceProvider = Mocker.GetMock<ServiceProvider>();
|
||||
|
@ -100,7 +97,7 @@ namespace NzbDrone.App.Test
|
|||
|
||||
serviceProvider.Setup(c => c.Run(It.IsAny<ServiceBase>()));
|
||||
|
||||
Mocker.Resolve<Router>().Route(applicationMode);
|
||||
Mocker.Resolve<Router>().Route(applicationModes);
|
||||
|
||||
serviceProvider.Verify(c => c.Run(It.IsAny<ServiceBase>()), Times.Once());
|
||||
}
|
||||
|
@ -116,7 +113,7 @@ namespace NzbDrone.App.Test
|
|||
consoleMock.Setup(c => c.PrintServiceAlreadyExist());
|
||||
serviceMock.Setup(c => c.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME)).Returns(true);
|
||||
|
||||
Mocker.Resolve<Router>().Route(ApplicationMode.InstallService);
|
||||
Mocker.Resolve<Router>().Route(ApplicationModes.InstallService);
|
||||
|
||||
Mocker.VerifyAllMocks();
|
||||
}
|
||||
|
@ -131,7 +128,7 @@ namespace NzbDrone.App.Test
|
|||
consoleMock.Setup(c => c.PrintServiceDoestExist());
|
||||
serviceMock.Setup(c => c.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME)).Returns(false);
|
||||
|
||||
Mocker.Resolve<Router>().Route(ApplicationMode.UninstallService);
|
||||
Mocker.Resolve<Router>().Route(ApplicationModes.UninstallService);
|
||||
|
||||
Mocker.VerifyAllMocks();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue