User: xtoff
Date: 2009/12/19 08:39 AM
Modified:
/InversionOfControl/trunk/src/Castle.MicroKernel.Tests/
DefaultConversionManagerTestCase.cs
/InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Lifestyle/
LifestyleManagerTestCase.cs
/InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Registration/
AllTypesTestCase.cs
/InversionOfControl/trunk/src/Castle.MicroKernel.Tests/SpecializedResolvers/
ArrayResolverTestCase.cs, ListResolverTestCase.cs
/InversionOfControl/trunk/src/Castle.Windsor/Configuration/Interpreters/
AbstractInterpreter.cs
Log:
Applied patch from Simon Cropp for IOC-ISSUE-179 - Misc silverlight patch
File Changes:
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel.Tests/
==================================================================
File [modified]: DefaultConversionManagerTestCase.cs
Delta lines: +2 -1
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Lifestyle/LifestyleManagerTestCase.cs
2009-12-19 10:33:32 UTC (rev 6465)
+++
InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Lifestyle/LifestyleManagerTestCase.cs
2009-12-19 15:38:58 UTC (rev 6466)
@@ -177,10 +177,11 @@
kernel.AddComponent("c", typeof(CustomComponent));
handler = kernel.GetHandler("c");
Assert.AreEqual(LifestyleType.Custom,
handler.ComponentModel.LifestyleType);
-
+#if (!SILVERLIGHT)
kernel.AddComponent("d",
typeof(PerWebRequestComponent));
handler = kernel.GetHandler("d");
Assert.AreEqual(LifestyleType.PerWebRequest,
handler.ComponentModel.LifestyleType);
+#endif
}
Directory:
/InversionOfControl/trunk/src/Castle.Windsor/Configuration/Interpreters/
===================================================================================
File [modified]: AbstractInterpreter.cs
Delta lines: +0 -0
===================================================================
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Lifestyle/
============================================================================
File [modified]: LifestyleManagerTestCase.cs
Delta lines: +2 -1
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Registration/AllTypesTestCase.cs
2009-12-19 10:33:32 UTC (rev 6465)
+++
InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Registration/AllTypesTestCase.cs
2009-12-19 15:38:58 UTC (rev 6466)
@@ -245,7 +245,7 @@
Assert.IsFalse(typeof(CustomerChain1).IsAssignableFrom(handler.ComponentModel.Implementation));
}
}
-
+#if(!SILVERLIGHT)
[Test]
public void RegisterTypes_WithLinq_RegisteredInContainer()
{
@@ -258,6 +258,7 @@
IHandler[] handlers =
kernel.GetAssignableHandlers(typeof(CustomerChain1));
Assert.AreEqual(2, handlers.Length);
}
+#endif
[Test]
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Registration/
===============================================================================
File [modified]: AllTypesTestCase.cs
Delta lines: +8 -2
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel.Tests/SpecializedResolvers/ArrayResolverTestCase.cs
2009-12-19 10:33:32 UTC (rev 6465)
+++
InversionOfControl/trunk/src/Castle.MicroKernel.Tests/SpecializedResolvers/ArrayResolverTestCase.cs
2009-12-19 15:38:58 UTC (rev 6466)
@@ -50,7 +50,10 @@
Assert.IsNotNull(comp);
Assert.IsNotNull(comp.Services);
Assert.AreEqual(2, comp.Services.Length);
- comp.Services.AsEnumerable().ForEach(Assert.IsNotNull);
+ foreach (var service in comp.Services.AsEnumerable())
+ {
+ Assert.IsNotNull(service);
+ }
}
[Test]
@@ -65,7 +68,10 @@
Assert.IsNotNull(comp);
Assert.IsNotNull(comp.Services);
Assert.AreEqual(2, comp.Services.Length);
- comp.Services.AsEnumerable().ForEach(Assert.IsNotNull);
+ foreach (var service in comp.Services.AsEnumerable())
+ {
+ Assert.IsNotNull(service);
+ }
}
Directory:
/InversionOfControl/trunk/src/Castle.MicroKernel.Tests/SpecializedResolvers/
=======================================================================================
File [modified]: ArrayResolverTestCase.cs
Delta lines: +8 -2
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel.Tests/SpecializedResolvers/ListResolverTestCase.cs
2009-12-19 10:33:32 UTC (rev 6465)
+++
InversionOfControl/trunk/src/Castle.MicroKernel.Tests/SpecializedResolvers/ListResolverTestCase.cs
2009-12-19 15:38:58 UTC (rev 6466)
@@ -52,7 +52,10 @@
Assert.IsNotNull(comp);
Assert.IsNotNull(comp.Services);
Assert.AreEqual(2, comp.Services.Count);
- comp.Services.AsEnumerable().ForEach(Assert.IsNotNull);
+ foreach (var service in comp.Services.AsEnumerable())
+ {
+ Assert.IsNotNull(service);
+ }
}
[Test]
@@ -67,7 +70,10 @@
Assert.IsNotNull(comp);
Assert.IsNotNull(comp.Services);
Assert.AreEqual(2, comp.Services.Count);
- comp.Services.AsEnumerable().ForEach(Assert.IsNotNull);
+ foreach (var service in comp.Services.AsEnumerable())
+ {
+ Assert.IsNotNull(service);
+ }
}
File [modified]: ListResolverTestCase.cs
Delta lines: +4 -3
===================================================================
---
InversionOfControl/trunk/src/Castle.Windsor/Configuration/Interpreters/AbstractInterpreter.cs
2009-12-19 10:33:32 UTC (rev 6465)
+++
InversionOfControl/trunk/src/Castle.Windsor/Configuration/Interpreters/AbstractInterpreter.cs
2009-12-19 15:38:58 UTC (rev 6466)
@@ -12,10 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+
namespace Castle.Windsor.Configuration.Interpreters
{
+ using System.Collections.Generic;
using System;
- using System.Collections;
using Castle.Core.Resource;
using Castle.Core.Configuration;
using Castle.MicroKernel;
@@ -40,7 +41,7 @@
// private ImportDirectiveCollection imports = new
ImportDirectiveCollection();
private IResource source;
- private Stack resourceStack = new Stack();
+ private Stack<IResource> resourceStack = new Stack<IResource>();
private string environmentName;
#endregion
@@ -95,7 +96,7 @@
{
if (resourceStack.Count == 0) return null;
- return resourceStack.Peek() as IResource;
+ return resourceStack.Peek();
}
}
--
You received this message because you are subscribed to the Google Groups
"Castle Project Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/castle-project-commits?hl=en.
