fix(tests): up-to-date

Author: emptybutton

tests/test_ttt/test_entities/test_core/conftest.py

@@ -3,7 +3,6 @@
 from pytest import fixture
 
 from ttt.entities.core.user.account import Account
-from ttt.entities.core.user.location import UserGameLocation
 from ttt.entities.core.user.user import User
 from ttt.entities.math.random import Random
 from ttt.entities.text.emoji import Emoji
@@ -28,7 +27,7 @@ def user1() -> User:
         emojis=[],
         selected_emoji_id=None,
         rating=1000.,
-        game_location=UserGameLocation(1, UUID(int=0)),
+        current_game_id=UUID(int=0),
         admin_right=None,
     )
 
@@ -41,7 +40,7 @@ def user2() -> User:
         emojis=[],
         rating=1000.,
         selected_emoji_id=None,
-        game_location=UserGameLocation(2, UUID(int=0)),
+        current_game_id=UUID(int=0),
         admin_right=None,
     )
 

tests/test_ttt/test_entities/test_core/test_game.py

@@ -120,7 +120,6 @@ def game(
         user2,
         emoji2,
         standard_board,
-        9,
         None,
         GameState.wait_player1,
     )
@@ -162,7 +161,6 @@ def test_not_standard_board(
             user2,
             emoji2,
             not_standard_board,
-            9,
             None,
             GameState.wait_player1,
         )
@@ -182,7 +180,6 @@ def test_one_user(
             user1,
             emoji2,
             standard_board,
-            9,
             None,
             GameState.wait_player1,
         )
@@ -202,7 +199,6 @@ def test_one_emoji(
             user2,
             emoji1,
             standard_board,
-            9,
             None,
             GameState.wait_player1,
         )
@@ -223,7 +219,6 @@ def test_game_with_invalid_cell_order(
             user2,
             emoji2,
             board_with_invalid_cell_order,
-            9,
             None,
             GameState.wait_player1,
         )
@@ -280,7 +275,6 @@ def test_make_move_with_completed_game(  # noqa: PLR0913, PLR0917
         user2,
         emoji2,
         standard_board,
-        9,
         DecidedGameResult(
             win=UserWin(user_id=1, new_stars=20, rating_vector=20.),
             loss=UserLoss(user_id=2, rating_vector=-20.),
@@ -428,7 +422,7 @@ def test_winning_game(  # noqa: PLR0913, PLR0917
             emojis=[],
             rating=1020.0,
             selected_emoji_id=None,
-            game_location=None,
+            current_game_id=None,
             admin_right=None,
         )
 
@@ -439,7 +433,7 @@ def test_winning_game(  # noqa: PLR0913, PLR0917
             emojis=[],
             rating=981.1500225556907,
             selected_emoji_id=None,
-            game_location=None,
+            current_game_id=None,
             admin_right=None,
         )
 
@@ -515,7 +509,7 @@ def test_drawn_game(  # noqa: PLR0913, PLR0917
             emojis=[],
             rating=1020.0,
             selected_emoji_id=None,
-            game_location=None,
+            current_game_id=None,
             admin_right=None,
         )
 
@@ -526,7 +520,7 @@ def test_drawn_game(  # noqa: PLR0913, PLR0917
             emojis=[],
             rating=1020.0,
             selected_emoji_id=None,
-            game_location=None,
+            current_game_id=None,
             admin_right=None,
         )
 
@@ -602,7 +596,7 @@ def test_winning_game_with_filled_board(  # noqa: PLR0913, PLR0917
             emojis=[],
             rating=1020.0,
             selected_emoji_id=None,
-            game_location=None,
+            current_game_id=None,
             admin_right=None,
         )
 
@@ -613,7 +607,7 @@ def test_winning_game_with_filled_board(  # noqa: PLR0913, PLR0917
             emojis=[],
             rating=981.1500225556907,
             selected_emoji_id=None,
-            game_location=None,
+            current_game_id=None,
             admin_right=None,
         )
 

tests/test_ttt/test_entities/test_core/test_user.py

@@ -16,7 +16,7 @@ def test_create_user(tracking: Tracking, object_: str) -> None:
             emojis=[],
             rating=1000.,
             selected_emoji_id=None,
-            game_location=None,
+            current_game_id=None,
             admin_right=None,
         )
 

tests/test_ttt/test_infrastructure/test_adapters/test_game_dao.py

@@ -8,7 +8,6 @@
 from ttt.entities.core.game.cell import Cell
 from ttt.entities.core.game.game import Game, GameState
 from ttt.entities.core.user.account import Account
-from ttt.entities.core.user.location import UserGameLocation
 from ttt.entities.core.user.user import User
 from ttt.entities.elo.rating import GamesPlayed
 from ttt.entities.math.matrix import Matrix
@@ -31,7 +30,7 @@ def player1() -> User:
         emojis=[],
         selected_emoji_id=None,
         rating=1000.,
-        game_location=UserGameLocation(1, UUID(int=0)),
+        current_game_id=UUID(int=0),
         admin_right=None,
     )
 
@@ -69,7 +68,6 @@ def game(player1: User, player2: Ai) -> Game:
                 Cell(UUID(int=0), UUID(int=0), (2, 2), None, None),
             ],
         ]),
-        number_of_unfilled_cells=9,
         result=None,
         state=GameState.wait_player1,
     )