Skip to content

Commit e5f9fd5

Browse files
moozzykmoozzyk
committed
Fix xUnit warnings
1 parent ba23d53 commit e5f9fd5

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎test/CodeFirstStoreFunctionsTests/E2ETests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ FROM [dbo].[GetAirports_ComplexType](@CountryCode) AS [Extent1]
534534

535535
var result = query.ToList();
536536

537-
Assert.Equal(1, result.Count());
537+
Assert.Single(result);
538538
Assert.Equal("WRO", result[0].IATACode);
539539
Assert.Equal("WRO", result[0].CityCode);
540540
Assert.Equal("PL", result[0].CountryCode);
@@ -625,7 +625,7 @@ public void Can_invoke_TVF_returning_entities_of_non_base_type()
625625
{
626626
var aircraft = ctx.GetAircraft().ToList();
627627

628-
Assert.Equal(1, aircraft.Count);
628+
Assert.Single(aircraft);
629629
Assert.Equal("AT7", aircraft[0].Code);
630630
}
631631
}
@@ -647,7 +647,7 @@ public void Can_invoke_stored_proc_mapped_to_ComplexTypes()
647647
{
648648
var result = ctx.GetAirports_ComplexTypeSP("PL").ToList();
649649

650-
Assert.Equal(1, result.Count);
650+
Assert.Single(result);
651651
Assert.Equal("WRO", result[0].IATACode);
652652
}
653653
}
@@ -659,7 +659,7 @@ public void Can_invoke_stored_proc_mapped_to_EntitySet()
659659
{
660660
var result = ctx.GetAirportsSP("PL").ToList();
661661

662-
Assert.Equal(1, result.Count);
662+
Assert.Single(result);
663663
Assert.Equal("WRO", result[0].IATACode);
664664
}
665665
}
@@ -683,7 +683,7 @@ public void Can_invoke_sproc_returning_entities_of_non_base_type()
683683
{
684684
var aircraft = ctx.GetAircraftSP().ToList();
685685

686-
Assert.Equal(1, aircraft.Count);
686+
Assert.Single(aircraft);
687687
Assert.Equal("AT7", aircraft[0].Code);
688688
}
689689
}
@@ -715,7 +715,7 @@ public void Can_invoke_stored_proc_with_out_parameter()
715715
var airportTypeParameter = new ObjectParameter("AirportType", typeof (AirportType?));
716716
var results = ctx.GetAirportTypesWithOutputParameter(airportTypeParameter);
717717

718-
Assert.Equal(1, results.ToList().Count);
718+
Assert.Single(results.ToList());
719719
Assert.Equal(AirportType.International, airportTypeParameter.Value);
720720
}
721721
}

‎test/CodeFirstStoreFunctionsTests/FunctionDescriptorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void FunctionDescriptor_initialized_correctly()
2828
Assert.Equal(parameters, functionDescriptor.Parameters);
2929
Assert.Equal("result", functionDescriptor.ResultColumnName);
3030
Assert.Equal("dbo", functionDescriptor.DatabaseSchema);
31-
Assert.Equal(functionDescriptor.StoreFunctionKind, StoreFunctionKind.TableValuedFunction);
31+
Assert.Equal(StoreFunctionKind.TableValuedFunction, functionDescriptor.StoreFunctionKind);
3232
Assert.True(functionDescriptor.IsBuiltIn.Value);
3333
Assert.True(functionDescriptor.IsNiladic.Value);
3434
}

‎test/CodeFirstStoreFunctionsTests/FunctionDiscoveryTests.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public void FindFunctions_creates_function_descriptors_returning_primitive_types
236236
Assert.Equal("PrimitiveFunctionImportComposable", functionDescriptor.Name);
237237
Assert.Equal(2, functionDescriptor.Parameters.Count());
238238
Assert.Equal("Edm.Int32", functionDescriptor.ReturnTypes[0].FullName);
239-
Assert.Equal(functionDescriptor.StoreFunctionKind, StoreFunctionKind.TableValuedFunction);
239+
Assert.Equal(StoreFunctionKind.TableValuedFunction, functionDescriptor.StoreFunctionKind);
240240
}
241241

242242
[Fact]
@@ -256,9 +256,9 @@ public void FindFunctions_creates_function_private()
256256

