Cherry-pick "Merge remote-tracking branch 'remotes/Nicaog/NH-3132'"

Author: hazzik

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

@@ -4,106 +4,99 @@
 
 namespace NHibernate.Test.NHSpecificTest.NH3132
 {
-    [TestFixture]
-    public class Fixture : TestCase
-    {
-        protected override string MappingsAssembly
-        {
-            get { return "NHibernate.Test"; }
-        }
+	[TestFixture]
+	public class Fixture : TestCase
+	{
+		protected override string MappingsAssembly
+		{
+			get { return "NHibernate.Test"; }
+		}
 
-        protected override IList Mappings
-        {
-            get
-            {
-                return new string[]
+		protected override IList Mappings
+		{
+			get
+			{
+				return new string[]
 					{
 						"NHSpecificTest.NH3132.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.Name = "First";
-                    product.Lazy = "Lazy";
-                    
-                    session.Save(product);
+		/// <summary>
+		/// push some data into the database
+		/// Really functions as a save test also 
+		/// </summary>
+		protected override void OnSetUp()
+		{
+			base.OnSetUp();
 
-/*                    Inventory inventory = new Inventory();
-                    inventory.Id = product.Id;
-                    inventory.Quantity = 1;
+			using (var session = OpenSession())
+			{
+				using (var tran = session.BeginTransaction())
+				{
+					Product product = new Product();
+					product.Name = "First";
+					product.Lazy = "Lazy";
+					
+					session.Save(product);
 
-                    session.Save(inventory);*/
+					tran.Commit();
+				}
+			}
+		}
 
-                    tran.Commit();
-                }
-            }
-        }
+		protected override void OnTearDown()
+		{
+			base.OnTearDown();
 
-        protected override void OnTearDown()
-        {
-            base.OnTearDown();
+			using (var session = OpenSession())
+			{
+				using (var tran = session.BeginTransaction())
+				{
+					session.Delete("from Product");
+					tran.Commit();
+				}
+			}
+		}
 
-            using (var session = OpenSession())
-            {
-                using (var tran = session.BeginTransaction())
-                {
-                    session.Delete("from Product");
-                    tran.Commit();
-                }                
-            }
+		[Test]
+		public void Query_returns_correct_name()
+		{
+			using (var session = OpenSession())
+			{
+				Product product = session.CreateCriteria(typeof (Product))
+					.Add(Restrictions.Eq("Name", "First"))
+					.UniqueResult<Product>();
 
-        }
+				Assert.IsNotNull(product);
+				Assert.AreEqual("First", product.Name);
+			}
+		}
 
-        [Test]
-        public void Query_returns_correct_name()
-        {
-            using (var session = OpenSession())
-            {
-                Product product = session.CreateCriteria(typeof (Product))
-                    .Add(Restrictions.Eq("Name", "First"))
-                    .UniqueResult<Product>();
+		[Test]
+		public void Correct_value_gets_saved()
+		{
+			using (var session = OpenSession())
+			{
+				Product product = session.CreateCriteria(typeof(Product))
+					.Add(Restrictions.Eq("Name", "First"))
+					.UniqueResult<Product>();
 
-                Assert.IsNotNull(product);
-                Assert.AreEqual("First", product.Name);
-            }
-        }
+				Assert.IsNotNull(product);
+				product.Name = "Changed";
 
-        [Test]
-        public void Correct_value_gets_saved()
-        {
-            using (var session = OpenSession())
-            {
-                Product product = session.CreateCriteria(typeof(Product))
-                    .Add(Restrictions.Eq("Name", "First"))
-                    .UniqueResult<Product>();
+				session.Flush();
+				
+				session.Clear();
 
-                Assert.IsNotNull(product);
-                product.Name = "Changed";
-
-                session.Flush();
-                
-                session.Clear();
-
-                Product product1 = session.CreateCriteria(typeof(Product))
-                    .Add(Restrictions.Eq("Name", "Changed"))
-                    .UniqueResult<Product>();
-                
-                Assert.IsNotNull(product1);
-                Assert.AreEqual("Changed", product1.Name);
-            }
-        }
-    }
+				Product product1 = session.CreateCriteria(typeof(Product))
+					.Add(Restrictions.Eq("Name", "Changed"))
+					.UniqueResult<Product>();
+				
+				Assert.IsNotNull(product1);
+				Assert.AreEqual("Changed", product1.Name);
+			}
+		}
+	}
 }

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

@@ -1,18 +1,18 @@
 using System;
 
-namespace NHibernate.Test.NHSpecificTest.NH3132
-{
-    public class Product
-    {
-        public virtual Guid Id { get; set; }
+namespace NHibernate.Test.NHSpecificTest.NH3132
+{
+	public class Product
+	{
+		public virtual Guid Id { get; set; }
 
-        private string _name;
-        public virtual string Name
-        {
-            get { return _name; }
-            set { _name = value; }
-        }
+		private string _name;
+		public virtual string Name
+		{
+			get { return _name; }
+			set { _name = value; }
+		}
 
-        public virtual string Lazy { get; set; }
-    }
-}
+		public virtual string Lazy { get; set; }
+	}
+}

src/NHibernate/Properties/FieldAccessor.cs

@@ -104,7 +104,7 @@ public bool CanAccessThroughReflectionOptimizer
 
 		private static FieldInfo GetField(System.Type type, string fieldName, System.Type originalType)
 		{
-			if (type == null || type == typeof (object))
+			if (type == null || type == typeof(object))
 			{
 				// the full inheritance chain has been walked and we could
 				// not find the Field
@@ -306,13 +306,13 @@ public void Set(object target, object value)
 						// all related to an ISet and IDictionary mixups.
 						string msg =
 							String.Format("The type {0} can not be assigned to a field of type {1}", value.GetType().ToString(),
-										  field.FieldType.ToString());
+														field.FieldType.ToString());
 						throw new PropertyAccessException(ae, msg, true, clazz, name);
 					}
 					else
 					{
 						throw new PropertyAccessException(ae, "ArgumentException while setting the field value by reflection", true, clazz,
-														  name);
+																							name);
 					}
 				}
 				catch (Exception e)