Skip to content

Commit 09e4cd5

Browse files
Copilotrenemadsen
Copilot
and
renemadsen
committed
Remove obsolete GearsOfWar test method overrides for EF Core 10
Co-authored-by: renemadsen <76994+renemadsen@users.noreply.github.com>
1 parent 1de5260 commit 09e4cd5

File tree

3 files changed

+0
-277
lines changed

3 files changed

+0
-277
lines changed

‎test/EFCore.MySql.FunctionalTests/Query/GearsOfWarQueryMySqlTest.cs‎

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,6 @@ public override Task DateTimeOffset_Contains_Less_than_Greater_than(bool async)
3434
m => start <= m.Timeline.Date && m.Timeline < end && dates.Contains(m.Timeline)));
3535
}
3636

37-
public override Task Where_datetimeoffset_milliseconds_parameter_and_constant(bool async)
38-
{
39-
var dateTimeOffset = MySqlTestHelpers.GetExpectedValue(new DateTimeOffset(599898024001234567, new TimeSpan(1, 30, 0)));
40-
41-
// Literal where clause
42-
var p = Expression.Parameter(typeof(Mission), "i");
43-
var dynamicWhere = Expression.Lambda<Func<Mission, bool>>(
44-
Expression.Equal(
45-
Expression.Property(p, "Timeline"),
46-
Expression.Constant(dateTimeOffset)
47-
), p);
48-
49-
return AssertCount(
50-
async,
51-
ss => ss.Set<Mission>().Where(dynamicWhere),
52-
ss => ss.Set<Mission>().Where(m => m.Timeline == dateTimeOffset));
53-
}
54-
5537
[ConditionalTheory(Skip = "TODO: Does not work as expected, probably due to some test definition issues.")]
5638
public override async Task DateTimeOffsetNow_minus_timespan(bool async)
5739
{
@@ -250,60 +232,6 @@ GROUP BY `g0`.`Key`
250232
""");
251233
}
252234

253-
public override async Task Array_access_on_byte_array(bool async)
254-
{
255-
await base.Array_access_on_byte_array(async);
256-
257-
AssertSql(
258-
"""
259-
SELECT `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`
260-
FROM `Squads` AS `s`
261-
WHERE ASCII(SUBSTRING(`s`.`Banner5`, 2 + 1, 1)) = 6
262-
""");
263-
}
264-
265-
public override async Task DateTimeOffset_to_unix_time_milliseconds(bool async)
266-
{
267-
await base.DateTimeOffset_to_unix_time_milliseconds(async);
268-
269-
AssertSql(
270-
"""
271-
@__unixEpochMilliseconds_0='0'
272-
273-
SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`Discriminator`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s1`.`SquadId`, `s1`.`MissionId`
274-
FROM `Gears` AS `g`
275-
INNER JOIN `Squads` AS `s` ON `g`.`SquadId` = `s`.`Id`
276-
LEFT JOIN `SquadMissions` AS `s1` ON `s`.`Id` = `s1`.`SquadId`
277-
WHERE NOT EXISTS (
278-
SELECT 1
279-
FROM `SquadMissions` AS `s0`
280-
INNER JOIN `Missions` AS `m` ON `s0`.`MissionId` = `m`.`Id`
281-
WHERE (`s`.`Id` = `s0`.`SquadId`) AND (@__unixEpochMilliseconds_0 = (TIMESTAMPDIFF(microsecond, TIMESTAMP '1970-01-01 00:00:00', `m`.`Timeline`)) DIV (1000)))
282-
ORDER BY `g`.`Nickname`, `g`.`SquadId`, `s`.`Id`, `s1`.`SquadId`
283-
""");
284-
}
285-
286-
public override async Task DateTimeOffset_to_unix_time_seconds(bool async)
287-
{
288-
await base.DateTimeOffset_to_unix_time_seconds(async);
289-
290-
AssertSql(
291-
"""
292-
@__unixEpochSeconds_0='0'
293-
294-
SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`Discriminator`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s1`.`SquadId`, `s1`.`MissionId`
295-
FROM `Gears` AS `g`
296-
INNER JOIN `Squads` AS `s` ON `g`.`SquadId` = `s`.`Id`
297-
LEFT JOIN `SquadMissions` AS `s1` ON `s`.`Id` = `s1`.`SquadId`
298-
WHERE NOT EXISTS (
299-
SELECT 1
300-
FROM `SquadMissions` AS `s0`
301-
INNER JOIN `Missions` AS `m` ON `s0`.`MissionId` = `m`.`Id`
302-
WHERE (`s`.`Id` = `s0`.`SquadId`) AND (@__unixEpochSeconds_0 = TIMESTAMPDIFF(second, TIMESTAMP '1970-01-01 00:00:00', `m`.`Timeline`)))
303-
ORDER BY `g`.`Nickname`, `g`.`SquadId`, `s`.`Id`, `s1`.`SquadId`
304-
""");
305-
}
306-
307235
public override async Task Group_by_with_having_StartsWith_with_null_parameter_as_argument(bool async)
308236
{
309237
await base.Group_by_with_having_StartsWith_with_null_parameter_as_argument(async);
@@ -339,22 +267,6 @@ public override async Task Where_subquery_with_ElementAt_using_column_as_index(b
339267
AssertSql("");
340268
}
341269

342-
public override async Task Where_datetimeoffset_hour_component(bool async)
343-
{
344-
await AssertQuery(
345-
async,
346-
ss => from m in ss.Set<Mission>()
347-
where m.Timeline.Hour == /* 10 */ 8
348-
select m);
349-
350-
AssertSql(
351-
"""
352-
SELECT `m`.`Id`, `m`.`CodeName`, `m`.`Date`, `m`.`Difficulty`, `m`.`Duration`, `m`.`Rating`, `m`.`Time`, `m`.`Timeline`
353-
FROM `Missions` AS `m`
354-
WHERE EXTRACT(hour FROM `m`.`Timeline`) = 8
355-
""");
356-
}
357-
358270
// TODO: Implement once TimeSpan is translated as ticks instead of TIME.
359271
public override async Task Non_string_concat_uses_appropriate_type_mapping(bool async)
360272
{

‎test/EFCore.MySql.FunctionalTests/Query/TPCGearsOfWarQueryMySqlTest.cs‎

Lines changed: 0 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -3956,22 +3956,6 @@ WHERE EXTRACT(day FROM `m`.`Timeline`) = 2
39563956
""");
39573957
}
39583958

