NHSpecificTest/NH3571/*: Various minor cleanups.

Author: oskarb

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

@@ -38,22 +38,19 @@ protected override void OnSetUp()
 			{
 				using (var tran = session.BeginTransaction())
 				{
-					Product product = new Product();
-					product.ProductId = "1";
+					var product = new Product {ProductId = "1"};
 					product.Details.Properties["Name"] = "First Product";
 					product.Details.Properties["Description"] = "First Description";
 
 					session.Save(product);
 
-					product = new Product();
-					product.ProductId = "2";
+					product = new Product {ProductId = "2"};
 					product.Details.Properties["Name"] = "Second Product";
 					product.Details.Properties["Description"] = "Second Description";
 
 					session.Save(product);
 
-					product = new Product();
-					product.ProductId = "3";
+					product = new Product {ProductId = "3"};
 					product.Details.Properties["Name"] = "val";
 					product.Details.Properties["Description"] = "val";
 
@@ -80,50 +77,52 @@ protected override void OnTearDown()
 		}
 
 		[Test]
-		public void Query_DynamicComponent_In_Component()
+		public void CanQueryDynamicComponentInComponent()
 		{
 			using (var session = OpenSession())
 			{
 				var query = session.CreateQuery("from Product p where p.Details.Properties.Name=:name");
 				query.SetString("name", "First Product");
 				//var product = query.List<Product>().FirstOrDefault();
 				var product =
-					(from p in session.Query<Product>() where p.Details.Properties["Name"] == "First Product" select p).Single();
+					(from p in session.Query<Product>() where (string) p.Details.Properties["Name"] == "First Product" select p).Single();
 
 				Assert.IsNotNull(product);
 				Assert.AreEqual("First Product", product.Details.Properties["Name"]);
 			}
 		}
 
-	
 
 		[Test]
-		public void Multiple_Query_Does_Not_Cache()
+		public void MultipleQueriesShouldNotCache()
 		{
 			using (var session = OpenSession())
 			{
 				// Query by name
 				var product1 = (from p in session.Query<Product>()
-								where p.Details.Properties["Name"] == "First Product"
+								where (string) p.Details.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.Details.Properties["Description"] == "Second Description"
+								where (string) p.Details.Properties["Description"] == "Second Description"
 								select p).Single();
 				Assert.That(product2.ProductId, Is.EqualTo("2"));
 			}
 		}
 
+
 		[Test]
-		public void Different_Key_In_DynamicComponentDictionary_Returns_Different_Keys()
+		public void DifferentKeyInDynamicComponentDictionaryReturnsDifferentExpressionKeys()
 		{
 			using (var session = OpenSession())
 			{
-				Expression<Func<IEnumerable>> key1 = () => (from a in session.Query<Product>() where a.Details.Properties["Name"] == "val" select a);
-				Expression<Func<IEnumerable>> key2 = () => (from a in session.Query<Product>() where a.Details.Properties["Description"] == "val" select a);
+// ReSharper disable AccessToDisposedClosure Ok since the expressions aren't actually used after the using block.
+				Expression<Func<IEnumerable>> key1 = () => (from a in session.Query<Product>() where (string) a.Details.Properties["Name"] == "val" select a);
+				Expression<Func<IEnumerable>> key2 = () => (from a in session.Query<Product>() where (string) a.Details.Properties["Description"] == "val" select a);
+// ReSharper restore AccessToDisposedClosure
 
 				var nhKey1 = new NhLinqExpression(key1.Body, sessions);
 				var nhKey2 = new NhLinqExpression(key2.Body, sessions);

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

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

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

@@ -7,7 +7,7 @@ public class Product
 	{
 		public Product()
 		{
-			Details=new ProductDetails();
+			Details = new ProductDetails();
 		}
 		public virtual string ProductId { get; set; }