Skip to content

Commit

Permalink
Downgrade xunit back to 2.6.1 (#3094)
Browse files Browse the repository at this point in the history
  • Loading branch information
roji committed Feb 14, 2024
1 parent ba34317 commit ea0a103
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 26 deletions.
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="xunit" Version="2.6.6" />
<PackageVersion Include="xunit" Version="2.6.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ public class NpgsqlModelBuilderGenericTest : NpgsqlModelBuilderTestBase
{
public class NpgsqlGenericNonRelationship(NpgsqlModelBuilderFixture fixture) : NpgsqlNonRelationship(fixture)
{
// https://github.com/dotnet/efcore/issues/33059
public override void Can_add_multiple_indexes()
=> Assert.Throws<EqualException>(() => base.Can_add_multiple_indexes());

// PostgreSQL actually does support mapping multi-dimensional arrays, so no exception is thrown as expected
protected override void Mapping_throws_for_non_ignored_three_dimensional_array()
=> Assert.Throws<ThrowsException>(() => base.Mapping_throws_for_non_ignored_three_dimensional_array());
Expand All @@ -23,14 +19,6 @@ protected override TestModelBuilder CreateModelBuilder(

public class NpgsqlGenericComplexType(NpgsqlModelBuilderFixture fixture) : NpgsqlComplexType(fixture)
{
// https://github.com/dotnet/efcore/issues/33059
public override void Access_mode_can_be_overridden_at_entity_and_property_levels()
=> Assert.Throws<EqualException>(() => base.Access_mode_can_be_overridden_at_entity_and_property_levels());

// https://github.com/dotnet/efcore/issues/33059
public override void Complex_properties_not_discovered_by_convention()
=> Assert.Throws<EqualException>(() => base.Complex_properties_not_discovered_by_convention());

protected override TestModelBuilder CreateModelBuilder(
Action<ModelConfigurationBuilder>? configure)
=> new GenericTestModelBuilder(Fixture, configure);
Expand Down Expand Up @@ -66,26 +54,13 @@ protected override TestModelBuilder CreateModelBuilder(

public class NpgsqlGenericManyToMany(NpgsqlModelBuilderFixture fixture) : NpgsqlManyToMany(fixture)
{
// https://github.com/dotnet/efcore/issues/33059
public override void Can_use_implicit_shared_type_with_default_name_and_implicit_relationships_as_join_entity()
=> Assert.Throws<EqualException>(
() => base.Can_use_implicit_shared_type_with_default_name_and_implicit_relationships_as_join_entity());

protected override TestModelBuilder CreateModelBuilder(
Action<ModelConfigurationBuilder>? configure)
=> new GenericTestModelBuilder(Fixture, configure);
}

public class NpgsqlGenericOwnedTypes(NpgsqlModelBuilderFixture fixture) : NpgsqlOwnedTypes(fixture)
{
// https://github.com/dotnet/efcore/issues/33059
public override void Can_configure_chained_ownerships()
=> Assert.Throws<EqualException>(() => base.Can_configure_chained_ownerships());

// https://github.com/dotnet/efcore/issues/33059
public override void Can_configure_chained_ownerships_different_order()
=> Assert.Throws<EqualException>(() => base.Can_configure_chained_ownerships_different_order());

// PostgreSQL stored procedures do not support result columns
public override void Can_use_sproc_mapping_with_owned_reference()
=> Assert.Throws<InvalidOperationException>(() => base.Can_use_sproc_mapping_with_owned_reference());
Expand Down

0 comments on commit ea0a103

Please sign in to comment.