3959-
public override async Task Where_datetimeoffset_hour_component(bool async)
3960-
{
3961-
await AssertQuery(
3962-
async,
3963-
ss => from m in ss.Set<Mission>()
3964-
where m.Timeline.Hour == /* 10 */ 8
3965-
select m);
3966-
3967-
AssertSql(
3968-
"""
3969-
SELECT `m`.`Id`, `m`.`CodeName`, `m`.`Date`, `m`.`Difficulty`, `m`.`Duration`, `m`.`Rating`, `m`.`Time`, `m`.`Timeline`
3970-
FROM `Missions` AS `m`
3971-
WHERE EXTRACT(hour FROM `m`.`Timeline`) = 8
3972-
""");
3973-
}
3974-
39753959
public override async Task Where_datetimeoffset_minute_component(bool async)
39763960
{
39773961
await base.Where_datetimeoffset_minute_component(async);
@@ -4074,31 +4058,6 @@ SELECT DATE_ADD(`m`.`Timeline`, INTERVAL 1000 * CAST(300.0 AS signed) microsecon
40744058
""");
40754059
}
40764060

4077-
public override async Task Where_datetimeoffset_milliseconds_parameter_and_constant(bool async)
4078-
{
4079-
var dateTimeOffset = MySqlTestHelpers.GetExpectedValue(new DateTimeOffset(599898024001234567, new TimeSpan(1, 30, 0)));
4080-
4081-
// Literal where clause
4082-
var p = Expression.Parameter(typeof(Mission), "i");
4083-
var dynamicWhere = Expression.Lambda<Func<Mission, bool>>(
4084-
Expression.Equal(
4085-
Expression.Property(p, "Timeline"),
4086-
Expression.Constant(dateTimeOffset)
4087-
), p);
4088-
4089-
await AssertCount(
4090-
async,
4091-
ss => ss.Set<Mission>().Where(dynamicWhere),
4092-
ss => ss.Set<Mission>().Where(m => m.Timeline == dateTimeOffset));
4093-
4094-
AssertSql(
4095-
"""
4096-
SELECT COUNT(*)
4097-
FROM `Missions` AS `m`
4098-
WHERE `m`.`Timeline` = TIMESTAMP '1902-01-02 08:30:00.123456'
4099-
""");
4100-
}
4101-
41024061
public override async Task Orderby_added_for_client_side_GroupJoin_composite_dependent_to_principal_LOJ_when_incomplete_key_is_used(
41034062
bool async)
41044063
{
@@ -11474,18 +11433,6 @@ WHERE ASCII(`s`.`Banner`) = 2
1147411433
""");
1147511434
}
1147611435

