[Nhibernate-commit] nhibernate/src/NHibernate.Test/CompositeId ClassWithCompositeId.cs,NONE,1.1 ClassWithCompositeId.hbm.xml,NONE,1.1 ClassWithCompositeIdFixture.cs,NONE,1.1 Id.cs,NONE,1.1

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

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

Added Files:
	ClassWithCompositeId.cs ClassWithCompositeId.hbm.xml 
	ClassWithCompositeIdFixture.cs Id.cs 
Log Message:
NH-151: added SByteType and Fixture for it
Moved nh specific CompositeId tests to their own namespace.

--- NEW FILE: Id.cs ---
using System;

namespace NHibernate.Test.CompositeId
{
	/// <summary>
	/// Summary description for Id.
	/// </summary>
	public class Id 
	{
		private string _keyString;
		private short _keyShort;
		private System.DateTime _keyDateTime;

		public Id() 
		{
		}

		public Id(string keyString, short keyShort, System.DateTime keyDateTime) {
			_keyString = keyString;
			_keyShort = keyShort;
			_keyDateTime = keyDateTime;
		}

		public string KeyString {
			get { return _keyString;}
			set { _keyString = value;}
		}

//		public short KeyShort {
//			get { return _keyShort;}
//			set {_keyShort = value;}
//		}

		public System.DateTime KeyDateTime {
			get { return _keyDateTime;}
//			set {_keyDateTime = value;}
		}

		public override int GetHashCode() {
			return _keyString.GetHashCode();
		}

		public override bool Equals(object obj) {
			Id otherObj = obj as Id;

			if(otherObj==null) return false;

			if(otherObj.KeyString.Equals(this.KeyString)) return true;

			return false;

		}
	}
}

--- NEW FILE: ClassWithCompositeIdFixture.cs ---
using System;
using System.Collections;
using System.Data;

using NHibernate.DomainModel.NHSpecific;
using NUnit.Framework;

namespace NHibernate.Test.CompositeId
{
	/// <summary>
	/// Summary description for ClassWithCompositeIdFixture.
	/// </summary>
	[TestFixture]
	public class ClassWithCompositeIdFixture : TestCase
	{
		
		private DateTime firstDateTime = new DateTime(2003, 8, 16);
		private DateTime secondDateTime = new DateTime(2003, 8, 17);
		private Id id;
		private Id secondId;
					
		[SetUp]
		public void SetUp() 
		{
			ExportSchema( new string[] { "CompositeId.ClassWithCompositeId.hbm.xml" }, true, "NHibernate.Test" );
			id = new Id("stringKey", 3, firstDateTime);
			secondId = new Id("stringKey2", 5, secondDateTime);
		}

		/// <summary>
		/// Test the basic CRUD operations for a class with a Composite Identifier
		/// </summary>
		/// <remarks>
		/// The following items are tested in this Test Script
		/// <list type="">
		///		<item>
		///			<term>Save</term>
		///		</item>
		///		<item>
		///			<term>Load</term>
		///		</item>
		///		<item>
		///			<term>Criteria</term>
		///		</item>
		///		<item>
		///			<term>Update</term>
		///		</item>
		///		<item>
		///			<term>Delete</term>
		///		</item>
		///		<item>
		///			<term>Criteria - No Results</term>
		///		</item>
		/// </list>
		/// </remarks>
		[Test]
		public void TestSimpleCRUD() 
		{
			
			// insert the new objects
			ISession s = sessions.OpenSession();
			ITransaction t = s.BeginTransaction();

			ClassWithCompositeId theClass = new ClassWithCompositeId(id);
			theClass.OneProperty = 5;

			ClassWithCompositeId theSecondClass = new ClassWithCompositeId(secondId);
			theSecondClass.OneProperty = 10;

			s.Save(theClass);
			s.Save(theSecondClass);

			t.Commit();
			s.Close();

			// verify they were inserted and test the SELECT

			ISession s2 = sessions.OpenSession();
			ITransaction t2 = s2.BeginTransaction();

			ClassWithCompositeId theClass2 = (ClassWithCompositeId)s2.Load(typeof(ClassWithCompositeId), id);
			
			IList results2 = s2.CreateCriteria(typeof(ClassWithCompositeId))
					.Add(Expression.Expression.Eq("Id", secondId))
					.List();

			Assert.AreEqual(1, results2.Count);
			ClassWithCompositeId theSecondClass2 = (ClassWithCompositeId)results2[0];

			ClassWithCompositeId theClass2Copy = (ClassWithCompositeId)s2.Load(typeof(ClassWithCompositeId), id);
			
			// verify the same results through Criteria & Load were achieved
			Assert.AreSame(theClass2, theClass2Copy);

			// compare them to the objects created in the first session
			Assert.AreEqual(theClass.Id, theClass2.Id);
			Assert.AreEqual(theClass.OneProperty, theClass2.OneProperty);

			Assert.AreEqual(theSecondClass.Id, theSecondClass2.Id);
			Assert.AreEqual(theSecondClass.OneProperty, theSecondClass2.OneProperty);

			// test the update functionallity
			theClass2.OneProperty = 6;
			theSecondClass2.OneProperty = 11;

			s2.Update(theClass2);
			s2.Update(theSecondClass2);

			t2.Commit();
			s2.Close();

			// lets verify the update went through
			ISession s3 = sessions.OpenSession();
			ITransaction t3 = s3.BeginTransaction();

			ClassWithCompositeId theClass3 = (ClassWithCompositeId)s3.Load(typeof(ClassWithCompositeId), id);
			ClassWithCompositeId theSecondClass3 = (ClassWithCompositeId)s3.Load(typeof(ClassWithCompositeId), secondId);

			// check the update properties
			Assert.AreEqual(theClass3.OneProperty, theClass2.OneProperty);
			Assert.AreEqual(theSecondClass3.OneProperty, theSecondClass2.OneProperty);
			
			// test the delete method
			s3.Delete(theClass3);
			s3.Delete(theSecondClass3);

			t3.Commit();
			s3.Close();

			// lets verify the delete went through
			ISession s4 = sessions.OpenSession();

			try 
			{
				ClassWithCompositeId theClass4 = (ClassWithCompositeId)s4.Load(typeof(ClassWithCompositeId), id);
			}
			catch(ObjectNotFoundException onfe) 
			{
				// I expect this to be thrown because the object no longer exists...
				Assert.IsNotNull(onfe); //getting ride of 'onfe' is never used compile warning
			}

			IList results =  s4.CreateCriteria(typeof(ClassWithCompositeId))
				.Add(Expression.Expression.Eq("Id", secondId))
				.List();

			Assert.AreEqual(0, results.Count);

		}

