[Springnet-commits] Spring.Net/test/Spring/Spring.Core.Tests/Objects/Factory/Xml ReadOnlyXmlTestResource.cs, 1.10, 1.11 XmlObjectFactoryTests.cs, 1.78, 1.79

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Objects/Factory/Xml
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7943

Modified Files:
	ReadOnlyXmlTestResource.cs XmlObjectFactoryTests.cs 
Log Message:
(Partial Fix) SPRNET-867 - Add line number to top level error message when there are XML parsing errors.

Index: XmlObjectFactoryTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectFactoryTests.cs,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** XmlObjectFactoryTests.cs	8 Aug 2007 17:49:04 -0000	1.78
--- XmlObjectFactoryTests.cs	4 Feb 2008 22:44:11 -0000	1.79
***************
*** 965,986 ****
  
          [Test]
-         [ExpectedException(typeof(ObjectDefinitionStoreException))]
          public void InvalidXmlFile()
          {
              DefaultListableObjectFactory xof = new DefaultListableObjectFactory();
              XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(xof);
!             // should be validating by default...
!             reader.LoadObjectDefinitions(
!                 new ReadOnlyXmlTestResource("invalid.xml", GetType()));
          }
  
          [Test]
-         [ExpectedException(typeof(ObjectDefinitionStoreException))]
          public void DefaultXmlResolverIsUsedIfNullSuppliedOrSet()
          {
              DefaultListableObjectFactory xof = new DefaultListableObjectFactory();
              XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(xof, null);
!             reader.LoadObjectDefinitions(
!                 new ReadOnlyXmlTestResource("invalid.xml", GetType()));
          }
  
--- 965,1008 ----
  
          [Test]
          public void InvalidXmlFile()
          {
              DefaultListableObjectFactory xof = new DefaultListableObjectFactory();
              XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(xof);
!             try
!             {
!                 reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("invalid.xml", GetType()));
!                 Assert.Fail("Should have thrown XmlObjectDefinitionStoreException");
!             }
! #if !NET_1_0
!             catch (XmlObjectDefinitionStoreException e)
!             {
!                 Assert.AreEqual(0, e.Message.IndexOf("Line 21 in XML document"));
!             }
! #else
!             catch (XmlObjectDefinitionStoreException)
!             {}
! #endif
          }
  
          [Test]
          public void DefaultXmlResolverIsUsedIfNullSuppliedOrSet()
          {
              DefaultListableObjectFactory xof = new DefaultListableObjectFactory();
              XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(xof, null);
!             try
!             {
!                 reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("invalid.xml", GetType()));  
!                 Assert.Fail("Should have thrown XmlObjectDefinitionStoreException");
!             }
! #if !NET_1_0
!             catch (XmlObjectDefinitionStoreException e)
!             {
!                 Assert.AreEqual(0, e.Message.IndexOf("Line 21 in XML document"));
!             }
! #else
!             catch (XmlObjectDefinitionStoreException)
!             {}
! #endif
! 
          }
  

Index: ReadOnlyXmlTestResource.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ReadOnlyXmlTestResource.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ReadOnlyXmlTestResource.cs	8 Aug 2007 17:49:04 -0000	1.10
--- ReadOnlyXmlTestResource.cs	4 Feb 2008 22:44:11 -0000	1.11
***************
*** 136,139 ****
--- 136,144 ----
              }
          }
+ 
+         public override string ToString()
+         {
+             return Description;
+         }
      }
  }