[Nhibernate-commit] nhibernate/src/NHibernate.Test CriteriaTest.cs,1.2,1.3 PerformanceTest.cs,1.3,1.4 SimpleTest.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-serv3428

Modified Files:
	CriteriaTest.cs PerformanceTest.cs SimpleTest.cs 
Log Message:
Made Simple class look like H2.0.3's Simple class.

Index: PerformanceTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/PerformanceTest.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PerformanceTest.cs	28 May 2004 11:49:05 -0000	1.3
--- PerformanceTest.cs	8 Jun 2004 11:47:37 -0000	1.4
***************
*** 61,65 ****
  
  		[Test]
! 		[Ignore("User should comment this out if they want it to run.  Does not test any functions.")]
  		public void Many() 
  		{
--- 61,65 ----
  
  		[Test]
! 		//[Ignore("User should comment this out if they want it to run.  Does not test any functions.")]
  		public void Many() 
  		{
***************
*** 70,74 ****
  			
  			//for(int n = 0; n < 20; n++) 
! 			for(int n = 0; n < 20; n++) 
  			{
  				Simple[] simples = new Simple[n];
--- 70,74 ----
  			
  			//for(int n = 0; n < 20; n++) 
! 			for(int n = 0; n < 5; n++) 
  			{
  				Simple[] simples = new Simple[n];
***************
*** 80,84 ****
  					simples[i].Init();
  					simples[i].Count = i;
- 					simples[i].Key = (long)i;
  					ids[i] = (long)i;
  				}
--- 80,83 ----
***************
*** 161,165 ****
  			for(int i = 0; i < N; i++) 
  			{
! 				s.Save(simples[i]); //, ids[i]);
  			}
  			s.Flush();
--- 160,164 ----
  			for(int i = 0; i < N; i++) 
  			{
! 				s.Save(simples[i], ids[i]);
  			}
  			s.Flush();
***************
*** 248,252 ****
  				keys[j] = (long)reader[0];
  				simplesFromReader[j] = new Simple();
- 				simplesFromReader[j].Key = keys[j];
  				simplesFromReader[j].Name = (string)reader[1];
  				simplesFromReader[j].Address = (string)reader[2];
--- 247,250 ----

Index: CriteriaTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/CriteriaTest.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CriteriaTest.cs	24 May 2004 05:46:59 -0000	1.2
--- CriteriaTest.cs	8 Jun 2004 11:47:37 -0000	1.3
***************
*** 23,43 ****
  			ISession s1 = sessions.OpenSession();
  			ITransaction t1 = s1.BeginTransaction();
! 
  			Simple simple1 = new Simple();
  			simple1.Address = "Street 12";
  			simple1.Date = DateTime.Now;
- 			simple1.Key = 15;
  			simple1.Name = "For Criteria Test";
  			simple1.Count = 16;
  
  			Simple notSimple1 = new Simple();
  			notSimple1.Address = "Street 123";
  			notSimple1.Date = DateTime.Now;
- 			notSimple1.Key = 17;
  			notSimple1.Name = "Don't be found";
  			notSimple1.Count = 18;
  
! 			s1.Save(notSimple1);
! 			s1.Save(simple1);
  
  			t1.Commit();
--- 23,43 ----
  			ISession s1 = sessions.OpenSession();
  			ITransaction t1 = s1.BeginTransaction();
! 			
! 			long simple1Key = 15;
  			Simple simple1 = new Simple();
  			simple1.Address = "Street 12";
  			simple1.Date = DateTime.Now;
  			simple1.Name = "For Criteria Test";
  			simple1.Count = 16;
  
+ 			long notSimple1Key = 17;
  			Simple notSimple1 = new Simple();
  			notSimple1.Address = "Street 123";
  			notSimple1.Date = DateTime.Now;
  			notSimple1.Name = "Don't be found";
  			notSimple1.Count = 18;
  
! 			s1.Save(notSimple1, notSimple1Key);
! 			s1.Save(simple1, simple1Key);
  
  			t1.Commit();
***************
*** 56,60 ****
  
  			Assertion.AssertNotNull("Unable to load object", simple2);
- 			Assertion.AssertEquals("Load failed", simple1.Key, simple2.Key);
  			Assertion.AssertEquals("Load failed", simple1.Count, simple2.Count);
  			Assertion.AssertEquals("Load failed", simple1.Name, simple2.Name);
--- 56,59 ----
***************
*** 62,67 ****
  			Assertion.AssertEquals("Load failed", simple1.Date.ToString(), simple2.Date.ToString());
  
! 			s2.Delete(notSimple1);
! 			s2.Delete(simple2);
  
  			t2.Commit();
--- 61,65 ----
  			Assertion.AssertEquals("Load failed", simple1.Date.ToString(), simple2.Date.ToString());
  
! 			s2.Delete("from Simple");
  
  			t2.Commit();

Index: SimpleTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SimpleTest.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimpleTest.cs	16 May 2004 03:49:36 -0000	1.2
--- SimpleTest.cs	8 Jun 2004 11:47:37 -0000	1.3
***************
*** 81,85 ****
  			ITransaction t3 = s3.BeginTransaction();
  
! 			Simple simple3 = (Simple)s3.Load(typeof(Simple), simple2.Key);
  			Simple otherSimple3;
  
--- 81,85 ----
  			ITransaction t3 = s3.BeginTransaction();
  
! 			Simple simple3 = (Simple)s3.Load(typeof(Simple), key);
  			Simple otherSimple3;
  
***************
*** 92,96 ****
  			// they were loaded in 2 different sessions
  			otherSimple3 = simple3.Other;
- 			Assertion.AssertEquals(simple2.Other.Key, otherSimple3.Key);
  
  			// the update worked - lets clear out the table
--- 92,95 ----
***************
*** 135,139 ****
  			
  			Simple loadedSimple = (Simple)q.List()[0];
- 			Assert.AreEqual(key, loadedSimple.Key);
  			Assert.AreEqual(99, loadedSimple.Count);
  			Assert.AreEqual("Simple 1", loadedSimple.Name);
--- 134,137 ----