Skip to content

Commit

Permalink
Disabled test issue number scrub
Browse files Browse the repository at this point in the history
Making sure we don't have disabled tests that reference closed issues. (Except client eval issue)
  • Loading branch information
ajcvickers committed Aug 10, 2019
1 parent 6c87dc6 commit 4477fdb
Show file tree
Hide file tree
Showing 32 changed files with 233 additions and 438 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ protected virtual string GetPropertyName([NotNull] DatabaseColumn column)

var table = column.Table ?? _nullTable;
var usedNames = new List<string>();
// TODO - need to clean up the way CSharpNamer & CSharpUniqueNamer work (see issue #1671)
if (column.Table != null)
{
usedNames.Add(GetEntityTypeName(table));
Expand Down
14 changes: 2 additions & 12 deletions test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,6 @@ FROM root c
OFFSET 0 LIMIT 2");
}

public override void Method_with_constant_queryable_arg()
{
base.Method_with_constant_queryable_arg();

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

public override async Task Entity_equality_self(bool isAsync)
{
await base.Entity_equality_self(isAsync);
Expand Down Expand Up @@ -2537,7 +2527,7 @@ public override async Task Select_expression_date_add_milliseconds_above_the_ran
await base.Select_expression_date_add_milliseconds_above_the_range(isAsync);

AssertSql(
@"SELECT c
@"SELECT c[""OrderDate""]
FROM root c
WHERE ((c[""Discriminator""] = ""Order"") AND (c[""OrderDate""] != null))");
}
Expand All @@ -2547,7 +2537,7 @@ public override async Task Select_expression_date_add_milliseconds_below_the_ran
await base.Select_expression_date_add_milliseconds_below_the_range(isAsync);

AssertSql(
@"SELECT c
@"SELECT c[""OrderDate""]
FROM root c
WHERE ((c[""Discriminator""] = ""Order"") AND (c[""OrderDate""] != null))");
}
Expand Down
28 changes: 26 additions & 2 deletions test/EFCore.Design.Tests/Migrations/ModelSnapshotSqlServerTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,32 @@ public virtual void Entities_are_stored_in_model_snapshot()
});
}

