SonarCloud fixups (phase 3)

davewalker5 · Sep 16, 2022 · 9c3502a · 9c3502a
1 parent bec012d
commit 9c3502a
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/src/FlightRecorder.Tests/AircraftManagerTest.cs b/src/FlightRecorder.Tests/AircraftManagerTest.cs
@@ -94,7 +94,7 @@ public async Task ListAllAsyncTest()
             List<Aircraft> aircraft = await _factory.Aircraft
                                                     .ListAsync(null, 1, 100)
                                                     .ToListAsync();
-            Assert.AreEqual(1, aircraft.Count());
+            Assert.AreEqual(1, aircraft.Count);
             Assert.AreEqual(Registration, aircraft.First().Registration);
             Assert.AreEqual(ModelName, aircraft.First().Model.Name);
             Assert.AreEqual(ManufacturerName, aircraft.First().Model.Manufacturer.Name);
@@ -116,7 +116,7 @@ public async Task FilteredListAsyncTest()
             List<Aircraft> aircraft = await _factory.Aircraft
                                                     .ListAsync(e => e.Registration == Registration, 1, 100)
                                                     .ToListAsync();
-            Assert.AreEqual(1, aircraft.Count());
+            Assert.AreEqual(1, aircraft.Count);
             Assert.AreEqual(Registration, aircraft.First().Registration);
             Assert.AreEqual(ModelName, aircraft.First().Model.Name);
             Assert.AreEqual(ManufacturerName, aircraft.First().Model.Manufacturer.Name);
@@ -138,7 +138,7 @@ public async Task FilterByModelAsyncTest()
             IAsyncEnumerable<Aircraft> matches = await _factory.Aircraft
                                                                .ListByModelAsync(ModelName, 1, 100);
             List<Aircraft> aircraft = await matches.ToListAsync();
-            Assert.AreEqual(1, aircraft.Count());
+            Assert.AreEqual(1, aircraft.Count);
             Assert.AreEqual(Registration, aircraft.First().Registration);
             Assert.AreEqual(ModelName, aircraft.First().Model.Name);
             Assert.AreEqual(ManufacturerName, aircraft.First().Model.Manufacturer.Name);
@@ -160,7 +160,7 @@ public async Task FilterByManufacturerAsyncTest()
             IAsyncEnumerable<Aircraft> matches = await _factory.Aircraft
                                                                .ListByManufacturerAsync(ManufacturerName, 1, 100);
             List<Aircraft> aircraft = await matches.ToListAsync();
-            Assert.AreEqual(1, aircraft.Count());
+            Assert.AreEqual(1, aircraft.Count);
             Assert.AreEqual(Registration, aircraft.First().Registration);
             Assert.AreEqual(ModelName, aircraft.First().Model.Name);
             Assert.AreEqual(ManufacturerName, aircraft.First().Model.Manufacturer.Name);

diff --git a/src/FlightRecorder.Tests/AirlineManagerTest.cs b/src/FlightRecorder.Tests/AirlineManagerTest.cs
@@ -72,7 +72,7 @@ public async Task ListAllAsyncTest()
             List<Airline> entities = await _factory.Airlines
                                                    .ListAsync(null, 1, 100)
                                                    .ToListAsync();
-            Assert.AreEqual(1, entities.Count());
+            Assert.AreEqual(1, entities.Count);
             Assert.AreEqual(EntityName, entities.First().Name);
         }
 
@@ -90,7 +90,7 @@ public async Task FilteredListAsyncTest()
             List<Airline> entities = await _factory.Airlines
                                                    .ListAsync(e => e.Name == EntityName, 1, 100)
                                                    .ToListAsync();
-            Assert.AreEqual(1, entities.Count());
+            Assert.AreEqual(1, entities.Count);
             Assert.AreEqual(EntityName, entities.First().Name);
         }
 

