Skip to content

Commit 2be8420

Browse files
committed
Replace USA with United States in query filter expressions
1 parent 1123371 commit 2be8420

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Orm/Xtensive.Orm.Tests/Linq/MsSamples/LinqToSqlSamples.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ public void DLinqJoin2()
431431
{
432432
var q =
433433
from i in Session.Query.All<Invoice>()
434-
where i.Customer.Address.Country=="USA" && i.Status==InvoiceStatus.Paid
434+
where i.Customer.Address.Country=="United States" && i.Status==InvoiceStatus.Paid
435435
select i;
436436

437437
QueryDumper.Dump(q);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,12 @@ public void OrderByExpressionReducedDataTest()
180180
// to avoid non-english characters, which cause different order
181181
// we filter out everything that may have them
182182
var serverSide = Session.Query.All<Customer>()
183-
.Where(c => c.Address.Country.In("USA", "Canda", "France", "United Kingdom"))
183+
.Where(c => c.Address.Country.In("United States", "Canda", "France", "United Kingdom"))
184184
.OrderBy(c => c.LastName.ToUpper())
185185
.Select(c => new { c.LastName, c.Address.Country })
186186
.ToList();
187187
var local = Customers
188-
.Where(c => c.Address.Country.In("USA", "Canda", "France", "United Kingdom"))
188+
.Where(c => c.Address.Country.In("United States", "Canda", "France", "United Kingdom"))
189189
.OrderBy(c => c.LastName.ToUpper()).Select(c => new { c.LastName, c.Address.Country }).ToList();
190190
Assert.That(serverSide, Is.Not.Empty);
191191
Assert.IsTrue(local.SequenceEqual(serverSide));

Orm/Xtensive.Orm.Tests/Linq/SkipTakeElementAtTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void ReuseTake1Test()
4141
public void TakeTest(int takeValue)
4242
{
4343
var query = Session.Query.All<Customer>()
44-
.Where(c => c.Address.Country == "USA")
44+
.Where(c => c.Address.Country == "United States")
4545
.Select(c => c.Key)
4646
.Take(takeValue);
4747
if (takeValue <= 0) {
@@ -64,9 +64,9 @@ public void TakeTest(int takeValue)
6464
public void SkipTest(int skipValue)
6565
{
6666
var customersFromGermanyOverallCount = Session.Query.All<Customer>()
67-
.Where(c => c.Address.Country == "USA").Count();
67+
.Where(c => c.Address.Country == "United States").Count();
6868
var query = Session.Query.All<Customer>()
69-
.Where(c => c.Address.Country == "USA")
69+
.Where(c => c.Address.Country == "United States")
7070
.Select(c => c.Key)
7171
.Skip(skipValue);
7272

0 commit comments

Comments
 (0)