Skip to content

Commit 5299e9c

Browse files
committed
fix tests
1 parent b311be9 commit 5299e9c

File tree

2 files changed

+41
-6
lines changed

2 files changed

+41
-6
lines changed

src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindAggregateOperatorsQueryFbTest.cs

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
//$Authors = Jiri Cincura ([email protected])
1717

1818
using System;
19+
using System.Linq;
1920
using System.Threading.Tasks;
2021
using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;
22+
using Microsoft.EntityFrameworkCore;
2123
using Microsoft.EntityFrameworkCore.Query;
2224
using Microsoft.EntityFrameworkCore.TestUtilities;
2325
using Xunit;
@@ -101,10 +103,28 @@ public override Task Average_over_nested_subquery(bool async)
101103
return base.Average_over_nested_subquery(async);
102104
}
103105

104-
[Theory(Skip = "Different math on Firebird.")]
106+
[Theory]
105107
[MemberData(nameof(IsAsyncData))]
106-
public override Task Contains_with_local_collection_sql_injection(bool async)
108+
public override async Task Contains_with_local_collection_sql_injection(bool async)
107109
{
108-
return base.Contains_with_local_collection_sql_injection(async);
110+
using var context = CreateContext();
111+
112+
var ids = new[] { "ALFKI", "ANATR" };
113+
114+
var query = context.Customers
115+
.Where(c => ids.Contains(c.CustomerID));
116+
117+
var result = async
118+
? await query.ToListAsync()
119+
: query.ToList();
120+
121+
var sql = query.ToQueryString();
122+
123+
Assert.Contains("IN", sql);
124+
Assert.Contains("@ids1", sql);
125+
Assert.Contains("@ids2", sql);
126+
127+
Assert.DoesNotContain("ALFKI, ANATR", sql);
128+
109129
}
110130
}

src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindMiscellaneousQueryFbTest.cs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616
//$Authors = Jiri Cincura ([email protected])
1717

1818
using System;
19+
using System.Linq;
1920
using System.Threading.Tasks;
2021
using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;
2122
using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.TestUtilities;
23+
using Microsoft.EntityFrameworkCore;
2224
using Microsoft.EntityFrameworkCore.Query;
2325
using Microsoft.EntityFrameworkCore.TestUtilities;
2426
using Xunit;
@@ -164,10 +166,23 @@ public override Task Where_nanosecond_and_microsecond_component(bool async)
164166
return base.Where_nanosecond_and_microsecond_component(async);
165167
}
166168

167-
[NotSupportedByProviderTheory]
169+
[Theory]
168170
[MemberData(nameof(IsAsyncData))]
169-
public override Task Contains_over_concatenated_columns_both_fixed_length(bool async)
171+
public override async Task Contains_over_concatenated_columns_both_fixed_length(bool async)
170172
{
171-
return base.Contains_over_concatenated_columns_both_fixed_length(async);
173+
using var context = CreateContext();
174+
175+
var query = context.Customers
176+
.Where(c => (c.ContactName + c.ContactTitle).Contains("Owner"));
177+
178+
var result = async
179+
? await query.ToListAsync()
180+
: query.ToList();
181+
182+
var sql = query.ToQueryString();
183+
184+
Assert.Contains("POSITION", sql);
185+
Assert.Contains("||", sql);
186+
Assert.Contains("COALESCE", sql);
172187
}
173188
}

0 commit comments

Comments
 (0)