diff --git a/src/FlightRecorder.Tests/FlightManagerTest.cs b/src/FlightRecorder.Tests/FlightManagerTest.cs
@@ -92,7 +92,7 @@ public async Task ListAllAsyncTest()
             List<Flight> flights = await _factory.Flights
                                                  .ListAsync(null, 1, 100)
                                                  .ToListAsync();
-            Assert.AreEqual(1, flights.Count());
+            Assert.AreEqual(1, flights.Count);
             Assert.AreEqual(FlightNumber, flights.First().Number);
             Assert.AreEqual(AirlineName, flights.First().Airline.Name);
         }
@@ -112,7 +112,7 @@ public async Task FilteredListAsyncTest()
             List<Flight> flights = await _factory.Flights
                                                  .ListAsync(e => e.Number == FlightNumber, 1, 100)
                                                  .ToListAsync();
-            Assert.AreEqual(1, flights.Count());
+            Assert.AreEqual(1, flights.Count);
             Assert.AreEqual(FlightNumber, flights.First().Number);
             Assert.AreEqual(AirlineName, flights.First().Airline.Name);
         }
@@ -139,7 +139,7 @@ public async Task ListByAirlineAsyncTest()
             IAsyncEnumerable<Flight> matches = await _factory.Flights
                                                              .ListByAirlineAsync(AirlineName, 1, 100);
             List<Flight> flights = await matches.ToListAsync();
-            Assert.AreEqual(1, flights.Count());
+            Assert.AreEqual(1, flights.Count);
             Assert.AreEqual(FlightNumber, flights.First().Number);
             Assert.AreEqual(AirlineName, flights.First().Airline.Name);
         }

diff --git a/src/FlightRecorder.Tests/LocationManagerTest.cs b/src/FlightRecorder.Tests/LocationManagerTest.cs
@@ -71,7 +71,7 @@ public async Task ListAllAsyncTest()
             List<Location> entities = await _factory.Locations
                                                     .ListAsync(null, 1, 100)
                                                     .ToListAsync();
-            Assert.AreEqual(1, entities.Count());
+            Assert.AreEqual(1, entities.Count);
             Assert.AreEqual(EntityName, entities.First().Name);
         }
 
@@ -89,7 +89,7 @@ public async Task FilteredListAsyncTest()
             List<Location> entities = await _factory.Locations
                                                     .ListAsync(e => e.Name == EntityName, 1, 100)
                                                     .ToListAsync();
-            Assert.AreEqual(1, entities.Count());
+            Assert.AreEqual(1, entities.Count);
             Assert.AreEqual(EntityName, entities.First().Name);
         }
 

diff --git a/src/FlightRecorder.Tests/ManufacturerTest.cs b/src/FlightRecorder.Tests/ManufacturerTest.cs
@@ -75,7 +75,7 @@ public async Task ListAllAsyncTest()
             List<Manufacturer> entities = await _factory.Manufacturers
                                                         .ListAsync(null, 1, 100)
                                                         .ToListAsync();
-            Assert.AreEqual(1, entities.Count());
+            Assert.AreEqual(1, entities.Count);
             Assert.AreEqual(EntityName, entities.First().Name);
         }
 
@@ -94,7 +94,7 @@ public async Task FilteredListAsyncTest()
             List<Manufacturer> entities = await _factory.Manufacturers
                                                         .ListAsync(e => e.Name == EntityName, 1, 100)
                                                         .ToListAsync();
-            Assert.AreEqual(1, entities.Count());
+            Assert.AreEqual(1, entities.Count);
             Assert.AreEqual(EntityName, entities.First().Name);
         }
 

diff --git a/src/FlightRecorder.Tests/ModelManagerTest.cs b/src/FlightRecorder.Tests/ModelManagerTest.cs
@@ -84,7 +84,7 @@ public async Task ListAllAsyncTest()
             List<Model> models = await _factory.Models
                                                .ListAsync(null, 1, 100)
                                                .ToListAsync();
