Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-enable fixed tests #33871

Merged
merged 2 commits into from
Jun 2, 2024
Merged

Re-enable fixed tests #33871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f07892
Re-enable `Json_collection_of_primitives_SelectMany`
ranma42 Jun 2, 2024
f8099e5
Re-enable `Column_collection_inside_json_owned_entity`
ranma42 Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/EFCore.Relational.Specification.Tests/Query/JsonQueryTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1437,7 +1437,7 @@ public virtual Task Json_nested_collection_SelectMany(bool async)
.AsNoTracking(),
elementSorter: e => (e.Enum, e.Date, e.NullableEnum, e.Fraction));

[ConditionalTheory(Skip = "issue #31364")]
[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Json_collection_of_primitives_SelectMany(bool async)
=> AssertQuery(
Expand Down
2 changes: 1 addition & 1 deletion ...ational.Specification.Tests/Query/NonSharedPrimitiveCollectionsQueryRelationalTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public abstract class NonSharedPrimitiveCollectionsQueryRelationalTestBase : Non
public override Task Array_of_byte()
=> AssertTranslationFailed(() => TestArray((byte)1, (byte)2));

[ConditionalFact(Skip = "#28688")]
[ConditionalFact]
public virtual async Task Column_collection_inside_json_owned_entity()
{
var contextFactory = await InitializeAsync<TestContext>(
Expand Down
7 changes: 6 additions & 1 deletion test/EFCore.SqlServer.FunctionalTests/Query/JsonQuerySqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,7 +1468,12 @@ public override async Task Json_collection_of_primitives_SelectMany(bool async)
{
await base.Json_collection_of_primitives_SelectMany(async);

AssertSql("");
AssertSql(
"""
SELECT [n].[value]
FROM [JsonEntitiesBasic] AS [j]
CROSS APPLY OPENJSON(JSON_QUERY([j].[OwnedReferenceRoot], '$.Names')) WITH ([value] nvarchar(max) '$') AS [n]
""");
}

public override async Task Json_collection_of_primitives_index_used_in_predicate(bool async)
Expand Down
4 changes: 2 additions & 2 deletions ...EFCore.SqlServer.FunctionalTests/Query/NonSharedPrimitiveCollectionsQuerySqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,13 +758,13 @@ SELECT TOP(2) [t].[Id], [t].[Owned]
FROM [TestOwner] AS [t]
WHERE (
SELECT COUNT(*)
FROM OPENJSON(JSON_VALUE([t].[Owned], '$.Strings')) AS [s]) = 2
FROM OPENJSON(JSON_QUERY([t].[Owned], '$.Strings')) AS [s]) = 2
""",
//
"""
SELECT TOP(2) [t].[Id], [t].[Owned]
FROM [TestOwner] AS [t]
WHERE JSON_VALUE(JSON_VALUE([t].[Owned], '$.Strings'), '$[1]') = N'bar'
WHERE JSON_VALUE([t].[Owned], '$.Strings[1]') = N'bar'
""");
}

Expand Down
7 changes: 7 additions & 0 deletions test/EFCore.Sqlite.FunctionalTests/Query/JsonQuerySqliteTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,13 @@ public override async Task Json_nested_collection_SelectMany(bool async)
() => base.Json_nested_collection_SelectMany(async)))
.Message);

public override async Task Json_collection_of_primitives_SelectMany(bool async)
=> Assert.Equal(
SqliteStrings.ApplyNotSupported,
(await Assert.ThrowsAsync<InvalidOperationException>(
() => base.Json_collection_of_primitives_SelectMany(async)))
.Message);

public override async Task Json_collection_index_in_projection_using_untranslatable_client_method(bool async)
{
var message = (await Assert.ThrowsAsync<InvalidOperationException>(
Expand Down