User: cneuwirt
Date: 2010/01/11 02:26 PM
Modified:
/InversionOfControl/trunk/src/Castle.MicroKernel.Tests/
Castle.MicroKernel.Tests-vs2008.csproj
/InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Registration/
DynamicParametersTestCase.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/Registration/
ComponentRegistration.cs
Log:
Hopefully fixed messed up svn merge.
File Changes:
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel.Tests/
==================================================================
File [modified]: Castle.MicroKernel.Tests-vs2008.csproj
Delta lines: +33 -48
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Registration/DynamicParametersTestCase.cs
2010-01-11 20:50:42 UTC (rev 6632)
+++
InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Registration/DynamicParametersTestCase.cs
2010-01-11 21:26:06 UTC (rev 6633)
@@ -16,33 +16,18 @@
{
using Castle.MicroKernel.Registration;
using Castle.MicroKernel.Tests.ClassComponents;
-
using NUnit.Framework;
[TestFixture]
- public class DynamicParametersTestCase
+ public class DynamicParametersTestCase : RegistrationTestCaseBase
{
- [SetUp]
- public void SetUp()
- {
- kernel = new DefaultKernel();
- }
-
- [TearDown]
- public void TearDown()
- {
- kernel.Dispose();
- }
-
- private DefaultKernel kernel;
-
[Test]
public void Can_mix_registration_and_call_site_parameters()
{
- kernel.Register(
+ Kernel.Register(
Component.For<ClassWithArguments>().LifeStyle.Transient.DynamicParameters((k,
d) => d["arg1"] = "foo"));
- var component = kernel.Resolve<ClassWithArguments>(new
{ arg2 = 2 });
+ var component = Kernel.Resolve<ClassWithArguments>(new
{ arg2 = 2 });
Assert.AreEqual(2, component.Arg2);
Assert.AreEqual("foo", component.Arg1);
}
@@ -50,7 +35,7 @@
[Test]
public void Can_dynamically_override_services()
{
- kernel.Register(
+ Kernel.Register(
Component.For<ICustomer>()
.ImplementedBy<CustomerImpl>()
.Named("defaultCustomer"),
@@ -71,7 +56,7 @@
}
}));
- var component =
kernel.Resolve<CommonImplWithDependancy>();
+ var component =
Kernel.Resolve<CommonImplWithDependancy>();
Assert.IsInstanceOf<CustomerImpl2>(component.Customer);
}
@@ -80,12 +65,12 @@
{
string arg1 = null;
int arg2 = 0;
-
kernel.Register(Component.For<ClassWithArguments>().LifeStyle.Transient.DynamicParameters((k,
d) =>
+
Kernel.Register(Component.For<ClassWithArguments>().LifeStyle.Transient.DynamicParameters((k,
d) =>
{
arg1 = (string)d["arg1"];
arg2 = (int)d["arg2"];
}));
- var component = kernel.Resolve<ClassWithArguments>(new
{ arg2 = 2, arg1 = "foo" });
+ var component = Kernel.Resolve<ClassWithArguments>(new
{ arg2 = 2, arg1 = "foo" });
Assert.AreEqual("foo", arg1);
Assert.AreEqual(2, arg2);
}
@@ -93,8 +78,8 @@
[Test]
public void Should_not_require_explicit_registration()
{
-
kernel.Register(Component.For<CommonSub2Impl>().LifeStyle.Transient.DynamicParameters((k,
d) => { }));
- Assert.DoesNotThrow(() =>
kernel.Resolve<CommonSub2Impl>());
+
Kernel.Register(Component.For<CommonSub2Impl>().LifeStyle.Transient.DynamicParameters((k,
d) => { }));
+ Assert.DoesNotThrow(() =>
Kernel.Resolve<CommonSub2Impl>());
}
[Test]
@@ -102,12 +87,12 @@
{
string arg1 = "bar";
int arg2 = 5;
-
kernel.Register(Component.For<ClassWithArguments>().LifeStyle.Transient.DynamicParameters((k,
d) =>
+
Kernel.Register(Component.For<ClassWithArguments>().LifeStyle.Transient.DynamicParameters((k,
d) =>
{
d["arg1"] = arg1;
d["arg2"] = arg2;
}));
- var component = kernel.Resolve<ClassWithArguments>(new
{ arg2 = 2, arg1 = "foo" });
+ var component = Kernel.Resolve<ClassWithArguments>(new
{ arg2 = 2, arg1 = "foo" });
Assert.AreEqual(arg1, component.Arg1);
Assert.AreEqual(arg2, component.Arg2);
}
@@ -117,17 +102,17 @@
{
string arg1 = "bar";
int arg2 = 5;
- kernel.Register(Component.For<ClassWithArguments>()
- .LifeStyle.Transient
- .DynamicParameters((k, d) =>
- {
- d["arg1"] = arg1;
- })
- .DynamicParameters((k, d) =>
- {
- d["arg2"] = arg2;
- }));
- var component = kernel.Resolve<ClassWithArguments>(new
{ arg2 = 2, arg1 = "foo" });
+ Kernel.Register(Component.For<ClassWithArguments>()
+
.LifeStyle.Transient
+
.DynamicParameters((k, d) =>
+ {
+
d["arg1"] = arg1;
+ })
+
.DynamicParameters((k, d) =>
+ {
+
d["arg2"] = arg2;
+ }));
+ var component = Kernel.Resolve<ClassWithArguments>(new
{ arg2 = 2, arg1 = "foo" });
Assert.AreEqual(arg1, component.Arg1);
Assert.AreEqual(arg2, component.Arg2);
}
@@ -137,31 +122,31 @@
{
string arg1 = "bar";
int arg2 = 5;
-
kernel.Register(Component.For<ClassWithArguments>().LifeStyle.Transient.DynamicParameters((k,
d) =>
+
Kernel.Register(Component.For<ClassWithArguments>().LifeStyle.Transient.DynamicParameters((k,
d) =>
{
d["arg1"] = arg1;
d["arg2"] = arg2;
}));
//Assert.DoesNotThrow(() =>
- kernel.Resolve<ClassWithArguments>();//);
+ Kernel.Resolve<ClassWithArguments>();//);
}
[Test]
public void Can_release_components_with_dynamic_parameters()
{
bool releaseCalled = false;
- kernel.Register(
-
Component.For<ClassWithArguments>().LifeStyle.Transient.DynamicParameters((k,
d) =>
- {
+ Kernel.Register(
+
Component.For<ClassWithArguments>().LifeStyle.Transient.DynamicParameters((k,
d) =>
+ {
d["arg1"] = "foo";
return kk => releaseCalled = true;
}));
-
- var component = kernel.Resolve<ClassWithArguments>(new
{ arg2 = 2 });
+
+ var component = Kernel.Resolve<ClassWithArguments>(new
{ arg2 = 2 });
Assert.AreEqual(2, component.Arg2);
Assert.AreEqual("foo", component.Arg1);
- kernel.ReleaseComponent(component);
+ Kernel.ReleaseComponent(component);
Assert.IsTrue(releaseCalled);
}
@@ -169,7 +154,7 @@
public void Can_release_generics_with_dynamic_parameters()
{
bool releaseCalled = false;
- kernel.Register(
+ Kernel.Register(
Component.For(typeof(IGenericClassWithParameter<>))
.ImplementedBy(typeof(GenericClassWithParameter<>))
.LifeStyle.Transient.DynamicParameters((k, d) =>
@@ -178,10 +163,10 @@
return kk => releaseCalled = true;
}));
- var component =
kernel.Resolve<IGenericClassWithParameter<int>>(new { name = "bar" });
+ var component =
Kernel.Resolve<IGenericClassWithParameter<int>>(new { name = "bar" });
Assert.AreEqual("foo", component.Name);
- kernel.ReleaseComponent(component);
+ Kernel.ReleaseComponent(component);
Assert.IsTrue(releaseCalled);
}
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel/Registration/
=========================================================================
File [modified]: ComponentRegistration.cs
Delta lines: +2 -2
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Castle.MicroKernel.Tests-vs2008.csproj
2010-01-11 20:50:42 UTC (rev 6632)
+++
InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Castle.MicroKernel.Tests-vs2008.csproj
2010-01-11 21:26:06 UTC (rev 6633)
@@ -289,13 +289,13 @@
</Compile>
<Compile Include="Registration\ComponentRegistrationTestCase.cs" />
<Compile Include="Registration\AllTypesTestCase.cs" />
+ <Compile
Include="Registration\Interceptors\InterceptorReferenceComparer.cs" />
+ <Compile Include="Registration\Interceptors\InterceptorsTestCaseBase.cs" />
<Compile
Include="Registration\Interceptors\Multiple\GenericInterceptorsInSingleCallTestCase.cs"
/>
<Compile
Include="Registration\Interceptors\Multiple\GenericInterceptorsMultipleCallTestCase.cs"
/>
<Compile
Include="Registration\Interceptors\Multiple\InterceptorKeyInSingleCallTestCase.cs"
/>
<Compile
Include="Registration\Interceptors\Multiple\InterceptorKeyMultipleCallTestCase.cs"
/>
- <Compile
Include="Registration\Interceptors\InterceptorReferenceComparer.cs" />
<Compile
Include="Registration\Interceptors\Multiple\InterceptorReferenceMultipleCallTestCase.cs"
/>
- <Compile Include="Registration\Interceptors\InterceptorsTestCaseBase.cs" />
<Compile
Include="Registration\Interceptors\Multiple\InterceptorReferencesInSingleCallTestCase.cs"
/>
<Compile
Include="Registration\Interceptors\Multiple\InterceptorReferenceWithPositionMultipleCall1TestCase.cs"
/>
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel.Tests/Registration/
===============================================================================
File [modified]: DynamicParametersTestCase.cs
Delta lines: +0 -0
===================================================================
--
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.