-            Assert.AreEqual(1, models.Count());
+            Assert.AreEqual(1, models.Count);
             Assert.AreEqual(ModelName, models.First().Name);
             Assert.AreEqual(ManufacturerName, models.First().Manufacturer.Name);
         }
@@ -105,7 +105,7 @@ public async Task FilteredListAsyncTest()
             List<Model> models = await _factory.Models
                                                .ListAsync(e => e.Name == ModelName, 1, 100)
                                                .ToListAsync();
-            Assert.AreEqual(1, models.Count());
+            Assert.AreEqual(1, models.Count);
             Assert.AreEqual(ModelName, models.First().Name);
             Assert.AreEqual(ManufacturerName, models.First().Manufacturer.Name);
         }
@@ -132,7 +132,7 @@ public async Task ListByManufacturerAsyncTest()
             List<Model> models = await _factory.Models
                                                .ListByManufacturerAsync(ManufacturerName, 1, 100)
                                                .ToListAsync();
-            Assert.AreEqual(1, models.Count());
+            Assert.AreEqual(1, models.Count);
             Assert.AreEqual(ModelName, models.First().Name);
             Assert.AreEqual(ManufacturerName, models.First().Manufacturer.Name);
         }

diff --git a/src/FlightRecorder.Tests/SightingManagerTest.cs b/src/FlightRecorder.Tests/SightingManagerTest.cs
@@ -141,7 +141,7 @@ public async Task ListAllAsyncTest()
             List<Sighting> sightings = await _factory.Sightings
                                                      .ListAsync(null, 1, 100)
                                                      .ToListAsync();
-            Assert.AreEqual(1, sightings.Count());
+            Assert.AreEqual(1, sightings.Count);
             Assert.AreEqual(_sightingId, sightings.First().Id);
         }
 
@@ -159,7 +159,7 @@ public async Task ListByAircraftAsyncTest()
             IAsyncEnumerable<Sighting> matches = await _factory.Sightings
                                                                .ListByAircraftAsync(Registration, 1, 100);
             List<Sighting> sightings = await matches.ToListAsync();
-            Assert.AreEqual(1, sightings.Count());
+            Assert.AreEqual(1, sightings.Count);
             Assert.AreEqual(_sightingId, sightings.First().Id);
         }
 
@@ -192,7 +192,7 @@ public async Task ListByRouteAsyncTest()
             IAsyncEnumerable<Sighting> matches = await _factory.Sightings
                                                                .ListByRouteAsync(Embarkation, Destination, 1, 100);
             List<Sighting> sightings = await matches.ToListAsync();
-            Assert.AreEqual(1, sightings.Count());
+            Assert.AreEqual(1, sightings.Count);
             Assert.AreEqual(_sightingId, sightings.First().Id);
         }
 
@@ -225,7 +225,7 @@ public async Task ListByAirlineAsyncTest()
             IAsyncEnumerable<Sighting> matches = await _factory.Sightings
                                                                .ListByAirlineAsync(AirlineName, 1, 100);
             List<Sighting> sightings = await matches.ToListAsync();
-            Assert.AreEqual(1, sightings.Count());
+            Assert.AreEqual(1, sightings.Count);
             Assert.AreEqual(_sightingId, sightings.First().Id);
         }
 

diff --git a/src/FlightRecorder.Tests/UserManagerTest.cs b/src/FlightRecorder.Tests/UserManagerTest.cs
@@ -110,7 +110,7 @@ public void GetAllUsersTest()
         public async Task GetAllUsersAsyncTest()
         {
             List<User> users = await _factory.Users.GetUsersAsync().ToListAsync();
-            Assert.AreEqual(1, users.Count());
+            Assert.AreEqual(1, users.Count);
             Assert.AreEqual(UserName, _factory.Context.Users.First().UserName);
             Assert.AreNotEqual(Password, _factory.Context.Users.First().Password);
         }