		[Test]
		public void Criteria() 
		{
			Id id = new Id("stringKey", 3, firstDateTime);
			ClassWithCompositeId cId = new ClassWithCompositeId(id);
			cId.OneProperty = 5;

			// add the new instance to the session so I have something to get results 
			// back for
			ISession s = sessions.OpenSession();
			s.Save(cId);
			s.Flush();
			s.Close();

			s = sessions.OpenSession();
			ICriteria c = s.CreateCriteria(typeof(ClassWithCompositeId));
			c.Add( Expression.Expression.Eq("Id", id) );

			// right now just want to see if the Criteria is valid
			IList results = c.List();

			Assert.AreEqual(1, results.Count);

			s.Close();
		}

		[Test]
		public void Hql() 
		{
			// insert the new objects
			ISession s = sessions.OpenSession();
			ITransaction t = s.BeginTransaction();

			ClassWithCompositeId theClass = new ClassWithCompositeId(id);
			theClass.OneProperty = 5;

			ClassWithCompositeId theSecondClass = new ClassWithCompositeId(secondId);
			theSecondClass.OneProperty = 10;

			s.Save(theClass);
			s.Save(theSecondClass);

			t.Commit();
			s.Close();

			ISession s2 = sessions.OpenSession();
			
			IQuery hql = s2.CreateQuery("from ClassWithCompositeId as cwid where cwid.Id.KeyString = :keyString");
 
			hql.SetString("keyString", id.KeyString);

			IList results = hql.List();

			Assert.AreEqual(1, results.Count);

		}


	}
}

--- NEW FILE: ClassWithCompositeId.cs ---
using System;

namespace NHibernate.Test.CompositeId
{
	/// <summary>
	/// Summary description for ClassWithCompositeId.
	/// </summary>
	public class ClassWithCompositeId
	{
		private Id _id;
		private int _oneProperty;

		public ClassWithCompositeId(){}
	
		public ClassWithCompositeId(Id id ) 
		{
			_id = id;
		}

		public Id Id 
		{
			get {return _id;}
		}

		public int OneProperty 
		{
			get {return _oneProperty;}
			set {_oneProperty = value;}
		}
	}
}

--- NEW FILE: ClassWithCompositeId.hbm.xml ---
<?xml version="1.0"?>

<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">

	<class 
		name="NHibernate.Test.CompositeId.ClassWithCompositeId, NHibernate.Test" 
		table="class_w_com_id"
	>
		<composite-id name="Id" class="NHibernate.Test.CompositeId.Id, NHibernate.Test" access="nosetter.camelcase-underscore">
			<key-property name="KeyString" column="string_" type="String(20)" length="20" />
			<key-property name="KeyShort" column="short_" access="field.camelcase-underscore"/>
			<key-property name="KeyDateTime" column="date_" type="DateTime" access="nosetter.camelcase-underscore"/>
		</composite-id>
		
		<property name="OneProperty" column="one_property"/>
	</class>
	
</hibernate-mapping>