257257
Assert.NotNull(functionDescriptor);
258258
Assert.Equal("PrivateFunction", functionDescriptor.Name);
259-
Assert.Equal(1, functionDescriptor.Parameters.Count());
259+
Assert.Single(functionDescriptor.Parameters);
260260
Assert.Equal("Edm.Int32", functionDescriptor.ReturnTypes[0].FullName);
261-
Assert.Equal(functionDescriptor.StoreFunctionKind, StoreFunctionKind.TableValuedFunction);
261+
Assert.Equal(StoreFunctionKind.TableValuedFunction, functionDescriptor.StoreFunctionKind);
262262
}
263263

264264
[Fact]
@@ -281,9 +281,9 @@ public void FindFunctions_creates_function_descriptors_returning_complex_types()
281281

282282
Assert.NotNull(functionDescriptor);
283283
Assert.Equal("FunctionImportReturningComplexTypesComposable", functionDescriptor.Name);
284-
Assert.Equal(0, functionDescriptor.Parameters.Count());
284+
Assert.Empty(functionDescriptor.Parameters);
285285
Assert.Equal("Model.TestComplexType", functionDescriptor.ReturnTypes[0].FullName);
286-
Assert.Equal(functionDescriptor.StoreFunctionKind, StoreFunctionKind.TableValuedFunction);
286+
Assert.Equal(StoreFunctionKind.TableValuedFunction, functionDescriptor.StoreFunctionKind);
287287
}
288288

289289
[Fact]
@@ -306,9 +306,9 @@ public void FindFunctions_creates_function_descriptors_taking_and_returning_null
306306

307307
Assert.NotNull(functionDescriptor);
308308
Assert.Equal("PrimitiveFunctionImportWithNullablePrimitiveTypes", functionDescriptor.Name);
309-
Assert.Equal(1, functionDescriptor.Parameters.Count());
309+
Assert.Single(functionDescriptor.Parameters);
310310
Assert.Equal("Edm.Int32", functionDescriptor.ReturnTypes[0].FullName);
311-
Assert.Equal(functionDescriptor.StoreFunctionKind, StoreFunctionKind.TableValuedFunction);
311+
Assert.Equal(StoreFunctionKind.TableValuedFunction, functionDescriptor.StoreFunctionKind);
312312
}
313313

314314
[Fact]
@@ -333,7 +333,7 @@ public void FindFunctions_creates_function_descriptors_returning_enum_types()
333333
Assert.Equal("EnumFunctionImportComposable", functionDescriptor.Name);
334334
Assert.Equal(2, functionDescriptor.Parameters.Count());
335335
Assert.Equal("Model.TestEnumType", functionDescriptor.ReturnTypes[0].FullName);
336-
Assert.Equal(functionDescriptor.StoreFunctionKind, StoreFunctionKind.TableValuedFunction);
336+
Assert.Equal(StoreFunctionKind.TableValuedFunction, functionDescriptor.StoreFunctionKind);
337337
}
338338

339339
[Fact]
@@ -356,9 +356,9 @@ public void FindFunctions_creates_function_descriptors_taking_and_returning_null
356356

357357
Assert.NotNull(functionDescriptor);
358358
Assert.Equal("EnumFunctionImportWithNullableEnums", functionDescriptor.Name);
359-
Assert.Equal(1, functionDescriptor.Parameters.Count());
359+
Assert.Single(functionDescriptor.Parameters);
360360
Assert.Equal("Model.TestEnumType", functionDescriptor.ReturnTypes[0].FullName);
361-
Assert.Equal(functionDescriptor.StoreFunctionKind, StoreFunctionKind.TableValuedFunction);
361+
Assert.Equal(StoreFunctionKind.TableValuedFunction, functionDescriptor.StoreFunctionKind);
362362
}
363363

364364
[Fact]
@@ -381,9 +381,9 @@ public void FindFunctions_creates_function_descriptors_for_functions_returning_c
381381

382382
Assert.NotNull(functionDescriptor);
383383
Assert.Equal("StoredProcToComplexTypes", functionDescriptor.Name);
384-
Assert.Equal(0, functionDescriptor.Parameters.Count());
384+
Assert.Empty(functionDescriptor.Parameters);
385385
Assert.Equal("Model.TestComplexType", functionDescriptor.ReturnTypes[0].FullName);
386-
Assert.Equal(functionDescriptor.StoreFunctionKind, StoreFunctionKind.StoredProcedure);
386+
Assert.Equal(StoreFunctionKind.StoredProcedure, functionDescriptor.StoreFunctionKind);
387387
}
388388