11477-
public override async Task Array_access_on_byte_array(bool async)
11478-
{
11479-
await base.Array_access_on_byte_array(async);
11480-
11481-
AssertSql(
11482-
"""
11483-
SELECT `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`
11484-
FROM `Squads` AS `s`
11485-
WHERE ASCII(SUBSTRING(`s`.`Banner5`, 2 + 1, 1)) = 6
11486-
""");
11487-
}
11488-
1148911436
public override async Task Project_shadow_properties(bool async)
1149011437
{
1149111438
await base.Project_shadow_properties(async);
@@ -13416,60 +13363,6 @@ public override async Task Using_indexer_on_byte_array_and_string_in_projection(
1341613363
""");
1341713364
}
1341813365

13419-
public override async Task DateTimeOffset_to_unix_time_milliseconds(bool async)
13420-
{
13421-
await base.DateTimeOffset_to_unix_time_milliseconds(async);
13422-
13423-
AssertSql(
13424-
"""
13425-
@__unixEpochMilliseconds_0='0'
13426-
13427-
SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s1`.`SquadId`, `s1`.`MissionId`
13428-
FROM (
13429-
SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
13430-
FROM `Gears` AS `g`
13431-
UNION ALL
13432-
SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
13433-
FROM `Officers` AS `o`
13434-
) AS `u`
13435-
INNER JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
13436-
LEFT JOIN `SquadMissions` AS `s1` ON `s`.`Id` = `s1`.`SquadId`
13437-
WHERE NOT EXISTS (
13438-
SELECT 1
13439-
FROM `SquadMissions` AS `s0`
13440-
INNER JOIN `Missions` AS `m` ON `s0`.`MissionId` = `m`.`Id`
13441-
WHERE (`s`.`Id` = `s0`.`SquadId`) AND (@__unixEpochMilliseconds_0 = (TIMESTAMPDIFF(microsecond, TIMESTAMP '1970-01-01 00:00:00', `m`.`Timeline`)) DIV (1000)))
13442-
ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s1`.`SquadId`
13443-
""");
13444-
}
13445-
13446-
public override async Task DateTimeOffset_to_unix_time_seconds(bool async)
13447-
{
13448-
await base.DateTimeOffset_to_unix_time_seconds(async);
13449-
13450-
AssertSql(
13451-
"""
13452-
@__unixEpochSeconds_0='0'
13453-
13454-
SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s1`.`SquadId`, `s1`.`MissionId`
13455-
FROM (
13456-
SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
13457-
FROM `Gears` AS `g`
13458-
UNION ALL
13459-
SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
13460-
FROM `Officers` AS `o`
13461-
) AS `u`
13462-
INNER JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
13463-
LEFT JOIN `SquadMissions` AS `s1` ON `s`.`Id` = `s1`.`SquadId`
13464-
WHERE NOT EXISTS (
13465-
SELECT 1
13466-
FROM `SquadMissions` AS `s0`
13467-
INNER JOIN `Missions` AS `m` ON `s0`.`MissionId` = `m`.`Id`
13468-
WHERE (`s`.`Id` = `s0`.`SquadId`) AND (@__unixEpochSeconds_0 = TIMESTAMPDIFF(second, TIMESTAMP '1970-01-01 00:00:00', `m`.`Timeline`)))
13469-
ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s1`.`SquadId`
13470-
""");
13471-
}
13472-
1347313366
public override async Task Set_operator_with_navigation_in_projection_groupby_aggregate(bool async)
1347413367
{
1347513368
await base.Set_operator_with_navigation_in_projection_groupby_aggregate(async);

‎test/EFCore.MySql.FunctionalTests/Query/TPTGearsOfWarQueryMySqlTest.cs‎

Lines changed: 0 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,6 @@ public override Task DateTimeOffset_Contains_Less_than_Greater_than(bool async)
3636
m => start <= m.Timeline.Date && m.Timeline < end && dates.Contains(m.Timeline)));
3737
}
3838

39-
public override Task Where_datetimeoffset_milliseconds_parameter_and_constant(bool async)
40-
{
41-
var dateTimeOffset = MySqlTestHelpers.GetExpectedValue(new DateTimeOffset(599898024001234567, new TimeSpan(1, 30, 0)));
42-
43-
// Literal where clause
44-
var p = Expression.Parameter(typeof(Mission), "i");
45-
var dynamicWhere = Expression.Lambda<Func<Mission, bool>>(
46-
Expression.Equal(
47-
Expression.Property(p, "Timeline"),
48-
Expression.Constant(dateTimeOffset)
49-
), p);
50-
51-
return AssertCount(
52-
async,
53-
ss => ss.Set<Mission>().Where(dynamicWhere),
54-
ss => ss.Set<Mission>().Where(m => m.Timeline == dateTimeOffset));
55-
}
56-
5739
[ConditionalTheory(Skip = "TODO: Does not work as expected, probably due to some test definition issues.")]
5840
public override async Task DateTimeOffsetNow_minus_timespan(bool async)
5941
{
@@ -237,54 +219,6 @@ public override Task Correlated_collection_with_groupby_with_complex_grouping_ke
237219
return base.Correlated_collection_with_groupby_with_complex_grouping_key_not_projecting_identifier_column_with_group_aggregate_in_final_projection(async);
238220
}
239221

240-
public override async Task DateTimeOffset_to_unix_time_milliseconds(bool async)
241-
{
242-
await base.DateTimeOffset_to_unix_time_milliseconds(async);
243-
244-
AssertSql(
245-
"""
246-
@__unixEpochMilliseconds_0='0'
247-
248-
SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, CASE
249-
WHEN `o`.`Nickname` IS NOT NULL THEN 'Officer'
250-
END AS `Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s1`.`SquadId`, `s1`.`MissionId`
251-
FROM `Gears` AS `g`
252-
LEFT JOIN `Officers` AS `o` ON (`g`.`Nickname` = `o`.`Nickname`) AND (`g`.`SquadId` = `o`.`SquadId`)
253-
INNER JOIN `Squads` AS `s` ON `g`.`SquadId` = `s`.`Id`
254-
LEFT JOIN `SquadMissions` AS `s1` ON `s`.`Id` = `s1`.`SquadId`
255-
WHERE NOT EXISTS (
256-
SELECT 1
257-
FROM `SquadMissions` AS `s0`
258-
INNER JOIN `Missions` AS `m` ON `s0`.`MissionId` = `m`.`Id`
259-
WHERE (`s`.`Id` = `s0`.`SquadId`) AND (@__unixEpochMilliseconds_0 = (TIMESTAMPDIFF(microsecond, TIMESTAMP '1970-01-01 00:00:00', `m`.`Timeline`)) DIV (1000)))
260-
ORDER BY `g`.`Nickname`, `g`.`SquadId`, `s`.`Id`, `s1`.`SquadId`
261-
""");
262-
}
263-
264-
public override async Task DateTimeOffset_to_unix_time_seconds(bool async)
265-
{
266-
await base.DateTimeOffset_to_unix_time_seconds(async);
267-
268-
AssertSql(
269-
"""
270-
@__unixEpochSeconds_0='0'
271-
272-
SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, CASE
273-
WHEN `o`.`Nickname` IS NOT NULL THEN 'Officer'
274-
END AS `Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s1`.`SquadId`, `s1`.`MissionId`
275-
FROM `Gears` AS `g`
276-
LEFT JOIN `Officers` AS `o` ON (`g`.`Nickname` = `o`.`Nickname`) AND (`g`.`SquadId` = `o`.`SquadId`)
277-
INNER JOIN `Squads` AS `s` ON `g`.`SquadId` = `s`.`Id`
278-
LEFT JOIN `SquadMissions` AS `s1` ON `s`.`Id` = `s1`.`SquadId`
279-
WHERE NOT EXISTS (
280-
SELECT 1
281-
FROM `SquadMissions` AS `s0`
282-
INNER JOIN `Missions` AS `m` ON `s0`.`MissionId` = `m`.`Id`
283-
WHERE (`s`.`Id` = `s0`.`SquadId`) AND (@__unixEpochSeconds_0 = TIMESTAMPDIFF(second, TIMESTAMP '1970-01-01 00:00:00', `m`.`Timeline`)))
284-
ORDER BY `g`.`Nickname`, `g`.`SquadId`, `s`.`Id`, `s1`.`SquadId`
285-
""");
286-
}
287-
288222
[SupportedServerVersionCondition(nameof(ServerVersionSupport.LimitWithNonConstantValue))]
289223
public override async Task Where_subquery_with_ElementAt_using_column_as_index(bool async)
290224
{
@@ -293,22 +227,6 @@ public override async Task Where_subquery_with_ElementAt_using_column_as_index(b
293227
AssertSql("");
294228
}
295229

296-
public override async Task Where_datetimeoffset_hour_component(bool async)
297-
{
298-
await AssertQuery(
299-
async,
300-
ss => from m in ss.Set<Mission>()
301-
where m.Timeline.Hour == /* 10 */ 8
302-
select m);
303-
304-
AssertSql(
305-
"""
306-
SELECT `m`.`Id`, `m`.`CodeName`, `m`.`Date`, `m`.`Difficulty`, `m`.`Duration`, `m`.`Rating`, `m`.`Time`, `m`.`Timeline`
307-
FROM `Missions` AS `m`
308-
WHERE EXTRACT(hour FROM `m`.`Timeline`) = 8
309-
""");
310-
}
311-
312230
// TODO: Implement once TimeSpan is translated as ticks instead of TIME.
313231
public override async Task Non_string_concat_uses_appropriate_type_mapping(bool async)
314232
{

0 commit comments

Comments
 (0)