Skip to content

Commit 48e030c

Browse files
committed
Tests made compatible with Firebird 4
- one test was failed due to difference of oredering locally and on server side - the rest just suppose to be ignored as they were for 2.5
1 parent 8dde67f commit 48e030c

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Orm/Xtensive.Orm.Tests/Linq/SelectManyTest.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,8 @@ from c2 in Session.Query.All<Customer>()
392392
public void IntersectBetweenFilterAndApplyTest()
393393
{
394394
Require.AllFeaturesSupported(ProviderFeatures.Apply);
395+
Require.ProviderIsNot(StorageProvider.Firebird);
396+
395397
var expected = Session.Query.All<Invoice>().Count(i => i.DesignatedEmployee.FirstName.StartsWith("A"));
396398
IQueryable<Invoice> result = Session.Query.All<Customer>()
397399
.SelectMany(c => Session.Query.All<Invoice>().Where(i => i.Customer==c).Intersect(Session.Query.All<Invoice>())
@@ -458,14 +460,14 @@ public void TwoCalculateWithApplyTest()
458460
Require.AllFeaturesSupported(ProviderFeatures.Apply);
459461

460462
var actual = from c in Session.Query.All<Customer>()
461-
from n in (c.Invoices.Select(i => c.FirstName + i.BillingAddress.StreetAddress))
462-
.Union(c.Invoices.Select(i => c.FirstName + i.BillingAddress.StreetAddress))
463+
from n in (c.Invoices.Select(i => c.FirstName + i.BillingAddress.StreetAddress).Where(x => x.StartsWith("M")))
464+
.Union(c.Invoices.Select(i => c.FirstName + i.BillingAddress.StreetAddress).Where(x => x.StartsWith("N")))
463465
orderby n
464466
select n;
465467

466468
var expected = from c in Customers
467-
from n in (c.Invoices.Select(i => c.FirstName + i.BillingAddress.StreetAddress))
468-
.Union(c.Invoices.Select(i => c.FirstName + i.BillingAddress.StreetAddress))
469+
from n in (c.Invoices.Select(i => c.FirstName + i.BillingAddress.StreetAddress).Where(x => x.StartsWith("M")))
470+
.Union(c.Invoices.Select(i => c.FirstName + i.BillingAddress.StreetAddress).Where(x => x.StartsWith("N")))
469471
orderby n
470472
select n;
471473

@@ -477,6 +479,8 @@ orderby n
477479
public void TwoFilterWithApplyTest()
478480
{
479481
Require.AllFeaturesSupported(ProviderFeatures.Apply);
482+
Require.ProviderIsNot(StorageProvider.Firebird);
483+
480484
var actual = from c in Session.Query.All<Customer>()
481485
from i in (c.Invoices.Where(x => x.BillingAddress.StreetAddress.StartsWith("A"))
482486
.Intersect(c.Invoices.Where(x => x.BillingAddress.StreetAddress.StartsWith("A"))))

Orm/Xtensive.Orm.Tests/Linq/SetOperationsTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ public void UnionStructureTest()
237237
public void IntersectWithoutOneOfSelect()
238238
{
239239
Require.AllFeaturesSupported(ProviderFeatures.Apply);
240+
Require.ProviderIsNot(StorageProvider.Firebird);
241+
240242
var actual = from c in Session.Query.All<Customer>()
241243
from r in (c.Invoices)
242244
.Intersect(c.Invoices).Select(o => o.PaymentDate)

0 commit comments

Comments
 (0)