Skip to content

Commit

Permalink
Rename leftover references to query types
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndriySvyryd
AndriySvyryd committed Aug 12, 2019
1 parent 40b48a4 commit 669ea67
Show file tree
Hide file tree
Showing 10 changed files with 71 additions and 71 deletions.
40 changes: 20 additions & 20 deletions ...Query/SimpleQueryCosmosTest.QueryTypes.cs → .../SimpleQueryCosmosTest.KeylessEntities.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ namespace Microsoft.EntityFrameworkCore.Query
public partial class SimpleQueryCosmosTest
{
[ConditionalTheory(Skip = "See issue#13857")]
public override async Task QueryType_simple(bool isAsync)
public override async Task KeylessEntity_simple(bool isAsync)
{
await base.QueryType_simple(isAsync);
await base.KeylessEntity_simple(isAsync);

AssertSql(
@"SELECT c
Expand All @@ -22,9 +22,9 @@ FROM root c
}

[ConditionalTheory(Skip = "See issue#13857")]
public override async Task QueryType_where_simple(bool isAsync)
public override async Task KeylessEntity_where_simple(bool isAsync)
{
await base.QueryType_where_simple(isAsync);
await base.KeylessEntity_where_simple(isAsync);

AssertSql(
@"SELECT c
Expand All @@ -33,27 +33,27 @@ FROM root c
}

[ConditionalFact(Skip = "See issue#13857")]
public override void Query_backed_by_database_view()
public override void KeylessEntity_by_database_view()
{
base.Query_backed_by_database_view();
base.KeylessEntity_by_database_view();

AssertSql(
@"SELECT c
FROM root c
WHERE ((c[""Discriminator""] = ""Product"") AND NOT(c[""Discontinued""]))");
}

public override void QueryType_with_nav_defining_query()
public override void KeylessEntity_with_nav_defining_query()
{
base.QueryType_with_nav_defining_query();
base.KeylessEntity_with_nav_defining_query();

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

public override async Task QueryType_with_mixed_tracking(bool isAsync)
public override async Task KeylessEntity_with_mixed_tracking(bool isAsync)
{
await AssertQuery<Customer, OrderQuery>(
isAsync,
Expand All @@ -73,57 +73,57 @@ FROM root c
WHERE ((c[""Discriminator""] = ""Customer"") AND (c[""City""] = ""London""))");
}

public override async Task QueryType_with_defining_query(bool isAsync)
public override async Task KeylessEntity_with_defining_query(bool isAsync)
{
await base.QueryType_with_defining_query(isAsync);
await base.KeylessEntity_with_defining_query(isAsync);

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

public override async Task QueryType_with_defining_query_and_correlated_collection(bool isAsync)
public override async Task KeylessEntity_with_defining_query_and_correlated_collection(bool isAsync)
{
await base.QueryType_with_defining_query_and_correlated_collection(isAsync);
await base.KeylessEntity_with_defining_query_and_correlated_collection(isAsync);

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

public override async Task QueryType_with_included_nav(bool isAsync)
public override async Task KeylessEntity_with_included_nav(bool isAsync)
{
await base.QueryType_with_included_nav(isAsync);
await base.KeylessEntity_with_included_nav(isAsync);

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

public override async Task QueryType_with_included_navs_multi_level(bool isAsync)
public override async Task KeylessEntity_with_included_navs_multi_level(bool isAsync)
{
await base.QueryType_with_included_navs_multi_level(isAsync);
await base.KeylessEntity_with_included_navs_multi_level(isAsync);

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

public override async Task QueryType_select_where_navigation(bool isAsync)
public override async Task KeylessEntity_select_where_navigation(bool isAsync)
{
await base.QueryType_select_where_navigation(isAsync);
await base.KeylessEntity_select_where_navigation(isAsync);

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

public override async Task QueryType_select_where_navigation_multi_level(bool isAsync)
public override async Task KeylessEntity_select_where_navigation_multi_level(bool isAsync)
{
await AssertQuery<OrderQuery>(
isAsync,
Expand Down
20 changes: 10 additions & 10 deletions test/EFCore.InMemory.FunctionalTests/Query/SimpleQueryInMemoryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ public override void Auto_initialized_view_set()
}

[ConditionalTheory(Skip = "See issue#13857")]
public override Task QueryType_simple(bool isAsync)
public override Task KeylessEntity_simple(bool isAsync)
{
return base.QueryType_simple(isAsync);
return base.KeylessEntity_simple(isAsync);
}

[ConditionalTheory(Skip = "See issue#13857")]
public override Task QueryType_where_simple(bool isAsync)
public override Task KeylessEntity_where_simple(bool isAsync)
{
return base.QueryType_where_simple(isAsync);
return base.KeylessEntity_where_simple(isAsync);
}

[ConditionalFact(Skip = "See issue#13857")]
public override void Query_backed_by_database_view()
public override void KeylessEntity_by_database_view()
{
base.Query_backed_by_database_view();
base.KeylessEntity_by_database_view();
}

// InMemory can mimic throw behavior for subquery
Expand Down Expand Up @@ -266,15 +266,15 @@ public override Task Project_single_element_from_collection_with_OrderBy_Distinc
}

[ConditionalTheory(Skip = "Issue#16963")]
public override Task QueryType_with_included_nav(bool isAsync)
public override Task KeylessEntity_with_included_nav(bool isAsync)
{
return base.QueryType_with_included_nav(isAsync);
return base.KeylessEntity_with_included_nav(isAsync);
}

[ConditionalTheory(Skip = "Issue#16963")]
public override Task QueryType_with_included_navs_multi_level(bool isAsync)
public override Task KeylessEntity_with_included_navs_multi_level(bool isAsync)
{
return base.QueryType_with_included_navs_multi_level(isAsync);
return base.KeylessEntity_with_included_navs_multi_level(isAsync);
}

[ConditionalTheory(Skip = "Issue#17050")]
Expand Down
22 changes: 11 additions & 11 deletions ...s/Query/SimpleQueryTestBase.QueryTypes.cs → ...ry/SimpleQueryTestBase.KeylessEntities.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public abstract partial class SimpleQueryTestBase<TFixture>
{
[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task QueryType_simple(bool isAsync)
public virtual Task KeylessEntity_simple(bool isAsync)
{
return AssertQuery<CustomerView>(
isAsync,
Expand All @@ -27,15 +27,15 @@ public virtual Task QueryType_simple(bool isAsync)

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task QueryType_where_simple(bool isAsync)
public virtual Task KeylessEntity_where_simple(bool isAsync)
{
return AssertQuery<CustomerView>(
isAsync,
cvs => cvs.AsNoTracking().Where(c => c.City == "London"));
}

[ConditionalFact]
public virtual void Query_backed_by_database_view()
public virtual void KeylessEntity_by_database_view()
{
using (var context = CreateContext())
{
Expand All @@ -57,7 +57,7 @@ public virtual void Auto_initialized_view_set()
}

[ConditionalFact(Skip = "issue #16323")]
public virtual void QueryType_with_nav_defining_query()
public virtual void KeylessEntity_with_nav_defining_query()
{
using (var context = CreateContext())
{
Expand All @@ -72,7 +72,7 @@ var results

[ConditionalTheory(Skip = "issue #16323")]
[MemberData(nameof(IsAsyncData))]
public virtual Task QueryType_with_defining_query(bool isAsync)
public virtual Task KeylessEntity_with_defining_query(bool isAsync)
{
return AssertQuery<OrderQuery>(
isAsync,
Expand All @@ -82,7 +82,7 @@ public virtual Task QueryType_with_defining_query(bool isAsync)
// also issue 12873
[ConditionalTheory(Skip = "issue #16323")]
[MemberData(nameof(IsAsyncData))]
public virtual Task QueryType_with_defining_query_and_correlated_collection(bool isAsync)
public virtual Task KeylessEntity_with_defining_query_and_correlated_collection(bool isAsync)
{
return AssertQuery<OrderQuery>(
isAsync,
Expand All @@ -92,7 +92,7 @@ public virtual Task QueryType_with_defining_query_and_correlated_collection(bool

[ConditionalTheory(Skip = "issue #15081")]
[MemberData(nameof(IsAsyncData))]
public virtual Task QueryType_with_mixed_tracking(bool isAsync)
public virtual Task KeylessEntity_with_mixed_tracking(bool isAsync)
{
return AssertQuery<Customer, OrderQuery>(
isAsync,
Expand All @@ -109,7 +109,7 @@ from o in ovs.AsNoTracking().Where(ov => ov.CustomerID == c.CustomerID)

[ConditionalTheory(Skip = "issue #16323")]
[MemberData(nameof(IsAsyncData))]
public virtual Task QueryType_with_included_nav(bool isAsync)
public virtual Task KeylessEntity_with_included_nav(bool isAsync)
{
return AssertIncludeQuery<OrderQuery>(
isAsync,
Expand All @@ -124,7 +124,7 @@ public virtual Task QueryType_with_included_nav(bool isAsync)

[ConditionalTheory(Skip = "issue #16323")]
[MemberData(nameof(IsAsyncData))]
public virtual Task QueryType_with_included_navs_multi_level(bool isAsync)
public virtual Task KeylessEntity_with_included_navs_multi_level(bool isAsync)
{
return AssertIncludeQuery<OrderQuery>(
isAsync,
Expand All @@ -140,7 +140,7 @@ public virtual Task QueryType_with_included_navs_multi_level(bool isAsync)

[ConditionalTheory(Skip = "issue #16323")]
[MemberData(nameof(IsAsyncData))]
public virtual Task QueryType_select_where_navigation(bool isAsync)
public virtual Task KeylessEntity_select_where_navigation(bool isAsync)
{
return AssertQuery<OrderQuery>(
isAsync,
Expand All @@ -151,7 +151,7 @@ public virtual Task QueryType_select_where_navigation(bool isAsync)

[ConditionalTheory(Skip = "issue #16323")]
[MemberData(nameof(IsAsyncData))]
public virtual Task QueryType_select_where_navigation_multi_level(bool isAsync)
public virtual Task KeylessEntity_select_where_navigation_multi_level(bool isAsync)
{
return AssertQuery<OrderQuery>(
isAsync,
Expand Down
Loading

0 comments on commit 669ea67

Please sign in to comment.