[Netreflector-develop] NetReflector/src/NetReflector.Test NetReflectorTypeTableUnusedNodeTest.cs,1.1,1.2

[Owen R. <exo...@us...>]

Update of /cvsroot/netreflector/NetReflector/src/NetReflector.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15960/src/NetReflector.Test

Modified Files:
	NetReflectorTypeTableUnusedNodeTest.cs 
Log Message:
some refactoring of invalid node detection.  now also detects duplicates.

Index: NetReflectorTypeTableUnusedNodeTest.cs
===================================================================
RCS file: /cvsroot/netreflector/NetReflector/src/NetReflector.Test/NetReflectorTypeTableUnusedNodeTest.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NetReflectorTypeTableUnusedNodeTest.cs	7 Apr 2005 04:30:37 -0000	1.1
--- NetReflectorTypeTableUnusedNodeTest.cs	15 Apr 2005 04:45:09 -0000	1.2
***************
*** 2,6 ****
  using System.Collections;
  using System.Reflection;
- using System.Xml;
  using Exortech.NetReflector.Util;
  using NUnit.Framework;
--- 2,5 ----
***************
*** 24,44 ****
  
  		[Test]
! 		public void RaiseUnusedNodeEventIfXmlContainsUnnecessaryNodes()
  		{
  			string xml = TestClass.GetXml(DateTime.Now, string.Format(@"<inner fooz=""bar""><baz/><yaz />{0}</inner>", TestInnerClass.GetInnerXml()));
! 			table.UnusedNode += new UnusedNodeEventHandler(HandleUnusedNode);
  			serialiser.Read(XmlUtil.ReadNode(xml), table);
  
  			Assert.AreEqual(3, nodes.Count);
! 			Assert.AreEqual("fooz", ((XmlNode)nodes[0]).Name);
! 			Assert.AreEqual("baz", ((XmlNode)nodes[1]).Name);
! 			Assert.AreEqual("yaz", ((XmlNode)nodes[2]).Name);
  		}
  
  		[Test]
! 		public void DoNotRaiseUnusedNodeEventIfXmlDoesNotContainUnnecessaryNodes()
  		{
  			string xml = TestClass.GetXmlWithSubClass(DateTime.Now);
! 			table.UnusedNode += new UnusedNodeEventHandler(HandleUnusedNode);
  			serialiser.Read(XmlUtil.ReadNode(xml), table);
  
--- 23,60 ----
  
  		[Test]
! 		public void RaiseEventIfXmlContainsUnnecessaryNodes()
  		{
  			string xml = TestClass.GetXml(DateTime.Now, string.Format(@"<inner fooz=""bar""><baz/><yaz />{0}</inner>", TestInnerClass.GetInnerXml()));
! 			table.InvalidNode += new InvalidNodeEventHandler(HandleUnusedNode);
  			serialiser.Read(XmlUtil.ReadNode(xml), table);
  
  			Assert.AreEqual(3, nodes.Count);
! 			Assert.AreEqual("fooz", InvalidNodeName(0));
! 			Assert.AreEqual("baz", InvalidNodeName(1));
! 			Assert.AreEqual("yaz", InvalidNodeName(2));
! 		}
! 
! 		private string InvalidNodeName(int index)
! 		{
! 			return ((InvalidNodeEventArgs)nodes[index]).Node.Name;
  		}
  
  		[Test]
! 		public void RaiseEventIfXmlContainsDuplicateNodes()
! 		{
! 			string xml = TestClass.GetXml(DateTime.Now, string.Format(@"<inner name=""dupe"">{0}<present>dupe</present></inner>", TestInnerClass.GetInnerXml()));
! 			table.InvalidNode += new InvalidNodeEventHandler(HandleUnusedNode);
! 			serialiser.Read(XmlUtil.ReadNode(xml), table);
! 
! 			Assert.AreEqual(2, nodes.Count);
! 			Assert.AreEqual("name", InvalidNodeName(0));
! 			Assert.AreEqual("present", InvalidNodeName(1));
! 		}
! 
! 		[Test]
! 		public void DoNotRaiseEventIfXmlDoesNotContainUnnecessaryNodes()
  		{
  			string xml = TestClass.GetXmlWithSubClass(DateTime.Now);
! 			table.InvalidNode += new InvalidNodeEventHandler(HandleUnusedNode);
  			serialiser.Read(XmlUtil.ReadNode(xml), table);
  
***************
*** 47,58 ****
  
  		[Test]
! 		public void ShouldHandleRaisingUnusedNodeEventsIfNoHandlerHasBeenRegistered()
  		{
! 			table.OnUnusedNode(null);
  		}
  
! 		private void HandleUnusedNode(XmlNode node)
  		{
! 			nodes.Add(node);
  		}
  
--- 63,74 ----
  
  		[Test]
! 		public void ShouldHandleRaisingEventsIfNoHandlerHasBeenRegistered()
  		{
! 			table.OnInvalidNode(null);
  		}
  
! 		private void HandleUnusedNode(InvalidNodeEventArgs args)
  		{
! 			nodes.Add(args);
  		}