Skip to content

Commit 716bb3d

Browse files
committed
fix tests
1 parent 6fc5023 commit 716bb3d

File tree

2 files changed

+6
-41
lines changed

2 files changed

+6
-41
lines changed

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

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616
//$Authors = Jiri Cincura (jiri@cincura.net)
1717

1818
using System;
19-
using System.Linq;
2019
using System.Threading.Tasks;
2120
using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;
22-
using Microsoft.EntityFrameworkCore;
2321
using Microsoft.EntityFrameworkCore.Query;
2422
using Microsoft.EntityFrameworkCore.TestUtilities;
2523
using Xunit;
@@ -103,28 +101,10 @@ public override Task Average_over_nested_subquery(bool async)
103101
return base.Average_over_nested_subquery(async);
104102
}
105103

106-
[Theory]
104+
[NotSupportedOnFirebirdTheory]
107105
[MemberData(nameof(IsAsyncData))]
108-
public override async Task Contains_with_local_collection_sql_injection(bool async)
106+
public override Task Contains_with_local_collection_sql_injection(bool async)
109107
{
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-
108+
return base.Contains_with_local_collection_sql_injection(async);
129109
}
130110
}

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

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
//$Authors = Jiri Cincura (jiri@cincura.net)
1717

1818
using System;
19-
using System.Linq;
2019
using System.Threading.Tasks;
2120
using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;
2221
using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.TestUtilities;
23-
using Microsoft.EntityFrameworkCore;
2422
using Microsoft.EntityFrameworkCore.Query;
2523
using Microsoft.EntityFrameworkCore.TestUtilities;
2624
using Xunit;
@@ -166,23 +164,10 @@ public override Task Where_nanosecond_and_microsecond_component(bool async)
166164
return base.Where_nanosecond_and_microsecond_component(async);
167165
}
168166

169-
[Theory]
167+
[NotSupportedByProviderTheory]
170168
[MemberData(nameof(IsAsyncData))]
171-
public override async Task Contains_over_concatenated_columns_both_fixed_length(bool async)
169+
public override Task Contains_over_concatenated_columns_both_fixed_length(bool async)
172170
{
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);
171+
return base.Contains_over_concatenated_columns_both_fixed_length(async);
187172
}
188173
}

0 commit comments

Comments
 (0)