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

Remove the IoC class in its entirety - it's not needed any more, and it's a bad idea

This commit is contained in:
Antony Male 2014-11-30 14:23:56 +00:00
parent 45dbcc2d30
commit 0f93eb1832
12 changed files with 28 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Stylet/Bootstrapper.cs
View File

@ -53,27 +53,13 @@ namespace Stylet
protected virtual void ConfigureIoC(IStyletIoCBuilder builder) { }
/// <summary>
/// Override which uses StyletIoC as the implementation for IoC.Get
/// Given a type, use the IoC container to fetch an instance of it
/// </summary>
protected override object GetInstance(Type service, string key = null)
/// <typeparam name="T">Instance of type to fetch</typeparam>
/// <returns>Fetched instance</returns>
protected override T GetInstance<T>()
{
return this.Container.Get(service, key);
}
/// <summary>
/// Override which uses StyletIoC as the implementation for IoC.GetAll
/// </summary>
protected override IEnumerable<object> GetAllInstances(Type service)
{
return this.Container.GetAll(service);
}
/// <summary>
/// Override which uses StyletIoC as the implementation for IoC.BuildUp
/// </summary>
protected override void BuildUp(object instance)
{
this.Container.BuildUp(instance);
return this.Container.Get<T>();
}
}
}

33
Stylet/BootstrapperBase.cs
View File

@ -47,11 +47,6 @@ namespace Stylet
/// </summary>
protected virtual void Start()
{
// Stitch the IoC shell to us
IoC.GetInstance = this.GetInstance;
IoC.GetAllInstances = this.GetAllInstances;
IoC.BuildUp = this.BuildUp;
// Use the current SynchronizationContext for the Execute helper
Execute.Dispatcher = new DispatcherWrapper(Dispatcher.CurrentDispatcher);
@ -62,7 +57,7 @@ namespace Stylet
this.Configure();
View.ViewManager = IoC.Get<IViewManager>();
View.ViewManager = this.GetInstance<IViewManager>();
if (!Execute.InDesignMode)
this.Launch();
@ -73,7 +68,9 @@ namespace Stylet
/// </summary>
protected virtual void Launch()
{
IoC.Get<IWindowManager>().ShowWindow(IoC.Get<TRootViewModel>());
var windowManager = this.GetInstance<IWindowManager>();
var rootViewModel = this.GetInstance<TRootViewModel>();
windowManager.ShowWindow(rootViewModel);
}
/// <summary>
@ -82,25 +79,11 @@ namespace Stylet
protected virtual void Configure() { }
/// <summary>
/// Override this to fetch an implementation of a service from your IoC container. Used by IoC.Get.
/// Given a type, use the IoC container to fetch an instance of it
/// </summary>
/// <param name="service">Service type to fetch an implementation of</param>
/// <param name="key">String key passed to IoC.Get</param>
/// <returns>An instance implementing the service</returns>
protected abstract object GetInstance(Type service, string key = null);
/// <summary>
/// Override this to fetch all implementations of a service from your IoC container. Used by IoC.GetAll.
/// </summary>
/// <param name="service">Service type to fetch all implementations for</param>
/// <returns>All instances implementing the service</returns>
protected abstract IEnumerable<object> GetAllInstances(Type service);
/// <summary>
/// Override this to build up an instance using your IoC container. Used by IoC.BuildUp
/// </summary>
/// <param name="instance">Instance to build up</param>
protected abstract void BuildUp(object instance);
/// <typeparam name="T">Instance of type to fetch</typeparam>
/// <returns>Fetched instance</returns>
protected abstract T GetInstance<T>();
/// <summary>
/// Initial contents of AssemblySource.Assemblies, defaults to the entry assembly

43
Stylet/IoC.cs
View File

@ -1,43 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace Stylet
{
/// <summary>
/// A lightweight wrapper around the IoC container of your choice. Configured in the bootstrapper
/// </summary>
public static class IoC
{
/// <summary>
/// Assign this to a func which can get a single instance of a service, with a given key
/// </summary>
public static Func<Type, string, object> GetInstance = (service, key) => { throw new InvalidOperationException("IoC is not initialized"); };
/// <summary>
/// Assign this to a func which can get an IEnumerable of all instances of a service
/// </summary>
public static Func<Type, IEnumerable<object>> GetAllInstances = service => { throw new InvalidOperationException("IoC is not initialized"); };
/// <summary>
/// Assign this to a fun which can build up a given object
/// </summary>
public static Action<object> BuildUp = instance => { throw new InvalidOperationException("IoC is not initialized"); };
/// <summary>
/// Wraps GetInstance, adding typing
/// </summary>
public static T Get<T>(string key = null)
{
return (T)GetInstance(typeof(T), key);
}
/// <summary>
/// Wraps GetAllInstances, adding typing
/// </summary>
public static IEnumerable<T> GetAll<T>()
{
return GetAllInstances(typeof(T)).Cast<T>();
}
}
}

1
Stylet/Stylet.csproj
View File

@ -112,7 +112,6 @@
<Compile Include="Execute.cs" />
<Compile Include="ExpressionExtensions.cs" />
<Compile Include="IConductor.cs" />
<Compile Include="IoC.cs" />
<Compile Include="Bootstrapper.cs" />
<Compile Include="IScreen.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />

4
Stylet/ViewManager.cs
View File

@ -37,6 +37,10 @@ namespace Stylet
private static readonly ILogger logger = LogManager.GetLogger(typeof(ViewManager));
private readonly Func<Type, UIElement> viewFactory;
/// <summary>
/// Create a new ViewManager, with the given viewFactory
/// </summary>
/// <param name="viewFactory">Delegate used to create view instances from their type</param>
public ViewManager(Func<Type, UIElement> viewFactory)
{
this.viewFactory = viewFactory;

2
StyletIntegrationTests/Bootstrapper.cs
View File

@ -24,7 +24,7 @@ namespace StyletIntegrationTests
var message = e.Exception.Message;
if (e.Exception is TargetInvocationException)
message = e.Exception.InnerException.Message;
IoC.Get<IWindowManager>().ShowMessageBox(String.Format("Unhandled Exception: {0}", message));
this.Container.Get<IWindowManager>().ShowMessageBox(String.Format("Unhandled Exception: {0}", message));
e.Handled = true;
}
}

