Added missing covered code

Author: Galarzaa90

tests/tests_highscores.py

@@ -98,6 +98,9 @@ def testHighscoresTibiaData(self):
         self.assertEqual(highscores.category, Category.AXE_FIGHTING)
         self.assertEqual(highscores.results_count, 300)
 
+        self.assertEqual(highscores.url_tibiadata,
+                         Highscores.get_url_tibiadata(highscores.world, highscores.category, highscores.vocation))
+
         for entry in highscores.entries:
             self.assertIsInstance(entry, HighscoresEntry)
             self.assertIsInstance(entry.name, str)

tests/tests_utils.py

@@ -5,6 +5,7 @@
 
 from tests.tests_tibiapy import TestCommons
 from tibiapy import enums, utils
+from tibiapy.utils import parse_integer, parse_tibia_money
 
 TIBIA_DATETIME_CEST = "Jul 10 2018, 07:13:32 CEST"
 TIBIA_DATETIME_CET = "Jan 10 2018, 07:13:32 CET"
@@ -161,3 +162,18 @@ def testEnumStr(self):
         self.assertEqual(enums.VocationFilter.from_name("royal paladin"), enums.VocationFilter.PALADINS)
         self.assertEqual(enums.VocationFilter.from_name("unknown"), enums.VocationFilter.ALL)
         self.assertIsNone(enums.VocationFilter.from_name("unknown", False))
+
+    def testParseTibiaMoney(self):
+        self.assertEqual(1000, parse_tibia_money("1k"))
+        self.assertEqual(5000000, parse_tibia_money("5kk"))
+        self.assertEqual(2500, parse_tibia_money("2.5k"))
+        self.assertEqual(50, parse_tibia_money("50"))
+        with self.assertRaises(ValueError):
+            parse_tibia_money("abc")
+
+    def testParseInteger(self):
+        self.assertEqual(1450, parse_integer("1.450"))
+        self.assertEqual(1110, parse_integer("1,110"))
+        self.assertEqual(15, parse_integer("15"))
+        self.assertEqual(0, parse_integer("abc"))
+        self.assertEqual(-1, parse_integer("abc", -1))

tests/tests_world.py

@@ -111,6 +111,8 @@ def testWorldOverview(self):
         self.assertGreater(world_overview.total_online, 0)
         self.assertIsNotNone(world_overview.record_date)
         self.assertIsNotNone(world_overview.record_count)
+        self.assertEqual(len(world_overview.regular_worlds), 65)
+        self.assertEqual(len(world_overview.tournament_worlds), 6)
 
         worlds = ListedWorld.list_from_content(content)
         self.assertEqual(len(world_overview.worlds), len(worlds))
@@ -206,6 +208,7 @@ def testWorldOverviewTibiaData(self):
 
         self.assertIsInstance(world_overview, WorldOverview)
         self.assertEqual(WorldOverview.get_url(), ListedWorld.get_list_url())
+        self.assertEqual(WorldOverview.get_url_tibiadata(), ListedWorld.get_list_url_tibiadata())
         self.assertGreater(sum(w.online_count for w in world_overview.worlds), 0)
         self.assertIsInstance(world_overview.worlds[0], ListedWorld)
         self.assertIsInstance(world_overview.worlds[0].pvp_type, PvpType)

tibiapy/__init__.py

@@ -13,7 +13,7 @@
 from tibiapy.creature import *
 from tibiapy.client import *
 
-__version__ = '2.0.1'
+__version__ = '2.1.0'
 
 from logging import NullHandler
 

tibiapy/creature.py

@@ -31,6 +31,9 @@ def __init__(self, name, image_url):
         self.name = name
         self.image_url = image_url
 
+    def __repr__(self):
+        return "<{0.__class__.__name__} name={0.name!r} image_url={0.image_url!r}>".format(self)
+
     @classmethod
     def from_content(cls, content):
         """

tibiapy/highscores.py

@@ -187,8 +187,7 @@ def from_tibiadata(cls, content, vocation=None):
             highscores.results_count = len(highscores.entries)
         except KeyError:
             raise InvalidContent("content is not a TibiaData highscores response.")
-        if isinstance(vocation, VocationFilter):
-            highscores.vocation = vocation
+        highscores.vocation = vocation or VocationFilter.ALL
         return highscores
 
     @classmethod

tibiapy/world.py

@@ -504,8 +504,6 @@ def from_content(cls, content):
         try:
             record_row, *rows = parsed_content.find_all("tr")
             m = record_regexp.search(record_row.text)
-            if not m:
-                raise InvalidContent("content does not belong to the World Overview section in Tibia.com")
             world_overview.record_count = parse_integer(m.group("count"))
             world_overview.record_date = parse_tibia_datetime(m.group("date"))
             world_rows = rows