389389
[Fact]
@@ -496,11 +496,11 @@ public void FindFunctions_creates_function_descriptors_for_extension_methods()
496496

497497
Assert.NotNull(functionDescriptor);
498498
Assert.Equal("ExtensionMethod", functionDescriptor.Name);
499-
Assert.Equal(1, functionDescriptor.Parameters.Count());
499+
Assert.Single(functionDescriptor.Parameters);
500500
Assert.Equal("param", functionDescriptor.Parameters.First().Name);
501501
Assert.Equal("Edm.String", functionDescriptor.Parameters.First().EdmType.FullName);
502502
Assert.Equal("Edm.Int32", functionDescriptor.ReturnTypes[0].FullName);
503-
Assert.Equal(functionDescriptor.StoreFunctionKind, StoreFunctionKind.TableValuedFunction);
503+
Assert.Equal(StoreFunctionKind.TableValuedFunction, functionDescriptor.StoreFunctionKind);
504504
}
505505

506506
[Fact]
@@ -521,11 +521,11 @@ public void FindFunctions_creates_function_descriptors_for_static_methods()
521521

522522
Assert.NotNull(functionDescriptor);
523523
Assert.Equal("StaticMethod", functionDescriptor.Name);
524-
Assert.Equal(1, functionDescriptor.Parameters.Count());
524+
Assert.Single(functionDescriptor.Parameters);
525525
Assert.Equal("param", functionDescriptor.Parameters.First().Name);
526526
Assert.Equal("Edm.String", functionDescriptor.Parameters.First().EdmType.FullName);
527527
Assert.Equal("Edm.Int32", functionDescriptor.ReturnTypes[0].FullName);
528-
Assert.Equal(functionDescriptor.StoreFunctionKind, StoreFunctionKind.TableValuedFunction);
528+
Assert.Equal(StoreFunctionKind.TableValuedFunction, functionDescriptor.StoreFunctionKind);
529529
}
530530

531531
[Fact]
@@ -541,11 +541,11 @@ public void FindFunctions_creates_function_descriptors_for_primitive_udfs()
541541
.FindFunctions().SingleOrDefault();
542542

543543
Assert.NotNull(functionDescriptor);
544-
Assert.Equal(1, functionDescriptor.Parameters.Count());
544+
Assert.Single(functionDescriptor.Parameters);
545545
Assert.Equal("param", functionDescriptor.Parameters.First().Name);
546546
Assert.Equal("Edm.String", functionDescriptor.Parameters.First().EdmType.FullName);
547547
Assert.Equal("Edm.Int32", functionDescriptor.ReturnTypes[0].FullName);
548-
Assert.Equal(functionDescriptor.StoreFunctionKind, StoreFunctionKind.ScalarUserDefinedFunction);
548+
Assert.Equal(StoreFunctionKind.ScalarUserDefinedFunction, functionDescriptor.StoreFunctionKind);
549549
}
550550

551551
[Fact]
@@ -778,11 +778,11 @@ public void FindFunctions_creates_function_descriptors_for_built_in_function()
778778
.FindFunctions().SingleOrDefault();
779779

780780
Assert.NotNull(functionDescriptor);
781-
Assert.Equal(1, functionDescriptor.Parameters.Count());
781+
Assert.Single(functionDescriptor.Parameters);
782782
Assert.Equal("param", functionDescriptor.Parameters.First().Name);
783783
Assert.Equal("Edm.String", functionDescriptor.Parameters.First().EdmType.FullName);
784784
Assert.Equal("Edm.Int32", functionDescriptor.ReturnTypes[0].FullName);
785-
Assert.Equal(functionDescriptor.IsBuiltIn, true);
785+
Assert.True(functionDescriptor.IsBuiltIn);
786786
}
787787

788788
private static DbModel CreateModel()

‎test/CodeFirstStoreFunctionsTests/StoreFunctionBuilderTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ public void Crate_creates_store_function_for_primitive_function_import()
3838
var collectionItemType =
3939
(RowType)((CollectionType)storeFunction.ReturnParameter.TypeUsage.EdmType).TypeUsage.EdmType;
4040

