Skip to content

Commit

Permalink
InMemory: Tests scrub
Browse files Browse the repository at this point in the history 
Update issues references and add area for #16963
Enable tests which are already working
  • Loading branch information
@smitpatel
smitpatel committed Aug 29, 2019
1 parent a45bdb5 commit 702a691
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 151 deletions.
3 changes: 0 additions & 3 deletions test/EFCore.InMemory.FunctionalTests/InMemoryComplianceTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ public class InMemoryComplianceTest : ComplianceTestBase
// Remaining Issue #16963 3.0 query tests:
typeof(ComplexNavigationsWeakQueryTestBase<>),
typeof(OwnedQueryTestBase<>),
typeof(ComplexNavigationsQueryTestBase<>),
typeof(GearsOfWarQueryTestBase<>),
typeof(SpatialQueryTestBase<>)
};

protected override Assembly TargetAssembly { get; } = typeof(InMemoryComplianceTest).Assembly;
Expand Down
118 changes: 11 additions & 107 deletions test/EFCore.InMemory.FunctionalTests/Query/ComplexNavigationsQueryInMemoryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,172 +15,76 @@ public ComplexNavigationsQueryInMemoryTest(ComplexNavigationsQueryInMemoryFixtur
//TestLoggerFactory.TestOutputHelper = testOutputHelper;
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
public override Task Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(bool isAsync)
{
return base.Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
public override Task Multiple_SelectMany_with_navigation_and_explicit_DefaultIfEmpty(bool isAsync)
{
return base.Multiple_SelectMany_with_navigation_and_explicit_DefaultIfEmpty(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
public override Task Multiple_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_joined_together(bool isAsync)
{
return base.Multiple_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_joined_together(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
public override Task SelectMany_with_navigation_and_explicit_DefaultIfEmpty(bool isAsync)
{
return base.SelectMany_with_navigation_and_explicit_DefaultIfEmpty(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
public override Task SelectMany_with_navigation_filter_and_explicit_DefaultIfEmpty(bool isAsync)
{
return base.SelectMany_with_navigation_filter_and_explicit_DefaultIfEmpty(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
public override Task SelectMany_with_navigation_filter_paging_and_explicit_DefaultIfEmpty(bool isAsync)
{
return base.SelectMany_with_navigation_filter_paging_and_explicit_DefaultIfEmpty(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
[ConditionalTheory(Skip = "issue #16963 TooManyResults")]
public override Task SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_followed_by_Select_required_navigation_using_different_navs(bool isAsync)
{
return base.SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_followed_by_Select_required_navigation_using_different_navs(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
public override Task SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_followed_by_Select_required_navigation_using_same_navs(bool isAsync)
{
return base.SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_followed_by_Select_required_navigation_using_same_navs(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
public override Task SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany(bool isAsync)
{
return base.SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
public override Task SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany2(bool isAsync)
{
return base.SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany2(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
public override Task SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany3(bool isAsync)
{
return base.SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany3(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
public override Task SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany4(bool isAsync)
{
return base.SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany4(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
[ConditionalTheory(Skip = "issue #16963 TooManyResults")]
public override Task SelectMany_with_nested_navigation_and_explicit_DefaultIfEmpty(bool isAsync)
{
return base.SelectMany_with_nested_navigation_and_explicit_DefaultIfEmpty(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
[ConditionalTheory(Skip = "issue #16963 TooManyResults")]
public override Task SelectMany_with_nested_navigation_filter_and_explicit_DefaultIfEmpty(bool isAsync)
{
return base.SelectMany_with_nested_navigation_filter_and_explicit_DefaultIfEmpty(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //DefaultIfEmpty
public override Task SelectMany_with_nested_required_navigation_filter_and_explicit_DefaultIfEmpty(bool isAsync)
{
return base.SelectMany_with_nested_required_navigation_filter_and_explicit_DefaultIfEmpty(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //GroupBy
public override Task Simple_level1_level2_GroupBy_Count(bool isAsync)
{
return base.Simple_level1_level2_GroupBy_Count(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] //GroupBy
public override Task Simple_level1_level2_GroupBy_Having_Count(bool isAsync)
{
return base.Simple_level1_level2_GroupBy_Having_Count(isAsync);
}

[ConditionalTheory(Skip = "issue #17386")]
public override Task Complex_query_with_optional_navigations_and_client_side_evaluation(bool isAsync)
{
return base.Complex_query_with_optional_navigations_and_client_side_evaluation(isAsync);
}

[ConditionalTheory(Skip = "issue #17453")]
[ConditionalTheory(Skip = "issue #16963 TooManyResults")]
public override Task Project_collection_navigation_nested(bool isAsync)
{
return base.Project_collection_navigation_nested(isAsync);
}

[ConditionalTheory(Skip = "issue #17453")]
[ConditionalTheory(Skip = "issue #16963 TooManyResults")]
public override Task Project_collection_navigation_nested_anonymous(bool isAsync)
{
return base.Project_collection_navigation_nested_anonymous(isAsync);
}

[ConditionalTheory(Skip = "issue #17453")]
[ConditionalTheory(Skip = "issue #16963 TooManyResults")]
public override Task Project_collection_navigation_using_ef_property(bool isAsync)
{
return base.Project_collection_navigation_using_ef_property(isAsync);
}

[ConditionalTheory(Skip = "issue #17453")]
[ConditionalTheory(Skip = "issue #16963 TooManyResults")]
public override Task Project_navigation_and_collection(bool isAsync)
{
return base.Project_navigation_and_collection(isAsync);
}

[ConditionalTheory(Skip = "issue #17453")]
[ConditionalTheory(Skip = "issue #16963 TooManyResults")]
public override Task SelectMany_nested_navigation_property_optional_and_projection(bool isAsync)
{
return base.SelectMany_nested_navigation_property_optional_and_projection(isAsync);
}

[ConditionalTheory(Skip = "issue #17453")]
[ConditionalTheory(Skip = "issue #16963 TooManyResults")]
public override Task SelectMany_nested_navigation_property_required(bool isAsync)
{
return base.SelectMany_nested_navigation_property_required(isAsync);
}

[ConditionalTheory(Skip = "issue #17460")]
public override Task Where_complex_predicate_with_with_nav_prop_and_OrElse4(bool isAsync)
{
return base.Where_complex_predicate_with_with_nav_prop_and_OrElse4(isAsync);
}

[ConditionalTheory(Skip = "issue #17460")]
[ConditionalTheory(Skip = "issue #16963 Test")]
public override Task Join_flattening_bug_4539(bool isAsync)
{
return base.Join_flattening_bug_4539(isAsync);
}

[ConditionalTheory(Skip = "issue #17463")]
[ConditionalTheory(Skip = "issue #16963 Test")]
public override Task Include18_3_3(bool isAsync)
{
return base.Include18_3_3(isAsync);
}

[ConditionalFact(Skip = "issue #17463")]
public override void Include19()
{
base.Include19();
}
}
}
2 changes: 1 addition & 1 deletion test/EFCore.InMemory.FunctionalTests/Query/ComplexNavigationsWeakQueryInMemoryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Microsoft.EntityFrameworkCore.Query
{
// issue #16963
// issue #16963 Weak
internal class ComplexNavigationsWeakQueryInMemoryTest :
ComplexNavigationsWeakQueryTestBase<ComplexNavigationsWeakQueryInMemoryFixture>
{
Expand Down
32 changes: 1 addition & 31 deletions test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,6 @@ public GearsOfWarQueryInMemoryTest(GearsOfWarQueryInMemoryFixture fixture, ITest
//TestLoggerFactory.TestOutputHelper = testOutputHelper;
}

[ConditionalTheory(Skip = "issue #16963")] // groupby
public override Task GroupBy_Property_Include_Aggregate_with_anonymous_selector(bool isAsync)
{
return base.GroupBy_Property_Include_Aggregate_with_anonymous_selector(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] // groupby
public override Task GroupBy_Property_Include_Select_Count(bool isAsync)
{
return base.GroupBy_Property_Include_Select_Count(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] // groupby
public override Task GroupBy_Property_Include_Select_LongCount(bool isAsync)
{
return base.GroupBy_Property_Include_Select_LongCount(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] // groupby
public override Task GroupBy_Property_Include_Select_Max(bool isAsync)
{
return base.GroupBy_Property_Include_Select_Max(isAsync);
}

[ConditionalTheory(Skip = "issue #16963")] // groupby
public override Task GroupBy_Property_Include_Select_Min(bool isAsync)
{
return base.GroupBy_Property_Include_Select_Min(isAsync);
}

[ConditionalTheory(Skip = "issue #17386")]
public override Task Correlated_collection_order_by_constant_null_of_non_mapped_type(bool isAsync)
{
Expand Down Expand Up @@ -111,7 +81,7 @@ public override void Include_on_GroupJoin_SelectMany_DefaultIfEmpty_with_coalesc
base.Include_on_GroupJoin_SelectMany_DefaultIfEmpty_with_coalesce_result2();
}

[ConditionalTheory(Skip = "issue #16963")] //length
[ConditionalTheory(Skip = "issue #16963 Nullable error")] //length
public override Task Null_semantics_is_correctly_applied_for_function_comparisons_that_take_arguments_from_optional_navigation_complex(bool isAsync)
{
return base.Null_semantics_is_correctly_applied_for_function_comparisons_that_take_arguments_from_optional_navigation_complex(isAsync);
Expand Down
3 changes: 2 additions & 1 deletion test/EFCore.InMemory.FunctionalTests/Query/InheritanceInMemoryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ public InheritanceInMemoryTest(InheritanceInMemoryFixture fixture, ITestOutputHe
//TestLoggerFactory.TestOutputHelper = testOutputHelper;
}

[ConditionalFact(Skip = "See issue#16963 Cannot compose when using client method in defining query")] // Defining query
[ConditionalFact(Skip = "Issue#17504")]
public override void Can_query_all_animal_views()
{
base.Can_query_all_animal_views();
}

protected override bool EnforcesFkConstraints => false;
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.InMemory.FunctionalTests/Query/OwnedQueryInMemoryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Microsoft.EntityFrameworkCore.Query
{
// issue #16963
// issue #16963 Owned
internal class OwnedQueryInMemoryTest : OwnedQueryTestBase<OwnedQueryInMemoryTest.OwnedQueryInMemoryFixture>
{
public OwnedQueryInMemoryTest(OwnedQueryInMemoryFixture fixture, ITestOutputHelper testOutputHelper)
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.InMemory.FunctionalTests/SpatialInMemoryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public SpatialInMemoryTest(SpatialInMemoryFixture fixture)
{
}

[ConditionalFact(Skip = "Issue#16963")]
[ConditionalFact(Skip = "Issue#14042")]
public override void Mutation_of_tracked_values_does_not_mutate_values_in_store()
{
base.Mutation_of_tracked_values_does_not_mutate_values_in_store();
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.InMemory.FunctionalTests/UpdatesInMemoryTestBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ protected UpdatesInMemoryTestBase(TFixture fixture)
{
}

[ConditionalFact(Skip = "Issue #16963")]
[ConditionalFact(Skip = "Issue #14042")]
public override void Mutation_of_tracked_values_does_not_mutate_values_in_store()
{
}
Expand Down
10 changes: 5 additions & 5 deletions test/EFCore.Tests/ChangeTracking/Internal/QueryFixupTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ public void Query_principal_include_dependent_self_ref_unidirectional_with_exist
}
}

[ConditionalFact(Skip = "Issue #16963")]
[ConditionalFact(Skip = "Issue #16963 Owned")]
public void Query_ownership_navigations()
{
Seed();
Expand Down Expand Up @@ -944,7 +944,7 @@ public void Query_ownership_navigations()
}
}

[ConditionalFact(Skip = "Issue #16963")]
[ConditionalFact(Skip = "Issue #16963 Owned")]
public void Query_owned_foreign_key()
{
Seed();
Expand All @@ -961,7 +961,7 @@ public void Query_owned_foreign_key()
}
}

[ConditionalFact(Skip = "Issue #16963")]
[ConditionalFact(Skip = "Issue #16963 Owned")]
public void Query_subowned_foreign_key()
{
Seed();
Expand All @@ -978,7 +978,7 @@ public void Query_subowned_foreign_key()
}
}

[ConditionalFact(Skip = "Issue #16963")]
[ConditionalFact(Skip = "Issue #16963 Owned")]
public void Query_owned()
{
Seed();
Expand All @@ -999,7 +999,7 @@ public void Query_owned()
}
}

[ConditionalFact(Skip = "Issue #16963")]
[ConditionalFact(Skip = "Issue #16963 Owned")]
public void Query_subowned()
{
Seed();
Expand Down

0 comments on commit 702a691

Please sign in to comment.