[Adapdev-commits] Adapdev/src/Adapdev.Tests/XPath XPathObjectNavigatorTest.cs,1.3,1.4

[Sean M. <int...@us...>]

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/XPath
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18792/src/Adapdev.Tests/XPath

Modified Files:
	XPathObjectNavigatorTest.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: XPathObjectNavigatorTest.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/XPath/XPathObjectNavigatorTest.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XPathObjectNavigatorTest.cs	16 Nov 2005 07:01:53 -0000	1.3
--- XPathObjectNavigatorTest.cs	26 Nov 2005 08:09:23 -0000	1.4
***************
*** 219,223 ****
  	/// </summary>
  	[TestFixture]
! 	public class XPathObjectNavigatorTest : Assertion
  	{
  		[Test]
--- 219,223 ----
  	/// </summary>
  	[TestFixture]
! 	public class XPathObjectNavigatorTest : Assert
  	{
  		[Test]
***************
*** 229,245 ****
  			XPathObjectNavigator context = new XPathObjectNavigator(customer);
  			XPathNodeIterator i = context.Select("/Customer/Address/Street");			
! 			AssertEquals(1, i.Count);
! 			AssertEquals(true, i.MoveNext());			
! 			AssertEquals(customer.Address.Street, i.Current.Value);
! 			AssertEquals(customer.Address.Street, ((XPathObjectNavigator)i.Current).Node);
  
  			i = context.Select("FirstName");
! 			AssertEquals(1, i.Count);
! 			AssertEquals(true, i.MoveNext());
! 			AssertEquals(customer.FirstName, i.Current.Value);
  
  			i = context.Select("/Customer/LastName");						
! 			AssertEquals(true, i.MoveNext());
! 			AssertEquals(customer.LastName, i.Current.Value);
  		}
  
--- 229,245 ----
  			XPathObjectNavigator context = new XPathObjectNavigator(customer);
  			XPathNodeIterator i = context.Select("/Customer/Address/Street");			
! 			Assert.AreEqual(1, i.Count);
! 			Assert.AreEqual(true, i.MoveNext());			
! 			Assert.AreEqual(customer.Address.Street, i.Current.Value);
! 			Assert.AreEqual(customer.Address.Street, ((XPathObjectNavigator)i.Current).Node);
  
  			i = context.Select("FirstName");
! 			Assert.AreEqual(1, i.Count);
! 			Assert.AreEqual(true, i.MoveNext());
! 			Assert.AreEqual(customer.FirstName, i.Current.Value);
  
  			i = context.Select("/Customer/LastName");						
! 			Assert.AreEqual(true, i.MoveNext());
! 			Assert.AreEqual(customer.LastName, i.Current.Value);
  		}
  
***************
*** 264,282 ****
  			Order[] orders = new Order[] { o1, o2 };
  			XPathObjectNavigator navigator = new XPathObjectNavigator(orders, "Orders");			
! 			AssertEquals(2, navigator.Select("//Order").Count);
! 			AssertEquals(2, navigator.Select("Order").Count);
! 			AssertEquals(o1, navigator.SelectObject("Order[1]"));
! 			AssertEquals(o2, navigator.SelectObject("Order[2]"));
  
! 			AssertEquals(o1, navigator.SelectObject("//Order[Customer/FirstName='Rodrigo']"));
! 			AssertEquals(o2, navigator.SelectObject("//Order[Customer/LastName='Longo']"));
  
  			XPathNodeIterator i = navigator.Select("//Product[Name='egg']");
! 			AssertEquals(2, i.Count);
! 			AssertEquals(true, i.MoveNext());
! 			AssertEquals(p1, ((XPathObjectNavigator)i.Current).Node);
  
! 			AssertEquals(o2.Items[0], navigator.SelectObject("//OrderItem[Quantity>10]"));
! 			AssertEquals(p2, navigator.SelectObject("//Product[Categories/String='Silly Stuff']"));
  		}
  
--- 264,282 ----
  			Order[] orders = new Order[] { o1, o2 };
  			XPathObjectNavigator navigator = new XPathObjectNavigator(orders, "Orders");			
! 			Assert.AreEqual(2, navigator.Select("//Order").Count);
! 			Assert.AreEqual(2, navigator.Select("Order").Count);
! 			Assert.AreEqual(o1, navigator.SelectObject("Order[1]"));
! 			Assert.AreEqual(o2, navigator.SelectObject("Order[2]"));
  
! 			Assert.AreEqual(o1, navigator.SelectObject("//Order[Customer/FirstName='Rodrigo']"));
! 			Assert.AreEqual(o2, navigator.SelectObject("//Order[Customer/LastName='Longo']"));
  
  			XPathNodeIterator i = navigator.Select("//Product[Name='egg']");
! 			Assert.AreEqual(2, i.Count);
! 			Assert.AreEqual(true, i.MoveNext());
! 			Assert.AreEqual(p1, ((XPathObjectNavigator)i.Current).Node);
  
! 			Assert.AreEqual(o2.Items[0], navigator.SelectObject("//OrderItem[Quantity>10]"));
! 			Assert.AreEqual(p2, navigator.SelectObject("//Product[Categories/String='Silly Stuff']"));
  		}
  
***************
*** 288,292 ****
  
  			XPathObjectNavigator navigator = new XPathObjectNavigator(customer);
! 			AssertEquals(customer.Properties["email"], navigator.SelectObject("Properties/email"));
  		}
  
--- 288,292 ----
  
  			XPathObjectNavigator navigator = new XPathObjectNavigator(customer);
! 			Assert.AreEqual(customer.Properties["email"], navigator.SelectObject("Properties/email"));
  		}
  
***************
*** 301,307 ****
  			XPathObjectNavigator navigator = new XPathObjectNavigator(customers);
  			object[] actual = navigator.SelectObjects("Customer[Address/Number = 45]");
! 			AssertEquals(2, actual.Length);
! 			AssertEquals(customer1, actual[0]);
! 			AssertEquals(customer2, actual[1]);
  		}
  
--- 301,307 ----
  			XPathObjectNavigator navigator = new XPathObjectNavigator(customers);
  			object[] actual = navigator.SelectObjects("Customer[Address/Number = 45]");
! 			Assert.AreEqual(2, actual.Length);
! 			Assert.AreEqual(customer1, actual[0]);
! 			Assert.AreEqual(customer2, actual[1]);
  		}
  
***************
*** 313,319 ****
  
  			XPathObjectNavigator navigator = new XPathObjectNavigator(customer1);
! 			AssertSame(customer1.Email, navigator.SelectObject("Email"));
  
! 			AssertSame(customer1, navigator.SelectObject("/Customer[Email='rb...@ac...']"));
  		}
  	}
--- 313,319 ----
  
  			XPathObjectNavigator navigator = new XPathObjectNavigator(customer1);
! 			Assert.AreSame(customer1.Email, navigator.SelectObject("Email"));
  
! 			Assert.AreSame(customer1, navigator.SelectObject("/Customer[Email='rb...@ac...']"));
  		}
  	}