2
StyletUnitTests/ActionExtensionTests.cs
View File

@ -43,8 +43,6 @@ namespace StyletUnitTests
[Test]
public void ReturnsCommandActionIfTargetObjectPropertyTypeIsICommand()
{
// This will be asked for the IViewManager, which we don't care about for now
IoC.GetInstance = (t, k) => null;
this.provideValueTarget.Setup(x => x.TargetProperty).Returns(Button.CommandProperty);
object value = this.actionExtension.ProvideValue(this.serviceProvider.Object);

45
StyletUnitTests/BootstrapperBaseTests.cs
View File

@ -36,29 +36,17 @@ namespace StyletUnitTests
}
public bool GetInstanceCalled;
protected override object GetInstance(Type service, string key = null)
protected override TInstance GetInstance<TInstance>()
{
var service = typeof(TInstance);
this.GetInstanceCalled = true;
if (service == typeof(IViewManager))
return this.viewManager;
return (TInstance)this.viewManager;
if (service == typeof(IWindowManager))
return this.windowManager;
return (TInstance)this.windowManager;
if (service == typeof(RootViewModel))
return new RootViewModel();
return new object();
}
public bool GetAllInstancesCalled;
protected override IEnumerable<object> GetAllInstances(Type service)
{
this.GetAllInstancesCalled = true;
return Enumerable.Empty<object>();
}
public bool BuildUpCalled;
protected override void BuildUp(object instance)
{
this.BuildUpCalled = true;
return (TInstance)(object)new RootViewModel();
return default(TInstance);
}
public bool OnExitCalled;
@ -100,27 +88,6 @@ namespace StyletUnitTests
this.bootstrapper = new MyBootstrapperBase<RootViewModel>(this.viewManager.Object, this.windowManager.Object);
}
[Test]
public void AssignsIoCGetInstanceToGetInstance()
{
IoC.GetInstance(typeof(string), null);
Assert.True(this.bootstrapper.GetInstanceCalled);
}
[Test]
public void AssignsIoCGetAllInstancesToGetAllInstances()
{
IoC.GetAllInstances(typeof(string));
Assert.True(this.bootstrapper.GetAllInstancesCalled);
}
[Test]
public void AssignsIoCBuildUpToBuildUp()
{
IoC.BuildUp(new object());
Assert.True(this.bootstrapper.BuildUpCalled);
}
[Test]
public void StartAssignsExecuteDispatcher()
{

42
StyletUnitTests/BootstrapperTests.cs
View File

@ -40,19 +40,9 @@ namespace StyletUnitTests
base.ConfigureIoC(builder);
}
public new object GetInstance(Type service, string key)
public new TInstance GetInstance<TInstance>()
{
return base.GetInstance(service, key);
}
public new IEnumerable<object> GetAllInstances(Type service)
{
return base.GetAllInstances(service);
}
public new void BuildUp(object instance)
{
base.BuildUp(instance);
return base.GetInstance<TInstance>();
}
}
@ -103,34 +93,10 @@ namespace StyletUnitTests
var container = new Mock<IContainer>();
this.bootstrapper.Container = container.Object;
container.Setup(x => x.Get(typeof(string), "test")).Returns("hello").Verifiable();
var result = this.bootstrapper.GetInstance(typeof(string), "test");
container.Setup(x => x.Get<string>(null)).Returns("hello").Verifiable();
var result = this.bootstrapper.GetInstance<string>();
Assert.AreEqual("hello", result);
container.Verify();
}
[Test]
public void GetAllInstancesMappedToContainer()
{
var container = new Mock<IContainer>();
this.bootstrapper.Container = container.Object;
container.Setup(x => x.GetAll(typeof(int), null)).Returns(new object[] { 1, 2, 3 }).Verifiable();
var result = this.bootstrapper.GetAllInstances(typeof(int));
Assert.That(result, Is.EquivalentTo(new[] { 1, 2, 3 }));
container.Verify();
}
[Test]
public void BuildUpMappedToContainer()
{
var container = new Mock<IContainer>();
this.bootstrapper.Container = container.Object;
var instance = new object();
container.Setup(x => x.BuildUp(instance)).Verifiable();
this.bootstrapper.BuildUp(instance);
container.Verify();
}
}
}

