Skip to content

Commit 1d6d841

Browse files
rojiroji
committed
Tiny test tweaks
1 parent 6f18809 commit 1d6d841

File tree

3 files changed

+17
-25
lines changed

3 files changed

+17
-25
lines changed

‎test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,7 +1994,7 @@ await Test(
19941994
{
19951995
var table = Assert.Single(model.Tables);
19961996
var index = Assert.Single(table.Indexes);
1997-
Assert.Equal(1, index.Columns.Count);
1997+
Assert.Single(index.Columns);
19981998
Assert.Contains(table.Columns.Single(c => c.Name == "Name"), index.Columns);
19991999

20002000
// Scaffolding included/covered properties is currently blocked, see #2194
@@ -2038,7 +2038,7 @@ await Test(
20382038
var table = Assert.Single(model.Tables);
20392039
var index = Assert.Single(table.Indexes);
20402040
Assert.Equal(@"(""Name"" IS NOT NULL)", index.Filter);
2041-
Assert.Equal(1, index.Columns.Count);
2041+
Assert.Single(index.Columns);
20422042
Assert.Contains(table.Columns.Single(c => c.Name == "Name"), index.Columns);
20432043

20442044
// Scaffolding included/covered properties is currently blocked, see #2194
@@ -2082,7 +2082,7 @@ await Test(
20822082
var table = Assert.Single(model.Tables);
20832083
var index = Assert.Single(table.Indexes);
20842084
Assert.True(index.IsUnique);
2085-
Assert.Equal(1, index.Columns.Count);
2085+
Assert.Single(index.Columns);
20862086
Assert.Contains(table.Columns.Single(c => c.Name == "Name"), index.Columns);
20872087

20882088
// Scaffolding included/covered properties is currently blocked, see #2194
@@ -2128,7 +2128,7 @@ await Test(
21282128
var index = Assert.Single(table.Indexes);
21292129
Assert.True(index.IsUnique);
21302130
Assert.Equal(@"(""Name"" IS NOT NULL)", index.Filter);
2131-
Assert.Equal(1, index.Columns.Count);
2131+
Assert.Single(index.Columns);
21322132
Assert.Contains(table.Columns.Single(c => c.Name == "Name"), index.Columns);
21332133

21342134
// Scaffolding included/covered properties is currently blocked, see #2194

‎test/EFCore.PG.FunctionalTests/Scaffolding/NpgsqlDatabaseModelFactoryTest.cs‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public void Filter_schemas()
186186
// ReSharper disable once PossibleNullReferenceException
187187
Assert.Equal("K2", table.Name);
188188
Assert.Equal(2, table.Columns.Count);
189-
Assert.Equal(1, table.UniqueConstraints.Count);
189+
Assert.Single(table.UniqueConstraints);
190190
Assert.Empty(table.ForeignKeys);
191191
},
192192
"""
@@ -209,7 +209,7 @@ public void Filter_tables()
209209
// ReSharper disable once PossibleNullReferenceException
210210
Assert.Equal("K2", table.Name);
211211
Assert.Equal(2, table.Columns.Count);
212-
Assert.Equal(1, table.UniqueConstraints.Count);
212+
Assert.Single(table.UniqueConstraints);
213213
Assert.Empty(table.ForeignKeys);
214214
},
215215
"""
@@ -232,7 +232,7 @@ public void Filter_tables_with_qualified_name()
232232
// ReSharper disable once PossibleNullReferenceException
233233
Assert.Equal("K.2", table.Name);
234234
Assert.Equal(2, table.Columns.Count);
235-
Assert.Equal(1, table.UniqueConstraints.Count);
235+
Assert.Single(table.UniqueConstraints);
236236
Assert.Empty(table.ForeignKeys);
237237
},
238238
"""
@@ -256,7 +256,7 @@ public void Filter_tables_with_schema_qualified_name1()
256256
// ReSharper disable once PossibleNullReferenceException
257257
Assert.Equal("K2", table.Name);
258258
Assert.Equal(2, table.Columns.Count);
259-
Assert.Equal(1, table.UniqueConstraints.Count);
259+
Assert.Single(table.UniqueConstraints);
260260
Assert.Empty(table.ForeignKeys);
261261
},
262262
"""
@@ -281,7 +281,7 @@ public void Filter_tables_with_schema_qualified_name2()
281281
// ReSharper disable once PossibleNullReferenceException
282282
Assert.Equal("K.2", table.Name);
283283
Assert.Equal(2, table.Columns.Count);
284-
Assert.Equal(1, table.UniqueConstraints.Count);
284+
Assert.Single(table.UniqueConstraints);
285285
Assert.Empty(table.ForeignKeys);
286286
},
287287
"""
@@ -306,7 +306,7 @@ public void Filter_tables_with_schema_qualified_name3()
306306
// ReSharper disable once PossibleNullReferenceException
307307
Assert.Equal("K.2", table.Name);
308308
Assert.Equal(2, table.Columns.Count);
309-
Assert.Equal(1, table.UniqueConstraints.Count);
309+
Assert.Single(table.UniqueConstraints);
310310
Assert.Empty(table.ForeignKeys);
311311
},
312312
"""
@@ -331,7 +331,7 @@ public void Filter_tables_with_schema_qualified_name4()
331331
// ReSharper disable once PossibleNullReferenceException
332332
Assert.Equal("K2", table.Name);
333333
Assert.Equal(2, table.Columns.Count);
334-
Assert.Equal(1, table.UniqueConstraints.Count);
334+
Assert.Single(table.UniqueConstraints);
335335
Assert.Empty(table.ForeignKeys);
336336
},
337337
"""
@@ -1060,12 +1060,7 @@ CREATE TABLE "SystemColumnsTable"
10601060
""",
10611061
Enumerable.Empty<string>(),
10621062
Enumerable.Empty<string>(),
1063-
dbModel =>
1064-
{
1065-
var columns = dbModel.Tables.Single().Columns;
1066-
1067-
Assert.Equal(1, columns.Count);
1068-
},
1063+
dbModel => Assert.Single(dbModel.Tables.Single().Columns),
10691064
@"DROP TABLE ""SystemColumnsTable""");
10701065

