Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump xunit from 2.4.2 to 2.5.0 #2805

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump xunit from 2.4.2 to 2.5.0 #2805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageVersion Include="xunit" Version="2.4.2" />
<PackageVersion Include="xunit" Version="2.5.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.2" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1994,7 +1994,7 @@ public virtual async Task Create_index_with_include()
{
var table = Assert.Single(model.Tables);
var index = Assert.Single(table.Indexes);
Assert.Equal(1, index.Columns.Count);
Assert.Single(index.Columns);
Assert.Contains(table.Columns.Single(c => c.Name == "Name"), index.Columns);

// Scaffolding included/covered properties is currently blocked, see #2194
Expand Down Expand Up @@ -2038,7 +2038,7 @@ public virtual async Task Create_index_with_include_and_filter()
var table = Assert.Single(model.Tables);
var index = Assert.Single(table.Indexes);
Assert.Equal(@"(""Name"" IS NOT NULL)", index.Filter);
Assert.Equal(1, index.Columns.Count);
Assert.Single(index.Columns);
Assert.Contains(table.Columns.Single(c => c.Name == "Name"), index.Columns);

// Scaffolding included/covered properties is currently blocked, see #2194
Expand Down Expand Up @@ -2082,7 +2082,7 @@ public virtual async Task Create_index_unique_with_include()
var table = Assert.Single(model.Tables);
var index = Assert.Single(table.Indexes);
Assert.True(index.IsUnique);
Assert.Equal(1, index.Columns.Count);
Assert.Single(index.Columns);
Assert.Contains(table.Columns.Single(c => c.Name == "Name"), index.Columns);

// Scaffolding included/covered properties is currently blocked, see #2194
Expand Down Expand Up @@ -2128,7 +2128,7 @@ public virtual async Task Create_index_unique_with_include_and_filter()
var index = Assert.Single(table.Indexes);
Assert.True(index.IsUnique);
Assert.Equal(@"(""Name"" IS NOT NULL)", index.Filter);
Assert.Equal(1, index.Columns.Count);
Assert.Single(index.Columns);
Assert.Contains(table.Columns.Single(c => c.Name == "Name"), index.Columns);

// Scaffolding included/covered properties is currently blocked, see #2194
Expand Down
28 changes: 10 additions & 18 deletions test/EFCore.PG.FunctionalTests/Scaffolding/NpgsqlDatabaseModelFactoryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public void Filter_schemas()
// ReSharper disable once PossibleNullReferenceException
Assert.Equal("K2", table.Name);
Assert.Equal(2, table.Columns.Count);
Assert.Equal(1, table.UniqueConstraints.Count);
Assert.Single(table.UniqueConstraints);
Assert.Empty(table.ForeignKeys);
},
"""
Expand All @@ -209,7 +209,7 @@ public void Filter_tables()
// ReSharper disable once PossibleNullReferenceException
Assert.Equal("K2", table.Name);
Assert.Equal(2, table.Columns.Count);
Assert.Equal(1, table.UniqueConstraints.Count);
Assert.Single(table.UniqueConstraints);
Assert.Empty(table.ForeignKeys);
},
"""
Expand All @@ -232,7 +232,7 @@ public void Filter_tables_with_qualified_name()
// ReSharper disable once PossibleNullReferenceException
Assert.Equal("K.2", table.Name);
Assert.Equal(2, table.Columns.Count);
Assert.Equal(1, table.UniqueConstraints.Count);
Assert.Single(table.UniqueConstraints);
Assert.Empty(table.ForeignKeys);
},
"""
Expand All @@ -256,7 +256,7 @@ public void Filter_tables_with_schema_qualified_name1()
// ReSharper disable once PossibleNullReferenceException
Assert.Equal("K2", table.Name);
Assert.Equal(2, table.Columns.Count);
Assert.Equal(1, table.UniqueConstraints.Count);
Assert.Single(table.UniqueConstraints);
Assert.Empty(table.ForeignKeys);
},
"""
Expand All @@ -281,7 +281,7 @@ public void Filter_tables_with_schema_qualified_name2()
// ReSharper disable once PossibleNullReferenceException
Assert.Equal("K.2", table.Name);
Assert.Equal(2, table.Columns.Count);
Assert.Equal(1, table.UniqueConstraints.Count);
Assert.Single(table.UniqueConstraints);
Assert.Empty(table.ForeignKeys);
},
"""
Expand All @@ -306,7 +306,7 @@ public void Filter_tables_with_schema_qualified_name3()
// ReSharper disable once PossibleNullReferenceException
Assert.Equal("K.2", table.Name);
Assert.Equal(2, table.Columns.Count);
Assert.Equal(1, table.UniqueConstraints.Count);
Assert.Single(table.UniqueConstraints);
Assert.Empty(table.ForeignKeys);
},
"""
Expand All @@ -331,7 +331,7 @@ public void Filter_tables_with_schema_qualified_name4()
// ReSharper disable once PossibleNullReferenceException
Assert.Equal("K2", table.Name);
Assert.Equal(2, table.Columns.Count);
Assert.Equal(1, table.UniqueConstraints.Count);
Assert.Single(table.UniqueConstraints);
Assert.Empty(table.ForeignKeys);
},
"""
Expand Down Expand Up @@ -1060,12 +1060,7 @@ public void System_columns_are_not_created()
""",
Enumerable.Empty<string>(),
Enumerable.Empty<string>(),
dbModel =>
{
var columns = dbModel.Tables.Single().Columns;

Assert.Equal(1, columns.Count);
},
dbModel => Assert.Single(dbModel.Tables.Single().Columns),
@"DROP TABLE ""SystemColumnsTable""");

