AMT-Cheif
/
Stylet
mirror of https://github.com/AMT-Cheif/Stylet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rework slightly how the root VM is launched, to avoid it being created only to be disposed

This commit is contained in:
Antony Male 2016-01-27 12:30:26 +00:00
parent 7c6e148a17
commit e0c7edd27a
10 changed files with 157 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Bootstrappers/AutofacBootstrapper.cs
View File

@ -13,7 +13,7 @@ namespace Bootstrappers
private IContainer container;
private object _rootViewModel;
protected override object RootViewModel
protected virtual object RootViewModel
{
get { return this._rootViewModel ?? (this._rootViewModel = this.GetInstance(typeof(TRootViewModel))); }
}
@ -51,9 +51,17 @@ namespace Bootstrappers
return this.container.Resolve(type);
}
public override void Launch()
{
base.DisplayRootView(this.RootViewModel);
}
public override void Dispose()
{
this.container.Dispose();
base.Dispose();
ScreenExtensions.TryDispose(this._rootViewModel);
if (this.container != null)
this.container.Dispose();
}
}
}

12
Bootstrappers/CastleWindsorBootstrapper.cs
View File

@ -14,7 +14,7 @@ namespace Bootstrappers
private IWindsorContainer container;
private object _rootViewModel;
protected override object RootViewModel
protected virtual object RootViewModel
{
get { return this._rootViewModel ?? (this._rootViewModel = this.GetInstance(typeof(TRootViewModel))); }
}
@ -54,9 +54,17 @@ namespace Bootstrappers
return this.container.Resolve(type);
}
public override void Launch()
{
base.DisplayRootView(this.RootViewModel);
}
public override void Dispose()
{
this.container.Dispose();
base.Dispose();
ScreenExtensions.TryDispose(this._rootViewModel);
if (this.container != null)
this.container.Dispose();
}
}
}

12
Bootstrappers/NinjectBootstrapper.cs
View File

@ -12,7 +12,7 @@ namespace Bootstrappers
private IKernel kernel;
private object _rootViewModel;
protected override object RootViewModel
protected virtual object RootViewModel
{
get { return this._rootViewModel ?? (this._rootViewModel = this.GetInstance(typeof(TRootViewModel))); }
}
@ -48,9 +48,17 @@ namespace Bootstrappers
return this.kernel.Get(type);
}
public override void Launch()
{
base.DisplayRootView(this.RootViewModel);
}
public override void Dispose()
{
this.kernel.Dispose();
base.Dispose();
ScreenExtensions.TryDispose(this._rootViewModel);
if (this.kernel != null)
this.kernel.Dispose();
}
}
}

8
Bootstrappers/NoIoCContainerBootstrapper.cs
View File

@ -15,6 +15,8 @@ namespace Bootstrappers
this.ConfigureContainer();
}
protected abstract object RootViewModel { get; }
protected virtual void DefaultConfigureContainer()
{
var viewManager = new ViewManager(this.GetInstance, new List<Assembly>() { this.GetType().Assembly });
@ -34,8 +36,14 @@ namespace Bootstrappers
/// </summary>
protected virtual void ConfigureContainer() { }
public override void Launch()
{
base.DisplayRootView(this.RootViewModel);
}
public override object GetInstance(Type type)
{
base.Dispose();
Func<object> factory;
if (this.Container.TryGetValue(type, out factory))
return factory();

12
Bootstrappers/StructureMapBootstrapper.cs
View File

@ -13,7 +13,7 @@ namespace Bootstrappers
private IContainer container;
private object _rootViewModel;
protected override object RootViewModel
protected virtual object RootViewModel
{
get { return this._rootViewModel ?? (this._rootViewModel = this.GetInstance(typeof(TRootViewModel))); }
}
@ -52,9 +52,17 @@ namespace Bootstrappers
return this.container.GetInstance(type);
}
public override void Launch()
{
base.DisplayRootView(this.RootViewModel);
}
public override void Dispose()
{
this.container.Dispose();
base.Dispose();
ScreenExtensions.TryDispose(this._rootViewModel);
if (this.container != null)
this.container.Dispose();
}
}
}