10711066
#endregion
@@ -2027,11 +2022,8 @@ public void Bug453()
20272022
""",
20282023
Enumerable.Empty<string>(),
20292024
Enumerable.Empty<string>(),
2030-
dbModel =>
2031-
{
2032-
// Enum columns are left out of the model for now (a warning is logged).
2033-
Assert.Equal(1, dbModel.Tables.Single(t => t.Name == "foo").Columns.Count);
2034-
},
2025+
// Enum columns are left out of the model for now (a warning is logged).
2026+
dbModel => Assert.Single(dbModel.Tables.Single(t => t.Name == "foo").Columns),
20352027
"""
20362028
DROP TABLE bar;
20372029
DROP TABLE foo;

‎test/EFCore.PG.Tests/Design/Internal/NpgsqlAnnotationCodeGeneratorTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ public void GenerateFluentApi_value_generation()
3939
var result = generator.GenerateFluentApiCalls(property, property.GetAnnotations().ToDictionary(a => a.Name, a => a))
4040
.Single();
4141
Assert.Equal(nameof(NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn), result.Method);
42-
Assert.Equal(0, result.Arguments.Count);
42+
Assert.Empty(result.Arguments);
4343

4444
property = entity.GetProperties().Single(p => p.Name == "IdentityAlways");
4545
annotations = property.GetAnnotations().ToDictionary(a => a.Name, a => a);
4646
generator.RemoveAnnotationsHandledByConventions(property, annotations);
4747
Assert.Contains(annotations, kv => kv.Key == NpgsqlAnnotationNames.ValueGenerationStrategy);
4848
result = generator.GenerateFluentApiCalls(property, annotations).Single();
4949
Assert.Equal(nameof(NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn), result.Method);
50-
Assert.Equal(0, result.Arguments.Count);
50+
Assert.Empty(result.Arguments);
5151

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

6161
property = entity.GetProperties().Single(p => p.Name == "None");
6262
annotations = property.GetAnnotations().ToDictionary(a => a.Name, a => a);

0 commit comments

Comments
 (0)