#endregion
Expand Down Expand Up @@ -2027,11 +2022,8 @@ public void Bug453()
""",
Enumerable.Empty<string>(),
Enumerable.Empty<string>(),
dbModel =>
{
// Enum columns are left out of the model for now (a warning is logged).
Assert.Equal(1, dbModel.Tables.Single(t => t.Name == "foo").Columns.Count);
},
// Enum columns are left out of the model for now (a warning is logged).
dbModel => Assert.Single(dbModel.Tables.Single(t => t.Name == "foo").Columns),
"""
DROP TABLE bar;
DROP TABLE foo;
Expand Down
6 changes: 3 additions & 3 deletions test/EFCore.PG.Tests/Design/Internal/NpgsqlAnnotationCodeGeneratorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ public void GenerateFluentApi_value_generation()
var result = generator.GenerateFluentApiCalls(property, property.GetAnnotations().ToDictionary(a => a.Name, a => a))
.Single();
Assert.Equal(nameof(NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn), result.Method);
Assert.Equal(0, result.Arguments.Count);
Assert.Empty(result.Arguments);

property = entity.GetProperties().Single(p => p.Name == "IdentityAlways");
annotations = property.GetAnnotations().ToDictionary(a => a.Name, a => a);
generator.RemoveAnnotationsHandledByConventions(property, annotations);
Assert.Contains(annotations, kv => kv.Key == NpgsqlAnnotationNames.ValueGenerationStrategy);
result = generator.GenerateFluentApiCalls(property, annotations).Single();
Assert.Equal(nameof(NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn), result.Method);
Assert.Equal(0, result.Arguments.Count);
Assert.Empty(result.Arguments);

property = entity.GetProperties().Single(p => p.Name == "Serial");
annotations = property.GetAnnotations().ToDictionary(a => a.Name, a => a);
Expand All @@ -56,7 +56,7 @@ public void GenerateFluentApi_value_generation()
result = generator.GenerateFluentApiCalls(property, property.GetAnnotations().ToDictionary(a => a.Name, a => a))
.Single();
Assert.Equal(nameof(NpgsqlPropertyBuilderExtensions.UseSerialColumn), result.Method);
Assert.Equal(0, result.Arguments.Count);
Assert.Empty(result.Arguments);

property = entity.GetProperties().Single(p => p.Name == "None");
annotations = property.GetAnnotations().ToDictionary(a => a.Name, a => a);
Expand Down
Loading