martials/pac-man-board-game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed test, deprecated method, and changes it's uses

Browse Source
This commit is contained in:
martin 2023-07-31 22:19:55 +02:00
parent dd6b493830
commit 89d2935323
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BackendTests/Services/ActionServiceTests.cs
View File

@ -148,8 +148,9 @@ public class ActionServiceTests
[Test] [Test]
public void Ready_NotAllReady() public void Ready_NotAllReady()
{ {
var game = _gameService.CreateAndJoin(_whitePlayer, _spawns);
_gameService.JoinById(game.Id, _blackPlayer);
_service.SetPlayerInfo(_whiteMessage.Data); _service.SetPlayerInfo(_whiteMessage.Data);
_service.SetPlayerInfo(_blackMessage.Data);
var result = _service.Ready(); var result = _service.Ready();
if (result is ReadyData r1) if (result is ReadyData r1)
@ -157,6 +158,7 @@ public class ActionServiceTests
else else
Assert.Fail("Result should be ReadyData"); Assert.Fail("Result should be ReadyData");
_gameService.JoinById(game.Id, _redPlayer);
_service.SetPlayerInfo(_redMessage.Data); _service.SetPlayerInfo(_redMessage.Data);
result = _service.Ready(); result = _service.Ready();

5
pac-man-board-game/ClientApp/package.json
View File

@ -43,11 +43,6 @@
"test": "cross-env CI=true vitest", "test": "cross-env CI=true vitest",
"coverage": "vitest run --coverage" "coverage": "vitest run --coverage"
}, },
"eslintConfig": {
"extends": [
"react-app"
]
},
"browserslist": { "browserslist": {
"production": [ "production": [
">0.2%", ">0.2%",

2
pac-man-board-game/Controllers/GameController.cs
View File

@ -32,7 +32,7 @@ public class GameController : GenericController
return _gameService.Games; return _gameService.Games;
} }
[HttpPost("join/{gameId}")] [HttpPost("join/{gameId:guid}")]
public IActionResult JoinGame(Guid gameId, [FromBody] Player player) // TODO what if player is in a game already? public IActionResult JoinGame(Guid gameId, [FromBody] Player player) // TODO what if player is in a game already?
{ {
Logger.Log(LogLevel.Debug, "Joining game {}", gameId); Logger.Log(LogLevel.Debug, "Joining game {}", gameId);

4
pac-man-board-game/Services/ActionService.cs
View File

@ -75,7 +75,7 @@ public class ActionService : IActionService
return jsonElement; return jsonElement;
} }
public List<Player> SetPlayerInfo(JsonElement? jsonElement) // TODO split up into two actions public List<Player> SetPlayerInfo(JsonElement? jsonElement) // TODO split up into two actions, join and create
{ {
var data = jsonElement?.Deserialize<PlayerInfoData>() ?? throw new NullReferenceException("Data is null"); var data = jsonElement?.Deserialize<PlayerInfoData>() ?? throw new NullReferenceException("Data is null");
Player = data.Player; Player = data.Player;
@ -93,7 +93,7 @@ public class ActionService : IActionService
} }
else else
{ {
Game = _gameService.AddPlayer(Player, data.Spawns); Game = _gameService.CreateAndJoin(Player, data.Spawns);
} }
Game.Connections += SendSegment; Game.Connections += SendSegment;

1
pac-man-board-game/Services/GameService.cs
View File

@ -19,6 +19,7 @@ public class GameService : WebSocketService
/// </summary> /// </summary>
public SynchronizedCollection<Game> Games { get; } = new(); public SynchronizedCollection<Game> Games { get; } = new();
[Obsolete("Use CreateAndJoin instead")]
public Game AddPlayer(Player player, Queue<DirectionalPosition> spawns) public Game AddPlayer(Player player, Queue<DirectionalPosition> spawns)
{ {
var index = 0; var index = 0;