use async database

This commit is contained in:
2019-09-11 04:21:31 +03:00
parent 14c1e4842c
commit 98b20a073a
23 changed files with 199 additions and 186 deletions

View File

@ -105,14 +105,14 @@ def player2(bis2: BiS) -> Player:
@pytest.fixture
def selector(party: Party, player: Player, player2: Player,
head_with_upgrade: Piece, weapon: Piece) -> LootSelector:
async def selector(party: Party, player: Player, player2: Player,
head_with_upgrade: Piece, weapon: Piece) -> LootSelector:
obj = LootSelector(party)
obj.party.set_player(player)
await obj.party.set_player(player)
player.bis.set_item(weapon)
obj.party.set_player(player2)
await obj.party.set_player(player2)
player2.bis.set_item(head_with_upgrade)
player2.bis.set_item(weapon)

View File

@ -4,92 +4,92 @@ from service.models.piece import Piece
from service.models.player import Player
def test_set_player(party: Party, player: Player) -> None:
async def test_set_player(party: Party, player: Player) -> None:
assert len(party.players) == 0
party.set_player(player)
await party.set_player(player)
assert len(party.players) == 1
def test_remove_player(party: Party, player: Player) -> None:
party.remove_player(player.player_id)
async def test_remove_player(party: Party, player: Player) -> None:
await party.remove_player(player.player_id)
assert len(party.players) == 0
party.set_player(player)
party.remove_player(player.player_id)
await party.set_player(player)
await party.remove_player(player.player_id)
assert len(party.players) == 0
def test_set_bis_link(party: Party, player: Player, bis_link: str) -> None:
party.set_player(player)
async def test_set_bis_link(party: Party, player: Player, bis_link: str) -> None:
await party.set_player(player)
party.set_bis_link(player.player_id, bis_link)
await party.set_bis_link(player.player_id, bis_link)
assert player.link == bis_link
def test_set_item(party: Party, player: Player, head_with_upgrade: Piece, weapon: Piece) -> None:
party.set_player(player)
async def test_set_item(party: Party, player: Player, head_with_upgrade: Piece, weapon: Piece) -> None:
await party.set_player(player)
party.set_item(player.player_id, weapon)
await party.set_item(player.player_id, weapon)
assert abs(player.loot_count(weapon)) == 1
assert abs(player.loot_count(head_with_upgrade)) == 0
def test_remove_item(party: Party, player: Player, head_with_upgrade: Piece, weapon: Piece) -> None:
party.set_player(player)
async def test_remove_item(party: Party, player: Player, head_with_upgrade: Piece, weapon: Piece) -> None:
await party.set_player(player)
party.remove_item(player.player_id, weapon)
await party.remove_item(player.player_id, weapon)
assert abs(player.loot_count(weapon)) == 0
assert abs(player.loot_count(head_with_upgrade)) == 0
party.set_item(player.player_id, weapon)
await party.set_item(player.player_id, weapon)
assert abs(player.loot_count(weapon)) == 1
assert abs(player.loot_count(head_with_upgrade)) == 0
party.remove_item(player.player_id, weapon)
await party.remove_item(player.player_id, weapon)
assert abs(player.loot_count(weapon)) == 0
assert abs(player.loot_count(head_with_upgrade)) == 0
def test_set_item_bis(party: Party, player: Player, head_with_upgrade: Piece, weapon: Piece) -> None:
party.set_player(player)
async def test_set_item_bis(party: Party, player: Player, head_with_upgrade: Piece, weapon: Piece) -> None:
await party.set_player(player)
party.set_item_bis(player.player_id, head_with_upgrade)
await party.set_item_bis(player.player_id, head_with_upgrade)
assert player.bis.has_piece(head_with_upgrade)
assert not player.bis.has_piece(weapon)
def test_remove_item_bis(party: Party, player: Player, head_with_upgrade: Piece, weapon: Piece) -> None:
party.set_player(player)
async def test_remove_item_bis(party: Party, player: Player, head_with_upgrade: Piece, weapon: Piece) -> None:
await party.set_player(player)
party.remove_item_bis(player.player_id, head_with_upgrade)
await party.remove_item_bis(player.player_id, head_with_upgrade)
assert not player.bis.has_piece(head_with_upgrade)
assert not player.bis.has_piece(weapon)
party.set_item_bis(player.player_id, head_with_upgrade)
await party.set_item_bis(player.player_id, head_with_upgrade)
assert player.bis.has_piece(head_with_upgrade)
assert not player.bis.has_piece(weapon)
party.set_item_bis(player.player_id, weapon)
await party.set_item_bis(player.player_id, weapon)
assert player.bis.has_piece(head_with_upgrade)
assert player.bis.has_piece(weapon)
party.remove_item_bis(player.player_id, head_with_upgrade)
await party.remove_item_bis(player.player_id, head_with_upgrade)
assert not player.bis.has_piece(head_with_upgrade)
assert player.bis.has_piece(weapon)
def test_get(party: Party, database: Database, player: Player, head_with_upgrade: Piece, weapon: Piece,
bis_link: str) -> None:
party.set_player(player)
party.set_bis_link(player.player_id, bis_link)
party.set_item_bis(player.player_id, head_with_upgrade)
party.set_item_bis(player.player_id, weapon)
party.set_item(player.player_id, weapon)
async def test_get(party: Party, database: Database, player: Player, head_with_upgrade: Piece,
weapon: Piece, bis_link: str) -> None:
await party.set_player(player)
await party.set_bis_link(player.player_id, bis_link)
await party.set_item_bis(player.player_id, head_with_upgrade)
await party.set_item_bis(player.player_id, weapon)
await party.set_item(player.player_id, weapon)
new_party = Party.get(database)
new_party = await Party.get(database)
assert party.party == new_party.party
party.remove_player(player.player_id)
new_party = Party.get(database)
await party.remove_player(player.player_id)
new_party = await Party.get(database)
assert party.party == new_party.party