//[ConditionalFact]
//Issue #14103
[ConditionalFact]
public virtual void Sequence_is_stored_in_snapshot_as_annotations()
{
Test(
builder =>
{
builder.HasSequence<int>("Foo", "Bar")
.StartsAt(2)
.HasMin(1)
.HasMax(3)
.IncrementsBy(2)
.IsCyclic();
},
AddBoilerPlate(
@"
modelBuilder
.HasAnnotation(""Relational:MaxIdentifierLength"", 128)
.HasAnnotation(""Relational:Sequence:Bar.Foo"", ""'Foo', 'Bar', '2', '2', '1', '3', 'Int32', 'True'"")
.HasAnnotation(""SqlServer:ValueGenerationStrategy"", SqlServerValueGenerationStrategy.IdentityColumn);"),
o =>
{
Assert.Equal(3, o.GetAnnotations().Count());
});
}

[ConditionalFact(Skip = "Issue #14103")]
public virtual void Sequence_is_stored_in_snapshot_as_fluent_api()
{
Test(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Microsoft.EntityFrameworkCore
{
// issue #15318
// issue #16963
internal class GraphUpdatesInMemoryTest
: GraphUpdatesTestBase<GraphUpdatesInMemoryTest.GraphUpdatesInMemoryFixture>
{
Expand Down
16 changes: 8 additions & 8 deletions test/EFCore.InMemory.FunctionalTests/InMemoryComplianceTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ public class InMemoryComplianceTest : ComplianceTestBase
typeof(FunkyDataQueryTestBase<>),
typeof(OptimisticConcurrencyTestBase<>),
typeof(StoreGeneratedTestBase<>),
typeof(LoadTestBase<>), // issue #15318
typeof(MusicStoreTestBase<>), // issue #15318
typeof(ConferencePlannerTestBase<>), // issue #15318
typeof(GraphUpdatesTestBase<>), // issue #15318
typeof(ProxyGraphUpdatesTestBase<>), // issue #15318
typeof(ComplexNavigationsWeakQueryTestBase<>), // issue #15285
typeof(OwnedQueryTestBase<>), // issue #15285
typeof(FiltersInheritanceTestBase<>), // issue #17047
typeof(LoadTestBase<>), // issue #16963
typeof(MusicStoreTestBase<>), // issue #16963
typeof(ConferencePlannerTestBase<>), // issue #16963
typeof(GraphUpdatesTestBase<>), // issue #16963
typeof(ProxyGraphUpdatesTestBase<>), // issue #16963
typeof(ComplexNavigationsWeakQueryTestBase<>), // issue #16963
typeof(FiltersInheritanceTestBase<>), // issue #16963
typeof(OwnedQueryTestBase<>), // issue #16963
// Query pipeline
typeof(SimpleQueryTestBase<>),
typeof(GroupByQueryTestBase<>),
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.InMemory.FunctionalTests/LoadInMemoryTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Microsoft.EntityFrameworkCore
{
//issue #15318
//issue #16963
internal class LoadInMemoryTest : LoadTestBase<LoadInMemoryTest.LoadInMemoryFixture>
{
public LoadInMemoryTest(LoadInMemoryFixture fixture)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Microsoft.EntityFrameworkCore
{
// issue #15318
// issue #16963
internal class MusicStoreInMemoryTest : MusicStoreTestBase<MusicStoreInMemoryTest.MusicStoreInMemoryFixture>
{
public MusicStoreInMemoryTest(MusicStoreInMemoryFixture fixture)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder build
}
}

// issue #15318
// issue #16963
internal class LazyLoading : ProxyGraphUpdatesInMemoryTestBase<LazyLoading.ProxyGraphUpdatesWithLazyLoadingInMemoryFixture>
{
public LazyLoading(ProxyGraphUpdatesWithLazyLoadingInMemoryFixture fixture)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public override Task ToList_on_nav_subquery_with_predicate_in_projection()
return base.ToList_on_nav_subquery_with_predicate_in_projection();
}

[ConditionalFact(Skip = "See issue#13857")]
[ConditionalFact(Skip = "See issue#16963")]
public override Task Query_backed_by_database_view()
{
return base.Query_backed_by_database_view();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ public CompiledQueryInMemoryTest(NorthwindQueryInMemoryFixture<NoopModelCustomiz
{
}

[ConditionalFact(Skip = "See issue#15318")]
[ConditionalFact(Skip = "See issue#16963")]
public override void Query_ending_with_include()
{
base.Query_ending_with_include();
}

[ConditionalFact(Skip = "See issue#15318")]
[ConditionalFact(Skip = "See issue#16963")]
public override void Query_with_single_parameter_with_include()
{
base.Query_ending_with_include();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,145 +35,145 @@ public override Task
isAsync);
}

[ConditionalTheory(Skip = "issue #15343")]
[ConditionalTheory(Skip = "issue #16963")]
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 #15343")]
[ConditionalTheory(Skip = "issue #16963")]
public override Task Key_equality_using_property_method_nested(bool isAsync)
{
return base.Key_equality_using_property_method_nested(isAsync);
}

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

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

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

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

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

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

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

[ConditionalTheory(Skip = "issue #15343")]
[ConditionalTheory(Skip = "issue #16963")]
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 #15343")]
[ConditionalTheory(Skip = "issue #16963")]
public override Task Optional_navigation_inside_method_call_translated_to_join_keeps_original_nullability(bool isAsync)
{
return base.Optional_navigation_inside_method_call_translated_to_join_keeps_original_nullability(isAsync);
}

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

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

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

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

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

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

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

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

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

[ConditionalTheory(Skip = "issue #15343")]
[ConditionalTheory(Skip = "issue #16963")]
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 #15343")]
[ConditionalTheory(Skip = "issue #16963")]
public override Task Join_navigation_in_outer_selector_translated_to_extra_join_nested(bool isAsync)
{
return base.Join_navigation_in_outer_selector_translated_to_extra_join_nested(isAsync);
}

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

[ConditionalTheory(Skip = "issue #15343")]
[ConditionalTheory(Skip = "issue #16963")]
public override Task Optional_navigation_inside_nested_method_call_translated_to_join_keeps_original_nullability_also_for_arguments(bool isAsync)
{
return base.Optional_navigation_inside_nested_method_call_translated_to_join_keeps_original_nullability_also_for_arguments(isAsync);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Microsoft.EntityFrameworkCore.Query
{
// issue #15285
// issue #16963
internal class ComplexNavigationsWeakQueryInMemoryTest :
ComplexNavigationsWeakQueryTestBase<ComplexNavigationsWeakQueryInMemoryFixture>
{
Expand Down
Loading

0 comments on commit 4477fdb

Please sign in to comment.