update brawlapi tests

Author: SharpBit

tests/brawlapi/test_async.py

@@ -4,6 +4,7 @@
 import os
 
 import brawlstats
+from brawlstats.brawlapi.models import BattleLog, Club, Constants, Events, Leaderboard, PartialClub
 from dotenv import load_dotenv, find_dotenv
 
 load_dotenv(find_dotenv('../.env'))
@@ -19,7 +20,7 @@ async def setUp(self):
         self.player_tag = 'GGJVJLU2'
         self.club_tag = 'QCGV8PG'
         self.client = brawlstats.BrawlAPI(
-            TOKEN,
+            token=TOKEN,
             is_async=True,
             timeout=30
         )
@@ -29,77 +30,85 @@ async def tearDown(self):
         await self.client.close()
 
     async def test_get_player(self):
+        """Test everything relating to the Player model"""
         player = await self.client.get_player(self.player_tag)
         self.assertEqual(player.tag, self.player_tag)
 
+        partialclub = await player.get_club(full=False)
+        self.assertIsInstance(partialclub, PartialClub)
+        full_club = await partialclub.get_full()
+        self.assertIsInstance(full_club, Club)
+        club = await player.get_club()
+        self.assertIsInstance(club, Club)
+
     async def test_get_club(self):
         club = await self.client.get_club(self.club_tag)
         self.assertEqual(club.tag, self.club_tag)
 
     async def test_get_leaderboard_player(self):
         lb = await self.client.get_leaderboard('players')
-        self.assertTrue(isinstance(lb, brawlstats.brawlapi.Leaderboard))
+        self.assertIsInstance(lb, Leaderboard)
         region = await self.client.get_leaderboard('players', region='us')
-        self.assertTrue(isinstance(region, brawlstats.brawlapi.Leaderboard))
+        self.assertIsInstance(region, Leaderboard)
 
     async def test_get_leaderboard_club(self):
         lb = await self.client.get_leaderboard('clubs')
-        self.assertTrue(isinstance(lb, brawlstats.brawlapi.Leaderboard))
+        self.assertIsInstance(lb, Leaderboard)
 
     async def test_get_leaderboard_brawler(self):
         lb = await self.client.get_leaderboard('brawlers', brawler='shelly')
-        self.assertTrue(isinstance(lb, brawlstats.brawlapi.Leaderboard))
+        self.assertIsInstance(lb, Leaderboard)
 
     async def test_get_events(self):
         events = await self.client.get_events()
-        self.assertTrue(isinstance(events.current, list))
+        self.assertIsInstance(events, Events)
 
     async def test_get_constants(self):
         default = await self.client.get_constants()
-        self.assertTrue(isinstance(default, brawlstats.brawlapi.Constants))
+        self.assertIsInstance(default, Constants)
         maps = await self.client.get_constants('maps')
-        self.assertTrue(isinstance(maps, brawlstats.brawlapi.Constants))
+        self.assertIsInstance(maps, Constants)
 
         async def request():
             await self.get_constants(invalid_key)
         invalid_key = 'invalid'
-        self.assertAsyncRaises(KeyError, request)
+        self.assertRaises(KeyError, request)
 
     async def test_get_misc(self):
         misc = await self.client.get_misc()
         self.assertEqual(misc.server_date_year, datetime.date.today().year)
 
     async def test_club_search(self):
         search = await self.client.search_club('Cactus Bandits')
-        self.assertTrue(isinstance(search, list))
+        self.assertIsInstance(search, list)
 
     async def test_battle_logs(self):
         logs = await self.client.get_battle_logs(self.player_tag)
-        self.assertTrue(isinstance(logs, brawlstats.brawlapi.BattleLog))
+        self.assertIsInstance(logs, BattleLog)
 
     # Other
     async def test_invalid_tag(self):
         async def request():
             await self.client.get_player(invalid_tag)
         invalid_tag = 'P'
-        self.assertAsyncRaises(brawlstats.NotFoundError, request)
+        self.assertRaises(brawlstats.NotFoundError, request)
         invalid_tag = 'AAA'
