Menu
▾
▴
[Structuremap-commits] SF.net SVN: structuremap: [32] trunk/Source/StructureMap
|
From: <jer...@us...> - 2007-03-29 15:58:27
|
Revision: 32
http://structuremap.svn.sourceforge.net/structuremap/?rev=32&view=rev
Author: jeremydmiller
Date: 2007-03-29 08:58:10 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
making diagnostics work with generic types
Modified Paths:
--------------
trunk/Source/StructureMap/Configuration/ConfigurationConstants.cs
trunk/Source/StructureMap/Configuration/ConfigurationParser.cs
trunk/Source/StructureMap/Configuration/ConfigurationParserCollection.cs
trunk/Source/StructureMap/Configuration/DSL/ChildInstanceExpression.cs
trunk/Source/StructureMap/Configuration/DSL/CreatePluginFamilyExpression.cs
trunk/Source/StructureMap/Configuration/DSL/InstanceDefaultExpression.cs
trunk/Source/StructureMap/Configuration/DSL/InstanceExpression.cs
trunk/Source/StructureMap/Configuration/DSL/MementoBuilder.cs
trunk/Source/StructureMap/Configuration/DSL/ProfileExpression.cs
trunk/Source/StructureMap/Configuration/DSL/Registry.cs
trunk/Source/StructureMap/Configuration/DiagnosticGraphBuilder.cs
trunk/Source/StructureMap/Configuration/GraphObject.cs
trunk/Source/StructureMap/Configuration/NormalGraphBuilder.cs
trunk/Source/StructureMap/Configuration/PluginGraphReport.cs
trunk/Source/StructureMap/Configuration/ProfileAndMachineParser.cs
trunk/Source/StructureMap/Configuration/Tokens/FamilyToken.cs
trunk/Source/StructureMap/Configuration/Tokens/InstanceToken.cs
trunk/Source/StructureMap/Graph/AssemblyGraph.cs
trunk/Source/StructureMap/Graph/PluginGraph.cs
trunk/Source/StructureMap/Graph/TypePath.cs
trunk/Source/StructureMap/IInstanceCreator.cs
trunk/Source/StructureMap/IInstanceManager.cs
trunk/Source/StructureMap/InstanceManager.cs
trunk/Source/StructureMap/InstanceMemento.cs
trunk/Source/StructureMap/Interceptors/HttpContextItemInterceptor.cs
trunk/Source/StructureMap/MemoryInstanceMemento.cs
trunk/Source/StructureMap/ObjectFactory.cs
trunk/Source/StructureMap/PluginGraphBuilder.cs
trunk/Source/StructureMap.Testing/AlternativeConfigurationTester.cs
trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserCollectionTester.cs
trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/AddInstanceTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/ChildInstanceExpressionTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/CreatePluginFamilyTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/CreateProfileTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/DeepInstanceTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/InstanceExpressionTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/LiteralExpressionTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/ProfileExpressionTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/RegistryIntegratedTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/RegistryTester.cs
trunk/Source/StructureMap.Testing/Configuration/InlineInstanceDefinitionInProfileAndMachineNodesTester.cs
trunk/Source/StructureMap.Testing/Container/InstanceManagerTester.cs
trunk/Source/StructureMap.Testing/GenericsAcceptanceTester.cs
trunk/Source/StructureMap.Testing/GenericsIntegrationTester.cs
trunk/Source/StructureMap.Testing/Graph/PluginGraphTester.cs
trunk/Source/StructureMap.Testing/Graph/PluginTester.cs
trunk/Source/StructureMap.Testing/ImplicitPluginFromPluggedTypeAttributeTester.cs
trunk/Source/StructureMap.Testing/ObjectMother.cs
trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj
trunk/Source/StructureMap.Testing/StructureMapConfigCreator.cs
trunk/Source/StructureMap.Testing/StructureMapConfigurationTester.cs
trunk/Source/StructureMap.Testing/TestData/DataMother.cs
trunk/Source/StructureMap.Testing/TestData/GenericsTesting.xml
trunk/Source/StructureMap.Testing.GenericWidgets/Widgets.cs
trunk/Source/StructureMap.Testing.Widget5/StructureMap.Testing.Widget5.csproj
trunk/Source/StructureMap.Testing.Widget5/WidgetRegistry.cs
Modified: trunk/Source/StructureMap/Configuration/ConfigurationConstants.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/ConfigurationConstants.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/ConfigurationConstants.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -42,5 +42,6 @@
"A fatal error in configuration is preventing StructureMap from functioning correctly";
public const string MISSING_TEMPLATE_VALUE = "A required value for a Templated InstanceMemento is missing";
+ public const string UNKNOWN_PLUGIN_PROBLEM = "Exception occured while attaching a Plugin to a PluginFamily";
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Configuration/ConfigurationParser.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/ConfigurationParser.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/ConfigurationParser.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -218,7 +218,5 @@
ProfileAndMachineParser parser = new ProfileAndMachineParser(builder, _structureMapNode, _mementoCreator);
parser.Parse();
}
-
-
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Configuration/ConfigurationParserCollection.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/ConfigurationParserCollection.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/ConfigurationParserCollection.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -74,4 +74,4 @@
_fetchers.Add(fetcher);
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Configuration/DSL/ChildInstanceExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/ChildInstanceExpression.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/DSL/ChildInstanceExpression.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -21,7 +21,8 @@
_propertyName = propertyName;
}
- public ChildInstanceExpression(InstanceExpression instance, MemoryInstanceMemento memento, string propertyName, Type childType)
+ public ChildInstanceExpression(InstanceExpression instance, MemoryInstanceMemento memento, string propertyName,
+ Type childType)
: this(instance, memento, propertyName)
{
_childType = childType;
Modified: trunk/Source/StructureMap/Configuration/DSL/CreatePluginFamilyExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/CreatePluginFamilyExpression.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/DSL/CreatePluginFamilyExpression.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -59,7 +59,7 @@
public CreatePluginFamilyExpression TheDefaultIsConcreteType<T>()
{
- ExpressionValidator.ValidatePluggabilityOf(typeof(T)).IntoPluginType(_pluginType);
+ ExpressionValidator.ValidatePluggabilityOf(typeof (T)).IntoPluginType(_pluginType);
_alterations.Add(delegate(PluginFamily family)
{
Modified: trunk/Source/StructureMap/Configuration/DSL/InstanceDefaultExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/InstanceDefaultExpression.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/DSL/InstanceDefaultExpression.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -42,8 +42,8 @@
}
else
{
- throw new StructureMapException(304, TypePath.GetAssemblyQualifiedName(_pluginType));
- }
+ throw new StructureMapException(304, TypePath.GetAssemblyQualifiedName(_pluginType));
+ }
}
public ProfileExpression Use(IMementoBuilder mementoBuilder)
@@ -52,7 +52,5 @@
return _parent;
}
-
-
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Configuration/DSL/InstanceExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/InstanceExpression.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/DSL/InstanceExpression.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -53,8 +53,6 @@
}
-
-
public PropertyExpression WithProperty(string propertyName)
{
return new PropertyExpression(this, _memento, propertyName);
@@ -118,7 +116,7 @@
public InstanceExpression UsingConcreteType<T>()
{
- _parent._pluggedType = typeof(T);
+ _parent._pluggedType = typeof (T);
return _parent;
}
@@ -127,7 +125,6 @@
_parent._memento.ConcreteKey = concreteKey;
return _parent;
}
-
}
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Configuration/DSL/MementoBuilder.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/MementoBuilder.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/DSL/MementoBuilder.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -23,7 +23,7 @@
validate();
PluginFamily family = graph.LocateOrCreateFamilyForType((Type) _pluginType);
configureMemento(family);
-
+
if (!string.IsNullOrEmpty(_instanceKey))
{
memento.InstanceKey = _instanceKey;
Modified: trunk/Source/StructureMap/Configuration/DSL/ProfileExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/ProfileExpression.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/DSL/ProfileExpression.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -1,4 +1,3 @@
-using System;
using System.Collections.Generic;
using StructureMap.Graph;
@@ -31,7 +30,7 @@
public InstanceDefaultExpression For<T>()
{
- InstanceDefaultExpression defaultExpression = new InstanceDefaultExpression(typeof(T), this);
+ InstanceDefaultExpression defaultExpression = new InstanceDefaultExpression(typeof (T), this);
_defaults.Add(defaultExpression);
return defaultExpression;
Modified: trunk/Source/StructureMap/Configuration/DSL/Registry.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Registry.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/DSL/Registry.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -113,7 +113,7 @@
public static bool IsPublicRegistry(Type type)
{
- if (!typeof(Registry).IsAssignableFrom(type))
+ if (!typeof (Registry).IsAssignableFrom(type))
{
return false;
}
Modified: trunk/Source/StructureMap/Configuration/DiagnosticGraphBuilder.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DiagnosticGraphBuilder.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/DiagnosticGraphBuilder.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -19,7 +19,7 @@
{
_innerBuilder = new NormalGraphBuilder(registries);
_systemReport = new PluginGraphReport();
- _report = _innerBuilder.PluginGraph.Report;
+ _report = new PluginGraphReport();
}
public PluginGraph PluginGraph
@@ -168,6 +168,11 @@
pluginToken.LogProblem(problem);
}
}
+ catch (Exception ex)
+ {
+ Problem problem = new Problem(ConfigurationConstants.UNKNOWN_PLUGIN_PROBLEM, ex);
+ pluginToken.LogProblem(problem);
+ }
return returnValue;
}
Modified: trunk/Source/StructureMap/Configuration/GraphObject.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/GraphObject.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/GraphObject.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -1,12 +1,13 @@
using System;
using System.Collections;
+using System.Collections.Generic;
namespace StructureMap.Configuration
{
[Serializable]
public abstract class GraphObject : IComparable
{
- private ArrayList _problems = new ArrayList();
+ private List<Problem> _problems = new List<Problem>();
private Guid _id = Guid.NewGuid();
public GraphObject()
@@ -21,8 +22,8 @@
public Problem[] Problems
{
- get { return (Problem[]) _problems.ToArray(typeof (Problem)); }
- set { _problems = new ArrayList(value); }
+ get { return _problems.ToArray(); }
+ set { _problems = new List<Problem>(value); }
}
public void LogProblem(Problem problem)
Modified: trunk/Source/StructureMap/Configuration/NormalGraphBuilder.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/NormalGraphBuilder.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/NormalGraphBuilder.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -25,7 +25,7 @@
public NormalGraphBuilder(IInterceptorChainBuilder builder, Registry[] registries)
{
_builder = builder;
-
+
_pluginGraph = new PluginGraph();
foreach (Registry registry in registries)
{
@@ -154,6 +154,13 @@
public Plugin AddPlugin(TypePath pluginTypePath, TypePath pluginPath, string concreteKey)
{
PluginFamily family = _pluginGraph.PluginFamilies[pluginTypePath];
+ if (family == null)
+ {
+ string message =
+ string.Format("Could not find a PluginFamily for {0}", pluginTypePath.AssemblyQualifiedName);
+ throw new ApplicationException(message);
+ }
+
Plugin plugin = new Plugin(pluginPath, concreteKey);
plugin.DefinitionSource = DefinitionSource.Explicit;
family.Plugins.Add(plugin);
Modified: trunk/Source/StructureMap/Configuration/PluginGraphReport.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/PluginGraphReport.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/PluginGraphReport.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -18,6 +18,33 @@
{
}
+ public PluginGraphReport(PluginGraph pluginGraph)
+ {
+ ReadFromPluginGraph(pluginGraph);
+ }
+
+ public void ReadFromPluginGraph(PluginGraph pluginGraph)
+ {
+ ImportImplicitChildren(pluginGraph);
+ AnalyzeInstances(pluginGraph);
+
+ Profile defaultProfile = pluginGraph.DefaultManager.CalculateDefaults();
+
+ InstanceManager manager = new InstanceManager();
+ try
+ {
+ manager = new InstanceManager(pluginGraph);
+ }
+ catch (Exception ex)
+ {
+ Problem problem = new Problem(ConfigurationConstants.FATAL_ERROR, ex);
+ LogProblem(problem);
+ }
+
+ IInstanceValidator validator = new InstanceValidator(pluginGraph, defaultProfile, manager);
+ ValidateInstances(validator);
+ }
+
public override GraphObject[] Children
{
get
@@ -62,6 +89,8 @@
FamilyToken[] returnValue = new FamilyToken[_families.Count];
_families.Values.CopyTo(returnValue, 0);
+
+
return returnValue;
}
}
@@ -90,6 +119,11 @@
return null;
}
+ public bool HasFamily(Type pluginType)
+ {
+ return _families.ContainsKey(new TypePath(pluginType));
+ }
+
public FamilyToken FindFamily(Type pluginType)
{
TypePath path = new TypePath(pluginType);
Modified: trunk/Source/StructureMap/Configuration/ProfileAndMachineParser.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/ProfileAndMachineParser.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/ProfileAndMachineParser.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -1,4 +1,3 @@
-using System;
using System.Xml;
using StructureMap.Graph;
using StructureMap.Graph.Configuration;
@@ -62,12 +61,12 @@
private void processOverrideElement(WriteOverride function, XmlElement overrideElement, string profileName)
{
string fullName = overrideElement.GetAttribute(XmlConstants.TYPE_ATTRIBUTE);
-
+
XmlElement instanceElement = (XmlElement) overrideElement.SelectSingleNode(XmlConstants.INSTANCE_NODE);
if (instanceElement == null)
{
string defaultKey = overrideElement.GetAttribute(XmlConstants.DEFAULT_KEY_ATTRIBUTE);
- function(fullName, defaultKey);
+ function(fullName, defaultKey);
}
else
{
@@ -75,7 +74,8 @@
}
}
- private void createOverrideInstance(string fullName, XmlElement instanceElement, WriteOverride function, string profileName)
+ private void createOverrideInstance(string fullName, XmlElement instanceElement, WriteOverride function,
+ string profileName)
{
string key = Profile.InstanceKeyForProfile(profileName);
InstanceMemento memento = _creator.CreateMemento(instanceElement);
@@ -91,6 +91,5 @@
{
return _structureMapNode.SelectNodes(nodeName);
}
-
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Configuration/Tokens/FamilyToken.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/Tokens/FamilyToken.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/Tokens/FamilyToken.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -1,5 +1,6 @@
using System;
using System.Collections;
+using System.Collections.Generic;
using StructureMap.Attributes;
using StructureMap.Graph;
@@ -31,7 +32,7 @@
private DefinitionSource _definitionSource = DefinitionSource.Explicit;
private string _defaultKey;
- private Hashtable _plugins = new Hashtable();
+ private Dictionary<string, PluginToken> _plugins = new Dictionary<string, PluginToken>();
private InstanceToken _sourceInstance;
private ArrayList _interceptors = new ArrayList();
private Hashtable _instances = new Hashtable();
@@ -142,7 +143,12 @@
public PluginToken FindPlugin(string concreteKey)
{
- return (PluginToken) _plugins[concreteKey];
+ if (_plugins.ContainsKey(concreteKey))
+ {
+ return _plugins[concreteKey];
+ }
+
+ return null;
}
public TemplateToken[] Templates
@@ -180,6 +186,14 @@
public void AddInstance(InstanceToken instance)
{
+ if (_instances.ContainsKey(instance.InstanceKey))
+ {
+ string message =
+ string.Format("Duplicate Instance '{0}' of PluginFamily '{1}'", instance.InstanceKey,
+ _typePath.AssemblyQualifiedName);
+ throw new ApplicationException(message);
+ }
+
_instances.Add(instance.InstanceKey, instance);
}
Modified: trunk/Source/StructureMap/Configuration/Tokens/InstanceToken.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/Tokens/InstanceToken.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Configuration/Tokens/InstanceToken.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -146,6 +146,11 @@
return;
}
+ if (_pluginTypePath.FindType().IsGenericType)
+ {
+ return;
+ }
+
object target = validator.CreateObject(_pluginTypePath.FindType(), _memento);
validateInstance(target);
}
Modified: trunk/Source/StructureMap/Graph/AssemblyGraph.cs
===================================================================
--- trunk/Source/StructureMap/Graph/AssemblyGraph.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Graph/AssemblyGraph.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -184,10 +184,9 @@
{
if (Registry.IsPublicRegistry(type))
{
- Registry registry = (Registry)Activator.CreateInstance(type);
+ Registry registry = (Registry) Activator.CreateInstance(type);
returnValue.Add(registry);
}
-
}
return returnValue;
Modified: trunk/Source/StructureMap/Graph/PluginGraph.cs
===================================================================
--- trunk/Source/StructureMap/Graph/PluginGraph.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Graph/PluginGraph.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -19,8 +19,8 @@
private bool _sealed = false;
private PluginFamilyCollection _pluginFamilies;
private InstanceDefaultManager _defaultManager = new InstanceDefaultManager();
- private PluginGraphReport _report = new PluginGraphReport();
+
/// <summary>
/// Default constructor
/// </summary>
@@ -28,8 +28,6 @@
{
_assemblies = new AssemblyGraphCollection(this);
_pluginFamilies = new PluginFamilyCollection(this);
-
- _report.DefaultManager = _defaultManager;
}
@@ -152,12 +150,6 @@
return pluginGraph;
}
- public PluginGraphReport Report
- {
- get { return _report; }
- set { _report = value; }
- }
-
public TypePath LocateOrCreateFamilyForType(string fullName)
{
Type pluginType = findTypeByFullName(fullName);
Modified: trunk/Source/StructureMap/Graph/TypePath.cs
===================================================================
--- trunk/Source/StructureMap/Graph/TypePath.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Graph/TypePath.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -13,7 +13,7 @@
{
public static string GetTypeIdentifier(Type type)
{
- return type.AssemblyQualifiedName;
+ return new TypePath(type).AssemblyQualifiedName;
}
public static TypePath TypePathForFullName(string fullname)
Modified: trunk/Source/StructureMap/IInstanceCreator.cs
===================================================================
--- trunk/Source/StructureMap/IInstanceCreator.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/IInstanceCreator.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -4,4 +4,4 @@
{
object BuildInstance(InstanceMemento memento);
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap/IInstanceManager.cs
===================================================================
--- trunk/Source/StructureMap/IInstanceManager.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/IInstanceManager.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -12,9 +12,6 @@
IList<T> GetAllInstances<T>();
void SetDefaultsToProfile(string profile);
- InstanceDefaultManager DefaultManager
- {
- get;
- }
+ InstanceDefaultManager DefaultManager { get; }
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/InstanceManager.cs
===================================================================
--- trunk/Source/StructureMap/InstanceManager.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/InstanceManager.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -469,7 +469,7 @@
public void Inject<T>(T instance)
{
- InjectStub(typeof(T), instance);
+ InjectStub(typeof (T), instance);
}
#endregion
Modified: trunk/Source/StructureMap/InstanceMemento.cs
===================================================================
--- trunk/Source/StructureMap/InstanceMemento.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/InstanceMemento.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -31,7 +31,7 @@
_concreteKey = innerConcreteKey;
if (string.IsNullOrEmpty(_concreteKey))
{
- Plugin plugin = this.CreateInferredPlugin();
+ Plugin plugin = CreateInferredPlugin();
if (plugin != null)
{
_concreteKey = plugin.ConcreteKey;
@@ -62,10 +62,7 @@
return _instanceKey;
}
}
- set
- {
- _instanceKey = value;
- }
+ set { _instanceKey = value; }
}
protected abstract string innerInstanceKey { get; }
Modified: trunk/Source/StructureMap/Interceptors/HttpContextItemInterceptor.cs
===================================================================
--- trunk/Source/StructureMap/Interceptors/HttpContextItemInterceptor.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/Interceptors/HttpContextItemInterceptor.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -12,7 +12,6 @@
public HttpContextItemInterceptor() : base()
{
-
}
private string getKey(string instanceKey)
Modified: trunk/Source/StructureMap/MemoryInstanceMemento.cs
===================================================================
--- trunk/Source/StructureMap/MemoryInstanceMemento.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/MemoryInstanceMemento.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -1,7 +1,5 @@
-using System;
using System.Collections;
using System.Collections.Specialized;
-using StructureMap.Graph;
namespace StructureMap
{
@@ -116,7 +114,7 @@
public void ReferenceChild(string name, string instanceKey)
{
- InstanceMemento child = MemoryInstanceMemento.CreateReferencedInstanceMemento(instanceKey);
+ InstanceMemento child = CreateReferencedInstanceMemento(instanceKey);
AddChild(name, child);
}
Modified: trunk/Source/StructureMap/ObjectFactory.cs
===================================================================
--- trunk/Source/StructureMap/ObjectFactory.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/ObjectFactory.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -90,7 +90,6 @@
}
-
/// <summary>
/// Restores all default instance settings according to the StructureMap.config files
/// </summary>
Modified: trunk/Source/StructureMap/PluginGraphBuilder.cs
===================================================================
--- trunk/Source/StructureMap/PluginGraphBuilder.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap/PluginGraphBuilder.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -133,8 +133,6 @@
{
parser.ParseProfilesAndMachines(graphBuilder);
}
-
-
}
private void readFamilies(IGraphBuilder graphBuilder)
Modified: trunk/Source/StructureMap.Testing/AlternativeConfigurationTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/AlternativeConfigurationTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/AlternativeConfigurationTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -12,7 +12,7 @@
[SetUp]
public void SetUp()
{
- StructureMapConfiguration.ResetAll();
+ StructureMapConfiguration.ResetAll();
DataMother.WriteDocument("Config1.xml");
DataMother.WriteDocument("Config2.xml");
}
@@ -20,11 +20,11 @@
[TearDown]
public void TearDown()
{
- StructureMapConfiguration.ResetAll();
+ StructureMapConfiguration.ResetAll();
ObjectFactory.Reset();
}
-
+
public void assertTheDefault(string color)
{
ColorWidget widget = (ColorWidget) ObjectFactory.GetInstance<IWidget>();
@@ -64,7 +64,7 @@
XmlDocument doc = new XmlDocument();
doc.LoadXml(xml);
-
+
StructureMapConfiguration.UseDefaultStructureMapConfigFile = true;
StructureMapConfiguration.IncludeConfigurationFromNode(doc.DocumentElement);
ObjectFactory.Reset();
@@ -73,4 +73,4 @@
Assert.IsNotNull(service);
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserCollectionTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserCollectionTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserCollectionTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -22,7 +22,8 @@
{
Array.Sort(expected);
ConfigurationParser[] parsers = _collection.GetParsers();
- Converter<ConfigurationParser, string> converter = delegate(ConfigurationParser parser) { return parser.Id; };
+ Converter<ConfigurationParser, string> converter =
+ delegate(ConfigurationParser parser) { return parser.Id; };
string[] actuals = Array.ConvertAll<ConfigurationParser, string>(parsers, converter);
Array.Sort(actuals);
@@ -47,7 +48,10 @@
assertParserIdList("Generics");
}
- [Test, ExpectedException(typeof(StructureMapException), "StructureMap Exception Code: 100\nExpected file \"StructureMap.config\" cannot be opened at DoesNotExist.xml")]
+ [Test,
+ ExpectedException(typeof (StructureMapException),
+ "StructureMap Exception Code: 100\nExpected file \"StructureMap.config\" cannot be opened at DoesNotExist.xml"
+ )]
public void FileDoesNotExist()
{
_collection.UseDefaultFile = false;
@@ -105,4 +109,4 @@
assertParserIdList("Somewhere");
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -4,7 +4,6 @@
using StructureMap.Configuration;
using StructureMap.Configuration.DSL;
using StructureMap.Graph;
-using StructureMap.Source;
using StructureMap.Testing.TestData;
using StructureMap.Testing.Widget;
@@ -105,7 +104,7 @@
{
string[] names = _defaults.GetMachineNames();
Array.Sort(names);
- Assert.AreEqual(new string[] {"GREEN-BOX", "SERVER" }, names);
+ Assert.AreEqual(new string[] {"GREEN-BOX", "SERVER"}, names);
}
[Test]
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/AddInstanceTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/AddInstanceTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/AddInstanceTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -38,8 +38,6 @@
.WithProperty("Color").EqualToAppSetting("Color");
-
-
registry.AddInstanceOf<IWidget>().UsingConcreteType<AWidget>();
manager = registry.BuildInstanceManager();
@@ -47,7 +45,7 @@
[Test]
public void UseAPreBuiltObjectForAnInstanceAsAPrototype()
- {
+ {
Registry registry = new Registry();
// Build an instance for IWidget, then setup StructureMap to return cloned instances of the
// "Prototype" (GoF pattern) whenever someone asks for IWidget named "Jeremy"
@@ -59,7 +57,7 @@
CloneableWidget widget1 = (CloneableWidget) manager.CreateInstance<IWidget>("Jeremy");
CloneableWidget widget2 = (CloneableWidget) manager.CreateInstance<IWidget>("Jeremy");
CloneableWidget widget3 = (CloneableWidget) manager.CreateInstance<IWidget>("Jeremy");
-
+
Assert.AreEqual("Jeremy", widget1.Name);
Assert.AreEqual("Jeremy", widget2.Name);
Assert.AreEqual("Jeremy", widget3.Name);
@@ -80,9 +78,9 @@
manager = registry.BuildInstanceManager();
- CloneableWidget widget1 = (CloneableWidget)manager.CreateInstance<IWidget>("Julia");
- CloneableWidget widget2 = (CloneableWidget)manager.CreateInstance<IWidget>("Julia");
- CloneableWidget widget3 = (CloneableWidget)manager.CreateInstance<IWidget>("Julia");
+ CloneableWidget widget1 = (CloneableWidget) manager.CreateInstance<IWidget>("Julia");
+ CloneableWidget widget2 = (CloneableWidget) manager.CreateInstance<IWidget>("Julia");
+ CloneableWidget widget3 = (CloneableWidget) manager.CreateInstance<IWidget>("Julia");
Assert.AreSame(julia, widget1);
Assert.AreSame(julia, widget2);
@@ -99,17 +97,17 @@
string instanceKey = "OrangeWidgetRule";
registry.AddInstanceOf<Rule>().UsingConcreteType<WidgetRule>().WithName(instanceKey)
.Child<IWidget>().Is(
- Registry.Instance<IWidget>().UsingConcreteType<ColorWidget>()
- .WithProperty("Color").EqualTo("Orange")
- .WithName("Orange")
- );
+ Registry.Instance<IWidget>().UsingConcreteType<ColorWidget>()
+ .WithProperty("Color").EqualTo("Orange")
+ .WithName("Orange")
+ );
IInstanceManager mgr = registry.BuildInstanceManager();
ColorWidget orange = (ColorWidget) mgr.CreateInstance<IWidget>("Orange");
Assert.IsNotNull(orange);
- WidgetRule rule = (WidgetRule)mgr.CreateInstance<Rule>(instanceKey);
+ WidgetRule rule = (WidgetRule) mgr.CreateInstance<Rule>(instanceKey);
ColorWidget widget = (ColorWidget) rule.Widget;
Assert.AreEqual("Orange", widget.Color);
}
@@ -126,8 +124,8 @@
manager = registry.BuildInstanceManager();
- WidgetRule rule = (WidgetRule)manager.CreateInstance<Rule>("AWidgetRule");
- Assert.IsInstanceOfType(typeof(AWidget), rule.Widget);
+ WidgetRule rule = (WidgetRule) manager.CreateInstance<Rule>("AWidgetRule");
+ Assert.IsInstanceOfType(typeof (AWidget), rule.Widget);
}
[Test]
@@ -181,7 +179,6 @@
//registry.ScanAssemblies().IncludeAssemblyContainingType<IWidget>();
-
registry.AddInstanceOf<Rule>().UsingConcreteType<ARule>().WithName("Alias");
// Add an instance by specifying the ConcreteKey
@@ -196,7 +193,7 @@
manager = registry.BuildInstanceManager();
- Assert.IsInstanceOfType(typeof(ARule), manager.CreateInstance<Rule>("Alias"));
+ Assert.IsInstanceOfType(typeof (ARule), manager.CreateInstance<Rule>("Alias"));
WidgetRule rule = (WidgetRule) manager.CreateInstance<Rule>("RuleThatUsesMyInstance");
ColorWidget widget = (ColorWidget) rule.Widget;
@@ -271,6 +268,5 @@
public class ARule : Rule
{
-
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/ChildInstanceExpressionTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/ChildInstanceExpressionTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/ChildInstanceExpressionTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -12,36 +12,48 @@
{
}
- [Test, ExpectedException(typeof(StructureMapException), "StructureMap Exception Code: 303\nType System.String,mscorlib is either abstract or cannot be plugged into Type StructureMap.Testing.Configuration.DSL.IType,StructureMap.Testing")]
+ [Test,
+ ExpectedException(typeof (StructureMapException),
+ "StructureMap Exception Code: 303\nType System.String,mscorlib is either abstract or cannot be plugged into Type StructureMap.Testing.Configuration.DSL.IType,StructureMap.Testing"
+ )]
public void CantCastTheRequestedConcreteType()
{
- InstanceExpression instance = new InstanceExpression(typeof(IStrategy));
+ InstanceExpression instance = new InstanceExpression(typeof (IStrategy));
MemoryInstanceMemento memento = new MemoryInstanceMemento();
- ChildInstanceExpression expression = new ChildInstanceExpression(instance, memento, "a property", typeof(IType));
+ ChildInstanceExpression expression =
+ new ChildInstanceExpression(instance, memento, "a property", typeof (IType));
expression.IsConcreteType<string>();
}
- [Test, ExpectedException(typeof(StructureMapException), "StructureMap Exception Code: 303\nType StructureMap.Testing.Configuration.DSL.AbstractType,StructureMap.Testing is either abstract or cannot be plugged into Type StructureMap.Testing.Configuration.DSL.IType,StructureMap.Testing")]
+ [Test,
+ ExpectedException(typeof (StructureMapException),
+ "StructureMap Exception Code: 303\nType StructureMap.Testing.Configuration.DSL.AbstractType,StructureMap.Testing is either abstract or cannot be plugged into Type StructureMap.Testing.Configuration.DSL.IType,StructureMap.Testing"
+ )]
public void CantCastTheRequestedConcreteType2()
{
- InstanceExpression instance = new InstanceExpression(typeof(IStrategy));
+ InstanceExpression instance = new InstanceExpression(typeof (IStrategy));
MemoryInstanceMemento memento = new MemoryInstanceMemento();
- ChildInstanceExpression expression = new ChildInstanceExpression(instance, memento, "a property", typeof(IType));
+ ChildInstanceExpression expression =
+ new ChildInstanceExpression(instance, memento, "a property", typeof (IType));
expression.IsConcreteType<AbstractType>();
}
- [Test, ExpectedException(typeof(StructureMapException), "StructureMap Exception Code: 303\nType StructureMap.Testing.Configuration.DSL.AbstractType,StructureMap.Testing is either abstract or cannot be plugged into Type StructureMap.Testing.Configuration.DSL.IType,StructureMap.Testing")]
+ [Test,
+ ExpectedException(typeof (StructureMapException),
+ "StructureMap Exception Code: 303\nType StructureMap.Testing.Configuration.DSL.AbstractType,StructureMap.Testing is either abstract or cannot be plugged into Type StructureMap.Testing.Configuration.DSL.IType,StructureMap.Testing"
+ )]
public void CantCastTheRequestedPluggedType3()
{
- InstanceExpression instance = new InstanceExpression(typeof(IStrategy));
+ InstanceExpression instance = new InstanceExpression(typeof (IStrategy));
MemoryInstanceMemento memento = new MemoryInstanceMemento();
- ChildInstanceExpression expression = new ChildInstanceExpression(instance, memento, "a property", typeof(IType));
+ ChildInstanceExpression expression =
+ new ChildInstanceExpression(instance, memento, "a property", typeof (IType));
InstanceExpression child = Registry.Instance<IType>().UsingConcreteType<AbstractType>();
-
+
expression.Is(child);
}
}
@@ -56,6 +68,5 @@
public class ConcreteType : AbstractType
{
-
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/CreatePluginFamilyTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/CreatePluginFamilyTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/CreatePluginFamilyTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -14,10 +14,9 @@
[SetUp]
public void SetUp()
{
-
}
- [Test, ExpectedException(typeof(StructureMapException))]
+ [Test, ExpectedException(typeof (StructureMapException))]
public void TheConceteTypeDoesNotCase()
{
Registry registry = new Registry();
@@ -34,7 +33,7 @@
IInstanceManager manager = registry.BuildInstanceManager();
- Assert.IsInstanceOfType(typeof(ARule), manager.CreateInstance<Rule>());
+ Assert.IsInstanceOfType(typeof (ARule), manager.CreateInstance<Rule>());
}
[Test]
@@ -61,9 +60,9 @@
Assert.IsTrue(pluginGraph.PluginFamilies.Contains<IGateway>());
InstanceManager manager = new InstanceManager(pluginGraph);
- IGateway gateway = (IGateway)manager.CreateInstance(typeof(IGateway));
+ IGateway gateway = (IGateway) manager.CreateInstance(typeof (IGateway));
- Assert.IsInstanceOfType(typeof(DefaultGateway), gateway);
+ Assert.IsInstanceOfType(typeof (DefaultGateway), gateway);
}
[Test]
@@ -79,9 +78,9 @@
Assert.IsTrue(pluginGraph.PluginFamilies.Contains<IGateway>());
InstanceManager manager = new InstanceManager(pluginGraph);
- IGateway gateway = (IGateway)manager.CreateInstance(typeof(IGateway));
+ IGateway gateway = (IGateway) manager.CreateInstance(typeof (IGateway));
- Assert.IsInstanceOfType(typeof(StubbedGateway), gateway);
+ Assert.IsInstanceOfType(typeof (StubbedGateway), gateway);
}
[Test]
@@ -110,7 +109,7 @@
Assert.IsNotNull(expression);
}
- PluginFamily family = pluginGraph.PluginFamilies[typeof(IGateway)];
+ PluginFamily family = pluginGraph.PluginFamilies[typeof (IGateway)];
Assert.AreEqual(0, family.InterceptionChain.Count);
}
@@ -120,12 +119,13 @@
PluginGraph pluginGraph = new PluginGraph();
using (Registry registry = new Registry(pluginGraph))
{
- CreatePluginFamilyExpression expression = registry.BuildInstancesOf<IGateway>().CacheBy(InstanceScope.ThreadLocal);
+ CreatePluginFamilyExpression expression =
+ registry.BuildInstancesOf<IGateway>().CacheBy(InstanceScope.ThreadLocal);
Assert.IsNotNull(expression);
}
- PluginFamily family = pluginGraph.PluginFamilies[typeof(IGateway)];
- Assert.IsTrue(family.InterceptionChain.Contains(typeof(ThreadLocalStorageInterceptor)));
+ PluginFamily family = pluginGraph.PluginFamilies[typeof (IGateway)];
+ Assert.IsTrue(family.InterceptionChain.Contains(typeof (ThreadLocalStorageInterceptor)));
}
[Test]
@@ -134,13 +134,13 @@
PluginGraph pluginGraph = new PluginGraph();
using (Registry registry = new Registry(pluginGraph))
{
- CreatePluginFamilyExpression expression =
+ CreatePluginFamilyExpression expression =
registry.BuildInstancesOf<IGateway>().AsSingletons();
Assert.IsNotNull(expression);
}
PluginFamily family = pluginGraph.PluginFamilies[typeof (IGateway)];
- Assert.IsTrue(family.InterceptionChain.Contains(typeof(SingletonInterceptor)));
+ Assert.IsTrue(family.InterceptionChain.Contains(typeof (SingletonInterceptor)));
}
[Test]
@@ -155,10 +155,9 @@
Assert.IsTrue(pluginGraph.PluginFamilies.Contains<IGateway>());
InstanceManager manager = new InstanceManager(pluginGraph);
- IGateway gateway = (IGateway)manager.CreateInstance(typeof(IGateway));
+ IGateway gateway = (IGateway) manager.CreateInstance(typeof (IGateway));
- Assert.IsInstanceOfType(typeof(FakeGateway), gateway);
+ Assert.IsInstanceOfType(typeof (FakeGateway), gateway);
}
-
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/CreateProfileTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/CreateProfileTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/CreateProfileTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -1,8 +1,5 @@
using NUnit.Framework;
-using StructureMap.Configuration.DSL;
using StructureMap.Graph;
-using StructureMap.Testing.GenericWidgets;
-using StructureMap.Testing.Widget;
namespace StructureMap.Testing.Configuration.DSL
{
@@ -36,7 +33,6 @@
[Test]
public void CreateProfile()
{
-
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/DeepInstanceTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/DeepInstanceTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/DeepInstanceTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -1,5 +1,4 @@
using NUnit.Framework;
-using Rhino.Mocks;
using StructureMap.Configuration.DSL;
using StructureMap.Testing.Widget;
@@ -36,7 +35,7 @@
.WithProperty("count").EqualTo(4)
.WithProperty("average").EqualTo(.333)
.Child<Rule>().Is(
- ruleExpression
+ ruleExpression
)
);
@@ -70,7 +69,7 @@
{
Registry registry = new Registry();
registry.BuildInstancesOf<IWidget>().TheDefaultIs(
- Registry.Object(new ColorWidget("yellow"))
+ Registry.Object(new ColorWidget("yellow"))
);
registry.BuildInstancesOf<Rule>().TheDefaultIsConcreteType<WidgetRule>();
@@ -109,7 +108,6 @@
}
-
[Test]
public void DeepInstance5()
{
@@ -136,7 +134,6 @@
assertThingMatches(registry);
}
-
}
public class Thing
@@ -177,4 +174,4 @@
return result;
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/InstanceExpressionTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/InstanceExpressionTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/InstanceExpressionTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -13,19 +13,22 @@
{
}
- [Test, ExpectedException(typeof(StructureMapException), "StructureMap Exception Code: 301\nNo concrete type or concrete key is specified for instance TheInstanceKey for PluginType StructureMap.Testing.Widget.IWidget,StructureMap.Testing.Widget")]
+ [Test,
+ ExpectedException(typeof (StructureMapException),
+ "StructureMap Exception Code: 301\nNo concrete type or concrete key is specified for instance TheInstanceKey for PluginType StructureMap.Testing.Widget.IWidget,StructureMap.Testing.Widget"
+ )]
public void BlowUpIfNoConcreteKeyOrTypeDefinied()
{
- InstanceExpression expression = new InstanceExpression(typeof(IWidget));
+ InstanceExpression expression = new InstanceExpression(typeof (IWidget));
expression.InstanceKey = "TheInstanceKey";
PluginGraph pluginGraph = new PluginGraph();
- ((IExpression)expression).Configure(pluginGraph);
+ ((IExpression) expression).Configure(pluginGraph);
}
- [Test, ExpectedException(typeof(StructureMapException))]
+ [Test, ExpectedException(typeof (StructureMapException))]
public void BlowUpIfNoPropertyIsFoundForType()
{
Registry.Instance<IWidget>().UsingConcreteType<AWidget>().Child<Rule>();
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/LiteralExpressionTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/LiteralExpressionTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/LiteralExpressionTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -1,5 +1,4 @@
using NUnit.Framework;
-using Rhino.Mocks;
using StructureMap.Configuration.DSL;
using StructureMap.Graph;
using StructureMap.Testing.Widget;
@@ -20,14 +19,13 @@
ColorWidget theWidget = new ColorWidget("Red");
LiteralExpression<IWidget> expression = new LiteralExpression<IWidget>(theWidget);
PluginGraph graph = new PluginGraph();
- ((IExpression)expression).Configure(graph);
+ ((IExpression) expression).Configure(graph);
PluginFamily family = graph.PluginFamilies[typeof (IWidget)];
Assert.IsNotNull(family);
LiteralMemento memento = (LiteralMemento) family.Source.GetMemento(expression.InstanceKey);
Assert.AreSame(theWidget, memento.Build(null));
-
}
[Test]
@@ -36,7 +34,7 @@
ColorWidget theWidget = new ColorWidget("Red");
LiteralExpression<IWidget> expression = new LiteralExpression<IWidget>(theWidget);
PluginGraph graph = new PluginGraph();
- ((IExpression)expression).Configure(graph);
+ ((IExpression) expression).Configure(graph);
InstanceManager manager = new InstanceManager(graph);
@@ -51,13 +49,13 @@
LiteralExpression<IWidget> expression = new LiteralExpression<IWidget>(theWidget);
expression.WithName("Blue");
PluginGraph graph = new PluginGraph();
- ((IExpression)expression).Configure(graph);
+ ((IExpression) expression).Configure(graph);
- PluginFamily family = graph.PluginFamilies[typeof(IWidget)];
+ PluginFamily family = graph.PluginFamilies[typeof (IWidget)];
Assert.IsNotNull(family);
- LiteralMemento memento = (LiteralMemento)family.Source.GetMemento(expression.InstanceKey);
+ LiteralMemento memento = (LiteralMemento) family.Source.GetMemento(expression.InstanceKey);
Assert.AreSame(theWidget, memento.Build(null));
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/ProfileExpressionTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/ProfileExpressionTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/ProfileExpressionTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -1,5 +1,4 @@
using NUnit.Framework;
-using Rhino.Mocks;
using StructureMap.Configuration.DSL;
using StructureMap.Graph;
using StructureMap.Testing.Widget;
@@ -12,7 +11,6 @@
[SetUp]
public void SetUp()
{
-
}
[Test]
@@ -22,16 +20,17 @@
string theDefaultName = "TheDefaultName";
ProfileExpression expression = new ProfileExpression(theProfileName);
-
+
ProfileExpression expression2 = expression.For<IWidget>().UseNamedInstance(theDefaultName);
Assert.AreSame(expression, expression2);
PluginGraph graph = new PluginGraph();
- ((IExpression)expression).Configure(graph);
+ ((IExpression) expression).Configure(graph);
Profile profile = graph.DefaultManager.GetProfile(theProfileName);
Assert.IsNotNull(profile);
- Assert.AreEqual(new InstanceDefault[] { new InstanceDefault(typeof(IWidget), theDefaultName) }, profile.Defaults);
+ Assert.AreEqual(new InstanceDefault[] {new InstanceDefault(typeof (IWidget), theDefaultName)},
+ profile.Defaults);
}
[Test]
@@ -43,12 +42,11 @@
Registry registry = new Registry(graph);
registry.CreateProfile(theProfileName)
.For<IWidget>().Use(
- Registry.Instance<IWidget>().UsingConcreteType<AWidget>()
+ Registry.Instance<IWidget>().UsingConcreteType<AWidget>()
);
IInstanceManager manager = registry.BuildInstanceManager();
-
Profile profile = manager.DefaultManager.GetProfile(theProfileName);
InstanceDefault instanceDefault = profile.Defaults[0];
@@ -59,4 +57,4 @@
Assert.IsNotNull(widget);
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/RegistryIntegratedTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/RegistryIntegratedTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/RegistryIntegratedTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -43,7 +43,7 @@
graph.Seal();
List<string> colors = new List<string>();
- foreach (InstanceMemento memento in graph.PluginFamilies[typeof(IWidget)].Source.GetAllMementos() )
+ foreach (InstanceMemento memento in graph.PluginFamilies[typeof (IWidget)].Source.GetAllMementos())
{
colors.Add(memento.InstanceKey);
}
@@ -83,4 +83,4 @@
Assert.Contains("Black", colors);
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/RegistryTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/RegistryTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/RegistryTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -1,5 +1,4 @@
using System;
-using System.Reflection;
using NUnit.Framework;
using Rhino.Mocks;
using StructureMap.Configuration.DSL;
@@ -28,7 +27,7 @@
expression1.Configure(graph);
expression2.Configure(graph);
expression3.Configure(graph);
-
+
mocks.ReplayAll();
TestRegistry registry = new TestRegistry(graph);
@@ -48,7 +47,7 @@
IExpression expression1 = mocks.CreateMock<IExpression>();
IExpression expression2 = mocks.CreateMock<IExpression>();
IExpression expression3 = mocks.CreateMock<IExpression>();
-
+
PluginGraph graph = new PluginGraph();
expression1.Configure(graph);
expression2.Configure(graph);
@@ -60,15 +59,11 @@
{
registry.AddExpression(expression1);
registry.AddExpression(expression2);
- registry.AddExpression(expression3);
+ registry.AddExpression(expression3);
}
mocks.VerifyAll();
}
-
-
-
-
}
public class TestRegistry : Registry
@@ -126,4 +121,4 @@
get { throw new NotImplementedException(); }
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Configuration/InlineInstanceDefinitionInProfileAndMachineNodesTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/InlineInstanceDefinitionInProfileAndMachineNodesTester.cs 2007-03-27 11:18:48 UTC (rev 31)
+++ trunk/Source/StructureMap.Testing/Configuration/InlineInstanceDefinitionInProfileAndMachineNodesTester.cs 2007-03-29 15:58:10 UTC (rev 32)
@@ -1,4 +1,3 @@
-using System;
using System.Diagnostics;
using NUnit.Framework;
using StructureMap.Graph;
@@ -33,24 +32,24 @@
[Test]
public void CanFindTheTwoPluginFamilies()
{
- Assert.IsTrue(_graph.PluginFamilies.Contains(typeof(IWidget)));
- Assert.IsTrue(_graph.PluginFamilies.Contains(typeof(Rule)));
+ Assert.IsTrue(_graph.PluginFamilies.Contains(typeof (IWidget)));
+ Assert.IsTrue(_graph.PluginFamilies.Contains(typeof (Rule)));
}
[Test]
public void HasTheOverrideForProfile()
{
Profile blueProfile = _graph.DefaultManager.GetProfile("Blue");
- Assert.IsTrue(blueProfile.HasOverride(typeof(Rule).FullName));
- Assert.IsTrue(blueProfile.HasOverride(typeof(IWidget).FullName));
+ Assert.IsTrue(blueProfile.HasOverride(typeof (Rule).FullName));
+ Assert.IsTrue(blueProfile.HasOverride(typeof (IWidget).FullName));
- Assert.IsNotEmpty(blueProfile[typeof(Rule).FullName]);
- Assert.IsNotEmpty(blueProfile[typeof(IWidget).FullName]);
+ Assert.IsNotEmpty(blueProfile[typeof (Rule).FullName]);
+ Assert.IsNotEmpty(blueProfile[typeof (IWidget).FullName]);
- Debug.WriteLine(blueProfile[typeof(IWidget).FullName]);
+ Debug.WriteLine(blueProfile[typeof (IWidget).FullName]);
Profile defaults = _graph.DefaultManager.CalculateDefaults(InstanceDefaultManager.GetMachineName(), "Blue");
- Assert.IsNotEmpty(defaults[typeof(Rule).FullName]);
+ Assert.IsNotEmpty(defaults[typeof (Rule).FullName]);
}
[Test]
@@ -59,10 +58,8 @@
InstanceManager manager = new InstanceManager(_graph);
manager.SetDefaultsToProfile("Green");
- string defaultKey = manager[typeof(Rule)].DefaultInstanceKey;
+ string defaultKey = manager[typeof (Rule)].DefaultInstanceKey;
Assert.IsNotEmpty(defaultKey);
-
-
}
[Test]
@@ -76,7 +73,7 @@
manager.SetDefaultsToProfile("Blue");
- ColorRule blueRule = (ColorRule)manager.CreateInstance(typeof(Rule));
+ ColorRule blueRule = (ColorRule) manager.CreateInstance(typeof (Rule));
Assert.AreEqual("Blue", blueRule.Color);
}
@@ -85,14 +82,13 @@
{
MachineOverride machine = _graph.DefaultManager.GetMachineOverride("SERVER");
Assert.AreEqual(1, machine.InnerDefaults.Length);
- Assert.IsTrue(machine.HasOverride(typeof(IWidget).FullName));
+ Assert.IsTrue...
[truncated message content] |
