Skip to content

Commit d091a40

Browse files
authored
Fix XUnit warnings (#214)
1 parent 1a9cd97 commit d091a40

File tree

4 files changed

+56
-56
lines changed

4 files changed

+56
-56
lines changed

AutoMapper.OData.EF6.Tests/GetQuerySelectTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public async void OpsTenantExpandBuildingsFilterEqAndOrderBy_FirstBuildingHasVal
7171

7272
void Test(ICollection<OpsTenant> collection)
7373
{
74-
Assert.Equal(1, collection.Count);
74+
Assert.Single(collection);
7575
Assert.Equal(2, collection.First().Buildings.Count);
7676
Assert.NotNull(collection.First().Buildings.First().Name);
7777
Assert.NotEqual(default, collection.First().Buildings.First().Identity);
@@ -90,7 +90,7 @@ public async void BuildingSelectNameExpandBuilder_BuilderNameShouldBeSam()
9090

9191
void Test(ICollection<CoreBuilding> collection)
9292
{
93-
Assert.Equal(1, collection.Count);
93+
Assert.Single(collection);
9494
Assert.Equal("Sam", collection.First().Builder.Name);
9595
Assert.Equal(default, collection.First().Builder.Id);
9696
Assert.Null(collection.First().Builder.City);
@@ -109,7 +109,7 @@ public async void BuildingExpandBuilderSelectNamefilterEqAndOrderBy()
109109

110110
void Test(ICollection<CoreBuilding> collection)
111111
{
112-
Assert.Equal(1, collection.Count);
112+
Assert.Single(collection);
113113
Assert.Equal("Sam", collection.First().Builder.Name);
114114
Assert.Equal(default, collection.First().Builder.Id);
115115
Assert.Null(collection.First().Builder.City);
@@ -128,7 +128,7 @@ public async void BuildingExpandBuilderSelectNameExpandCityFilterEqAndOrderBy_Ci
128128

129129
void Test(ICollection<CoreBuilding> collection)
130130
{
131-
Assert.Equal(1, collection.Count);
131+
Assert.Single(collection);
132132
Assert.Equal("Sam", collection.First().Builder.Name);
133133
Assert.Equal(default, collection.First().Builder.Id);
134134
Assert.Equal("London", collection.First().Builder.City.Name);

AutoMapper.OData.EF6.Tests/GetQueryTests.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public async void OpsTenantSearch()
6363

6464
void Test(ICollection<OpsTenant> collection)
6565
{
66-
Assert.Equal(1, collection.Count);
66+
Assert.Single(collection);
6767
Assert.Equal("One", collection.First().Name);
6868
}
6969
}
@@ -78,7 +78,7 @@ public async void OpsTenantSearchAndFilter()
7878

7979
void Test(ICollection<OpsTenant> collection)
8080
{
81-
Assert.Equal(0, collection.Count);
81+
Assert.Empty(collection);
8282
}
8383
}
8484

@@ -92,7 +92,7 @@ public async void OpsTenantExpandBuildingsFilterEqAndOrderBy()
9292

9393
void Test(ICollection<OpsTenant> collection)
9494
{
95-
Assert.Equal(1, collection.Count);
95+
Assert.Single(collection);
9696
Assert.Equal(2, collection.First().Buildings.Count);
9797
Assert.Equal("One", collection.First().Name);
9898
}
@@ -141,7 +141,7 @@ public async void OpsTenantExpandBuildingsFilterNeAndOrderBy()
141141

142142
void Test(ICollection<OpsTenant> collection)
143143
{
144-
Assert.Equal(1, collection.Count);
144+
Assert.Single(collection);
145145
Assert.Equal(3, collection.First().Buildings.Count);
146146
Assert.Equal("Two", collection.First().Name);
147147
}
@@ -157,7 +157,7 @@ public async void OpsTenantFilterEqNoExpand()
157157

158158
void Test(ICollection<OpsTenant> collection)
159159
{
160-
Assert.Equal(1, collection.Count);
160+
Assert.Single(collection);
161161
Assert.Null(collection.First().Buildings);
162162
Assert.Equal("One", collection.First().Name);
163163
}
@@ -189,7 +189,7 @@ public async void OpsTenantFilterLtDateNoExpand()
189189

190190
void Test(ICollection<OpsTenant> collection)
191191
{
192-
Assert.Equal(0, collection.Count);
192+
Assert.Empty(collection);
193193
}
194194
}
195195

@@ -235,7 +235,7 @@ public async void OpsTenantNoExpandFilterEqAndOrderBy()
235235

236236
void Test(ICollection<OpsTenant> collection)
237237
{
238-
Assert.Equal(1, collection.Count);
238+
Assert.Single(collection);
239239
Assert.Null(collection.First().Buildings);
240240
Assert.Equal("One", collection.First().Name);
241241
}
@@ -251,7 +251,7 @@ public async void OpsTenantExpandBuildingsSelectNameAndBuilderExpandBuilderExpan
251251

252252
void Test(ICollection<OpsTenant> collection)
253253
{
254-
Assert.Equal(1, collection.Count);
254+
Assert.Single(collection);
255255
Assert.Equal(3, collection.First().Buildings.Count);
256256
Assert.NotNull(collection.First().Buildings.First().Builder);
257257
Assert.NotNull(collection.First().Buildings.First().Builder.City);
@@ -270,7 +270,7 @@ public async void OpsTenantExpandBuildingsExpandBuilderExpandCityFilterNeAndOrde
270270

271271
void Test(ICollection<OpsTenant> collection)
272272
{
273-
Assert.Equal(1, collection.Count);
273+
Assert.Single(collection);
274274
Assert.Equal(3, collection.First().Buildings.Count);
275275
Assert.NotNull(collection.First().Buildings.First().Builder);
276276
Assert.NotNull(collection.First().Buildings.First().Builder.City);
@@ -334,7 +334,7 @@ await GetUsingCustomNameSpace<CoreBuilding, TBuilding>
334334

335335
void Test(ICollection<CoreBuilding> collection)
336336
{
337-
Assert.Equal(1, collection.Count);
337+
Assert.Single(collection);
338338
Assert.Equal("One L1", collection.First().Name);
339339
Assert.Equal(buildingParameterValue, collection.First().Parameter);
340340
Assert.Equal("Sam", collection.First().Builder.Name);
@@ -352,7 +352,7 @@ public async void BuildingExpandBuilderTenantFilterEqAndOrderBy()
352352

353353
void Test(ICollection<CoreBuilding> collection)
354354
{
355-
Assert.Equal(1, collection.Count);
355+
Assert.Single(collection);
356356
Assert.Equal("Sam", collection.First().Builder.Name);
357357
Assert.Equal("One", collection.First().Tenant.Name);
358358
Assert.Equal("One L1", collection.First().Name);
@@ -369,7 +369,7 @@ public async void BuildingExpandBuilderSelectNameExpandTenantFilterEqAndOrderBy(
369369

370370
void Test(ICollection<CoreBuilding> collection)
371371
{
372-
Assert.Equal(1, collection.Count);
372+
Assert.Single(collection);
373373
Assert.Equal("Sam", collection.First().Builder.Name);
374374
Assert.Equal("One", collection.First().Tenant.Name);
375375
Assert.Equal("One L1", collection.First().Name);
@@ -504,7 +504,7 @@ public async void BuildingExpandBuilderTenantExpandCityOrderByBuilderNameSkip3Ta
504504
void Test(ICollection<CoreBuilding> collection)
505505
{
506506
Assert.Equal(5, options.Request.ODataFeature().TotalCount);
507-
Assert.Equal(1, collection.Count);
507+
Assert.Single(collection);
508508
Assert.Equal("London", collection.First().Builder.City.Name);
509509
Assert.Equal("One L1", collection.First().Name);
510510
}
@@ -527,7 +527,7 @@ public async void BuildingExpandBuilderTenantExpandCityOrderByBuilderNameSkip3Ta
527527
void Test(ICollection<CoreBuilding> collection)
528528
{
529529
Assert.Null(options.Request.ODataFeature().TotalCount);
530-
Assert.Equal(1, collection.Count);
530+
Assert.Single(collection);
531531
Assert.Equal("London", collection.First().Builder.City.Name);
532532
Assert.Equal("One L1", collection.First().Name);
533533
}
@@ -1090,7 +1090,7 @@ await GetUsingCustomNameSpace<CategoryModel, Category>
10901090
static void Test(ICollection<CategoryModel> collection)
10911091
{
10921092
Assert.Equal(2, collection.Count);
1093-
Assert.Equal(1, collection.First().Products.Count);
1093+
Assert.Single(collection.First().Products);
10941094
Assert.Equal(2, collection.First().Products.First().AlternateAddresses.Count());
10951095
}
10961096
}
@@ -1142,9 +1142,9 @@ public async void SkipOnRootNoOrderByThenExpandAndSkipOnChildCollectionNoOrderBy
11421142

11431143
static void Test(ICollection<CategoryModel> collection)
11441144
{
1145-
Assert.Equal(1, collection.Count);
1145+
Assert.Single(collection);
11461146
Assert.Equal(2, collection.First().CategoryID);
1147-
Assert.Equal(1, collection.First().Products.Count);
1147+
Assert.Single(collection.First().Products);
11481148
Assert.Equal(5, collection.First().Products.First().ProductID);
11491149
Assert.Equal(2, collection.First().Products.First().AlternateAddresses.Length);
11501150
Assert.Equal(4, collection.First().Products.First().AlternateAddresses.First().AddressID);
@@ -1162,9 +1162,9 @@ public async void SkipOnRootNoOrderByThenExpandAndSkipOnChildCollectionNoOrderBy
11621162

11631163
static void Test(ICollection<CategoryModel> collection)
11641164
{
1165-
Assert.Equal(1, collection.Count);
1165+
Assert.Single(collection);
11661166
Assert.Equal(2, collection.First().CategoryID);
1167-
Assert.Equal(1, collection.First().Products.Count);
1167+
Assert.Single(collection.First().Products);
11681168
Assert.Equal(5, collection.First().Products.First().ProductID);
11691169
Assert.Equal(2, collection.First().Products.First().AlternateAddresses.Length);
11701170
Assert.Equal(4, collection.First().Products.First().AlternateAddresses.First().AddressID);
@@ -1184,7 +1184,7 @@ static void Test(ICollection<CategoryModel> collection)
11841184
{
11851185
Assert.Equal(2, collection.First().Products.First().ProductID);
11861186
Assert.Equal(3, collection.First().Products.Last().ProductID);
1187-
Assert.Equal(1, collection.Last().Products.Count);
1187+
Assert.Single(collection.Last().Products);
11881188
Assert.Equal(5, collection.Last().Products.First().ProductID);
11891189
}
11901190
}
@@ -1262,7 +1262,7 @@ public async void SkipOnRootNoOrderBy()
12621262

12631263
static void Test(ICollection<CategoryModel> collection)
12641264
{
1265-
Assert.Equal(1, collection.Count);
1265+
Assert.Single(collection);
12661266
Assert.Equal(2, collection.First().CategoryID);
12671267
}
12681268
}

AutoMapper.OData.EF6.Tests/GetTests.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public async void OpsTenantExpandBuildingsFilterEqAndOrderBy()
6363

6464
void Test(ICollection<OpsTenant> collection)
6565
{
66-
Assert.Equal(1, collection.Count);
66+
Assert.Single(collection);
6767
Assert.Equal(2, collection.First().Buildings.Count);
6868
Assert.Equal("One", collection.First().Name);
6969
}
@@ -79,7 +79,7 @@ public async void OpsTenantExpandBuildingsFilterNeAndOrderBy()
7979

8080
void Test(ICollection<OpsTenant> collection)
8181
{
82-
Assert.Equal(1, collection.Count);
82+
Assert.Single(collection);
8383
Assert.Equal(3, collection.First().Buildings.Count);
8484
Assert.Equal("Two", collection.First().Name);
8585
}
@@ -95,8 +95,8 @@ public async void OpsTenantFilterEqNoExpand()
9595

9696
void Test(ICollection<OpsTenant> collection)
9797
{
98-
Assert.Equal(1, collection.Count);
99-
Assert.Equal(0, collection.First().Buildings.Count);
98+
Assert.Single(collection);
99+
Assert.Empty(collection.First().Buildings);
100100
Assert.Equal("One", collection.First().Name);
101101
}
102102
}
@@ -128,7 +128,7 @@ public async void OpsTenantNoExpandNoFilterAndOrderBy()
128128
void Test(ICollection<OpsTenant> collection)
129129
{
130130
Assert.Equal(2, collection.Count);
131-
Assert.Equal(0, collection.First().Buildings.Count);
131+
Assert.Empty(collection.First().Buildings);
132132
Assert.Equal("Two", collection.First().Name);
133133
}
134134
}
@@ -143,8 +143,8 @@ public async void OpsTenantNoExpandFilterEqAndOrderBy()
143143

144144
void Test(ICollection<OpsTenant> collection)
145145
{
146-
Assert.Equal(1, collection.Count);
147-
Assert.Equal(0, collection.First().Buildings.Count);
146+
Assert.Single(collection);
147+
Assert.Empty(collection.First().Buildings);
148148
Assert.Equal("One", collection.First().Name);
149149
}
150150
}
@@ -159,7 +159,7 @@ public async void OpsTenantExpandBuildingsExpandBuilderExpandCityFilterNeAndOrde
159159

160160
void Test(ICollection<OpsTenant> collection)
161161
{
162-
Assert.Equal(1, collection.Count);
162+
Assert.Single(collection);
163163
Assert.Equal(3, collection.First().Buildings.Count);
164164
Assert.NotNull(collection.First().Buildings.First().Builder);
165165
Assert.NotNull(collection.First().Buildings.First().Builder.City);
@@ -177,7 +177,7 @@ public async void BuildingExpandBuilderTenantFilterEqAndOrderBy()
177177

178178
void Test(ICollection<CoreBuilding> collection)
179179
{
180-
Assert.Equal(1, collection.Count);
180+
Assert.Single(collection);
181181
Assert.Equal("Sam", collection.First().Builder.Name);
182182
Assert.Equal("One", collection.First().Tenant.Name);
183183
Assert.Equal("One L1", collection.First().Name);
@@ -312,7 +312,7 @@ public async void BuildingExpandBuilderTenantExpandCityOrderByBuilderNameSkip3Ta
312312
void Test(ICollection<CoreBuilding> collection)
313313
{
314314
Assert.Equal(5, options.Request.ODataFeature().TotalCount);
315-
Assert.Equal(1, collection.Count);
315+
Assert.Single(collection);
316316
Assert.Equal("London", collection.First().Builder.City.Name);
317317
Assert.Equal("One L1", collection.First().Name);
318318
}
@@ -335,7 +335,7 @@ public async void BuildingExpandBuilderTenantExpandCityOrderByBuilderNameSkip3Ta
335335
void Test(ICollection<CoreBuilding> collection)
336336
{
337337
Assert.Null(options.Request.ODataFeature().TotalCount);
338-
Assert.Equal(1, collection.Count);
338+
Assert.Single(collection);
339339
Assert.Equal("London", collection.First().Builder.City.Name);
340340
Assert.Equal("One L1", collection.First().Name);
341341
}

0 commit comments

Comments
 (0)