[Nhibernate-commit] nhibernate/src/NHibernate.Test BasicTypes.cs,1.6,1.7 ObjectAssertion.cs,1.2,1.3

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7673

Modified Files:
	BasicTypes.cs ObjectAssertion.cs 
Log Message:
Added an ObjectAssertion for an IList that takes a parameter indicating if the
order of items in the List matters.  The <bag> mapping is not being stored in 
any particular order in MySql while MsSql stores them in the order they are 
inserted.

Index: ObjectAssertion.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ObjectAssertion.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ObjectAssertion.cs	15 Feb 2004 22:52:41 -0000	1.2
--- ObjectAssertion.cs	16 Apr 2004 14:06:35 -0000	1.3
***************
*** 40,48 ****
  		{
  
! 			Assertion.AssertEquals(expected.Count, actual.Count);
  
  			for(int i = 0; i < expected.Count; i++) 
  			{
! 				Assertion.AssertEquals("The item at index " + i + " was not equal", expected[i], actual[i]);
  			}
  		}
--- 40,65 ----
  		{
  
! 			AssertEquals(expected, actual, true);
! 		}
  
+ 		/// <summary>
+ 		/// 
+ 		/// </summary>
+ 		/// <param name="expected"></param>
+ 		/// <param name="actual"></param>
+ 		/// <param name="indexMatters">A boolean indicating if the List are compared at Index or by Contains.</param>
+ 		internal static void AssertEquals(IList expected, IList actual, bool indexMatters) 
+ 		{
+ 			Assert.AreEqual(expected.Count, actual.Count);
  			for(int i = 0; i < expected.Count; i++) 
  			{
! 				if(indexMatters) 
! 				{
! 					Assert.IsTrue(expected[i].Equals(actual[i]), "The item at index " + i + " was not equal" );
! 				}
! 				else 
! 				{
! 					Assert.IsTrue(actual.Contains(expected[i]), "The item " + expected[i].ToString() + " could not be found in the actual List.");
! 				}
  			}
  		}

Index: BasicTypes.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/BasicTypes.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BasicTypes.cs	14 Apr 2004 18:09:41 -0000	1.6
--- BasicTypes.cs	16 Apr 2004 14:06:35 -0000	1.7
***************
*** 885,889 ****
  				ObjectAssertion.AssertEquals(expected.StringArray, actual.StringArray);
  				ObjectAssertion.AssertEquals(expected.Int32Array, actual.Int32Array);
! 				ObjectAssertion.AssertEquals(expected.StringBag, actual.StringBag);
  				ObjectAssertion.AssertEquals(expected.StringList, actual.StringList);
  				ObjectAssertion.AssertEquals(expected.StringMap, actual.StringMap, true);
--- 885,889 ----
  				ObjectAssertion.AssertEquals(expected.StringArray, actual.StringArray);
  				ObjectAssertion.AssertEquals(expected.Int32Array, actual.Int32Array);
! 				ObjectAssertion.AssertEquals(expected.StringBag, actual.StringBag, false);
  				ObjectAssertion.AssertEquals(expected.StringList, actual.StringList);
  				ObjectAssertion.AssertEquals(expected.StringMap, actual.StringMap, true);