View File

@ -8,9 +8,9 @@ from service.models.player import Player
async def test_bis_get(server: Any, party: Party, player: Player, player2: Player,
head_with_upgrade: Piece, weapon: Piece) -> None:
party.set_item_bis(player.player_id, weapon)
party.set_item_bis(player2.player_id, weapon)
party.set_item_bis(player2.player_id, head_with_upgrade)
await party.set_item_bis(player.player_id, weapon)
await party.set_item_bis(player2.player_id, weapon)
await party.set_item_bis(player2.player_id, head_with_upgrade)
response = await server.get('/api/v1/party/bis')
assert response.status == 200
@ -19,9 +19,9 @@ async def test_bis_get(server: Any, party: Party, player: Player, player2: Playe
async def test_bis_get_with_filter(server: Any, party: Party, player: Player, player2: Player,
head_with_upgrade: Piece, weapon: Piece) -> None:
party.set_item_bis(player.player_id, weapon)
party.set_item_bis(player2.player_id, weapon)
party.set_item_bis(player2.player_id, head_with_upgrade)
await party.set_item_bis(player.player_id, weapon)
await party.set_item_bis(player2.player_id, weapon)
await party.set_item_bis(player2.player_id, head_with_upgrade)
response = await server.get('/api/v1/party/bis', params={'nick': player.nick})
assert response.status == 200

View File

@ -7,8 +7,8 @@ from service.models.player import Player
async def test_loot_get(server: Any, party: Party, player: Player, player2: Player, weapon: Piece) -> None:
party.set_item(player.player_id, weapon)
party.set_item(player2.player_id, weapon)
await party.set_item(player.player_id, weapon)
await party.set_item(player2.player_id, weapon)
response = await server.get('/api/v1/party/loot')
assert response.status == 200
@ -16,8 +16,8 @@ async def test_loot_get(server: Any, party: Party, player: Player, player2: Play
async def test_loot_get_with_filter(server: Any, party: Party, player: Player, player2: Player, weapon: Piece) -> None:
party.set_item(player.player_id, weapon)
party.set_item(player2.player_id, weapon)
await party.set_item(player.player_id, weapon)
await party.set_item(player2.player_id, weapon)
response = await server.get('/api/v1/party/loot', params={'nick': player.nick})
assert response.status == 200

View File

@ -7,7 +7,7 @@ from service.models.player import Player
async def test_players_get(server: Any, party: Party, player: Player) -> None:
party.set_player(player)
await party.set_player(player)
response = await server.get('/api/v1/party')
assert response.status == 200
@ -15,7 +15,7 @@ async def test_players_get(server: Any, party: Party, player: Player) -> None:
async def test_players_get_with_filter(server: Any, party: Party, player: Player, player2: Player) -> None:
party.set_player(player)
await party.set_player(player)
response = await server.get('/api/v1/party', params={'nick': player.nick})
assert response.status == 200
@ -27,7 +27,7 @@ async def test_players_get_with_filter(server: Any, party: Party, player: Player
async def test_players_post_add(server: Any, party: Party, player: Player) -> None:
party.remove_player(player.player_id)
await party.remove_player(player.player_id)
response = await server.get('/api/v1/party', params={'nick': player.nick})
assert response.status == 200
@ -64,7 +64,7 @@ async def test_players_post_remove(server: Any, party: Party, player: Player) ->
async def test_players_post_add_with_link(server: Any, party: Party, player: Player,
bis_link: str, bis_set: List[Piece]) -> None:
party.remove_player(player.player_id)
await party.remove_player(player.player_id)
response = await server.get('/api/v1/party', params={'nick': player.nick})
assert response.status == 200