Skip to content

Commit

Permalink
Merge sync/async query tests into one (#23383)
Browse files Browse the repository at this point in the history 
Resolves #22410
  • Loading branch information
@smitpatel
smitpatel committed Nov 18, 2020
1 parent 4dc48f3 commit 44fb095
Show file tree
Hide file tree
Showing 15 changed files with 1,272 additions and 1,805 deletions.
52 changes: 21 additions & 31 deletions test/EFCore.Cosmos.FunctionalTests/Query/NorthwindMiscellaneousQueryCosmosTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2270,43 +2270,43 @@ FROM root c
WHERE (c[""Discriminator""] = ""Order"")");
}

[ConditionalFact(Skip = "Issue #17246")]
public override void Select_bitwise_or()
[ConditionalTheory(Skip = "Issue #17246")]
public override async Task Select_bitwise_or(bool async)
{
base.Select_bitwise_or();
await base.Select_bitwise_or(async);

AssertSql(
@"SELECT c
FROM root c
WHERE (c[""Discriminator""] = ""Customer"")");
}

[ConditionalFact(Skip = "Issue #17246")]
public override void Select_bitwise_or_multiple()
[ConditionalTheory(Skip = "Issue #17246")]
public override async Task Select_bitwise_or_multiple(bool async)
{
base.Select_bitwise_or_multiple();
await base.Select_bitwise_or_multiple(async);

AssertSql(
@"SELECT c
FROM root c
WHERE (c[""Discriminator""] = ""Customer"")");
}

[ConditionalFact(Skip = "Issue #17246")]
public override void Select_bitwise_and()
[ConditionalTheory(Skip = "Issue #17246")]
public override async Task Select_bitwise_and(bool async)
{
base.Select_bitwise_and();
await base.Select_bitwise_and(async);

AssertSql(
@"SELECT c
FROM root c
WHERE (c[""Discriminator""] = ""Customer"")");
}

[ConditionalFact(Skip = "Issue #17246")]
public override void Select_bitwise_and_or()
[ConditionalTheory(Skip = "Issue #17246")]
public override async Task Select_bitwise_and_or(bool async)
{
base.Select_bitwise_and_or();
await base.Select_bitwise_and_or(async);

AssertSql(
@"SELECT c
Expand Down Expand Up @@ -2378,21 +2378,21 @@ FROM root c
WHERE ((c[""Discriminator""] = ""Order"") AND ((c[""OrderID""] | 10248) = 10248))");
}

[ConditionalFact(Skip = "Issue #17246")]
public override void Select_bitwise_or_with_logical_or()
[ConditionalTheory(Skip = "Issue #17246")]
public override async Task Select_bitwise_or_with_logical_or(bool async)
{
base.Select_bitwise_or_with_logical_or();
await base.Select_bitwise_or_with_logical_or(async);

AssertSql(
@"SELECT c
FROM root c
WHERE (c[""Discriminator""] = ""Customer"")");
}

[ConditionalFact(Skip = "Issue #17246")]
public override void Select_bitwise_and_with_logical_and()
[ConditionalTheory(Skip = "Issue #17246")]
public override async Task Select_bitwise_and_with_logical_and(bool async)
{
base.Select_bitwise_and_with_logical_and();
await base.Select_bitwise_and_with_logical_and(async);

AssertSql(
@"SELECT c
Expand Down Expand Up @@ -2602,10 +2602,10 @@ FROM root c
WHERE ((c[""Discriminator""] = ""Order"") AND (c[""OrderDate""] != null))");
}

[ConditionalFact(Skip = "Issue#17246")]
public override void DefaultIfEmpty_without_group_join()
[ConditionalTheory(Skip = "Issue#17246")]
public override async Task DefaultIfEmpty_without_group_join(bool async)
{
base.DefaultIfEmpty_without_group_join();
await base.DefaultIfEmpty_without_group_join(async);

AssertSql(
@"SELECT c
Expand Down Expand Up @@ -3820,16 +3820,6 @@ FROM root c
WHERE (c[""Discriminator""] = ""Customer"")");
}

public override void Throws_on_concurrent_query_first()
{
// #13160
}

public override void Throws_on_concurrent_query_list()
{
// #13160
}

[ConditionalTheory(Skip = "Issue#17246")]
public override Task Entity_equality_through_nested_anonymous_type_projection(bool async)
{
Expand Down
23 changes: 0 additions & 23 deletions test/EFCore.InMemory.FunctionalTests/Query/NorthwindAsyncSimpleQueryInMemoryTest.cs
View file

This file was deleted.

Loading

0 comments on commit 44fb095

Please sign in to comment.