12
Bootstrappers/UnityBootstrapper.cs
View File

@ -12,7 +12,7 @@ namespace Bootstrappers
private IUnityContainer container;
private object _rootViewModel;
protected override object RootViewModel
protected virtual object RootViewModel
{
get { return this._rootViewModel ?? (this._rootViewModel = this.GetInstance(typeof(TRootViewModel))); }
}
@ -48,9 +48,17 @@ namespace Bootstrappers
return this.container.Resolve(type);
}
public override void Launch()
{
base.DisplayRootView(this.RootViewModel);
}
public override void Dispose()
{
this.container.Dispose();
base.Dispose();
ScreenExtensions.TryDispose(this._rootViewModel);
if (this.container != null)
this.container.Dispose();
}
}
}

21
Stylet/Bootstrapper.cs
View File

@ -16,14 +16,14 @@ namespace Stylet
/// </summary>
protected IContainer Container { get; set; }
private object _rootViewModel;
private TRootViewModel _rootViewModel;
/// <summary>
/// Gets the instance of the root ViewMode, which is displayed at launch
/// Gets the root ViewModel, creating it first if necessary
/// </summary>
protected override object RootViewModel
protected virtual TRootViewModel RootViewModel
{
get { return this._rootViewModel ?? (this._rootViewModel = this.GetInstance(typeof(TRootViewModel))); }
get { return this._rootViewModel ?? (this._rootViewModel = this.Container.Get<TRootViewModel>()); }
}
/// <summary>
@ -77,6 +77,14 @@ namespace Stylet
return this.Container.Get(type);
}
/// <summary>
/// Called when the application is launched. Displays the root view.
/// </summary>
public override void Launch()
{
this.DisplayRootView(this.RootViewModel);
}
/// <summary>
/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
/// </summary>
@ -84,7 +92,10 @@ namespace Stylet
{
// Dispose the container last
base.Dispose();
this.Container.Dispose();
// Don't create the root ViewModel if it doesn't already exist...
ScreenExtensions.TryDispose(this._rootViewModel);
if (this.Container != null)
this.Container.Dispose();
}
}
}

19
Stylet/BootstrapperBase.cs
View File

@ -24,11 +24,6 @@ namespace Stylet
/// </summary>
public string[] Args { get; private set; }
/// <summary>
/// Gets the instance of the root ViewMode, which is displayed at launch
/// </summary>
protected abstract object RootViewModel { get; }
/// <summary>
/// Initialises a new instance of the <see cref="BootstrapperBase"/> class
/// </summary>
@ -92,13 +87,18 @@ namespace Stylet
/// </summary>
protected virtual void Configure() { }
/// <summary>
/// Called when the application is launched. Should display the root view using <see cref="DisplayRootView(object)"/>
/// </summary>
public abstract void Launch();
/// <summary>
/// Launch the root view
/// </summary>
protected virtual void Launch()
protected virtual void DisplayRootView(object rootViewModel)
{
var windowManager = (IWindowManager)this.GetInstance(typeof(IWindowManager));
windowManager.ShowWindow(this.RootViewModel);
windowManager.ShowWindow(rootViewModel);
}
/// <summary>
@ -147,9 +147,6 @@ namespace Stylet
/// <summary>
/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
/// </summary>
public virtual void Dispose()
{
ScreenExtensions.TryDispose(this.RootViewModel);
}
public virtual void Dispose() { }
}
}

49
StyletUnitTests/BootstrapperBaseTests.cs
View File

