Cleanup test & fix

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH3898/DomainClasses.cs

@@ -1,31 +1,13 @@
-
+using System;
 
-using System;
-using System.Collections.Generic;
 namespace NHibernate.Test.NHSpecificTest.NH3898
 {
 	public class Employee
 	{
-		private Int32 id;
-		public virtual Int32 Id
-		{
-			get { return id; }
-			set { id = value; }
-		}
+		public virtual int Id { get; set; }
 
-		private String name;
-		public virtual String Name
-		{
-			get { return name; }
-			set { name = value; }
-		}
+		public virtual string Name { get; set; }
 
-		private Int32 promotionCount;
-
-		public virtual Int32 PromotionCount
-		{
-			get { return promotionCount; }
-			set { promotionCount = value; }
-		}
+		public virtual int PromotionCount { get; set; }
 	}
-}
+}

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

@@ -1,102 +1,61 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using NHibernate.Dialect;
-using NUnit.Framework;
-using NHibernate.Test.NHSpecificTest;
-using Iesi.Collections.Generic;
-using NHibernate;
-using System.Data;
-using NHibernate.Criterion;
+using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH3898
 {
-	/// <summary>
-	/// <para>
-	/// </para>
-	/// </remarks>
 	[TestFixture]
 	public class Fixture : BugTestCase
 	{
-		protected override void Configure(NHibernate.Cfg.Configuration configuration)
+		protected override void Configure(Cfg.Configuration configuration)
 		{
-			#region removing possible second-level-cache configs
-			configuration.Properties.Remove(NHibernate.Cfg.Environment.CacheProvider);
-			configuration.Properties.Remove(NHibernate.Cfg.Environment.UseQueryCache);
-			configuration.Properties.Add(NHibernate.Cfg.Environment.UseQueryCache, "true");
-			configuration.Properties.Remove(NHibernate.Cfg.Environment.UseSecondLevelCache);
-			#endregion
-
-			base.Configure(configuration);
+			configuration.SetProperty(Cfg.Environment.UseQueryCache, "false");
+			configuration.SetProperty(Cfg.Environment.UseSecondLevelCache, "false");
 		}
 
 		protected override void OnTearDown()
 		{
-			base.OnTearDown();
-			using (ISession s = OpenSession())
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
 			{
-				int countUpdate = 0;
-
-				countUpdate =
-					s
-						.CreateSQLQuery("DELETE FROM T_EMPLOYEE")
-						.ExecuteUpdate();
-				Assert.AreEqual(1, countUpdate);
+				s.CreateQuery("delete from Employee").ExecuteUpdate();
 
-				s.Flush();
+				tx.Commit();
 			}
 		}
 
-		protected override void OnSetUp()
-		{
-			base.OnSetUp();
-		}
-
-		protected override bool AppliesTo(global::NHibernate.Dialect.Dialect dialect)
-		{
-			//return dialect as MsSql2005Dialect != null;
-			return base.AppliesTo(dialect);
-		}
-
-		/// <summary>
-		/// Test that reproduces the problem.
-		/// </summary>
 		[Test]
 		public void GeneratedInsertUpdateTrue()
 		{
-			using (ISession session = this.OpenSession())
+			object id;
+			using (var session = OpenSession())
+			using (var tx = session.BeginTransaction())
 			{
-				using (ITransaction tx = session.BeginTransaction())
+				var employee = new Employee
 				{
-					Employee employee = new Employee();
-					employee.Id = 1;
-					employee.Name = "Employee 1";
-					employee.PromotionCount = 9999999;
-					session.Save(employee);
-					Assert.AreEqual(0, employee.PromotionCount);
-					tx.Commit();
-				}
+					Name = "Employee 1",
+					PromotionCount = 9999999
+				};
+				id = session.Save(employee);
+				Assert.That(employee.PromotionCount, Is.EqualTo(0));
+				tx.Commit();
 			}
 
-			using (ISession session = this.OpenSession())
+			using (var session = OpenSession())
+			using (var tx = session.BeginTransaction())
 			{
-				using (ITransaction tx = session.BeginTransaction())
-				{
-					Employee employee = session.Get<Employee>(1);
-					employee.Name = "Employee 1 changed";
-					employee.PromotionCount++;
-					Assert.AreEqual(1, employee.PromotionCount);
-					tx.Commit();
-				}
+				var employee = session.Get<Employee>(id);
+				employee.Name = "Employee 1 changed";
+				employee.PromotionCount++;
+				Assert.That(employee.PromotionCount, Is.EqualTo(1));
+				tx.Commit();
 			}
 
-			using (ISession session = this.OpenSession())
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
 			{
-				Employee employee = session.Get<Employee>(1);
-				Assert.AreEqual("Employee 1 changed", employee.Name);
-				Assert.AreEqual(1, employee.PromotionCount);
+				var employee = session.Get<Employee>(id);
+				Assert.That(employee.Name, Is.EqualTo("Employee 1 changed"));
+				Assert.That(employee.PromotionCount, Is.EqualTo(1));
 			}
 		}
 	}
-}
+}

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

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
-                   namespace="NHibernate.Test.NHSpecificTest.NH3898" default-access="field.camelcase"
-                   default-lazy="true" default-cascade="none">
+                   namespace="NHibernate.Test.NHSpecificTest.NH3898">
 
-  <class name="Employee" table="T_EMPLOYEE" mutable="true">
-    <id name="Id" column="C_E_ID">
+  <class name="Employee">
+    <id name="Id">
       <generator class="native" />
     </id>
-    <property name="Name" column="C_E_NAME"/>
+    <property name="Name"/>
     <property name="PromotionCount" insert="false" generated="insert">
-      <column name="C_E_PROMOTION_COUNT" default="0"/>
+      <column name="PromotionCount" default="0"/>
     </property>
   </class>
-</hibernate-mapping>
+</hibernate-mapping>

src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs

@@ -289,24 +289,19 @@ private void BindValueProperty(HbmProperty propertyMapping, Property property)
 					throw new MappingException("cannot specify both insert=\"true\" and generated=\"" + generation
 					                           + "\" for property: " + propertyMapping.Name);
 				}
-				else
-				{
-					property.IsInsertable = false;
-				}
-
+				property.IsInsertable = false;
+			}
+			if (generation == PropertyGeneration.Always)
+			{
 				// properties generated on update can never be updateable...
-				if (propertyMapping.updateSpecified && property.IsUpdateable && generation == PropertyGeneration.Always)
+				if (propertyMapping.updateSpecified && property.IsUpdateable)
 				{
 					// the user specifically supplied update="true",
 					// which constitutes an illegal combo
 					throw new MappingException("cannot specify both update=\"true\" and generated=\"" + generation
 					                           + "\" for property: " + propertyMapping.Name);
 				}
-				//Fix for NH-3898
-				else if (generation == PropertyGeneration.Always)
-				{
-					property.IsUpdateable = false;
-				}
+				property.IsUpdateable = false;
 			}
 		}
 
@@ -422,4 +417,4 @@ private string GetPropertyAccessorName(string propertyMappedAccessor)
 			return propertyMappedAccessor ?? Mappings.DefaultAccess;
 		}
 	}
-}
+}