NH-3670

Created additional tests with generic properties for NH-1796, NH-1039, NH-3571 and NH-2664

Author: rjperes

src/NHibernate.Test/NHSpecificTest/NH1039Generic/Fixture.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+
+
+namespace NHibernate.Test.NHSpecificTest.NH1039Generic
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		public override string BugNumber
+		{
+			get { return "NH1039Generic";  }
+		}
+
+		protected override void OnTearDown()
+		{
+			base.OnTearDown();
+			using (ISession s = OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				s.Delete("from Person");
+				tx.Commit();
+			}
+		}
+
+		[Test]
+		public void test()
+		{
+			using (ISession s = OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				Person person = new Person("1");
+				person.Name = "John Doe";
+				var set = new HashSet<object>();
+				set.Add("555-1234");
+				set.Add("555-4321");
+				person.Properties.Add("Phones", set);
+
+				s.Save(person);
+				tx.Commit();
+			}
+			using (ISession s = OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				Person person = (Person)s.CreateCriteria(typeof(Person)).UniqueResult();
+
+				Assert.AreEqual("1", person.ID);
+				Assert.AreEqual("John Doe", person.Name);
+				Assert.AreEqual(1, person.Properties.Count);
+				Assert.That(person.Properties["Phones"], Is.InstanceOf<ISet<object>>());
+				Assert.IsTrue(((ISet<object>) person.Properties["Phones"]).Contains("555-1234"));
+				Assert.IsTrue(((ISet<object>) person.Properties["Phones"]).Contains("555-4321"));
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH1039Generic/Mappings.hbm.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+				   namespace="NHibernate.Test.NHSpecificTest.NH1039Generic"
+				   assembly="NHibernate.Test">
+
+	<class name="Person" table="NH1039_Person">
+		<id name="ID" type="string" length="32">
+			<generator class="assigned"/>
+		</id>
+
+		<property name="Name"/>
+
+		<dynamic-component name="Properties">
+			<set name="Phones" table="NH1039_Phone">
+				<key column="PersonId"/>
+				<element column="`Number`" type="string"/>
+			</set>
+		</dynamic-component>
+	</class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH1039Generic/Model.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH1039Generic
+{
+	public class Person
+	{
+		public Person() { }
+		public Person(string id) { this._ID = id; }
+
+		private string _ID;
+		public virtual string ID
+		{
+			get { return _ID; }
+			set { _ID = value; }
+		}
+
+		private string _Name;
+		public virtual string Name
+		{
+			get { return _Name; }
+			set { _Name = value; }
+		}
+
+		private IDictionary<string, object> _Properties = new Dictionary<string, object>();
+		public virtual IDictionary<string, object> Properties
+		{
+			get { return _Properties; }
+			set { _Properties = value; }
+		}
+	}
+
+}

src/NHibernate.Test/NHSpecificTest/NH1796Generic/Entity.cs

@@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH1796Generic
+{
+	public class Entity
+	{
+		public virtual int Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual IDictionary<string, object> DynProps { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH1796Generic/Fixture.cs

@@ -0,0 +1,65 @@
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1796Generic
+{
+	[TestFixture]
+	public class Fixture: BugTestCase
+	{
+		[Test]
+		public void Merge()
+		{
+			var entity = new Entity { Name = "Vinnie Luther" };
+			using (ISession s = OpenSession())
+			using (ITransaction t = s.BeginTransaction())
+			{
+				s.Save(entity);
+				t.Commit();
+			}
+
+			entity.DynProps = new Dictionary<string, object>();
+			entity.DynProps["StrProp"] = "Modified";
+			using (ISession s = OpenSession())
+			using (ITransaction t = s.BeginTransaction())
+			{
+				s.Merge(entity);
+				t.Commit();
+			}
+
+			using (ISession s = OpenSession())
+			using (ITransaction t = s.BeginTransaction())
+			{
+				s.CreateQuery("delete from Entity").ExecuteUpdate();
+				t.Commit();
+			}
+		}
+
+		[Test]
+		public void SaveOrUpdate()
+		{
+			var entity = new Entity { Name = "Vinnie Luther" };
+			using (ISession s = OpenSession())
+			using (ITransaction t = s.BeginTransaction())
+			{
+				s.SaveOrUpdate(entity);
+				t.Commit();
+			}
+
+			entity.DynProps = new Dictionary<string, object>();
+			entity.DynProps["StrProp"] = "Modified";
+			using (ISession s = OpenSession())
+			using (ITransaction t = s.BeginTransaction())
+			{
+				s.SaveOrUpdate(entity);
+				t.Commit();
+			}
+
+			using (ISession s = OpenSession())
+			using (ITransaction t = s.BeginTransaction())
+			{
+				s.CreateQuery("delete from Entity").ExecuteUpdate();
+				t.Commit();
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH1796Generic/Mappings.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+	assembly="NHibernate.Test"
+	namespace="NHibernate.Test.NHSpecificTest.NH1796Generic">
+
+	<class name="Entity">
+		<id name="Id">
+			<generator class="native" />
+		</id>
+		<property name="Name"/>
+		<dynamic-component name="DynProps">
+			<property name="StrProp" type="string" />
+			<property name="ValueProp" type="int" />
+		</dynamic-component>
+	</class>
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH2664Generic/Fixture.cs

@@ -0,0 +1,130 @@
+using System.Collections;
+using System.Linq;
+using NHibernate.Linq;
+using NUnit.Framework;
+using System.Linq.Expressions;
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH2664Generic
+{
+	[TestFixture]
+	public class Fixture : TestCase
+	{
+		protected override string MappingsAssembly
+		{
+			get { return "NHibernate.Test"; }
+		}
+
+		protected override IList Mappings
+		{
+			get
+			{
+				return new[]
+					{
+						"NHSpecificTest.NH2664Generic.Mappings.hbm.xml"
+					};
+			}
+		}
+
+		/// <summary>
+		/// push some data into the database
+		/// Really functions as a save test also 
+		/// </summary>
+		protected override void OnSetUp()
+		{
+			base.OnSetUp();
+
+			using (var session = OpenSession())
+			{
+				using (var tran = session.BeginTransaction())
+				{
+					Product product = new Product();
+					product.ProductId = "1";
+					product.Properties["Name"] = "First Product";
+					product.Properties["Description"] = "First Description";
+
+					session.Save(product);
+
+					product = new Product();
+					product.ProductId = "2";
+					product.Properties["Name"] = "Second Product";
+					product.Properties["Description"] = "Second Description";
+
+					session.Save(product);
+
+					product = new Product();
+					product.ProductId = "3";
+					product.Properties["Name"] = "val";
+					product.Properties["Description"] = "val";
+
+					session.Save(product);
+
+					tran.Commit();
+				}
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			base.OnTearDown();
+
+			using (var session = OpenSession())
+			{
+				using (var tran = session.BeginTransaction())
+				{
+					session.Delete("from Product");
+					tran.Commit();
+				}
+			}
+
+		}
+
+		[Test]
+		public void Query_DynamicComponent()
+		{
+			using (var session = OpenSession())
+			{
+				var product =
+					(from p in session.Query<Product>() where p.Properties["Name"] == "First Product" select p).Single();
+
+				Assert.IsNotNull(product);
+				Assert.AreEqual("First Product", product.Properties["Name"]);
+			}
+		}
+
+		[Test]
+		public void Multiple_Query_Does_Not_Cache()
+		{
+			using (var session = OpenSession())
+			{
+				// Query by name
+				var product1 = (from p in session.Query<Product>()
+								where p.Properties["Name"] == "First Product"
+								select p).Single();
+				Assert.That(product1.ProductId, Is.EqualTo("1"));
+
+				// Query by description (this test is to verify that the dictionary
+				// index isn't cached from the query above.
+				var product2 = (from p in session.Query<Product>()
+								where p.Properties["Description"] == "Second Description"
+								select p).Single();
+				Assert.That(product2.ProductId, Is.EqualTo("2"));
+			}
+		}
+
+		[Test]
+		public void Different_Key_In_DynamicComponentDictionary_Returns_Different_Keys()
+		{
+			using (var session = OpenSession())
+			{
+				Expression<Func<IEnumerable>> key1 = () => (from a in session.Query<Product>() where a.Properties["Name"] == "val" select a);
+				Expression<Func<IEnumerable>> key2 = () => (from a in session.Query<Product>() where a.Properties["Description"] == "val" select a);
+
+				var nhKey1 = new NhLinqExpression(key1.Body, sessions);
+				var nhKey2 = new NhLinqExpression(key2.Body, sessions);
+
+				Assert.AreNotEqual(nhKey1.Key, nhKey2.Key);
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH2664Generic/Mappings.hbm.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH2664Generic">
+	<class name="Product" table="Products">
+		<id name="ProductId" column="ProductId" type="String">
+			<generator class="assigned" />
+
+		</id>
+		<dynamic-component name="Properties">
+			<property name="Description" column="Description" type="String"/>
+			<property name="Name" column="Name" type="String" />
+
+		</dynamic-component>
+
+	</class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH2664Generic/Product.cs

@@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH2664Generic
+{
+	public class Product
+	{
+		public virtual string ProductId { get; set; }
+
+		private IDictionary<string, object> _properties;
+
+		public virtual IDictionary<string, object> Properties
+		{
+			get
+			{
+				if (_properties == null)
+					_properties = new Dictionary<string, object>();
+
+				return _properties;
+			}
+			set { _properties = value; }
+		}
+	}
+}