Tests changes

- remove empty command
- remove ordered items output, added previosly
- more usages of "USA" in raw data replaced with "United States"

Author: alex-kulakov

Orm/Xtensive.Orm.Tests/Issues/IssueJira0786_SqlServerAggregatesProblem/MaxProcessingTest.cs

@@ -3017,7 +3017,6 @@ public void NullableDoubleFieldExpressionTest02()
         var queryableResult = session.Query.All<TestEntity>().Max(i => (decimal?) i.NullableDoubleValue1 * i.NullableDecimalValue);
         var enumerableResult = session.Query.All<TestEntity>().AsEnumerable().Max(i => (decimal?) i.NullableDoubleValue1 * i.NullableDecimalValue);
         Assert.That(Math.Abs(queryableResult.Value - enumerableResult.Value), Is.LessThan(DoubleValueAccuracy));
-        ;
       }
     }
 

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

@@ -99,48 +99,12 @@ public void OrderByAnonymous2Test()
     [Test]
     public void OrderByDescendingTest()
     {
-      //Require.ProviderIsNot(StorageProvider.Sqlite | StorageProvider.Firebird | StorageProvider.MySql, "Different ordering");
-
-      var serverOrdered = Session.Query.All<Customer>()
-        .OrderByDescending(c => c.Address.Country).ThenByDescending(c => c.CustomerId)
-        .Select(c => new { c.Address.Country, c.CustomerId, c.Address.City }).ToList();
-
-      var localOrdered = Customers
-        .OrderByDescending(c => c.Address.Country).ThenByDescending(c => c.CustomerId)
-        .Select(c => new { c.Address.Country, c.CustomerId, c.Address.City }).ToList();
-
-      for(var i = 0; i < serverOrdered.Count; i++) {
-        var server = serverOrdered[i];
-        var local = localOrdered[i];
-        Console.WriteLine($"({server.Country}, {server.CustomerId}, {server.City}) - ({local.Country}, {local.CustomerId}, {local.City});");
-      }
-
-      var result = Session.Query.All<Customer>()
-        .OrderByDescending(c => c.Address.Country).ThenByDescending(c => c.CustomerId)
-        .Select(c => c.Address.City)
-        .AsEnumerable()
-        .Where(c => c[0] != 'S').ToList();//There are Cites which cause slight deviation in order accross RDBMSs
-      var expected = Customers
-        .OrderByDescending(c => c.Address.Country).ThenByDescending(c => c.CustomerId)
-        .Select(c => c.Address.City)
-        .Where(c => c[0] != 'S');
-      Assert.That(result, Is.Not.Empty);
-      Assert.IsTrue(expected.SequenceEqual(result));
-    }
-
-    [Test]
-    public void OrderByDescendingAlternativeTest()
-    {
-      Require.ProviderIs(StorageProvider.Sqlite | StorageProvider.Firebird | StorageProvider.MySql, "Different ordering");
-
       var result = Session.Query.All<Customer>()
-        .Where(c => !c.Address.Country.StartsWith("U"))
         .OrderByDescending(c => c.Address.Country).ThenByDescending(c => c.CustomerId)
         .Select(c => c.Address.City)
         .AsEnumerable()
         .Where(c => c[0] != 'S').ToList();//There are Cites which cause slight deviation in order accross RDBMSs
       var expected = Customers
-        .Where(c => !c.Address.Country.StartsWith('U'))
         .OrderByDescending(c => c.Address.Country).ThenByDescending(c => c.CustomerId)
         .Select(c => c.Address.City)
         .Where(c => c[0] != 'S');

Orm/Xtensive.Orm.Tests/ObjectModel/ChinookDO.cs

@@ -181,7 +181,9 @@ public override void Import(Dictionary<string, object> fields, ImportContext con
             StreetAddress = (string) fields["BillingStreetAddress"],
             City = (string) fields["BillingCity"],
             State = (string) fields["BillingState"],
-            Country = (string) fields["BillingCountry"],
+            // USA and United Kingdom, depending on runtime and/or RDBMS, can be differently ordered
+            // so not having abbreviation should resolve this issue.
+            Country = ((string) fields["BillingCountry"]).Replace("USA", "United States", StringComparison.Ordinal),
             PostalCode = (string) fields["BillingPostalCode"],
           },
           Total = (decimal) fields["Total"],