Fixed bug with CharacterHouse attributes being mixed up

- Modified unit tests to verify the attributes
- Bumped to v1.1.1

Author: Galarzaa90

CHANGELOG.rst

@@ -2,6 +2,13 @@
 Changelog
 =========
 
+.. _v1.1.1:
+
+1.1.1 (2019-01-09)
+==================
+
+- Fixed character houses having attributes mixed up.
+
 .. _v1.1.0:
 
 1.1.0 (2019-01-09)

tests/tests_character.py

@@ -2,7 +2,7 @@
 
 import tests.tests_guild
 from tests.tests_tibiapy import TestTibiaPy
-from tibiapy import Character, Death, InvalidContent, Killer
+from tibiapy import Character, CharacterHouse, Death, InvalidContent, Killer
 from tibiapy.enums import AccountStatus, Sex, Vocation
 from tibiapy.utils import parse_tibia_datetime
 
@@ -60,6 +60,12 @@ def testCharacterFormerNames(self):
         self.assertTrue(char.former_names)
         self.assertEqual(len(char.former_names), 2)
 
+        self.assertIsInstance(char.house, CharacterHouse)
+        self.assertEqual(char.house.owner, char.name)
+        self.assertEqual(char.house.town, "Darashia")
+        self.assertEqual(char.house.world, char.world)
+        self.assertIsInstance(char.house.paid_until_date, datetime.date)
+
     def testCharacterPosition(self):
         content = self._load_resource(FILE_CHARACTER_SPECIAL_POSITION)
         char = Character.from_content(content)
@@ -113,6 +119,12 @@ def testCharacterTibiaData(self):
         self.assertIsNotNone(char.guild_name)
         self.assertIsInstance(char.last_login, datetime.datetime)
 
+        self.assertIsInstance(char.house, CharacterHouse)
+        self.assertEqual(char.house.owner, char.name)
+        self.assertEqual(char.house.town, "Ankrahmun")
+        self.assertEqual(char.house.world, char.world)
+        self.assertIsInstance(char.house.paid_until_date, datetime.date)
+
         self.assertTrue(char.deaths[3].by_player)
 
     def testCharacterTibiaDataUnhidden(self):
@@ -123,6 +135,12 @@ def testCharacterTibiaDataUnhidden(self):
         self.assertTrue(char.other_characters)
         self.assertFalse(char.hidden)
 
+        self.assertIsInstance(char.house, CharacterHouse)
+        self.assertEqual(char.house.owner, char.name)
+        self.assertEqual(char.house.town, "Kazordoon")
+        self.assertEqual(char.house.world, char.world)
+        self.assertIsInstance(char.house.paid_until_date, datetime.date)
+
     def testCharacterTibiaDataDeleted(self):
         content = self._load_resource(FILE_CHARACTER_TIBIADATA_DELETED)
         char = Character.from_tibiadata(content)

tests/tests_guild.py

@@ -49,6 +49,11 @@ def testGuildFull(self):
             self.assertIsNotNone(invited.name, "Invited character's name should not be None.")
             self.assertIsInstance(invited.date, datetime.date, "Invited character's date should be datetime.date.")
 
+        self.assertIsInstance(guild.guildhall, GuildHouse)
+        self.assertEqual(guild.guildhall.owner, guild.members[0].name)
+        self.assertEqual(guild.guildhall.world, guild.world)
+        self.assertIsInstance(guild.guildhall.paid_until_date, datetime.date)
+
     def testGuildNotFound(self):
         content = self._load_resource(FILE_GUILD_NOT_FOUND)
         guild = Guild.from_content(content)

tibiapy/__init__.py

@@ -7,4 +7,4 @@
 from tibiapy.house import *
 from tibiapy.world import *
 
-__version__ = '1.1.0'
+__version__ = '1.1.1'

tibiapy/character.py

@@ -265,7 +265,8 @@ def from_tibiadata(cls, content):
         if "house" in character_data:
             house = character_data["house"]
             paid_until_date = parse_tibiadata_date(house["paid"])
-            char.house = CharacterHouse(house["houseid"], house["name"], house["town"], char.name, paid_until_date)
+            char.house = CharacterHouse(house["houseid"], house["name"], char.world, house["town"], char.name,
+                                        paid_until_date)
         char.comment = character_data.get("comment")
         if len(character_data["last_login"]) > 0:
             char.last_login = parse_tibiadata_datetime(character_data["last_login"][0])