49
StyletUnitTests/IoCTests.cs
View File

@ -1,49 +0,0 @@
using NUnit.Framework;
using Stylet;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StyletUnitTests
{
[TestFixture]
public class IoCTests
{
[Test]
public void GetUsesGetInstance()
{
Type type = null;
string key = null;
IoC.GetInstance = (t, k) =>
{
type = t;
key = k;
return 5;
};
var result = IoC.Get<int>("hello");
Assert.AreEqual(5, result);
Assert.AreEqual(typeof(int), type);
Assert.AreEqual("hello", key);
}
[Test]
public void GetAllUsesGetAllInstances()
{
Type type = null;
IoC.GetAllInstances = t =>
{
type = t;
return new object[] { 1, 2, 3 };
};
var result = IoC.GetAll<int>();
Assert.That(result, Is.EquivalentTo(new object[] { 1, 2, 3 }));
Assert.AreEqual(typeof(int), type);
}
}
}

1
StyletUnitTests/StyletUnitTests.csproj
View File

@ -75,7 +75,6 @@
<Compile Include="ExecuteTests.cs" />
<Compile Include="ExpressionExtensionsTests.cs" />
<Compile Include="IconToBitmapSourceConverterTests.cs" />
<Compile Include="IoCTests.cs" />
<Compile Include="LabelledValueTests.cs" />
<Compile Include="LambdaComparerTests.cs" />
<Compile Include="LambdaEqualityComparerTests.cs" />

2
StyletUnitTests/WindowManagerTests.cs
View File

@ -70,8 +70,6 @@ namespace StyletUnitTests
this.viewManager = new Mock<IViewManager>();
this.messageBoxViewModel = new Mock<IMessageBoxViewModel>();
this.windowManager = new MyWindowManager(this.viewManager.Object, () => this.messageBoxViewModel.Object);
IoC.GetInstance = (service, key) => this.viewManager.Object;
}
[Test]