From 9c3502afb421e60c1b5b14bb5666ccc3b8a63c3e Mon Sep 17 00:00:00 2001 From: Dave Walker Date: Fri, 16 Sep 2022 16:06:05 +0100 Subject: [PATCH] SonarCloud fixups (phase 3) --- src/FlightRecorder.Tests/AircraftManagerTest.cs | 8 ++++---- src/FlightRecorder.Tests/AirlineManagerTest.cs | 4 ++-- src/FlightRecorder.Tests/FlightManagerTest.cs | 6 +++--- src/FlightRecorder.Tests/LocationManagerTest.cs | 4 ++-- src/FlightRecorder.Tests/ManufacturerTest.cs | 4 ++-- src/FlightRecorder.Tests/ModelManagerTest.cs | 6 +++--- src/FlightRecorder.Tests/SightingManagerTest.cs | 8 ++++---- src/FlightRecorder.Tests/UserManagerTest.cs | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/FlightRecorder.Tests/AircraftManagerTest.cs b/src/FlightRecorder.Tests/AircraftManagerTest.cs index f764955..77b6374 100644 --- a/src/FlightRecorder.Tests/AircraftManagerTest.cs +++ b/src/FlightRecorder.Tests/AircraftManagerTest.cs @@ -94,7 +94,7 @@ public async Task ListAllAsyncTest() List 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 = 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 matches = await _factory.Aircraft .ListByModelAsync(ModelName, 1, 100); List 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 matches = await _factory.Aircraft .ListByManufacturerAsync(ManufacturerName, 1, 100); List 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 index d2752fb..6894726 100644 --- a/src/FlightRecorder.Tests/AirlineManagerTest.cs +++ b/src/FlightRecorder.Tests/AirlineManagerTest.cs @@ -72,7 +72,7 @@ public async Task ListAllAsyncTest() List 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 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 index bb0a950..84ee04d 100644 --- a/src/FlightRecorder.Tests/FlightManagerTest.cs +++ b/src/FlightRecorder.Tests/FlightManagerTest.cs @@ -92,7 +92,7 @@ public async Task ListAllAsyncTest() List 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 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 matches = await _factory.Flights .ListByAirlineAsync(AirlineName, 1, 100); List 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 index 296ea30..31cb255 100644 --- a/src/FlightRecorder.Tests/LocationManagerTest.cs +++ b/src/FlightRecorder.Tests/LocationManagerTest.cs @@ -71,7 +71,7 @@ public async Task ListAllAsyncTest() List 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 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 index 889e737..3116cb4 100644 --- a/src/FlightRecorder.Tests/ManufacturerTest.cs +++ b/src/FlightRecorder.Tests/ManufacturerTest.cs @@ -75,7 +75,7 @@ public async Task ListAllAsyncTest() List 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 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 index 460e39e..0494090 100644 --- a/src/FlightRecorder.Tests/ModelManagerTest.cs +++ b/src/FlightRecorder.Tests/ModelManagerTest.cs @@ -84,7 +84,7 @@ public async Task ListAllAsyncTest() List 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 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 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 index 28be0a3..27d7025 100644 --- a/src/FlightRecorder.Tests/SightingManagerTest.cs +++ b/src/FlightRecorder.Tests/SightingManagerTest.cs @@ -141,7 +141,7 @@ public async Task ListAllAsyncTest() List 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 matches = await _factory.Sightings .ListByAircraftAsync(Registration, 1, 100); List 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 matches = await _factory.Sightings .ListByRouteAsync(Embarkation, Destination, 1, 100); List 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 matches = await _factory.Sightings .ListByAirlineAsync(AirlineName, 1, 100); List 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 index 006c122..ca44704 100644 --- a/src/FlightRecorder.Tests/UserManagerTest.cs +++ b/src/FlightRecorder.Tests/UserManagerTest.cs @@ -110,7 +110,7 @@ public void GetAllUsersTest() public async Task GetAllUsersAsyncTest() { List 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); }