@ -39,11 +39,6 @@ namespace StyletUnitTests
public readonly RootViewModel MyRootViewModel = new BootstrapperBaseTests.RootViewModel();
protected override object RootViewModel
{
get { return this.MyRootViewModel; }
}
public bool GetInstanceCalled;
public override object GetInstance(Type service)
{
@ -55,6 +50,18 @@ namespace StyletUnitTests
return null;
}
public bool LaunchCalled;
public override void Launch()
{
this.LaunchCalled = true;
}
public bool OnLaunchCalled;
protected override void OnLaunch()
{
this.OnLaunchCalled = true;
}
public bool OnStartCalled;
protected override void OnStart()
{
@ -67,10 +74,10 @@ namespace StyletUnitTests
this.OnExitCalled = true;
}
public bool ConfigureCalled;
public bool ConfigureBootstrapperCalled;
protected override void ConfigureBootstrapper()
{
this.ConfigureCalled = true;
this.ConfigureBootstrapperCalled = true;
base.ConfigureBootstrapper();
}
@ -78,6 +85,11 @@ namespace StyletUnitTests
{
base.Start(args);
}
public new void DisplayRootView(object rootViewModel)
{
base.DisplayRootView(rootViewModel);
}
}
private class FakeDispatcher : IDispatcher
@ -127,10 +139,10 @@ namespace StyletUnitTests
}
[Test]
public void StartCallsConfigure()
public void StartCallsConfigureBootstrapper()
{
this.bootstrapper.Start(new string[0]);
Assert.True(this.bootstrapper.ConfigureCalled);
Assert.True(this.bootstrapper.ConfigureBootstrapperCalled);
}
[Test]
@ -141,17 +153,26 @@ namespace StyletUnitTests
}
[Test]
public void StartCallsOnStartup()
public void StartCallsLaunch()
{
this.bootstrapper.Start(new string[0]);
Assert.True(this.bootstrapper.OnStartCalled);
Assert.True(this.bootstrapper.LaunchCalled);
}
[Test]
public void DisposesRootViewModel()
public void StartCallsOnLaunch()
{
this.bootstrapper.Dispose();
Assert.True(this.bootstrapper.MyRootViewModel.DisposeCalled);
this.bootstrapper.Start(new string[0]);
Assert.True(this.bootstrapper.OnLaunchCalled);
}
[Test]
public void DisplayRootViewDisplaysTheRootView()
{
var viewModel = new object();
this.bootstrapper.DisplayRootView(viewModel);
this.windowManager.Verify(x => x.ShowWindow(viewModel));
}
}
}

41
StyletUnitTests/BootstrapperTests.cs
View File

@ -2,6 +2,7 @@
using NUnit.Framework;
using Stylet;
using StyletIoC;
using System;
namespace StyletUnitTests
{
@ -11,7 +12,17 @@ namespace StyletUnitTests
private interface I1 { }
private class C1 : I1 { }
private class RootViewModel { }
private class RootViewModel : IDisposable
{
public bool Disposed;
public void Dispose()
{
this.Disposed = true;
}
}
private class RandomClass { }
private class MyBootstrapper<T> : Bootstrapper<T> where T : class
{
@ -21,16 +32,25 @@ namespace StyletUnitTests
set { base.Container = value; }
}
public new T RootViewModel
{
get { return base.RootViewModel; }
}
public new void Configure()
{
base.ConfigureBootstrapper();
}
public RootViewModel MyRootViewModel = new RootViewModel();
public bool ConfigureIoCCalled;
protected override void ConfigureIoC(IStyletIoCBuilder builder)
{
this.ConfigureIoCCalled = true;
builder.Bind<I1>().To<C1>();
// Singleton, so we can test against it
builder.Bind<RootViewModel>().ToInstance(this.MyRootViewModel);
base.ConfigureIoC(builder);
}
}
@ -89,5 +109,24 @@ namespace StyletUnitTests
this.bootstrapper.Dispose();
container.Verify(x => x.Dispose());
}
[Test]
public void DisposeDoesNotCreateRootViewModel()
{
this.bootstrapper.Configure();
this.bootstrapper.Dispose();
Assert.False(this.bootstrapper.MyRootViewModel.Disposed);
}
[Test]
public void DisposeDisposesRootViewModel()
{
this.bootstrapper.Configure();
// Force it to be created
var dummy = this.bootstrapper.RootViewModel;
this.bootstrapper.Dispose();
Assert.True(this.bootstrapper.MyRootViewModel.Disposed);
}
}
}