Fix Code Factor errors

And slightly reduces/adjusts some changes

Author: fredericDelaporte

src/NHibernate.Test/Any/AnyTypeTest.cs

@@ -23,14 +23,12 @@ protected override string CacheConcurrencyStrategy
 		[Test]
 		public void FlushProcessing()
 		{
-			Person person;
-			Address address;
+			var person = new Person();
+			var address = new Address();
 			//http://opensource.atlassian.com/projects/hibernate/browse/HHH-1663
 			using (var session = OpenSession())
 			using (var tran = session.BeginTransaction())
 			{
-				person = new Person();
-				address = new Address();
 				person.Data = address;
 				session.SaveOrUpdate(person);
 				session.SaveOrUpdate(address);

src/NHibernate.Test/Async/Any/AnyTypeTest.cs

@@ -34,14 +34,12 @@ protected override string CacheConcurrencyStrategy
 		[Test]
 		public async Task FlushProcessingAsync()
 		{
-			Person person;
-			Address address;
+			var person = new Person();
+			var address = new Address();
 			//http://opensource.atlassian.com/projects/hibernate/browse/HHH-1663
 			using (var session = OpenSession())
 			using (var tran = session.BeginTransaction())
 			{
-				person = new Person();
-				address = new Address();
 				person.Data = address;
 				await (session.SaveOrUpdateAsync(person));
 				await (session.SaveOrUpdateAsync(address));

src/NHibernate.Test/Async/ConnectionTest/AggressiveReleaseTest.cs

@@ -240,15 +240,13 @@ public async Task ConnectionMaintanenceDuringFlushAsync()
 					entities.Add(silly);
 					await (s.SaveAsync(silly));
 				}
-
 				await (s.FlushAsync());
 
 				foreach (Silly silly in entities)
 				{
 					silly.Name = "new-" + silly.Name;
 					silly.Other.Name = "new-" + silly.Other.Name;
 				}
-
 				// long initialCount = sessions.Statistics.getConnectCount();
 				await (s.FlushAsync());
 				//Assert.AreEqual(initialCount + 1, sessions.Statistics.getConnectCount(), "connection not maintained through Flush");
@@ -257,7 +255,6 @@ public async Task ConnectionMaintanenceDuringFlushAsync()
 				await (s.DeleteAsync("from Other"));
 				await (t.CommitAsync());
 			}
-
 			Release(s);
 			Done();
 		}

src/NHibernate.Test/Async/DynamicEntity/Interceptor/InterceptorDynamicEntity.cs

@@ -37,16 +37,14 @@ protected override void Configure(Configuration configuration)
 		[Test]
 		public async Task ItAsync()
 		{
-			Company company;
-			Customer customer;
+			var company = ProxyHelper.NewCompanyProxy();
+			var customer = ProxyHelper.NewCustomerProxy();
 			// Test saving these dyna-proxies
 			using (var session = OpenSession())
 			using (var tran = session.BeginTransaction())
 			{
-				company = ProxyHelper.NewCompanyProxy();
 				company.Name = "acme";
 				await (session.SaveAsync(company));
-				customer = ProxyHelper.NewCustomerProxy();
 				customer.Name = "Steve";
 				customer.Company = company;
 				await (session.SaveAsync(customer));

src/NHibernate.Test/Async/DynamicEntity/Tuplizer/TuplizerDynamicEntity.cs

@@ -38,31 +38,27 @@ protected override void Configure(Configuration configuration)
 		[Test]
 		public async Task ItAsync()
 		{
-			Company company;
-			Customer customer;
-			Address address;
-			Person son, wife;
+			var company = ProxyHelper.NewCompanyProxy();
+			var customer = ProxyHelper.NewCustomerProxy();
+			var address = ProxyHelper.NewAddressProxy();
+			var son = ProxyHelper.NewPersonProxy();
+			var wife = ProxyHelper.NewPersonProxy();
 
 			// Test saving these dyna-proxies
 			using (var session = OpenSession())
 			using (var tran = session.BeginTransaction())
 			{
-				company = ProxyHelper.NewCompanyProxy();
 				company.Name = "acme";
 				await (session.SaveAsync(company));
-				customer = ProxyHelper.NewCustomerProxy();
 				customer.Name = "Steve";
 				customer.Company = company;
-				address = ProxyHelper.NewAddressProxy();
 				address.Street = "somewhere over the rainbow";
 				address.City = "lawerence, kansas";
 				address.PostalCode = "toto";
 				customer.Address = address;
 				customer.Family = new HashSet<Person>();
-				son = ProxyHelper.NewPersonProxy();
 				son.Name = "son";
 				customer.Family.Add(son);
-				wife = ProxyHelper.NewPersonProxy();
 				wife.Name = "wife";
 				customer.Family.Add(wife);
 				await (session.SaveAsync(customer));

src/NHibernate.Test/Async/Generatedkeys/ByTrigger/GeneratedIdentityFixture.cs

@@ -37,7 +37,6 @@ public async Task GetGeneratedKeysSupportAsync()
 			using (var session = OpenSession())
 			using (var tran = session.BeginTransaction())
 			{
-
 				var e = new MyEntity { Name = "entity-1" };
 				await (session.SaveAsync(e));
 

src/NHibernate.Test/Async/ReadOnly/ReadOnlyProxyTest.cs

@@ -1721,7 +1721,6 @@ public async Task SetClosedSessionInLazyInitializerAsync()
 					Assert.That(s.Contains(dp), Is.True);
 					s.Close();
 
-
 					Assert.That(((INHibernateProxy) dp).HibernateLazyInitializer.Session, Is.Null);
 					Assert.That(((ISessionImplementor) s).IsClosed, Is.True);
 

src/NHibernate.Test/Async/ReadOnly/ReadOnlyVersionedNodes.cs

@@ -640,7 +640,6 @@ protected override void OnTearDown()
 			using (var s = OpenSession())
 			using (var t = s.BeginTransaction())
 			{
-
 				s.CreateQuery("delete from VersionedNode where parent is not null").ExecuteUpdate();
 				s.CreateQuery("delete from VersionedNode").ExecuteUpdate();
 

src/NHibernate.Test/ConnectionTest/AggressiveReleaseTest.cs

@@ -228,15 +228,13 @@ public void ConnectionMaintanenceDuringFlush()
 					entities.Add(silly);
 					s.Save(silly);
 				}
-
 				s.Flush();
 
 				foreach (Silly silly in entities)
 				{
 					silly.Name = "new-" + silly.Name;
 					silly.Other.Name = "new-" + silly.Other.Name;
 				}
-
 				// long initialCount = sessions.Statistics.getConnectCount();
 				s.Flush();
 				//Assert.AreEqual(initialCount + 1, sessions.Statistics.getConnectCount(), "connection not maintained through Flush");
@@ -245,7 +243,6 @@ public void ConnectionMaintanenceDuringFlush()
 				s.Delete("from Other");
 				t.Commit();
 			}
-
 			Release(s);
 			Done();
 		}

src/NHibernate.Test/DynamicEntity/Interceptor/InterceptorDynamicEntity.cs

@@ -26,16 +26,14 @@ protected override void Configure(Configuration configuration)
 		[Test]
 		public void It()
 		{
-			Company company;
-			Customer customer;
+			var company = ProxyHelper.NewCompanyProxy();
+			var customer = ProxyHelper.NewCustomerProxy();
 			// Test saving these dyna-proxies
 			using (var session = OpenSession())
 			using (var tran = session.BeginTransaction())
 			{
-				company = ProxyHelper.NewCompanyProxy();
 				company.Name = "acme";
 				session.Save(company);
-				customer = ProxyHelper.NewCustomerProxy();
 				customer.Name = "Steve";
 				customer.Company = company;
 				session.Save(customer);

src/NHibernate.Test/DynamicEntity/Tuplizer/TuplizerDynamicEntity.cs

@@ -27,31 +27,27 @@ protected override void Configure(Configuration configuration)
 		[Test]
 		public void It()
 		{
-			Company company;
-			Customer customer;
-			Address address;
-			Person son, wife;
+			var company = ProxyHelper.NewCompanyProxy();
+			var customer = ProxyHelper.NewCustomerProxy();
+			var address = ProxyHelper.NewAddressProxy();
+			var son = ProxyHelper.NewPersonProxy();
+			var wife = ProxyHelper.NewPersonProxy();
 
 			// Test saving these dyna-proxies
 			using (var session = OpenSession())
 			using (var tran = session.BeginTransaction())
 			{
-				company = ProxyHelper.NewCompanyProxy();
 				company.Name = "acme";
 				session.Save(company);
-				customer = ProxyHelper.NewCustomerProxy();
 				customer.Name = "Steve";
 				customer.Company = company;
-				address = ProxyHelper.NewAddressProxy();
 				address.Street = "somewhere over the rainbow";
 				address.City = "lawerence, kansas";
 				address.PostalCode = "toto";
 				customer.Address = address;
 				customer.Family = new HashSet<Person>();
-				son = ProxyHelper.NewPersonProxy();
 				son.Name = "son";
 				customer.Family.Add(son);
-				wife = ProxyHelper.NewPersonProxy();
 				wife.Name = "wife";
 				customer.Family.Add(wife);
 				session.Save(customer);

src/NHibernate.Test/Generatedkeys/ByTrigger/GeneratedIdentityFixture.cs

@@ -26,7 +26,6 @@ public void GetGeneratedKeysSupport()
 			using (var session = OpenSession())
 			using (var tran = session.BeginTransaction())
 			{
-
 				var e = new MyEntity { Name = "entity-1" };
 				session.Save(e);
 

src/NHibernate.Test/Generatedkeys/Identity/IdentityGeneratedKeysTest.cs

@@ -46,18 +46,17 @@ public void IdentityColumnGeneratedIds()
 		[Test, Ignore("Not supported yet.")]
 		public void PersistOutsideTransaction()
 		{
-			MyEntity myEntity1, myEntity2;
+			var myEntity1 = new MyEntity("test-save");
+			var myEntity2 = new MyEntity("test-persist");
 			using (var s = OpenSession())
 			{
 				// first test save() which should force an immediate insert...
-				myEntity1 = new MyEntity("test-save");
 				long id = (long) s.Save(myEntity1);
 				Assert.IsNotNull(id, "identity column did not force immediate insert");
 				Assert.AreEqual(id, myEntity1.Id);
 
 				// next test persist() which should cause a delayed insert...
 				long initialInsertCount = Sfi.Statistics.EntityInsertCount;
-				myEntity2 = new MyEntity("test-persist");
 				s.Persist(myEntity2);
 				Assert.AreEqual(
 					initialInsertCount,

src/NHibernate.Test/ReadOnly/ReadOnlyProxyTest.cs

@@ -1819,7 +1819,6 @@ public void SetClosedSessionInLazyInitializer()
 					Assert.That(s.Contains(dp), Is.True);
 					s.Close();
 
-
 					Assert.That(((INHibernateProxy) dp).HibernateLazyInitializer.Session, Is.Null);
 					Assert.That(((ISessionImplementor) s).IsClosed, Is.True);
 

src/NHibernate.Test/ReadOnly/ReadOnlyVersionedNodes.cs

@@ -212,11 +212,10 @@ public void UpdateSetReadOnlySetModifiableFailureExpected()
 		[Ignore("Failure expected")]
 		public void SetReadOnlyUpdateSetModifiableFailureExpected()
 		{
-			VersionedNode node;
+			VersionedNode node = new VersionedNode("node", "node");
 			using (var s = OpenSession())
 			using (var t = s.BeginTransaction())
 			{
-				node = new VersionedNode("node", "node");
 				s.Persist(node);
 				t.Commit();
 				s.Close();
@@ -707,7 +706,6 @@ protected override void OnTearDown()
 			using (var s = OpenSession())
 			using (var t = s.BeginTransaction())
 			{
-
 				s.CreateQuery("delete from VersionedNode where parent is not null").ExecuteUpdate();
 				s.CreateQuery("delete from VersionedNode").ExecuteUpdate();