Menu
▾
▴
[Structuremap-commits] SF.net SVN: structuremap: [108] trunk/Source/StructureMap
|
From: <jer...@us...> - 2008-05-28 04:02:57
|
Revision: 108
http://structuremap.svn.sourceforge.net/structuremap/?rev=108&view=rev
Author: jeremydmiller
Date: 2008-05-27 21:02:54 -0700 (Tue, 27 May 2008)
Log Message:
-----------
renaming InstanceManager to Container
Modified Paths:
--------------
trunk/Source/StructureMap/Configuration/GraphBuilder.cs
trunk/Source/StructureMap/IContainer.cs
trunk/Source/StructureMap/InstanceBuilder.cs
trunk/Source/StructureMap/ObjectFactory.cs
trunk/Source/StructureMap/PluginGraphBuilder.cs
trunk/Source/StructureMap/StructureMap.csproj
trunk/Source/StructureMap.AutoMocking/AutoMockedInstanceManager.cs
trunk/Source/StructureMap.AutoMocking/RhinoAutoMocker.cs
trunk/Source/StructureMap.Testing/BuildSessionTester.cs
trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/AddInstanceTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/AddTypesTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/ConstructorExpressionTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/CreatePluginFamilyTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/DeepInstanceTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/GenericFamilyExpressionTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/InjectArrayTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/InterceptAllInstancesOfPluginTypeTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/InterceptorTesting.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/ProfileExpressionTester.cs
trunk/Source/StructureMap.Testing/Configuration/DefaultInstanceNodeTester.cs
trunk/Source/StructureMap.Testing/Configuration/InlineInstanceDefinitionInProfileAndMachineNodesTester.cs
trunk/Source/StructureMap.Testing/Configuration/ShortcuttedInstanceNodeTester.cs
trunk/Source/StructureMap.Testing/Container/ArrayConstructorTester.cs
trunk/Source/StructureMap.Testing/Container/DynamicInjectionTester.cs
trunk/Source/StructureMap.Testing/Container/EnumerationTester.cs
trunk/Source/StructureMap.Testing/Container/ExceptionHandling/StructureMapExceptionTester.cs
trunk/Source/StructureMap.Testing/Container/ExplicitArgumentTester.cs
trunk/Source/StructureMap.Testing/Container/FillDependenciesTester.cs
trunk/Source/StructureMap.Testing/Container/FullStackFacadeTester.cs
trunk/Source/StructureMap.Testing/Container/InstanceFactoryTester.cs
trunk/Source/StructureMap.Testing/Container/InstanceManagerTester.cs
trunk/Source/StructureMap.Testing/Container/IntegratedTester.cs
trunk/Source/StructureMap.Testing/Container/Interceptors/TypeInterceptionTester.cs
trunk/Source/StructureMap.Testing/Container/SetterInjectionEmittingTester.cs
trunk/Source/StructureMap.Testing/Container/TypeFindingTester.cs
trunk/Source/StructureMap.Testing/GenericsAcceptanceTester.cs
trunk/Source/StructureMap.Testing/GenericsIntegrationTester.cs
trunk/Source/StructureMap.Testing/Graph/GenericsPluginGraphTester.cs
trunk/Source/StructureMap.Testing/Graph/PluginFamilyTester.cs
trunk/Source/StructureMap.Testing/Graph/PluginTester.cs
trunk/Source/StructureMap.Testing/ImplicitPluginFromPluggedTypeAttributeTester.cs
trunk/Source/StructureMap.Testing/ObjectMother.cs
Added Paths:
-----------
trunk/Source/StructureMap/Container.cs
Modified: trunk/Source/StructureMap/Configuration/GraphBuilder.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/GraphBuilder.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap/Configuration/GraphBuilder.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -11,7 +11,7 @@
private readonly PluginGraph _pluginGraph;
private readonly PluginGraph _systemGraph;
private Profile _profile;
- private InstanceManager _systemInstanceManager;
+ private Container _systemContainer;
public GraphBuilder(Registry[] registries) : this(registries, new PluginGraph())
@@ -110,12 +110,12 @@
{
Instance instance = memento.ReadInstance(_systemGraph, type);
- if (_systemInstanceManager == null)
+ if (_systemContainer == null)
{
- _systemInstanceManager = new InstanceManager(_systemGraph);
+ _systemContainer = new Container(_systemGraph);
}
- return _systemInstanceManager.GetInstance(type, instance);
+ return _systemContainer.GetInstance(type, instance);
}
}
}
\ No newline at end of file
Added: trunk/Source/StructureMap/Container.cs
===================================================================
--- trunk/Source/StructureMap/Container.cs (rev 0)
+++ trunk/Source/StructureMap/Container.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -0,0 +1,291 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using StructureMap.Configuration.DSL;
+using StructureMap.Diagnostics;
+using StructureMap.Graph;
+using StructureMap.Interceptors;
+using StructureMap.Pipeline;
+
+namespace StructureMap
+{
+ /// <summary>
+ /// A collection of IInstanceFactory's.
+ /// </summary>
+ public class Container : TypeRules, IContainer
+ {
+ private InterceptorLibrary _interceptorLibrary;
+ private PipelineGraph _pipelineGraph;
+
+ public Container(Action<Registry> action)
+ {
+ Registry registry = new Registry();
+ action(registry);
+
+ construct(registry.Build());
+ }
+
+ public Container(Registry registry) : this(registry.Build())
+ {
+ }
+
+ public Container() : this(new PluginGraph())
+ {
+ }
+
+ /// <summary>
+ /// Constructor to create an Container
+ /// </summary>
+ /// <param name="pluginGraph">PluginGraph containing the instance and type definitions
+ /// for the Container</param>
+ /// <param name="failOnException">Flags the Container to fail or trap exceptions</param>
+ public Container(PluginGraph pluginGraph)
+ {
+ construct(pluginGraph);
+ }
+
+ private void construct(PluginGraph pluginGraph)
+ {
+ _interceptorLibrary = pluginGraph.InterceptorLibrary;
+
+ if (!pluginGraph.IsSealed)
+ {
+ pluginGraph.Seal();
+ }
+
+ pluginGraph.Log.AssertFailures();
+
+ _pipelineGraph = new PipelineGraph(pluginGraph);
+ }
+
+ protected MissingFactoryFunction onMissingFactory
+ {
+ set { _pipelineGraph.OnMissingFactory = value; }
+ }
+
+ #region IContainer Members
+
+ public T GetInstance<T>(string instanceKey)
+ {
+ return (T) GetInstance(typeof (T), instanceKey);
+ }
+
+ public T GetInstance<T>(Instance instance)
+ {
+ return (T) GetInstance(typeof (T), instance);
+ }
+
+ public PLUGINTYPE GetInstance<PLUGINTYPE>(ExplicitArguments args)
+ {
+ Instance defaultInstance = _pipelineGraph.GetDefault(typeof (PLUGINTYPE));
+
+ ExplicitInstance<PLUGINTYPE> instance = new ExplicitInstance<PLUGINTYPE>(args, defaultInstance);
+ return GetInstance<PLUGINTYPE>(instance);
+ }
+
+ public void Inject<PLUGINTYPE>(PLUGINTYPE instance)
+ {
+ _pipelineGraph.Inject(instance);
+ }
+
+ public void InjectByName<PLUGINTYPE>(PLUGINTYPE instance, string instanceKey)
+ {
+ LiteralInstance literalInstance = new LiteralInstance(instance);
+ literalInstance.Name = instanceKey;
+
+ AddInstance<PLUGINTYPE>(literalInstance);
+ }
+
+ public void InjectByName<PLUGINTYPE, CONCRETETYPE>(string instanceKey)
+ {
+ ConfiguredInstance instance = new ConfiguredInstance(typeof(CONCRETETYPE));
+ instance.Name = instanceKey;
+
+ AddInstance<PLUGINTYPE>(instance);
+ }
+
+ public T GetInstance<T>()
+ {
+ return (T) GetInstance(typeof (T));
+ }
+
+ public T FillDependencies<T>()
+ {
+ return (T) FillDependencies(typeof (T));
+ }
+
+ public void InjectStub<T>(T instance)
+ {
+ InjectStub(typeof (T), instance);
+ }
+
+ public IList<T> GetAllInstances<T>()
+ {
+ List<T> list = new List<T>();
+
+ IBuildSession session = withNewSession();
+
+ foreach (T instance in forType(typeof (T)).GetAllInstances(session))
+ {
+ list.Add(instance);
+ }
+
+ return list;
+ }
+
+ public void SetDefaultsToProfile(string profile)
+ {
+ _pipelineGraph.CurrentProfile = profile;
+ }
+
+ /// <summary>
+ /// Creates the named instance of the PluginType
+ /// </summary>
+ /// <param name="pluginType"></param>
+ /// <param name="instanceKey"></param>
+ /// <returns></returns>
+ public object GetInstance(Type pluginType, string instanceKey)
+ {
+ return withNewSession().CreateInstance(pluginType, instanceKey);
+ }
+
+
+ /// <summary>
+ /// Creates a new object instance of the requested type
+ /// </summary>
+ /// <param name="pluginType"></param>
+ /// <returns></returns>
+ public object GetInstance(Type pluginType)
+ {
+ return withNewSession().CreateInstance(pluginType);
+ }
+
+
+ /// <summary>
+ /// Creates a new instance of the requested type using the InstanceMemento. Mostly used from other
+ /// classes to link children members
+ /// </summary>
+ /// <param name="pluginType"></param>
+ /// <param name="instance"></param>
+ /// <returns></returns>
+ public object GetInstance(Type pluginType, Instance instance)
+ {
+ return withNewSession().CreateInstance(pluginType, instance);
+ }
+
+ /// <summary>
+ /// Sets the default instance for the PluginType
+ /// </summary>
+ /// <param name="pluginType"></param>
+ /// <param name="instance"></param>
+ public void SetDefault(Type pluginType, Instance instance)
+ {
+ _pipelineGraph.SetDefault(pluginType, instance);
+ }
+
+ /// <summary>
+ /// Sets the default instance for the PluginType
+ /// </summary>
+ /// <param name="pluginType"></param>
+ /// <param name="instanceKey"></param>
+ public void SetDefault(Type pluginType, string instanceKey)
+ {
+ ReferencedInstance reference = new ReferencedInstance(instanceKey);
+ _pipelineGraph.SetDefault(pluginType, reference);
+ }
+
+
+ /// <summary>
+ /// Attempts to create a new instance of the requested type. Automatically inserts the default
+ /// configured instance for each dependency in the StructureMap constructor function.
+ /// </summary>
+ /// <param name="type"></param>
+ /// <returns></returns>
+ public object FillDependencies(Type type)
+ {
+ if (!IsConcrete(type))
+ {
+ throw new StructureMapException(230, type.FullName);
+ }
+
+ Plugin plugin = new Plugin(type);
+ if (!plugin.CanBeAutoFilled)
+ {
+ throw new StructureMapException(230, type.FullName);
+ }
+
+ return GetInstance(type);
+ }
+
+ /// <summary>
+ /// Sets up the Container to return the object in the "stub" argument anytime
+ /// any instance of the PluginType is requested
+ /// </summary>
+ /// <param name="pluginType"></param>
+ /// <param name="stub"></param>
+ public void InjectStub(Type pluginType, object stub)
+ {
+ if (!CanBeCast(pluginType, stub.GetType()))
+ {
+ throw new StructureMapException(220, pluginType.FullName,
+ stub.GetType().FullName);
+ }
+
+
+ LiteralInstance instance = new LiteralInstance(stub);
+ _pipelineGraph.SetDefault(pluginType, instance);
+ }
+
+ public IList GetAllInstances(Type type)
+ {
+ return forType(type).GetAllInstances(withNewSession());
+ }
+
+ public void AddInstance<T>(Instance instance)
+ {
+ _pipelineGraph.AddInstance<T>(instance);
+ }
+
+ public void AddInstance<PLUGINTYPE, CONCRETETYPE>() where CONCRETETYPE : PLUGINTYPE
+ {
+ _pipelineGraph.AddInstance<PLUGINTYPE, CONCRETETYPE>();
+ }
+
+ public void AddDefaultInstance<PLUGINTYPE, CONCRETETYPE>()
+ {
+ _pipelineGraph.AddDefaultInstance<PLUGINTYPE, CONCRETETYPE>();
+ }
+
+ public string WhatDoIHave()
+ {
+ WhatDoIHaveWriter writer = new WhatDoIHaveWriter(_pipelineGraph);
+ return writer.GetText();
+ }
+
+ public ExplicitArgsExpression With<T>(T arg)
+ {
+ return new ExplicitArgsExpression(this).With<T>(arg);
+ }
+
+ public IExplicitProperty With(string argName)
+ {
+ return new ExplicitArgsExpression(this).With(argName);
+ }
+
+ #endregion
+
+ private IBuildSession withNewSession()
+ {
+ return new BuildSession(_pipelineGraph, _interceptorLibrary);
+ }
+
+
+ protected IInstanceFactory forType(Type type)
+ {
+ return _pipelineGraph.ForType(type);
+ }
+
+ }
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap/IContainer.cs
===================================================================
--- trunk/Source/StructureMap/IContainer.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap/IContainer.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -18,7 +18,7 @@
T GetInstance<T>(Instance instance);
/// <summary>
- /// Sets up the InstanceManager to return the object in the "stub" argument anytime
+ /// Sets up the Container to return the object in the "stub" argument anytime
/// any instance of the PluginType is requested
/// </summary>
/// <param name="pluginType"></param>
Modified: trunk/Source/StructureMap/InstanceBuilder.cs
===================================================================
--- trunk/Source/StructureMap/InstanceBuilder.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap/InstanceBuilder.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -9,7 +9,7 @@
/// </summary>
public abstract class InstanceBuilder
{
- private InstanceManager _manager;
+ private Container _manager;
public InstanceBuilder()
{
Modified: trunk/Source/StructureMap/ObjectFactory.cs
===================================================================
--- trunk/Source/StructureMap/ObjectFactory.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap/ObjectFactory.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -129,7 +129,7 @@
manager.AddInstance<PLUGINTYPE, CONCRETETYPE>();
}
- #region InstanceManager and setting defaults
+ #region Container and setting defaults
private static IContainer manager
{
@@ -226,14 +226,14 @@
}
- private static InstanceManager buildManager()
+ private static Container buildManager()
{
PluginGraph graph = StructureMapConfiguration.GetPluginGraph();
- InstanceManager instanceManager = new InstanceManager(graph);
- instanceManager.SetDefaultsToProfile(_profile);
+ Container container = new Container(graph);
+ container.SetDefaultsToProfile(_profile);
- return instanceManager;
+ return container;
}
#endregion
Modified: trunk/Source/StructureMap/PluginGraphBuilder.cs
===================================================================
--- trunk/Source/StructureMap/PluginGraphBuilder.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap/PluginGraphBuilder.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -9,7 +9,7 @@
{
/// <summary>
/// Reads configuration XML documents and builds the structures necessary to initialize
- /// the InstanceManager/IInstanceFactory/InstanceBuilder/ObjectInstanceActivator objects
+ /// the Container/IInstanceFactory/InstanceBuilder/ObjectInstanceActivator objects
/// </summary>
public class PluginGraphBuilder
{
Modified: trunk/Source/StructureMap/StructureMap.csproj
===================================================================
--- trunk/Source/StructureMap/StructureMap.csproj 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap/StructureMap.csproj 2008-05-28 04:02:54 UTC (rev 108)
@@ -292,7 +292,7 @@
<Compile Include="InstanceFactory.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="InstanceManager.cs">
+ <Compile Include="Container.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="InstanceMemento.cs">
Modified: trunk/Source/StructureMap.AutoMocking/AutoMockedInstanceManager.cs
===================================================================
--- trunk/Source/StructureMap.AutoMocking/AutoMockedInstanceManager.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.AutoMocking/AutoMockedInstanceManager.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -4,7 +4,7 @@
namespace StructureMap.AutoMocking
{
- public class AutoMockedInstanceManager : InstanceManager
+ public class AutoMockedInstanceManager : Container
{
private readonly ServiceLocator _locator;
Modified: trunk/Source/StructureMap.AutoMocking/RhinoAutoMocker.cs
===================================================================
--- trunk/Source/StructureMap.AutoMocking/RhinoAutoMocker.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.AutoMocking/RhinoAutoMocker.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -22,8 +22,8 @@
_manager = new AutoMockedInstanceManager(locator);
}
- // Replaces the inner InstanceManager in ObjectFactory with the mocked
- // InstanceManager from the auto mocking container. This will make ObjectFactory
+ // Replaces the inner Container in ObjectFactory with the mocked
+ // Container from the auto mocking container. This will make ObjectFactory
// return mocks for everything. Use cautiously!!!!!!!!!!!!!!!
// Gets the ClassUnderTest with mock objects (or stubs) pushed in
Modified: trunk/Source/StructureMap.Testing/BuildSessionTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/BuildSessionTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/BuildSessionTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -138,7 +138,7 @@
[Test]
public void If_no_child_array_is_explicitly_defined_return_all_instances()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.AddInstanceOf<IWidget>(new ColorWidget("Red"));
registry.AddInstanceOf<IWidget>(new ColorWidget("Blue"));
Modified: trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -60,7 +60,7 @@
PluginGraphBuilder builder = new PluginGraphBuilder(parser);
PluginGraph graph = builder.Build();
- InstanceManager manager = new InstanceManager(graph);
+ StructureMap.Container manager = new StructureMap.Container(graph);
GrandChild tommy = (GrandChild) manager.GetInstance(typeof (GrandChild), "Tommy");
Assert.AreEqual(false, tommy.RightHanded);
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/AddInstanceTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/AddInstanceTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/AddInstanceTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -16,7 +16,7 @@
public void SetUp()
{
- manager = new InstanceManager(delegate(Registry registry)
+ manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ScanAssemblies().IncludeAssemblyContainingType<ColorWidget>();
@@ -65,7 +65,7 @@
[Test]
public void AddInstanceAndOverrideTheConcreteTypeForADependency()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
// Specify a new Instance that specifies the concrete type used for a dependency
registry.AddInstanceOf<Rule>().UsingConcreteType<WidgetRule>().WithName("AWidgetRule")
@@ -87,7 +87,7 @@
[Test]
public void SimpleCaseWithNamedInstance()
{
- manager = new InstanceManager(delegate(Registry registry)
+ manager = new StructureMap.Container(delegate(Registry registry)
{
// Specify a new Instance and override the Name
registry.AddInstanceOf<IWidget>().UsingConcreteType<AWidget>().WithName("MyInstance");
@@ -100,7 +100,7 @@
[Test]
public void SpecifyANewInstanceOverrideADependencyWithANamedInstance()
{
- manager = new InstanceManager(delegate(Registry registry)
+ manager = new StructureMap.Container(delegate(Registry registry)
{
registry.AddInstanceOf<Rule>().UsingConcreteType<ARule>().WithName("Alias");
@@ -128,7 +128,7 @@
// Specify a new Instance, create an instance for a dependency on the fly
string instanceKey = "OrangeWidgetRule";
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.AddInstanceOf<Rule>().UsingConcreteType<WidgetRule>().WithName(instanceKey)
.Child<IWidget>().Is(
@@ -152,7 +152,7 @@
CloneableWidget theWidget = new CloneableWidget("Jeremy");
- manager = new InstanceManager(delegate(Registry registry)
+ manager = new StructureMap.Container(delegate(Registry registry)
{
registry.AddPrototypeInstanceOf<IWidget>(theWidget).WithName("Jeremy");
});
@@ -177,7 +177,7 @@
// Return the specific instance when an IWidget named "Julia" is requested
CloneableWidget julia = new CloneableWidget("Julia");
- manager = new InstanceManager(delegate(Registry registry)
+ manager = new StructureMap.Container(delegate(Registry registry)
{
registry.AddInstanceOf<IWidget>(julia).WithName("Julia");
});
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/AddTypesTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/AddTypesTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/AddTypesTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -30,7 +30,7 @@
[Test]
public void A_concrete_type_is_available_by_name_when_it_is_added_by_the_shorthand_mechanism()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<IAddTypes>()
.AddConcreteType<RedAddTypes>("Red")
@@ -47,7 +47,7 @@
[Test]
public void A_concrete_type_is_available_when_it_is_added_by_the_shorthand_mechanism()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<IAddTypes>()
.AddConcreteType<RedAddTypes>()
@@ -64,7 +64,7 @@
[Test]
public void Make_sure_that_we_dont_double_dip_instances_when_we_register_a_type_with_a_name()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<IAddTypes>()
.AddConcreteType<RedAddTypes>("Red")
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/ConstructorExpressionTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/ConstructorExpressionTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/ConstructorExpressionTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -31,7 +31,7 @@
Concretion concretion1 = new Concretion();
Concretion concretion2 = new Concretion();
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<Abstraction>()
.AddInstances(
@@ -49,7 +49,7 @@
{
Concretion concretion = new Concretion();
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<Abstraction>().TheDefaultIs(
ConstructedBy<Abstraction>(delegate { return concretion; })
@@ -65,7 +65,7 @@
Concretion concretion1 = new Concretion();
Concretion concretion2 = new Concretion();
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<Abstraction>().AddInstance(
ConstructedBy<Abstraction>(delegate { return concretion1; }).WithName("One")
@@ -85,7 +85,7 @@
{
Concretion concretion = new Concretion();
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<Abstraction>().AddInstance(
ConstructedBy<Abstraction>(delegate { return concretion; })
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/CreatePluginFamilyTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/CreatePluginFamilyTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/CreatePluginFamilyTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -38,8 +38,8 @@
[Test]
public void Add_an_instance_by_lambda()
{
- InstanceManager manager =
- new InstanceManager(
+ StructureMap.Container manager =
+ new StructureMap.Container(
delegate(Registry registry) { registry.ForRequestedType<IWidget>().AddInstance(delegate { return new AWidget(); }); });
Assert.IsInstanceOfType(typeof (AWidget), manager.GetAllInstances<IWidget>()[0]);
@@ -50,8 +50,8 @@
{
AWidget aWidget = new AWidget();
- InstanceManager manager =
- new InstanceManager(
+ StructureMap.Container manager =
+ new StructureMap.Container(
delegate(Registry registry) { registry.ForRequestedType<IWidget>().AddInstance(aWidget); });
Assert.IsInstanceOfType(typeof (AWidget), manager.GetAllInstances<IWidget>()[0]);
@@ -60,7 +60,7 @@
[Test]
public void AddInstanceByNameOnlyAddsOneInstanceToStructureMap()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<Something>().AddInstance(
RegistryExpressions.Instance<Something>().UsingConcreteType<RedSomething>().WithName("Red")
@@ -73,7 +73,7 @@
[Test]
public void AddInstanceWithNameOnlyAddsOneInstanceToStructureMap()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.AddInstanceOf<Something>().UsingConcreteType<RedSomething>().WithName("Red");
});
@@ -143,7 +143,7 @@
PluginGraph pluginGraph = registry.Build();
Assert.IsTrue(pluginGraph.ContainsFamily(typeof (IGateway)));
- InstanceManager manager = new InstanceManager(pluginGraph);
+ StructureMap.Container manager = new StructureMap.Container(pluginGraph);
IGateway gateway = (IGateway) manager.GetInstance(typeof (IGateway));
Assert.IsInstanceOfType(typeof (StubbedGateway), gateway);
@@ -158,7 +158,7 @@
Assert.IsTrue(pluginGraph.ContainsFamily(typeof (IGateway)));
- InstanceManager manager = new InstanceManager(pluginGraph);
+ StructureMap.Container manager = new StructureMap.Container(pluginGraph);
IGateway gateway = (IGateway) manager.GetInstance(typeof (IGateway));
Assert.IsInstanceOfType(typeof (FakeGateway), gateway);
@@ -167,7 +167,7 @@
[Test]
public void CreatePluginFamilyWithADefault()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.BuildInstancesOf<IWidget>().TheDefaultIs(
RegistryExpressions.Instance<IWidget>().UsingConcreteType<ColorWidget>().WithProperty("Color").EqualTo(
@@ -195,8 +195,8 @@
[Test]
public void Set_the_default_by_a_lambda()
{
- InstanceManager manager =
- new InstanceManager(
+ StructureMap.Container manager =
+ new StructureMap.Container(
delegate(Registry registry) { registry.ForRequestedType<IWidget>().TheDefaultIs(delegate { return new AWidget(); }); });
Assert.IsInstanceOfType(typeof (AWidget), manager.GetInstance<IWidget>());
@@ -207,8 +207,8 @@
{
AWidget aWidget = new AWidget();
- InstanceManager manager =
- new InstanceManager(
+ StructureMap.Container manager =
+ new StructureMap.Container(
delegate(Registry registry) { registry.ForRequestedType<IWidget>().TheDefaultIs(aWidget); });
Assert.AreSame(aWidget, manager.GetInstance<IWidget>());
@@ -217,7 +217,7 @@
[Test]
public void TheDefaultInstanceIsConcreteType()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
// Needs to blow up if the concrete type can't be used
registry.BuildInstancesOf<Rule>().TheDefaultIsConcreteType<ARule>();
@@ -237,7 +237,7 @@
Assert.IsTrue(pluginGraph.ContainsFamily(typeof (IGateway)));
- InstanceManager manager = new InstanceManager(pluginGraph);
+ StructureMap.Container manager = new StructureMap.Container(pluginGraph);
IGateway gateway = (IGateway) manager.GetInstance(typeof (IGateway));
Assert.IsInstanceOfType(typeof (DefaultGateway), gateway);
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/DeepInstanceTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/DeepInstanceTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/DeepInstanceTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -12,7 +12,7 @@
private void assertThingMatches(Action<Registry> action)
{
- IContainer manager = new InstanceManager(action);
+ IContainer manager = new StructureMap.Container(action);
Thing actual = manager.GetInstance<Thing>();
Assert.AreEqual(_prototype, actual);
}
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/GenericFamilyExpressionTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/GenericFamilyExpressionTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/GenericFamilyExpressionTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -45,7 +45,7 @@
[Test]
public void Add_concrete_type()
{
- InstanceManager manager = new InstanceManager(delegate(Registry r)
+ StructureMap.Container manager = new StructureMap.Container(delegate(Registry r)
{
r.ForRequestedType(typeof(ITarget)).AddConcreteType(typeof(Target1));
});
@@ -57,7 +57,7 @@
[Test]
public void Add_concrete_type_with_name()
{
- InstanceManager manager = new InstanceManager(delegate(Registry r)
+ StructureMap.Container manager = new StructureMap.Container(delegate(Registry r)
{
r.ForRequestedType(typeof(ITarget)).AddConcreteType(typeof(Target1), "1");
r.ForRequestedType(typeof(ITarget)).AddConcreteType(typeof(Target2), "2");
@@ -73,7 +73,7 @@
[Test]
public void Add_default_by_concrete_type()
{
- InstanceManager manager = new InstanceManager(delegate(Registry r)
+ StructureMap.Container manager = new StructureMap.Container(delegate(Registry r)
{
r.ForRequestedType(typeof (ITarget)).TheDefaultIsConcreteType(typeof (Target3));
});
@@ -84,7 +84,7 @@
[Test]
public void Add_default_instance()
{
- InstanceManager manager = new InstanceManager(delegate(Registry r)
+ StructureMap.Container manager = new StructureMap.Container(delegate(Registry r)
{
r.ForRequestedType(typeof(ITarget)).TheDefaultIs(Instance<Target2>());
});
@@ -95,7 +95,7 @@
[Test]
public void Add_instance_by_lambda()
{
- InstanceManager manager = new InstanceManager(delegate(Registry r)
+ StructureMap.Container manager = new StructureMap.Container(delegate(Registry r)
{
r.ForRequestedType(typeof(ITarget)).TheDefaultIs(delegate() { return new Target1(); });
});
@@ -106,7 +106,7 @@
[Test]
public void Add_instance_directly()
{
- InstanceManager manager = new InstanceManager(delegate(Registry r)
+ StructureMap.Container manager = new StructureMap.Container(delegate(Registry r)
{
r.ForRequestedType(typeof (ITarget)).AddInstance(Instance<Target2>());
});
@@ -118,7 +118,7 @@
[Test]
public void Enrichment()
{
- InstanceManager manager = new InstanceManager(delegate(Registry r)
+ StructureMap.Container manager = new StructureMap.Container(delegate(Registry r)
{
r.ForRequestedType(typeof(ITarget))
.TheDefaultIsConcreteType(typeof(Target1))
@@ -164,7 +164,7 @@
{
ITarget created = null;
- InstanceManager manager = new InstanceManager(delegate(Registry r)
+ StructureMap.Container manager = new StructureMap.Container(delegate(Registry r)
{
r.ForRequestedType(typeof (ITarget))
.TheDefaultIsConcreteType(typeof (Target3))
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/InjectArrayTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/InjectArrayTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/InjectArrayTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -82,7 +82,7 @@
[Test]
public void CanStillAddOtherPropertiesAfterTheCallToChildArray()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<Processor>()
.TheDefaultIs(
@@ -103,7 +103,7 @@
[Test]
public void InjectPropertiesByName()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<Processor2>()
.TheDefaultIs(
@@ -153,7 +153,7 @@
[Test]
public void PlaceMemberInArrayByReference()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.AddInstanceOf<IHandler>().UsingConcreteType<Handler1>().WithName("One");
registry.AddInstanceOf<IHandler>().UsingConcreteType<Handler2>().WithName("Two");
@@ -178,7 +178,7 @@
[Test]
public void ProgrammaticallyInjectArrayAllInline()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<Processor>()
.TheDefaultIs(
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/InterceptAllInstancesOfPluginTypeTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/InterceptAllInstancesOfPluginTypeTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/InterceptAllInstancesOfPluginTypeTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -38,7 +38,7 @@
{
if (_manager == null)
{
- _manager = new InstanceManager(delegate(Registry registry)
+ _manager = new StructureMap.Container(delegate(Registry registry)
{
_defaultRegistry(registry);
action(registry);
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/InterceptorTesting.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/InterceptorTesting.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/InterceptorTesting.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -15,7 +15,7 @@
{
_lastService = null;
- _manager = new InstanceManager(delegate(Registry registry)
+ _manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<IService>().AddInstances
(
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/ProfileExpressionTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/ProfileExpressionTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/ProfileExpressionTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -56,7 +56,7 @@
Assert.AreEqual(Profile.InstanceKeyForProfile(theProfileName), defaultInstance.Name);
- InstanceManager manager = new InstanceManager(graph);
+ StructureMap.Container manager = new StructureMap.Container(graph);
manager.SetDefaultsToProfile(theProfileName);
AWidget widget = (AWidget)manager.GetInstance<IWidget>();
Assert.IsNotNull(widget);
@@ -83,7 +83,7 @@
{
string theProfileName = "something";
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.CreateProfile(theProfileName)
.For<IWidget>().UseConcreteType<AWidget>()
@@ -101,7 +101,7 @@
{
string theProfileName = "something";
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.CreateProfile(theProfileName)
.For<IWidget>().Use(delegate() { return new AWidget(); })
@@ -122,7 +122,7 @@
string theProfileName = "something";
IWidget theTemplate = new AWidget();
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.CreateProfile(theProfileName)
.For<IWidget>().UsePrototypeOf(theTemplate);
Modified: trunk/Source/StructureMap.Testing/Configuration/DefaultInstanceNodeTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DefaultInstanceNodeTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/DefaultInstanceNodeTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -21,12 +21,12 @@
";
_graph = DataMother.BuildPluginGraphFromXml(xml);
- _manager = new InstanceManager(_graph);
+ _manager = new StructureMap.Container(_graph);
}
#endregion
- private InstanceManager _manager;
+ private StructureMap.Container _manager;
private PluginGraph _graph;
[Test]
Modified: trunk/Source/StructureMap.Testing/Configuration/InlineInstanceDefinitionInProfileAndMachineNodesTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/InlineInstanceDefinitionInProfileAndMachineNodesTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/InlineInstanceDefinitionInProfileAndMachineNodesTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -85,7 +85,7 @@
public void GettingTheRightInstanceKeyWhenUsingAMAchineOverrideInCombinationWithProfile()
{
ProfileBuilder.OverrideMachineName("GREEN-BOX");
- InstanceManager manager = new InstanceManager(graph);
+ StructureMap.Container manager = new StructureMap.Container(graph);
ColorWidget widget = (ColorWidget) manager.GetInstance<IWidget>();
Assert.AreEqual("Green", widget.Color);
@@ -95,7 +95,7 @@
public void GotTheInstanceForTheMachineOverride()
{
ProfileBuilder.OverrideMachineName("ORANGE-BOX");
- InstanceManager manager = new InstanceManager(graph);
+ StructureMap.Container manager = new StructureMap.Container(graph);
ColorWidget widget = (ColorWidget)manager.GetInstance<IWidget>();
Assert.AreEqual("Orange", widget.Color);
@@ -104,7 +104,7 @@
[Test]
public void HasADefaultInstanceKey()
{
- InstanceManager manager = new InstanceManager(graph);
+ StructureMap.Container manager = new StructureMap.Container(graph);
manager.SetDefaultsToProfile("Green");
@@ -115,7 +115,7 @@
[Test]
public void HasTheOverrideForProfile()
{
- InstanceManager manager = new InstanceManager(graph);
+ StructureMap.Container manager = new StructureMap.Container(graph);
manager.SetDefaultsToProfile("Blue");
ColorRule rule = (ColorRule) manager.GetInstance<Rule>();
@@ -131,7 +131,7 @@
public void InlineMachine1()
{
ProfileBuilder.OverrideMachineName("ORANGE-BOX");
- InstanceManager manager = new InstanceManager(graph);
+ StructureMap.Container manager = new StructureMap.Container(graph);
ColorWidget widget = (ColorWidget)manager.GetInstance(typeof(IWidget));
Assert.AreEqual("Orange", widget.Color);
@@ -141,7 +141,7 @@
public void InlineMachine2()
{
ProfileBuilder.OverrideMachineName("GREEN-BOX");
- InstanceManager manager = new InstanceManager(graph);
+ StructureMap.Container manager = new StructureMap.Container(graph);
ColorWidget widget = (ColorWidget)manager.GetInstance(typeof(IWidget));
Assert.AreEqual("Green", widget.Color);
@@ -150,7 +150,7 @@
[Test]
public void SetTheProfile()
{
- InstanceManager manager = new InstanceManager(graph);
+ StructureMap.Container manager = new StructureMap.Container(graph);
manager.SetDefaultsToProfile("Green");
ColorRule greenRule = (ColorRule)manager.GetInstance(typeof(Rule));
Modified: trunk/Source/StructureMap.Testing/Configuration/ShortcuttedInstanceNodeTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/ShortcuttedInstanceNodeTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Configuration/ShortcuttedInstanceNodeTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -17,12 +17,12 @@
public void SetUp()
{
_graph = DataMother.GetPluginGraph("ShortInstance.xml");
- _manager = new InstanceManager(_graph);
+ _manager = new StructureMap.Container(_graph);
}
#endregion
- private InstanceManager _manager;
+ private StructureMap.Container _manager;
private PluginGraph _graph;
[Test]
Modified: trunk/Source/StructureMap.Testing/Container/ArrayConstructorTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Container/ArrayConstructorTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Container/ArrayConstructorTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -39,7 +39,7 @@
PluginGraph graph = builder.Build();
- InstanceManager manager = new InstanceManager(graph);
+ StructureMap.Container manager = new StructureMap.Container(graph);
Decision d1 = (Decision) manager.GetInstance(typeof (Decision), "RedBlue");
Assert.IsNotNull(d1);
Modified: trunk/Source/StructureMap.Testing/Container/DynamicInjectionTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Container/DynamicInjectionTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Container/DynamicInjectionTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -59,7 +59,7 @@
[Test]
public void AddInstanceToInstanceManagerWhenTheInstanceFactoryDoesNotExist()
{
- InstanceManager manager = new InstanceManager(new PluginGraph());
+ StructureMap.Container manager = new StructureMap.Container(new PluginGraph());
manager.AddInstance<IService>(new LiteralInstance(_red).WithName("Red"));
manager.AddInstance<IService>(new LiteralInstance(_blue).WithName("Blue"));
@@ -99,7 +99,7 @@
PluginFamily family = pluginGraph.FindFamily(typeof(ISomething));
family.AddPlugin(typeof (SomethingOne), "One");
- InstanceManager manager = new InstanceManager(pluginGraph);
+ StructureMap.Container manager = new StructureMap.Container(pluginGraph);
ConfiguredInstance instance = new ConfiguredInstance().WithConcreteKey("One").WithName("One");
manager.AddInstance<ISomething>(instance);
@@ -113,7 +113,7 @@
public void AddPluginForTypeWhenThePluginDoesNotAlreadyExistsDoesNothing()
{
PluginGraph pluginGraph = new PluginGraph();
- InstanceManager manager = new InstanceManager(pluginGraph);
+ StructureMap.Container manager = new StructureMap.Container(pluginGraph);
manager.AddInstance<ISomething, SomethingOne>();
Modified: trunk/Source/StructureMap.Testing/Container/EnumerationTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Container/EnumerationTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Container/EnumerationTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -23,7 +23,7 @@
PluginFamily family = graph.FindFamily(typeof (Cow));
family.AddPlugin(typeof (Cow), "Default");
- InstanceManager manager = new InstanceManager(graph);
+ StructureMap.Container manager = new StructureMap.Container(graph);
ConfiguredInstance instance = new ConfiguredInstance()
.WithConcreteKey("Default").WithName("Angus")
Modified: trunk/Source/StructureMap.Testing/Container/ExceptionHandling/StructureMapExceptionTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Container/ExceptionHandling/StructureMapExceptionTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Container/ExceptionHandling/StructureMapExceptionTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -107,14 +107,14 @@
}
- private void assertErrorIsThrown(int errorCode, string xml, Action<InstanceManager> action)
+ private void assertErrorIsThrown(int errorCode, string xml, Action<StructureMap.Container> action)
{
XmlDocument document = new XmlDocument();
document.LoadXml(xml.Replace("\"", "'"));
ConfigurationParser parser = new ConfigurationParser(document.DocumentElement);
PluginGraphBuilder builder = new PluginGraphBuilder(parser);
- InstanceManager manager = new InstanceManager(builder.Build());
+ StructureMap.Container manager = new StructureMap.Container(builder.Build());
try
{
@@ -154,7 +154,7 @@
<PluginFamily Type='StructureMap.Testing.Widget.IWidget' Assembly='StructureMap.Testing.Widget' DefaultKey=''> </PluginFamily>
</StructureMap>
",
- delegate (InstanceManager manager)
+ delegate (StructureMap.Container manager)
{
manager.GetInstance<IWidget>("NotAnActualInstanceName");
}
@@ -187,7 +187,7 @@
<PluginFamily Type='StructureMap.Testing.Widget.IWidget' Assembly='StructureMap.Testing.Widget' DefaultKey=''></PluginFamily>
</StructureMap>
",
- delegate (InstanceManager manager)
+ delegate (StructureMap.Container manager)
{
manager.GetInstance<IWidget>();
}
Modified: trunk/Source/StructureMap.Testing/Container/ExplicitArgumentTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Container/ExplicitArgumentTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Container/ExplicitArgumentTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -123,7 +123,7 @@
[Test]
public void PassAnArgumentIntoExplicitArgumentsForARequestedInterface()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<IProvider>().TheDefaultIsConcreteType<LumpProvider>();
});
@@ -158,7 +158,7 @@
[Test]
public void PassExplicitArgsIntoInstanceManager()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ForRequestedType<ExplicitTarget>().TheDefaultIs(
Registry.Instance<ExplicitTarget>()
@@ -211,7 +211,7 @@
[Test]
public void Fill_in_argument_by_name()
{
- InstanceManager manager = new InstanceManager();
+ StructureMap.Container manager = new StructureMap.Container();
manager.AddDefaultInstance<IView, View>();
Node theNode = new Node();
@@ -230,7 +230,7 @@
[Test]
public void Pass_in_arguments_as_dictionary()
{
- InstanceManager manager = new InstanceManager();
+ StructureMap.Container manager = new StructureMap.Container();
manager.AddDefaultInstance<IView, View>();
Node theNode = new Node();
Modified: trunk/Source/StructureMap.Testing/Container/FillDependenciesTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Container/FillDependenciesTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Container/FillDependenciesTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -14,7 +14,7 @@
{
PluginGraph pluginGraph = ObjectMother.GetPluginGraph();
- InstanceManager manager = new InstanceManager(pluginGraph);
+ StructureMap.Container manager = new StructureMap.Container(pluginGraph);
// The dependencies must have a default setting first
manager.SetDefault(typeof (IStrategy), "Red");
@@ -33,7 +33,7 @@
public void TryToFillDependenciesOnAbstractClassThrowsException()
{
PluginGraph pluginGraph = ObjectMother.GetPluginGraph();
- InstanceManager manager = new InstanceManager(pluginGraph);
+ StructureMap.Container manager = new StructureMap.Container(pluginGraph);
manager.FillDependencies(typeof (AbstractClass));
}
@@ -43,7 +43,7 @@
public void TryToFillDependenciesOnClassWithPrimitiveArgumentsThrowsException()
{
PluginGraph pluginGraph = ObjectMother.GetPluginGraph();
- InstanceManager manager = new InstanceManager(pluginGraph);
+ StructureMap.Container manager = new StructureMap.Container(pluginGraph);
manager.FillDependencies(typeof (CannotBeFilledConcreteClass));
}
Modified: trunk/Source/StructureMap.Testing/Container/FullStackFacadeTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Container/FullStackFacadeTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Container/FullStackFacadeTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -33,7 +33,7 @@
PluginGraph pluginGraph = DataMother.GetDiagnosticPluginGraph("SampleConfig.xml");
- InstanceManager manager = new InstanceManager(pluginGraph);
+ StructureMap.Container manager = new StructureMap.Container(pluginGraph);
IList list = manager.GetAllInstances(typeof (IWidget));
Modified: trunk/Source/StructureMap.Testing/Container/InstanceFactoryTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Container/InstanceFactoryTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Container/InstanceFactoryTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -17,7 +17,7 @@
[SetUp]
public void SetUp()
{
- _manager = new InstanceManager(delegate(Registry registry)
+ _manager = new StructureMap.Container(delegate(Registry registry)
{
registry.BuildInstancesOf<Rule>();
registry.ScanAssemblies()
@@ -29,7 +29,7 @@
#endregion
- private InstanceManager _manager;
+ private StructureMap.Container _manager;
Modified: trunk/Source/StructureMap.Testing/Container/InstanceManagerTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Container/InstanceManagerTester.cs 2008-05-28 03:58:49 UTC (rev 107)
+++ trunk/Source/StructureMap.Testing/Container/InstanceManagerTester.cs 2008-05-28 04:02:54 UTC (rev 108)
@@ -20,7 +20,7 @@
[SetUp]
public void SetUp()
{
- _manager = new InstanceManager(delegate(Registry registry)
+ _manager = new StructureMap.Container(delegate(Registry registry)
{
registry.ScanAssemblies().IncludeAssembly("StructureMap.Testing.Widget");
registry.BuildInstancesOf<Rule>();
@@ -73,14 +73,14 @@
[Test]
public void CanBuildConcreteTypesThatAreNotPreviouslyRegistered()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap.Container(delegate(Registry registry)
{
- // Create a new InstanceManager that has a default instance configured for only the
- // IProvider interface. InstanceManager is the real "container" behind ObjectFactory
+ // Create a new Container that has a default instance configured for only the
+ // IProvider interface. Container is the real "container" behind ObjectFactory
registry.ForRequestedType<IProvider>().TheDefaultIsConcreteType<Provider>();
});
- // Now, have that same InstanceManager create a ClassThatUsesProvider. StructureMap will
+ // Now, have that same Container create a ClassThatUsesProvider. StructureMap will
// see that ClassThatUsesProvider is concrete, determine its constructor args, and build one
// for you with the default IProvider. No other configuration necessary.
ClassThatUsesProvider classThatUsesProvider = manager.GetInstance<ClassThatUsesProvider>();
@@ -90,7 +90,7 @@
[Test]
public void CanBuildConcreteTypesThatAreNotPreviouslyRegisteredWithArgumentsProvided()
{
- IContainer manager = new InstanceManager(delegate(Registry registry)
+ IContainer manager = new StructureMap....
[truncated message content] |
