Skip to content

Commit

Permalink
Clean up usings and enhance player statistics tests
Browse files Browse the repository at this point in the history
Removed unused `using` directives from multiple files to reduce clutter.
Enhanced `GetPlayerStatisticsBySeasonAndFilterExpressionAsync` and
`GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync` method
calls in `StatisticsTests.cs` by adding parameters for better filtering
and sorting: `playerStatisticsFilterToSortBy`, `limit`, `offsetStart`,
and `gameType`.
  • Loading branch information
Afischbacher committed Nov 5, 2024
1 parent b2337a7 commit 0a851c7
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 26 deletions.
2 changes: 0 additions & 2 deletions Nhl.Api.Common/Http/NhlScoresHtmlReportsApiHttpClient.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using System;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;

namespace Nhl.Api.Common.Http;
/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion Nhl.Api.Domain/Models/Draft/PlayerDraftRanking.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Newtonsoft.Json;
using System.Collections.Generic;
using Newtonsoft.Json;

namespace Nhl.Api.Models.Draft;

Expand Down
5 changes: 2 additions & 3 deletions Nhl.Api.Domain/Services/NhlGameService.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text.RegularExpressions;
using System;
using System.Threading.Tasks;
using Nhl.Api.Common.Http;
using Nhl.Api.Models.Game;
using System.Linq;
using Nhl.Api.Models.Schedule;

namespace Nhl.Api.Services;

Expand Down
1 change: 0 additions & 1 deletion Nhl.Api.Domain/Services/NhlTeamService.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Nhl.Api.Common.Extensions;
Expand Down
2 changes: 0 additions & 2 deletions Nhl.Api.Tests/GameTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System.Linq;
using System.Text.RegularExpressions;
using Nhl.Api.Common.Http;

namespace Nhl.Api.Tests;

Expand Down
34 changes: 21 additions & 13 deletions Nhl.Api.Tests/StatisticsTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Collections.Concurrent;
using System.Linq;
using System.Security.AccessControl;
using System.Threading;
using Newtonsoft.Json;
using Nhl.Api.Enumerations.Game;
Expand Down Expand Up @@ -451,7 +450,8 @@ public async Task GetPlayerStatisticsBySeasonAndFilterAsync_Returns_Valid_Result

await using var nhlApi = new NhlApi();

var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression);
var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals,
limit: 5, offsetStart: 0, gameType: GameType.RegularSeason);

// Assert
Assert.IsNotNull(expression);
Expand Down Expand Up @@ -483,7 +483,8 @@ public async Task GetPlayerStatisticsBySeasonAndFilterAsync_Returns_Valid_Result
.Build();


var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season19992000, expression);
var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season19992000, expression, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals,
limit: 5, offsetStart: 0, gameType: GameType.RegularSeason);

// Assert
Assert.IsNotNull(expression);
Expand All @@ -507,7 +508,8 @@ public async Task GetPlayerStatisticsBySeasonAndFilterAsync_Returns_Valid_Result
// Act
var expression = expressionFilter.Build();

var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20102011, expression);
var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20102011, expression, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals,
limit: 5, offsetStart: 0, gameType: GameType.RegularSeason);

// Assert
Assert.IsNotNull(expression);
Expand Down Expand Up @@ -544,7 +546,8 @@ public async Task GetPlayerStatisticsBySeasonAndFilterAsync_Returns_Valid_Result
.Build();


var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression);
var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals,
limit: 5, offsetStart: 0, gameType: GameType.RegularSeason);

// Assert
Assert.IsNotNull(expression);
Expand Down Expand Up @@ -598,7 +601,8 @@ public async Task GetPlayerStatisticsBySeasonAndFilterAsync_Returns_Valid_Result
.EndGroup()
.Build();

var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression);
var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals,
limit: 5, offsetStart: 0, gameType: GameType.RegularSeason);

