[Nhibernate-commit] nhibernate/src/NHibernate.Test CriteriaTest.cs,1.5,1.6 ObjectAssertion.cs,1.4,1.5 SimpleTest.cs,1.5,1.6

[Peter S. <sz...@us...>]

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

Modified Files:
	CriteriaTest.cs ObjectAssertion.cs SimpleTest.cs 
Log Message:
Removed obsolete method Assertion.*, replaced with Assert.*. Reordered asserts.


Index: CriteriaTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/CriteriaTest.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CriteriaTest.cs	13 Jul 2004 19:37:25 -0000	1.5
--- CriteriaTest.cs	20 Sep 2004 17:45:58 -0000	1.6
***************
*** 52,64 ****
  				.List();
  			
! 			Assertion.AssertEquals(1, results2.Count);
  
  			Simple simple2 = (Simple)results2[0];
  
! 			Assertion.AssertNotNull("Unable to load object", simple2);
! 			Assertion.AssertEquals("Load failed", simple1.Count, simple2.Count);
! 			Assertion.AssertEquals("Load failed", simple1.Name, simple2.Name);
! 			Assertion.AssertEquals("Load failed", simple1.Address, simple2.Address);
! 			Assertion.AssertEquals("Load failed", simple1.Date.ToString(), simple2.Date.ToString());
  
  			s2.Delete("from Simple");
--- 52,64 ----
  				.List();
  			
! 			Assert.AreEqual(1, results2.Count);
  
  			Simple simple2 = (Simple)results2[0];
  
! 			Assert.IsNotNull(simple2, "Unable to load object");
! 			Assert.AreEqual(simple1.Count, simple2.Count, "Load failed");
! 			Assert.AreEqual(simple1.Name, simple2.Name, "Load failed");
! 			Assert.AreEqual(simple1.Address, simple2.Address, "Load failed");
! 			Assert.AreEqual(simple1.Date.ToString(), simple2.Date.ToString(), "Load failed");
  
  			s2.Delete("from Simple");

Index: SimpleTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SimpleTest.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SimpleTest.cs	18 Aug 2004 20:48:33 -0000	1.5
--- SimpleTest.cs	20 Sep 2004 17:45:58 -0000	1.6
***************
*** 60,66 ****
  
  			// verify each property was saved as expected
! 			Assertion.AssertNotNull("Unable to load object", simple2);
! 			Assertion.AssertNotNull(otherSimple2);
! 			Assertion.AssertSame(simple2.Other, otherSimple2);
  
  			// update
--- 60,66 ----
  
  			// verify each property was saved as expected
! 			Assert.IsNotNull(simple2, "Unable to load object");
! 			Assert.IsNotNull(otherSimple2);
! 			Assert.AreSame(simple2.Other, otherSimple2);
  
  			// update
***************
*** 83,90 ****
  			Simple otherSimple3;
  
! 			Assertion.AssertEquals(simple2.Count, simple3.Count);
! 			Assertion.AssertEquals(simple2.Name, simple3.Name);
! 			Assertion.AssertEquals(simple2.Address, simple3.Address);
! 			Assertion.AssertEquals(simple2.Date, simple3.Date);
  			
  			// note that the Other will not be the same object because
--- 83,90 ----
  			Simple otherSimple3;
  
! 			Assert.AreEqual(simple2.Count, simple3.Count);
! 			Assert.AreEqual(simple2.Name, simple3.Name);
! 			Assert.AreEqual(simple2.Address, simple3.Address);
! 			Assert.AreEqual(simple2.Date, simple3.Date);
  			
  			// note that the Other will not be the same object because
***************
*** 101,105 ****
  			// verify there is no other Simple objects in the db
  			ISession s4 = sessions.OpenSession();
! 			Assertion.AssertEquals(0, s4.CreateCriteria(typeof(Simple)).List().Count);
  			s4.Close();
  
--- 101,105 ----
  			// verify there is no other Simple objects in the db
  			ISession s4 = sessions.OpenSession();
! 			Assert.AreEqual(0, s4.CreateCriteria(typeof(Simple)).List().Count);
  			s4.Close();
  