41-
Assert.Equal(1, collectionItemType.Properties.Count);
41+
Assert.Single(collectionItemType.Properties);
4242
Assert.Equal("ResultCol", collectionItemType.Properties[0].Name);
4343
Assert.Equal("bigint", collectionItemType.Properties[0].TypeUsage.EdmType.Name);
4444

45-
Assert.Equal(1, storeFunction.Parameters.Count);
45+
Assert.Single(storeFunction.Parameters);
4646
Assert.Equal("p1", storeFunction.Parameters[0].Name);
4747
Assert.Equal("nvarchar(max)", storeFunction.Parameters[0].TypeName);
4848
Assert.Equal(ParameterMode.In, storeFunction.Parameters[0].Mode);
@@ -84,7 +84,7 @@ public void Crate_creates_store_function_for_complex_type_function_import()
8484

8585
Assert.Null(storeFunction.ReturnParameter);
8686

87-
Assert.Equal(1, storeFunction.Parameters.Count);
87+
Assert.Single(storeFunction.Parameters);
8888
Assert.Equal("p1", storeFunction.Parameters[0].Name);
8989
Assert.Equal("nvarchar(max)", storeFunction.Parameters[0].TypeName);
9090
Assert.Equal(ParameterMode.In, storeFunction.Parameters[0].Mode);
@@ -128,7 +128,7 @@ public void Crate_creates_store_function_for_complex_type_withEnum_in_TableValue
128128
BuiltInTypeKind.CollectionType,
129129
storeFunction.ReturnParameter.TypeUsage.EdmType.BuiltInTypeKind);
130130

131-
Assert.Equal(1, storeFunction.Parameters.Count);
131+
Assert.Single(storeFunction.Parameters);
132132
Assert.Equal("p1", storeFunction.Parameters[0].Name);
133133
Assert.Equal("nvarchar(max)", storeFunction.Parameters[0].TypeName);
134134
Assert.Equal(ParameterMode.In, storeFunction.Parameters[0].Mode);
@@ -166,11 +166,11 @@ public void Crate_creates_store_function_for_enum_type_function_import()
166166
var collectionItemType =
167167
(RowType)((CollectionType)storeFunction.ReturnParameter.TypeUsage.EdmType).TypeUsage.EdmType;
168168

169-
Assert.Equal(1, collectionItemType.Properties.Count);
169+
Assert.Single(collectionItemType.Properties);
170170
Assert.Equal("ResultCol", collectionItemType.Properties[0].Name);
171171
Assert.Equal("int", collectionItemType.Properties[0].TypeUsage.EdmType.Name);
172172

173-
Assert.Equal(1, storeFunction.Parameters.Count);
173+
Assert.Single(storeFunction.Parameters);
174174
Assert.Equal("p1", storeFunction.Parameters[0].Name);
175175
Assert.Equal("int", storeFunction.Parameters[0].TypeName);
176176
Assert.Equal(ParameterMode.In, storeFunction.Parameters[0].Mode);
@@ -195,7 +195,7 @@ public void Crate_can_create_out_params()
195195

196196
var storeFunction = new StoreFunctionBuilder(model, "docs", "ns").Create(functionDescriptor);
197197

198-
Assert.Equal(1, storeFunction.Parameters.Count);
198+
Assert.Single(storeFunction.Parameters);
199199
Assert.Equal("p1", storeFunction.Parameters[0].Name);
200200
Assert.Equal("nvarchar(max)", storeFunction.Parameters[0].TypeName);
201201
Assert.Equal(ParameterMode.InOut, storeFunction.Parameters[0].Mode);
@@ -239,7 +239,7 @@ public void Can_specify_store_type_for_parameters()
239239

240240
var storeFunction = new StoreFunctionBuilder(model, "docs", "ns").Create(functionDescriptor);
241241

242-
Assert.Equal(1, storeFunction.Parameters.Count);
242+
Assert.Single(storeFunction.Parameters);
243243
Assert.Equal("p1", storeFunction.Parameters[0].Name);
244244
Assert.Equal("xml", storeFunction.Parameters[0].TypeName);
245245
}

0 commit comments

Comments
 (0)