-        self.assertAsyncRaises(brawlstats.NotFoundError, request)
+        self.assertRaises(brawlstats.NotFoundError, request)
         invalid_tag = '2PPPPPPP'
-        self.assertAsyncRaises(brawlstats.ServerError, request)
+        self.assertRaises(brawlstats.ServerError, request)
 
     async def test_invalid_lb(self):
         async def request():
             await self.client.get_leaderboard(invalid_type, invalid_limit)
         invalid_type = 'test'
         invalid_limit = 200
-        self.assertAsyncRaises(ValueError, request)
+        self.assertRaises(ValueError, request)
         invalid_type = 'players'
         invalid_limit = 201
-        self.assertAsyncRaises(ValueError, request)
+        self.assertRaises(ValueError, request)
         invalid_type = 'players'
         invalid_limit = -5
-        self.assertAsyncRaises(ValueError, request)
+        self.assertRaises(ValueError, request)
 
 
 if __name__ == '__main__':

tests/brawlapi/test_blocking.py

@@ -4,6 +4,7 @@
 import time
 
 import brawlstats
+from brawlstats.brawlapi.models import BattleLog, Club, Constants, Events, Leaderboard, PartialClub
 from dotenv import load_dotenv, find_dotenv
 
 load_dotenv(find_dotenv('../.env'))
@@ -33,33 +34,41 @@ def test_get_player(self):
         player = self.client.get_player(self.player_tag)
         self.assertEqual(player.tag, self.player_tag)
 
+        partialclub = player.get_club(full=False)
+        self.assertIsInstance(partialclub, PartialClub)
+        full_club = partialclub.get_full()
+        self.assertIsInstance(full_club, Club)
+        club = player.get_club()
+        self.assertIsInstance(club, Club)
+
     def test_get_club(self):
         club = self.client.get_club(self.club_tag)
         self.assertEqual(club.tag, self.club_tag)
 
     def test_get_leaderboard_player(self):
         lb = self.client.get_leaderboard('players')
-        self.assertTrue(isinstance(lb, brawlstats.brawlapi.Leaderboard))
+        self.assertIsInstance(lb, Leaderboard)
         region = self.client.get_leaderboard('players', region='us')
-        self.assertTrue(isinstance(region, brawlstats.brawlapi.Leaderboard))
+        self.assertIsInstance(region, Leaderboard)
 
     def test_get_leaderboard_club(self):
         lb = self.client.get_leaderboard('clubs')
-        self.assertTrue(isinstance(lb, brawlstats.brawlapi.Leaderboard))
+        self.assertIsInstance(lb, Leaderboard)
 
     def test_get_leaderboard_brawler(self):
         lb = self.client.get_leaderboard('brawlers', brawler='shelly')
-        self.assertTrue(isinstance(lb, brawlstats.brawlapi.Leaderboard))
+        self.assertIsInstance(lb, Leaderboard)
 
     def test_get_events(self):
         events = self.client.get_events()
-        self.assertTrue(isinstance(events.current, list))
+        self.assertIsInstance(events, Events)
 
     def test_get_constants(self):
         default = self.client.get_constants()
-        self.assertTrue(isinstance(default, brawlstats.brawlapi.Constants))
+        self.assertIsInstance(default, Constants)
         maps = self.client.get_constants('maps')
-        self.assertTrue(isinstance(maps, brawlstats.brawlapi.Constants))
+        self.assertIsInstance(maps, Constants)
+
         get_constants = self.client.get_constants
         invalid_key = 'invalid'
         self.assertRaises(KeyError, get_constants, invalid_key)
@@ -70,11 +79,11 @@ def test_get_misc(self):
 
     def test_club_search(self):
         search = self.client.search_club('Cactus Bandits')
-        self.assertTrue(isinstance(search, list))
+        self.assertIsInstance(search, list)
 
     def test_battle_logs(self):
         logs = self.client.get_battle_logs(self.player_tag)
-        self.assertTrue(isinstance(logs, brawlstats.brawlapi.BattleLog))
+        self.assertIsInstance(logs, BattleLog)
 
     # Other
     def test_invalid_tag(self):