Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPRNET-694

Browse Source 
-updated so-called "anonymous child containers" to be assigned deterministic naming of the form "parent/nestedContainer1/nestedContainer2/nestedContainer3/etc"
-prior changes already prevent the actual error reported in this issue by throwing if two contexts are attempted to be registered with the same names
This commit is contained in:
sbohlen
2010-08-04 19:56:30 +00:00
parent c756336427
commit 11816bf43b
3 changed files with 151 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/Spring/Spring.Core.Tests/Context/CommonTypes.cs
View File

@@ -254,9 +254,17 @@ namespace Spring.Context
_mockName = name;
factory = new DefaultListableObjectFactory();
// factory.AddObjectPostProcessor(new ApplicationContextAwareProcessor(this));
}
}
public MockApplicationContext(string name, IApplicationContext parentContext) : base(name, true, parentContext)
/// <summary>
/// Initializes a new instance of the MockApplicationContext class.
/// </summary>
public MockApplicationContext(IApplicationContext parentContext)
{
factory = new DefaultListableObjectFactory(parentContext);
}
public MockApplicationContext(string name, IApplicationContext parentContext) : base(name, true, parentContext)
{
_mockName = name;
factory = new DefaultListableObjectFactory(GetInternalParentObjectFactory());

91
test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs
View File

@@ -249,6 +249,7 @@ namespace Spring.Context.Support
ContextRegistry.RegisterContext(duplicate);
}
[Test]
public void RemovesContextFromRegistryWhenContextCloses()
{
@@ -259,5 +260,95 @@ namespace Spring.Context.Support
appCtx.Dispose();
Assert.IsFalse(ContextRegistry.IsContextRegistered(appCtx.Name));
}
[TestFixture]
public class WhenHierarchicalContextsAllHaveDefaultNames
{
private MockApplicationContext _parentContext;
private MockApplicationContext _childContext;
private MockApplicationContext _grandChildContext;
private MockApplicationContext _greatGrandChildContext;
private string _expectedParentName;
private string _expectedChildName;
private string _expectedGrandChildName;
private string _expectedGreatGrandChildName;
[TestFixtureSetUp]
public void InitializeAllTests()
{
_expectedParentName = AbstractApplicationContext.DefaultRootContextName;
_expectedChildName = string.Format("{0}/{1}", _expectedParentName, AbstractApplicationContext.DefaultRootContextName);
_expectedGrandChildName = string.Format("{0}/{1}/{2}",_expectedParentName, _expectedChildName, AbstractApplicationContext.DefaultRootContextName);
_expectedGreatGrandChildName = string.Format("{0}/{1}/{2}/{3}",_expectedParentName, _expectedChildName, _expectedGrandChildName, AbstractApplicationContext.DefaultRootContextName);
}
[SetUp]
public void Setup()
{
//ensure prior-registered contexts are removed
ContextRegistry.Clear();
_parentContext = new MockApplicationContext();
_parentContext.MockName = "parent";
_childContext = new MockApplicationContext(_parentContext);
_childContext.MockName = "child";
_childContext.ParentContext = _parentContext;
_grandChildContext = new MockApplicationContext(_childContext);
_grandChildContext.MockName = "grandchild";
_grandChildContext.ParentContext = _childContext;
_greatGrandChildContext = new MockApplicationContext(_grandChildContext);
_greatGrandChildContext.MockName = "greatgrandchild";
_greatGrandChildContext.ParentContext = _grandChildContext;
}
[Test]
public void RegisterContext_ConstructsNestedPathBasedNames_IfRegisterdInHierarchicalOrder()
{
ContextRegistry.RegisterContext(_parentContext);
ContextRegistry.RegisterContext(_childContext);
ContextRegistry.RegisterContext(_grandChildContext);
ContextRegistry.RegisterContext(_greatGrandChildContext);
Assert.AreEqual(_expectedParentName, ContextRegistry.GetContext().Name);
Assert.AreEqual(_expectedChildName, ContextRegistry.GetContext(_expectedChildName).Name);
Assert.AreEqual(_expectedGrandChildName, ContextRegistry.GetContext(_expectedGrandChildName).Name);
Assert.AreEqual(_expectedGreatGrandChildName, ContextRegistry.GetContext(_expectedGreatGrandChildName).Name);
}
[Test]
public void RegisterContext_ConstructsNestedPathBasedNames_IfRegisteringAMixOfDefaultAndExplicitNamedContexts()
{
//modify the expected names for the decendent contexts for this one test
string childContextInitialName = AbstractApplicationContext.DefaultRootContextName + "_CUSTOM";
_expectedChildName = string.Format("{0}/{1}", _expectedParentName, childContextInitialName);
_expectedGrandChildName = string.Format("{0}/{1}/{2}", _expectedParentName, _expectedChildName, AbstractApplicationContext.DefaultRootContextName);
_expectedGreatGrandChildName = string.Format("{0}/{1}/{2}/{3}", _expectedParentName, _expectedChildName, _expectedGrandChildName, AbstractApplicationContext.DefaultRootContextName);
//setup custom child instance for this one test
_childContext = new MockApplicationContext(_expectedChildName);
_childContext.MockName = "child";
_childContext.ParentContext = _parentContext;
_grandChildContext.ParentContext = _childContext;
//register contexts in conflict with hierarchical order
ContextRegistry.RegisterContext(_parentContext);
ContextRegistry.RegisterContext(_childContext);
ContextRegistry.RegisterContext(_grandChildContext);
ContextRegistry.RegisterContext(_greatGrandChildContext);
Assert.AreEqual(_expectedParentName, ContextRegistry.GetContext(_expectedParentName).Name);
Assert.AreEqual(_expectedChildName, ContextRegistry.GetContext(_expectedChildName).Name);
Assert.AreEqual(_expectedGrandChildName, ContextRegistry.GetContext(_expectedGrandChildName).Name);
Assert.AreEqual(_expectedGreatGrandChildName, ContextRegistry.GetContext(_expectedGreatGrandChildName).Name);
}
}
}
}