// Assert
Assert.IsNotNull(expression);
Expand Down Expand Up @@ -637,7 +641,8 @@ public async Task GetRealtimePlayerStatisticsBySeasonAndFilterAsync_Returns_Vali

await using var nhlApi = new NhlApi();

var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression);
var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, playerRealtimeStatisticsFilterToSortBy: PlayerRealtimeStatisticsFilter.MissedShotWideOfNet,
limit: 5, offsetStart: 0, gameType: GameType.RegularSeason);

// Assert
Assert.IsNotNull(expression);
Expand Down Expand Up @@ -670,7 +675,8 @@ public async Task GetRealtimePlayerStatisticsBySeasonAndFilterAsync_Returns_Vali
.Build();


var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20202021, expression);
var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20202021, expression, playerRealtimeStatisticsFilterToSortBy: PlayerRealtimeStatisticsFilter.EmptyNetAssists,
limit: 5, offsetStart: 0, gameType: GameType.RegularSeason);

// Assert
Assert.IsNotNull(expression);
Expand All @@ -694,7 +700,8 @@ public async Task GetRealtimePlayerStatisticsBySeasonAndFilterAsync_Returns_Vali
// Act
var expression = expressionFilter.Build();

var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20102011, expression);
var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20102011, expression, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals,
limit: 5, offsetStart: 0, gameType: GameType.RegularSeason);

// Assert
Assert.IsNotNull(expression);
Expand Down Expand Up @@ -734,7 +741,8 @@ public async Task GetRealtimePlayerStatisticsBySeasonAndFilterAsync_Returns_Vali
.Build();


var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression);
var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, playerRealtimeStatisticsFilterToSortBy: PlayerRealtimeStatisticsFilter.TakeawaysPer60,
limit: 5, offsetStart: 0, gameType: GameType.RegularSeason);

// Assert
Assert.IsNotNull(expression);
Expand Down Expand Up @@ -789,7 +797,7 @@ public async Task GetRealtimePlayerStatisticsBySeasonAndFilterAsync_Returns_Vali
.EndGroup()
.Build();

var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression);
var result = await nhlApi.GetRealtimePlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, playerRealtimeStatisticsFilterToSortBy: PlayerRealtimeStatisticsFilter.TakeawaysPer60, limit: 50, offsetStart: 0, gameType: GameType.RegularSeason);

// Assert
Assert.IsNotNull(expression);
Expand All @@ -815,7 +823,7 @@ public async Task GetGoalieStatisticsBySeasonAndFilterAsync_Returns_Valid_Result
await using var nhlApi = new NhlApi();

// Act
var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, ExpressionPlayerFilter.Empty);
var result = await nhlApi.GetPlayerStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, ExpressionPlayerFilter.Empty, playerStatisticsFilterToSortBy: PlayerStatisticsFilter.Goals, limit: 5, offsetStart: 0, gameType: GameType.RegularSeason);

// Assert
Assert.IsNotNull(result);
Expand All @@ -838,7 +846,7 @@ public async Task GetGoalieStatisticsBySeasonAndFilterAsync_Returns_Valid_Result
.LessThanOrEqualTo(3.15)
.Build();

var result = await nhlApi.GetGoalieStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression);
var result = await nhlApi.GetGoalieStatisticsBySeasonAndFilterExpressionAsync(SeasonYear.season20232024, expression, goalieStatisticsFilterToSortBy: GoalieStatisticsFilter.Wins, limit: 5, offsetStart: 0, gameType: GameType.RegularSeason);

// Assert
Assert.IsNotNull(expression);
Expand Down
4 changes: 0 additions & 4 deletions Nhl.Api/Src/GameApi/NhlGameApi.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
using System.Globalization;
using System.Text.RegularExpressions;
using Nhl.Api.Common.Http;
using Nhl.Api.Models.Game;
using Nhl.Api.Services;

namespace Nhl.Api;
Expand Down

0 comments on commit 0a851c7

Please sign in to comment.