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

additional SPRNET-912 fix

Browse Source
This commit is contained in:
eeichinger
2008-10-29 14:29:11 +00:00
parent 26be3d4ef0
commit 62a976ffaa
5 changed files with 51 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs
View File

@@ -122,17 +122,45 @@ namespace Spring.Objects.Factory.Xml
}
[Test]
[ExpectedException(typeof(XmlObjectDefinitionStoreException))]
public void ThrowsObjectDefinitionStoreExceptionOnValidationError()
{
DefaultListableObjectFactory of = new DefaultListableObjectFactory();
XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(of);
reader.LoadObjectDefinitions(new StringResource(
@"<?xml version='1.0' encoding='UTF-8' ?>
<objects xmlns='http://www.springframework.net'>
<INVALIDELEMENT id='test2' type='Spring.Objects.TestObject, Spring.Core.Tests' />
</objects>
"));
try
{
DefaultListableObjectFactory of = new DefaultListableObjectFactory();
XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(of);
reader.LoadObjectDefinitions(new StringResource(
@"<?xml version='1.0' encoding='UTF-8' ?>
<objects xmlns='http://www.springframework.net'>
<INVALIDELEMENT id='test2' type='Spring.Objects.TestObject, Spring.Core.Tests' />
</objects>
"));
Assert.Fail();
}
catch(ObjectDefinitionStoreException ex)
{
Assert.IsTrue( ex.Message.IndexOf("Line 3 in XML document from violates the schema.") > -1);
}
}
[Test]
public void ThrowsObjectDefinitionStoreExceptionOnInvalidXml()
{
try
{
DefaultListableObjectFactory of = new DefaultListableObjectFactory();
XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(of);
reader.LoadObjectDefinitions(new StringResource(
@"<?xml version='1.0' encoding='UTF-8' ?>
<objects xmlns='http://www.springframework.net'>
<object id='test2' type='Spring.Objects.TestObject, Spring.Core.Tests'>
</objects>
"));
Assert.Fail();
}
catch(ObjectDefinitionStoreException ex)
{
Assert.IsTrue( ex.Message.IndexOf("Line 4 in XML document from is not well formed.") > -1);
}
}
#region ThrowsObjectDefinitionStoreExceptionOnErrorDuringObjectDefinitionRegistration Helper

15
test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectFactoryTests.cs
View File

@@ -993,15 +993,10 @@ namespace Spring.Objects.Factory.Xml
reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("invalid.xml", GetType()));
Assert.Fail("Should have thrown XmlObjectDefinitionStoreException");
}
#if !NET_1_0
catch (XmlObjectDefinitionStoreException e)
catch (ObjectDefinitionStoreException e)
{
Assert.AreEqual(0, e.Message.IndexOf("Line 21 in XML document"));
}
#else
catch (XmlObjectDefinitionStoreException)
{}
#endif
}
[Test]
@@ -1014,16 +1009,10 @@ namespace Spring.Objects.Factory.Xml
reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("invalid.xml", GetType()));
Assert.Fail("Should have thrown XmlObjectDefinitionStoreException");
}
#if !NET_1_0
catch (XmlObjectDefinitionStoreException e)
catch (ObjectDefinitionStoreException e)
{
Assert.AreEqual(0, e.Message.IndexOf("Line 21 in XML document"));
}
#else
catch (XmlObjectDefinitionStoreException)
{}
#endif
}
[Test]