Merge branch '6.0-5.0-changes-port' into 6.0

Author: alex-kulakov

Orm/Xtensive.Orm.Tests.Core/Collections/EnumerableExtensionsTest.cs

@@ -172,8 +172,14 @@ public void ToArrayCountTest()
       Assert.That(array.Length, Is.EqualTo(10));
       Assert.That(array.All(x => x == 1));
 
-      _ = Assert.Throws<ArgumentOutOfRangeException>(() => Enumerable.Repeat(1, 10).ToArray(11));
-      _ = Assert.Throws<ArgumentOutOfRangeException>(() => Enumerable.Repeat(1, 10).ToArray(9));
+      array = Enumerable.Repeat(1, 10).ToArray(11);
+      Assert.That(array.Length, Is.EqualTo(11));
+      Assert.That(array.Take(10).All(x => x == 1));
+      Assert.That(array[10], Is.Not.EqualTo(1));
+
+      array = Enumerable.Repeat(1, 10).ToArray(9);
+      Assert.That(array.Length, Is.EqualTo(9));
+      Assert.That(array.All(x => x == 1));
     }
 
     [Test]

Orm/Xtensive.Orm.Tests/Issues/IssueJira0742_QueryPreprocessorClosureExpressionSupport.cs

@@ -16,8 +16,8 @@ namespace Xtensive.Orm.Tests.Issues
   public sealed class IssueJira0742_QueryPreprocessorClosureExpressionSupport
   {
     [Test]
-    [TestCase(true, TestName = "WithClosurePreprocessor")]
-    [TestCase(false, TestName = "WithoutClosurePreprocessor")]
+    [TestCase(true)]
+    [TestCase(false)]
     public void MainTest(bool useClosurePreprocessor)
     {
       using (var domain = BuildDomain(useClosurePreprocessor))
@@ -27,13 +27,15 @@ public void MainTest(bool useClosurePreprocessor)
 
         var simpleQuery = session.Query.All<TestEntity>().Count(e => e.Id == TestMethod());
         Assert.That(simpleQuery, Is.EqualTo(1));
+        session.Extensions.Clear();
 
         var simpleJoin = session.Query.All<TestEntity>().Where(e => e.Id == TestMethod())
           .Join(session.Query.All<TestEntity>().Where(e => e.Id == TestMethod()),
             o => o.Id, i => i.Id, (o, i) => o)
           .Count();
         Assert.That(session.Extensions.Get(typeof(ClosureMarker)), GetSuccess());
         Assert.That(simpleJoin, Is.EqualTo(1));
+        session.Extensions.Clear();
 
         var query = session.Query.All<TestEntity>().Where(e => e.Id == TestMethod());
 
@@ -43,10 +45,14 @@ public void MainTest(bool useClosurePreprocessor)
 
         Assert.That(session.Extensions.Get(typeof(ClosureMarker)), GetSuccess());
         Assert.That(variableJoin, Is.EqualTo(1));
+        session.Extensions.Clear();
 
         var anyCount = session.Query.All<TestEntity>()
-          .Count(e => e.Id == TestMethod() && Query.All<TestEntity>().Where(i => i.Id == TestMethod()).Any(z => z.Id == e.Id));
+          .Count(e => e.Id == TestMethod() && session.Query.All<TestEntity>().Where(i => i.Id == TestMethod()).Any(z => z.Id == e.Id));
+
+        Assert.That(session.Extensions.Get(typeof(ClosureMarker)), GetSuccess());
         Assert.That(anyCount, Is.EqualTo(1));
+        session.Extensions.Clear();
 
         var linqCount = (from a in session.Query.All<TestEntity>().Where(e => e.Id == TestMethod())
                          from b in session.Query.All<TestEntity>().Where(e => e.Id == TestMethod())
@@ -55,6 +61,7 @@ from b in session.Query.All<TestEntity>().Where(e => e.Id == TestMethod())
 
         Assert.That(session.Extensions.Get(typeof(ClosureMarker)), GetSuccess());
         Assert.That(linqCount, Is.EqualTo(1));
+        session.Extensions.Clear();
 
         var anyCountFail = session.Query.All<TestEntity>()
           .Count(e => e.Id == TestMethod() && query.Any(z => z.Id == e.Id));
@@ -142,7 +149,7 @@ public class TestVisitor : ExpressionVisitor
       protected override Expression VisitMember(MemberExpression node)
       {
         if (!anyClosure) {
-          anyClosure = node.Member.DeclaringType.IsClosure();
+          anyClosure = node.Type != typeof(Session) && node.Member.DeclaringType.IsClosure();
         }
         return base.VisitMember(node);
       }

Orm/Xtensive.Orm.Tests/Issues/IssueJira0752_RecycledAttributeDontWorkForPersistentGenericInterface.cs

@@ -78,14 +78,14 @@ private void TestResutlts(Domain domain, Type type, bool isRecycled)
       bool hasCreations;
       bool hasRemovals;
       if (actionSequences.UpgradingActions != null) {
-        hasCreations = actionSequences.UpgradingActions.Flatten().OfType<CreateNodeAction>().Any(x => x.Path.StartsWith("Tables/" + tableName));
-        hasRemovals = actionSequences.UpgradingActions.Flatten().OfType<RemoveNodeAction>().Any(x => x.Path.StartsWith("Tables/" + tableName));
+        hasCreations = actionSequences.UpgradingActions.Flatten().OfType<CreateNodeAction>().Any(x => x.Path.StartsWith("Tables/" + tableName, StringComparison.OrdinalIgnoreCase));
+        hasRemovals = actionSequences.UpgradingActions.Flatten().OfType<RemoveNodeAction>().Any(x => x.Path.StartsWith("Tables/" + tableName, StringComparison.OrdinalIgnoreCase));
         Assert.That(hasCreations, Is.True);
         Assert.That(hasRemovals, Is.False);
       }
 
-      hasCreations = actionSequences.FinalActions.Flatten().OfType<CreateNodeAction>().Any(x => x.Path.StartsWith("Tables/" + tableName));
-      hasRemovals = actionSequences.FinalActions.Flatten().OfType<RemoveNodeAction>().Any(x => x.Path.StartsWith("Tables/" + tableName));
+      hasCreations = actionSequences.FinalActions.Flatten().OfType<CreateNodeAction>().Any(x => x.Path.StartsWith("Tables/" + tableName, StringComparison.OrdinalIgnoreCase));
+      hasRemovals = actionSequences.FinalActions.Flatten().OfType<RemoveNodeAction>().Any(x => x.Path.StartsWith("Tables/" + tableName, StringComparison.OrdinalIgnoreCase));
 
       if (domain.Configuration.UpgradeMode.IsMultistage()) {
         Assert.That(hasCreations, Is.False);

Orm/Xtensive.Orm.Tests/Storage/ClosureParametersCachingTest.cs

@@ -12,7 +12,7 @@
 
 namespace Xtensive.Orm.Tests.Storage.ClosureParametersCachingTestModel
 {
-  #region Entityes
+  #region Entities
 
   [HierarchyRoot]
   public class PaymentSplit : Entity
@@ -32,7 +32,7 @@ public class PaymentSplit : Entity
     [Field]
     public int Order { get;set; }
 
-    [Field(Precision = 19, Scale = 6)]
+    [Field(Precision = 18, Scale = 6)]
     public decimal Amount { get; set; }
   }