diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs index 1259767d..55778b66 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs @@ -21,8 +21,10 @@ #region Imports using System; +using System.Reflection; using System.Xml; using NUnit.Framework; +using Spring.Aop.Config; using Spring.Core.IO; using Spring.Objects.Factory.Config; using Spring.Objects.Factory.Support; @@ -72,6 +74,15 @@ namespace Spring.Objects.Factory.Xml { try { + Assembly[] loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies(); + foreach(Assembly assembly in loadedAssemblies) + { + if (assembly.GetName(true).Name.StartsWith("Spring.Data")) + { + Assert.Fail("Spring.Data is already loaded - this test checks if it gets loaded during xml parsing"); + } + } + NamespaceParserRegistry.Reset(); DefaultListableObjectFactory of = new DefaultListableObjectFactory(); @@ -79,11 +90,12 @@ namespace Spring.Objects.Factory.Xml reader.LoadObjectDefinitions(new StringResource( @" - + xmlns:tx='http://www.springframework.net/tx'> + ")); - Assert.AreEqual(typeof(RequiredValidator), of.GetObject("tripValidator").GetType()); + object apc = of.GetObject(AopNamespaceUtils.AUTO_PROXY_CREATOR_OBJECT_NAME); + Assert.NotNull(apc); } finally { diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj index b5d422bd..6e95001e 100644 --- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj +++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj @@ -906,10 +906,18 @@ + + {3A3A4E65-45A6-4B20-B460-0BEDC302C02C} + Spring.Aop.2008 + {710961A3-0DF4-49E4-A26E-F5B9C044AC84} Spring.Core.2008 + + {AE00E5AB-C39A-436F-86D2-33BFE33E2E40} + Spring.Data.2008 +