More tests fixed for Firebird

Author: alex-kulakov

Orm/Xtensive.Orm.Tests/Linq/DistinctTest.cs

@@ -1,9 +1,10 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alexis Kochetov
 // Created:    2009.02.04
 
+using System;
 using System.Linq;
 using NUnit.Framework;
 using Xtensive.Orm.Providers;
@@ -38,7 +39,22 @@ public void OrderBy2Test()
         .Select(c => c.Address.City)
         .Distinct()
         .OrderBy(c => c);
-      Assert.IsTrue(expected.SequenceEqual(result));
+      if (StorageProviderInfo.Instance.CheckProviderIs(StorageProvider.Firebird | StorageProvider.Sqlite)) {
+        var storage = result.AsEnumerable().Where(c => !c.StartsWith('S'));
+        var local = expected.Where(c => !c.StartsWith('S'));
+        Assert.IsTrue(local.SequenceEqual(storage));
+        var storageHashset = result.AsEnumerable().Where(c => c.StartsWith('S')).ToHashSet();
+        local = expected.Where(c => c.StartsWith('S'));
+        var count = 0;
+        foreach (var item in local) {
+          Assert.That(storageHashset.Contains(item));
+          count++;
+        }
+        Assert.That(storageHashset.Count, Is.EqualTo(count));
+      }
+      else {
+        Assert.IsTrue(expected.SequenceEqual(result));
+      }
       QueryDumper.Dump(result);
     }
 
@@ -95,7 +111,23 @@ public void DistinctOrderByTest()
         .Select(c => c.Address.City)
         .Distinct()
         .OrderBy(c => c);
-      Assert.IsTrue(expected.SequenceEqual(result));
+
+      if (StorageProviderInfo.Instance.CheckProviderIs(StorageProvider.Firebird | StorageProvider.Sqlite)) {
+        var storage = result.AsEnumerable().Where(c => !c.StartsWith('S'));
+        var local = expected.Where(c => !c.StartsWith('S'));
+        Assert.IsTrue(local.SequenceEqual(storage));
+        var storageHashset = result.AsEnumerable().Where(c => c.StartsWith('S')).ToHashSet();
+        local = expected.Where(c => c.StartsWith('S'));
+        var count = 0;
+        foreach (var item in local) {
+          Assert.That(storageHashset.Contains(item));
+          count++;
+        }
+        Assert.That(storageHashset.Count, Is.EqualTo(count));
+      }
+      else {
+        Assert.IsTrue(expected.SequenceEqual(result));
+      }
       QueryDumper.Dump(result);
     }
 
@@ -316,6 +348,7 @@ public void DistinctSkipTest()
         .Distinct()
         .OrderBy(c => c.LastName)
         .Skip(5);
+
       Assert.IsTrue(expected.SequenceEqual(result));
       Assert.Greater(result.ToList().Count, 0);
     }

Orm/Xtensive.Orm.Tests/Linq/OrderByTest.cs

@@ -1,9 +1,10 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Dmitri Maximov
 // Created:    2009.01.29
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -85,11 +86,11 @@ public void OrderByAnonymous2Test()
     {
       IQueryable<Customer> customers = Session.Query.All<Customer>();
       var result = customers
-        .Select(c => new {c.Address.Country, c})
+        .Select(c => new {c.SupportRep.EmployeeId, c})
         .OrderBy(x => x);
-      var expected = customers.ToList()
-        .Select(c => new {c.Address.Country, c})
-        .OrderBy(x => x.Country)
+      var expected = Customers
+        .Select(c => new {c.SupportRep.EmployeeId, c})
+        .OrderBy(x => x.EmployeeId)
         .ThenBy(x => x.c.CustomerId);
       Assert.That(result, Is.Not.Empty);
       Assert.IsTrue(expected.SequenceEqual(result));
@@ -308,10 +309,11 @@ public void SelectTest()
     [Test]
     public void ThenByTest()
     {
-      var result = Session.Query.All<Customer>().OrderBy(c => c.Address.Country)
+      var result = Session.Query.All<Customer>().OrderBy(c => c.SupportRep.EmployeeId)
         .ThenBy(c => c.Phone).Select(c => c.Address.City);
-      var expected = Customers.OrderBy(c => c.Address.Country)
+      var expected = Customers.OrderBy(c => c.SupportRep.EmployeeId)
         .ThenBy(c => c.Phone).Select(c => c.Address.City);
+
       Assert.That(result, Is.Not.Empty);
       Assert.IsTrue(expected.SequenceEqual(result));
     }

Orm/Xtensive.Orm.Tests/Linq/SelectTest.cs

@@ -539,13 +539,28 @@ from t in tracks
     [Test]
     public void NestedQueryTest()
     {
+      Require.ProviderIsNot(StorageProvider.Firebird);
       var tracks = Session.Query.All<Track>();
       var result = from pd in
         from t in tracks
         select new { ProductKey = t.Key, t.Name, TotalPrice = t.UnitPrice * t.UnitPrice }
-      where pd.TotalPrice > 100
+      where pd.TotalPrice > 3.96005m
       select new { PKey = pd.ProductKey, pd.Name, Total = pd.TotalPrice };
 
+      var list = result.ToList(213);
+    }
+
+    [Test]
+    public void NestedQueryFirebirdTest()
+    {
+      Require.ProviderIs(StorageProvider.Firebird);
+      var tracks = Session.Query.All<Track>();
+      var result = from pd in
+        from t in tracks
+        select new { ProductKey = t.Key, t.Name, TotalPrice = t.UnitPrice + t.UnitPrice }
+        where pd.TotalPrice > 3
+        select new { PKey = pd.ProductKey, pd.Name, Total = pd.TotalPrice };
+
       var list = result.ToList();
     }