Menu
▾
▴
[Structuremap-commits] SF.net SVN: structuremap:[178] trunk/Source/StructureMap
|
From: <jer...@us...> - 2008-10-08 19:29:46
|
Revision: 178
http://structuremap.svn.sourceforge.net/structuremap/?rev=178&view=rev
Author: jeremydmiller
Date: 2008-10-08 19:29:40 +0000 (Wed, 08 Oct 2008)
Log Message:
-----------
little fix for Kevin
Modified Paths:
--------------
trunk/Source/StructureMap/Configuration/ConfigurationParser.cs
trunk/Source/StructureMap/Configuration/ConfigurationParserBuilder.cs
trunk/Source/StructureMap/Configuration/XmlExtensions.cs
trunk/Source/StructureMap/Diagnostics/ValidationBuildSession.cs
trunk/Source/StructureMap/Interceptors/Interceptors.cs
trunk/Source/StructureMap.AutoMocking/RhinoAutoMocker.cs
trunk/Source/StructureMap.Testing/AutoMocking/RhinoAutoMockerTester.cs
Modified: trunk/Source/StructureMap/Configuration/ConfigurationParser.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/ConfigurationParser.cs 2008-10-08 18:14:10 UTC (rev 177)
+++ trunk/Source/StructureMap/Configuration/ConfigurationParser.cs 2008-10-08 19:29:40 UTC (rev 178)
@@ -71,6 +71,9 @@
public void ForEachFile(GraphLog log, Action<string> action)
{
string includePath = getIncludePath();
+
+ // Find the text in every child node of _structureMapNode and
+ // perform an action with that text
_structureMapNode.ForTextInChild("Include/@File").Do(fileName =>
{
string includedFile = Path.Combine(includePath, fileName);
Modified: trunk/Source/StructureMap/Configuration/ConfigurationParserBuilder.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/ConfigurationParserBuilder.cs 2008-10-08 18:14:10 UTC (rev 177)
+++ trunk/Source/StructureMap/Configuration/ConfigurationParserBuilder.cs 2008-10-08 19:29:40 UTC (rev 178)
@@ -85,12 +85,12 @@
{
foreach (ConfigurationParser parser in list.ToArray())
{
- parser.ForEachFile(_log,
- filename => _log.Try(() =>
- {
- ConfigurationParser childParser = ConfigurationParser.FromFile(filename);
- list.Add(childParser);
- }).AndReportErrorAs(150, filename));
+ parser.ForEachFile(_log, filename => _log.Try(() =>
+ {
+ ConfigurationParser childParser = ConfigurationParser.FromFile(filename);
+ list.Add(childParser);
+ })
+ .AndReportErrorAs(150, filename));
}
}
Modified: trunk/Source/StructureMap/Configuration/XmlExtensions.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/XmlExtensions.cs 2008-10-08 18:14:10 UTC (rev 177)
+++ trunk/Source/StructureMap/Configuration/XmlExtensions.cs 2008-10-08 19:29:40 UTC (rev 178)
@@ -16,6 +16,26 @@
return new XmlTextExpression(node, xpath);
}
+ public class XmlTextExpression
+ {
+ private readonly XmlNodeList _list;
+
+ internal XmlTextExpression(XmlNode parent, string attributePath)
+ {
+ _list = parent.SelectNodes(attributePath);
+ }
+
+ public void Do(Action<string> action)
+ {
+ if (_list == null) return;
+
+ foreach (XmlNode node in _list)
+ {
+ action(node.InnerText);
+ }
+ }
+ }
+
public static XmlNodeExpression ForEachChild(this XmlNode node, string xpath)
{
return new XmlNodeExpression(node, xpath);
@@ -93,26 +113,8 @@
#region Nested type: XmlTextExpression
- public class XmlTextExpression
- {
- private readonly XmlNodeList _list;
- internal XmlTextExpression(XmlNode parent, string attributePath)
- {
- _list = parent.SelectNodes(attributePath);
- }
- public void Do(Action<string> action)
- {
- if (_list == null) return;
-
- foreach (XmlNode node in _list)
- {
- action(node.InnerText);
- }
- }
- }
-
#endregion
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Diagnostics/ValidationBuildSession.cs
===================================================================
--- trunk/Source/StructureMap/Diagnostics/ValidationBuildSession.cs 2008-10-08 18:14:10 UTC (rev 177)
+++ trunk/Source/StructureMap/Diagnostics/ValidationBuildSession.cs 2008-10-08 19:29:40 UTC (rev 178)
@@ -134,6 +134,7 @@
writer.WriteLine();
+
writer.WriteLine("StructureMap Failures: {0} Build/Configuration Failures and {1} Validation Errors",
_errors.BuildErrors.Length, _validationErrors.Count);
Modified: trunk/Source/StructureMap/Interceptors/Interceptors.cs
===================================================================
--- trunk/Source/StructureMap/Interceptors/Interceptors.cs 2008-10-08 18:14:10 UTC (rev 177)
+++ trunk/Source/StructureMap/Interceptors/Interceptors.cs 2008-10-08 19:29:40 UTC (rev 178)
@@ -1,4 +1,4 @@
namespace StructureMap.Interceptors
{
- public delegate T EnrichmentHandler<T>(T target);
+ public delegate object EnrichmentHandler<T>(T target);
}
\ No newline at end of file
Modified: trunk/Source/StructureMap.AutoMocking/RhinoAutoMocker.cs
===================================================================
--- trunk/Source/StructureMap.AutoMocking/RhinoAutoMocker.cs 2008-10-08 18:14:10 UTC (rev 177)
+++ trunk/Source/StructureMap.AutoMocking/RhinoAutoMocker.cs 2008-10-08 19:29:40 UTC (rev 178)
@@ -11,7 +11,7 @@
public delegate void VoidMethod();
- public enum MockMode { Record, Replay }
+ public enum MockMode { RecordAndReplay, AAA }
// Note that it subclasses the RhinoMocks.MockRepository class
/// <summary>
@@ -23,7 +23,7 @@
private readonly AutoMockedContainer _container;
private TARGETCLASS _classUnderTest;
- public RhinoAutoMocker() : this(MockMode.Record) {}
+ public RhinoAutoMocker() : this(MockMode.RecordAndReplay) {}
public RhinoAutoMocker(MockMode mockMode)
{
@@ -37,9 +37,9 @@
{
switch (mockMode)
{
- case MockMode.Record:
+ case MockMode.RecordAndReplay:
return MockCreationStrategy.RecordMode;
- case MockMode.Replay:
+ case MockMode.AAA:
return MockCreationStrategy.ReplayMode;
default:
throw new InvalidOperationException("Unsupported MockMode " + mockMode);
Modified: trunk/Source/StructureMap.Testing/AutoMocking/RhinoAutoMockerTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/AutoMocking/RhinoAutoMockerTester.cs 2008-10-08 18:14:10 UTC (rev 177)
+++ trunk/Source/StructureMap.Testing/AutoMocking/RhinoAutoMockerTester.cs 2008-10-08 19:29:40 UTC (rev 178)
@@ -335,7 +335,7 @@
[Test]
public void TheAutoMockerOptionallyPushesInMocksInReplayModeToAllowForAAAsyntax()
{
- var autoMocker = new RhinoAutoMocker<ConcreteClass>(MockMode.Replay);
+ var autoMocker = new RhinoAutoMocker<ConcreteClass>(MockMode.AAA);
autoMocker.ClassUnderTest.CallService();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