Index: ObjectAssertion.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ObjectAssertion.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ObjectAssertion.cs	9 Jun 2004 01:05:46 -0000	1.4
--- ObjectAssertion.cs	20 Sep 2004 17:45:58 -0000	1.5
***************
*** 9,18 ****
  {
  	/// <summary>
! 	/// Helps with Assertions with two Objects.
  	/// </summary>
  	[TestFixture]
! 	public class ObjectAssertion
  	{
! 		public ObjectAssertion()
  		{
  		}
--- 9,18 ----
  {
  	/// <summary>
! 	/// Helps with Asserts with two Objects.
  	/// </summary>
  	[TestFixture]
! 	public class ObjectAssert
  	{
! 		public ObjectAssert()
  		{
  		}
***************
*** 20,33 ****
  		internal static void AssertPropertiesEqual(JoinedSubclassBase expected, JoinedSubclassBase actual) 
  		{
! 			Assertion.AssertEquals(expected.Id, actual.Id);
! 			Assertion.AssertEquals(expected.TestDateTime, actual.TestDateTime);
! 			Assertion.AssertEquals(expected.TestLong, actual.TestLong);
! 			Assertion.AssertEquals(expected.TestString, actual.TestString);
  		}
  
  		internal static void AssertPropertiesEqual(JoinedSubclassOne expected, JoinedSubclassOne actual) 
  		{
! 			ObjectAssertion.AssertPropertiesEqual((JoinedSubclassBase)expected, (JoinedSubclassBase)actual);
! 			Assertion.AssertEquals(expected.OneTestLong, actual.OneTestLong);
  		}
  
--- 20,33 ----
  		internal static void AssertPropertiesEqual(JoinedSubclassBase expected, JoinedSubclassBase actual) 
  		{
! 			Assert.AreEqual(expected.Id, actual.Id);
! 			Assert.AreEqual(expected.TestDateTime, actual.TestDateTime);
! 			Assert.AreEqual(expected.TestLong, actual.TestLong);
! 			Assert.AreEqual(expected.TestString, actual.TestString);
  		}
  
  		internal static void AssertPropertiesEqual(JoinedSubclassOne expected, JoinedSubclassOne actual) 
  		{
! 			ObjectAssert.AssertPropertiesEqual((JoinedSubclassBase)expected, (JoinedSubclassBase)actual);
! 			Assert.AreEqual(expected.OneTestLong, actual.OneTestLong);
  		}
  
***************
*** 74,84 ****
  		internal static void AssertEquals(IDictionary expected, IDictionary actual, bool compareValues) 
  		{
! 			Assertion.AssertEquals(expected.Count, actual.Count);
  
  			foreach(DictionaryEntry de in expected) 
  			{
! 				Assertion.Assert(actual.Contains(de.Key));
  				if(compareValues)
! 					Assertion.AssertEquals("The item identified by the key " + de.Key.ToString(), expected[de.Key], actual[de.Key]);	
  			}
  		}
--- 74,84 ----
  		internal static void AssertEquals(IDictionary expected, IDictionary actual, bool compareValues) 
  		{
! 			Assert.AreEqual(expected.Count, actual.Count);
  
  			foreach(DictionaryEntry de in expected) 
  			{
! 				Assert.IsTrue(actual.Contains(de.Key));
  				if(compareValues)
! 					Assert.AreEqual(expected[de.Key], actual[de.Key], "The item identified by the key " + de.Key.ToString());
  			}
  		}
***************
*** 96,100 ****
  			actualWithEqualValues["ONE"] = "one";
  
! 			ObjectAssertion.AssertEquals(expected, actualWithEqualValues, true);
  
  		}
--- 96,100 ----
  			actualWithEqualValues["ONE"] = "one";
  
! 			ObjectAssert.AssertEquals(expected, actualWithEqualValues, true);
  
  		}
***************
*** 102,113 ****
  		public static void AssertEquals(DateTime expected, DateTime actual, bool useMilliseconds) 
  		{
! 			Assertion.AssertEquals("Year", expected.Year, actual.Year);
! 			Assertion.AssertEquals("Month", expected.Month, actual.Month);
! 			Assertion.AssertEquals("Day", expected.Day, actual.Day);
! 			Assertion.AssertEquals("Hour", expected.Hour, actual.Hour);
! 			Assertion.AssertEquals("Minute", expected.Minute, actual.Minute);
! 			Assertion.AssertEquals("Second", expected.Second, actual.Second);
  			if(useMilliseconds)
! 				Assertion.AssertEquals("Millisecond", expected.Millisecond, actual.Millisecond);
  
  		}
--- 102,113 ----
  		public static void AssertEquals(DateTime expected, DateTime actual, bool useMilliseconds) 
  		{
! 			Assert.AreEqual(expected.Year, actual.Year, "Year");
! 			Assert.AreEqual(expected.Month, actual.Month, "Month");
! 			Assert.AreEqual(expected.Day, actual.Day, "Day");
! 			Assert.AreEqual(expected.Hour, actual.Hour, "Hour");
! 			Assert.AreEqual(expected.Minute, actual.Minute, "Minute");
! 			Assert.AreEqual(expected.Second, actual.Second, "Second");
  			if(useMilliseconds)
! 				Assert.AreEqual(expected.Millisecond, actual.Millisecond, "Millisecond");
  
  		}