Minor fixex

Author: alex-kulakov

Orm/Xtensive.Orm.Tests/Issues/IssueJira0613_DataCleanUpInPerformSafely.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2016 Xtensive LLC.
+// Copyright (C) 2016 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Alexey Kulakov
@@ -184,14 +184,19 @@ private void RunTest(Action populateAction, Action<Session> validateAction, Type
           validateAction.Invoke(session);
         }
       }
-      else
+      else {
         // In this kind of tests we have only primary keys changed.
         // To be clear, only name is changed.
         // But MySQL has no named PKs so we have no difference in mysql
-        if (validationConfiguration.ConnectionInfo.Provider!=WellKnown.Provider.MySql)
-          Assert.Throws<SchemaSynchronizationException>(() => Domain.Build(validationConfiguration));
-        else
-          Assert.DoesNotThrow(()=>Domain.Build(validationConfiguration));
+        var exception = Assert.Throws<SchemaSynchronizationException>(() => Domain.Build(validationConfiguration));
+
+        if (validationConfiguration.ConnectionInfo.Provider != WellKnown.Provider.MySql) {
+          Assert.That(exception.ComparisonResult, Is.Not.Null);
+        }
+        else {
+          Assert.That(exception.ComparisonResult, Is.Null);
+        }
+      }
     }
   }
 }

Orm/Xtensive.Orm.Tests/Issues/Issue_0716_UpgradeFailsInValidateMode/UpgradeTest.cs

@@ -20,10 +20,8 @@ namespace Xtensive.Orm.Tests.Issues.Issue_0716_UpgradeFailsInValidateMode
   [Ignore("Outdated")]
   // Alowing behavior when types moved to different namespace 
   // can cause problems and corrupt data in database which is unacceptable.
-  // Relying on t
   // As long as Validate mode is expected to be strict we have to forbid
   // cases when cross-namespace movements appear.
-
   public class UpgradeTest
   {
     private Domain domain;

Orm/Xtensive.Orm.Tests/Upgrade/UpgradeContextTest.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Xtensive LLC.
+// Copyright (C) 2018 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Alexey Kulakov
@@ -25,7 +25,7 @@ public class TestEntity : Entity
 
   public class AccessGatherer
   {
-    Dictionary<MethodBase, ProviderInfo> stagesAccess = new Dictionary<MethodBase, ProviderInfo>();
+    private Dictionary<MethodBase, ProviderInfo> stagesAccess = new Dictionary<MethodBase, ProviderInfo>();
 
     public ProviderInfo this[MethodInfo method]
     {
@@ -156,7 +156,7 @@ namespace Xtensive.Orm.Tests.Upgrade
 {
   public sealed class UpgradeContextTest
   {
-    private static string additionalNodeName = "additional";
+    private const string additionalNodeName = "additional";
     private MethodInfo[] upgraderMethods;
 
     [OneTimeSetUp]

Orm/Xtensive.Orm/Orm/Entity.cs

@@ -69,8 +69,8 @@ public abstract class Entity : Persistent,
     IDeserializationCallback
   {
     private static readonly Parameter<Tuple> keyParameter = new Parameter<Tuple>(WellKnown.KeyFieldName);
+    private readonly bool changeVersionOnSetAttempt;
     private EntityState state;
-    private bool changeVersionOnSetAttempt;
 
     #region Internal properties
 

Orm/Xtensive.Orm/Orm/EntitySetBase.cs

@@ -43,8 +43,8 @@ public abstract class EntitySetBase : SessionBound,
 
     private readonly Entity owner;
     private readonly CombineTransform auxilaryTypeKeyTransform;
+    private readonly bool skipOwnerVersionChange;
     private bool isInitialized;
-    private bool skipOwnerVersionChange;
 
     /// <summary>
     /// Gets the owner of this instance.