Fix spell with no cities showing "none" entry instead of empty list.

- Also simplified tests and added more samples and cases

Author: Galarzaa90

tests/resources/README.md

@@ -1,89 +1,112 @@
 # Resources
+
 This directory and its subdirectories contain extracts from Tibia.com,
 trying to cover as many scenarios possible, to be used in unit tests.
 
 ## Character resources
+
 - [character.txt](character/character.txt) - A full character response.
 - [characterTraded.txt](character/characterTraded.txt) - A character that was traded and is also visible.
-- [characterWithComplexDeaths.txt](character/characterWithComplexDeaths.txt) - A character with many types of deaths, such as deaths by summons, players, assisted deaths, etcetera.
+- [characterWithComplexDeaths.txt](character/characterWithComplexDeaths.txt) - A character with many types of deaths,
+  such as deaths by summons, players, assisted deaths, etcetera.
 - [characterDeletionScheduled.txt](character/characterDeletionScheduled.txt) - A character scheduled for deletion.
 - [characterFormerNames.txt](character/characterFormerNames.txt) - A character with former names.
 - [characterNotFound.txt](character/characterNotFound.txt) - A character not found page.
-- [characterWithTitleAndBadges.txt](character/characterWithTitleAndBadges.txt) - A character with unlocked titles and badges.
+- [characterWithTitleAndBadges.txt](character/characterWithTitleAndBadges.txt) - A character with unlocked titles and
+  badges.
 - [characterNoBadgesSelected.txt](character/characterNoBadgesSelected.txt) - A character with no selected badges.
 - [characterMultipleHouses.txt](character/characterMultipleHouses.txt) - A character with two houses.
-- [characterTruncatedDeaths.txt](character/characterTruncatedDeaths.txt) - A character with too many deaths to be displayed.
+- [characterTruncatedDeaths.txt](character/characterTruncatedDeaths.txt) - A character with too many deaths to be
+  displayed.
 - [characterSpecialPosition.txt](character/characterSpecialPosition.txt) - A character with a special position.
 
-
 ## Guild resources
+
 - [guild.txt](guild/guild.txt) - The content of a guild's page.
 - [guildAtWar.txt](guild/guildAtWar.txt) - The content of a guild's page for a guild with an active war.
 - [guildDisbanding.txt](guild/guildDisbanding.txt) - A guild that is set to be disbanded.
 - [guildFormation.txt](guild/guildFormation.txt) - A guild still in formation.
-- [guildMinimumInfo.txt](guild/guildMinimumInfo.txt) - A guild with the bare minimum (no description, no guildhall, no homepage)
+- [guildMinimumInfo.txt](guild/guildMinimumInfo.txt) - A guild with the bare minimum (no description, no guildhall, no
+  homepage)
 - [guildsSection.txt](guild/guildsSection.txt) - The guild list of a world.
 - [guildsSectionNotFound.txt](guild/guildsSectionNotFound.txt) - The guild list of a world that doesn't exist.
 - [guildNotFound.txt](guild/guildNotFound.txt) - The page shown for a guild that doesn't exist.
- 
+
 ### War resources
 
 - [guildWarEmpty.txt](guild/wars/guildWarEmpty.txt) - A guild with no active wars and no war history.
-- [guildWarUnactiveAndHistory.txt](guild/wars/guildWarUnactiveAndHistory.txt) - A guild with no active wars and a previous war (enemy disbanded).
-- [guildWarActiveAndHistory.txt](guild/wars/guildWarActiveAndHistory.txt) - A guild with an active war and two previous wars.
+- [guildWarUnactiveAndHistory.txt](guild/wars/guildWarUnactiveAndHistory.txt) - A guild with no active wars and a
+  previous war (enemy disbanded).
+- [guildWarActiveAndHistory.txt](guild/wars/guildWarActiveAndHistory.txt) - A guild with an active war and two previous
+  wars.
 
 ## House resources
+
 - [houseRented.txt](house/houseRented.txt) - The content of a house's page
 - [houseStatusNoBids.txt](house/houseStatusNoBids.txt) - The status string of a auction house with no bids.
 - [houseStatusRented.txt](house/houseStatusRented.txt) - The status string of a rented house.
 - [houseStatusTransferred.txt](house/houseStatusTransferred.txt) - The status string of a rented house that is set
- for transfer.
+  for transfer.
 - [houseStatusWithBids.txt](house/houseAuctionedWithBids.txt) - The status string of a auctioned house with
- bids.
-- - [houseBeforeMerge.txt](house/houseBeforeMerge.txt) - A house from a world scheduled to be merged.
+  bids.
+-
+  - [houseBeforeMerge.txt](house/houseBeforeMerge.txt) - A house from a world scheduled to be merged.
 - [houseNotFound.txt](house/houseNotFound.txt) - The content of a page for a house not found.
 - [housesSection.txt](house/housesSection.txt) - The house list of a world.
 - [housesSectionEmpty.txt](house/housesSectionEmpty.txt) - The house list of a world, showing no houses.
-- [housesSectionNotFound.txt](house/housesSectionNotFound.txt) - The house list of a world or town that doesn't 
-exist.
-- [housesSectionBeforeMerge.txt](house/housesSectionBeforeMerge.txt) - The houses section of a world that is scheduled to be merged.
+- [housesSectionNotFound.txt](house/housesSectionNotFound.txt) - The house list of a world or town that doesn't
+  exist.
+- [housesSectionBeforeMerge.txt](house/housesSectionBeforeMerge.txt) - The houses section of a world that is scheduled
+  to be merged.
 
 ## Highscores resources
+
 - [highscores.txt](highscores/highscores.txt) - The content of a correct highscore's page.
 - [highscoresEmpty.txt](highscores/highscoresEmpty.txt) - The content of the highscores page of a nonexistent world.
-- [highscoresNoResults.txt](highscores/highscoresNoResults.txt) - The content of the highscores page of a new world (no results shown). _OUTDATED_
+- [highscoresNoResults.txt](highscores/highscoresNoResults.txt) - The content of the highscores page of a new world (no
+  results shown). _OUTDATED_
 - [highscoresExperience.txt](highscores/highscoresExperience.txt) - The content of an experience highscores page.
 - [highscoresLoyalty.txt](highscores/highscoresLoyalty.txt) - The content of a loyalty highscores page.
-- [highscoresBattleEyePvpFilters.txt](highscores/highscoresBattleEyePvpFilters.txt) - The content of the highscores page using BattlEye and PvP filters.
-
+- [highscoresBattleEyePvpFilters.txt](highscores/highscoresBattleEyePvpFilters.txt) - The content of the highscores page
+  using BattlEye and PvP filters.
 
 ## Kill Statistics resources
-- [killStatisticsWithResults.txt](killStatistics/killStatisticsWithResults.txt) - The content of a correct kill statistics' page.
-- [killStatisticsNotFound.txt](killStatistics/killStatisticsNotFound.txt) - The content of the kill statistics's page of a 
-nonexistent world or a unselected world.
+
+- [killStatisticsWithResults.txt](killStatistics/killStatisticsWithResults.txt) - The content of a correct kill
+  statistics' page.
+- [killStatisticsNotFound.txt](killStatistics/killStatisticsNotFound.txt) - The content of the kill statistics's page of
+  a
+  nonexistent world or a unselected world.
 
 ## News resources
-- [newsArchiveInitial.txt](news/newsArchiveInitial.txt) - The content of the news search page with results and default filters.
-- [newsArchiveWithFilters.txt](news/newsArchiveWithFilters.txt) - The content of the news search page with results using filters.
+
+- [newsArchiveInitial.txt](news/newsArchiveInitial.txt) - The content of the news search page with results and default
+  filters.
+- [newsArchiveWithFilters.txt](news/newsArchiveWithFilters.txt) - The content of the news search page with results using
+  filters.
 - [newsArchiveEmpty.txt](news/newsArchiveEmpty.txt) - The content of the news search page with no results.
 - [newsArchiveError.txt](news/newsArchiveError.txt) - The content of the news search page with an error.
 - [newsArticle.txt](news/newsArticle.txt) - The content of a news article.
 - [newsTicker.txt](news/newsTicker.txt) - The content of a news ticker.
 
 ## Leaderboard resources
-- [leaderboardCurrentRotation.txt](leaderboards/leaderboardCurrentRotation.txt) - The leaderboard page for the current rotation of a world.
-- [leaderboardDeletedCharacter.txt](leaderboards/leaderboardDeletedCharacter.txt) - A leaderboad containing a deleted character.
+
+- [leaderboardCurrentRotation.txt](leaderboards/leaderboardCurrentRotation.txt) - The leaderboard page for the current
+  rotation of a world.
+- [leaderboardDeletedCharacter.txt](leaderboards/leaderboardDeletedCharacter.txt) - A leaderboad containing a deleted
+  character.
 - [leaderboardEmpty.txt](leaderboards/leaderboardEmpty.txt) - The leaderboard page for a world with no entries.
 - [leaderboardNotFound.txt](leaderboards/leaderboardNotFound.txt) - The leaderboard page for a world that doesn't exist.
 
 ## World resources
- - [worldOnline.txt](world/worldOnline.txt) - An online world on Tibia.com.
- - [worldUnprotected.txt](world/worldUnprotected.txt) - A world with no BattlEye protection.
- - [worldYellowBattlEye.txt](world/worldYellowBattlEye.txt) - A world that was not initially protected by BattlEye.
- - [worldNoTitles.txt](world/worldNoTitles.txt) - A world without titles.
- - [worldNotFound.txt](world/worldNotFound.txt) - The page shown for a world that doesn't exist.
- - [worldOverviewOnline.txt](world/worldOverviewOnline.txt) - The world list with all worlds online.
- - [worldOverviewOffline.txt](world/worldOverviewOffline.txt) - The world list with all worlds offline.
+
+- [worldOnline.txt](world/worldOnline.txt) - An online world on Tibia.com.
+- [worldUnprotected.txt](world/worldUnprotected.txt) - A world with no BattlEye protection.
+- [worldYellowBattlEye.txt](world/worldYellowBattlEye.txt) - A world that was not initially protected by BattlEye.
+- [worldNoTitles.txt](world/worldNoTitles.txt) - A world without titles.
+- [worldNotFound.txt](world/worldNotFound.txt) - The page shown for a world that doesn't exist.
+- [worldOverviewOnline.txt](world/worldOverviewOnline.txt) - The world list with all worlds online.
+- [worldOverviewOffline.txt](world/worldOverviewOffline.txt) - The world list with all worlds offline.
 
 ## Forum resources
 
@@ -109,23 +132,31 @@ nonexistent world or a unselected world.
 - [cmPostArchivePages.txt](forums/cmPostArchivePages.txt) - The CM Post Archive with multiple pages.
 
 ## Events resources
+
 - [tibiacom_calendar.txt](events/event_schedule.txt) - The content of the event's calendar.
 
 ## Bazaar resources
+
 - [auctionFinished.txt](bazaar/auctionFinished.txt) - The content of a finished auction.
 - [auctionNotFound.txt](bazaar/auctionNotFound.txt) - The content of an auction that doesn't exist.
 - [bazaarCurrentAuctions.txt](bazaar/bazaarCurrentAuctions.txt) - The content of the current auctions page.
-- [bazaarCurrentAuctionsWithFilters.txt](bazaar/bazaarCurrentAuctionsWithFilters.txt) - The content of the current auctions page with all filters selected.
+- [bazaarCurrentAuctionsWithFilters.txt](bazaar/bazaarCurrentAuctionsWithFilters.txt) - The content of the current
+  auctions page with all filters selected.
 - [bazaarHistory.txt](bazaar/bazaarHistory.txt) - The content of the auction history page.
 - [bazaarHistoryEmpty.txt](bazaar/bazaarHistoryEmpty.txt) - The content of the auction history page with no entries.
 
- 
 ## Spells resources
+
 - [spellsSectionDefault.txt](spells/spellsSectionDefault.txt) - The spells section with all results (no filters used).
-- [spellsSectionEmpty.txt](spells/spellsSectionEmpty.txt) - The spells section with empty results (due to filter combination).
-- [spellWithSecondaryGroup.txt](spells/spellWithSecondaryGroup.txt) - A spell with a secondary cooldown group.
+- [spellsSectionEmpty.txt](spells/spellsSectionEmpty.txt) - The spells section with empty results (due to filter
+  combination).
+- [spell.txt](spells/spell.txt) - A regular spell.
+- [spellMultilneDescription.txt](spells/spellMultilneDescription.txt) - A spell with a description of multiple lines.
+- [spellVariableMana.txt](spells/spellVariableMana.txt) - A spell with variable mana usage.
+- [spellRevelationPerk.txt](spells/spellRevelationPerk.txt) - A spell obtained from a revelation perk.
 - [spellWithRune.txt](spells/spellWithRune.txt) - A spell that produces a rune.
 
- ## Other resources
- - [tibiacom_about.txt](tibiacom_about.txt) - The 'About Tibia' section on Tibia.com, used to provide invalid content 
- for tests.
+## Other resources
+
+- [tibiacom_about.txt](tibiacom_about.txt) - The 'About Tibia' section on Tibia.com, used to provide invalid content
+  for tests.

tests/resources/spells/spell.txt

@@ -4,7 +4,11 @@
 
 FILE_SPELLS_SECTION = "spells/spellsSectionDefault.txt"
 FILE_SPELLS_SECTION_EMPTY = "spells/spellsSectionEmpty.txt"
+FILE_SPELL = "spells/spell.txt"
 FILE_SPELL_RUNE = "spells/spellWithRune.txt"
+FILE_SPELL_REVELATION_PERK = "spells/spellRevelationPerk.txt"
+FILE_SPELL_VARIABLE_MANA = "spells/spellVariableMana.txt"
+FILE_SPELL_MULTILINE_DESC = "spells/spellMultilneDescription.txt"
 FILE_SPELL_SECONDARY_GROUP = "spells/spellWithSecondaryGroup.txt"
 
 
@@ -41,30 +45,52 @@ def test_spells_section_parser_from_content_unrelated_section(self):
 
     # region Spells Tests
 
-    def test_spell_parser_from_content_rune(self):
-        """Testing parsing a rune spell."""
-        content = self.load_resource(FILE_SPELL_RUNE)
+    def test_spell_parser_from_content(self):
+        content = self.load_resource(FILE_SPELL)
 
         spell = SpellParser.from_content(content)
 
         self.assertIsNotNone(spell)
         self.assertIsNotNone(spell.url)
         self.assertIsNotNone(spell.image_url)
+
+        self.assertEqual("Light Healing", spell.name)
+        self.assertEqual("exura", spell.words)
+        self.assertIn("Druid", spell.vocations)
+        self.assertEqual("Healing", spell.group.value)
+        self.assertEqual("Instant", spell.spell_type.value)
+        self.assertEqual(1, spell.cooldown)
+        self.assertEqual(1, spell.cooldown_group)
+        self.assertEqual(8, spell.exp_level)
+        self.assertEqual(20, spell.mana)
+        self.assertEqual(0, spell.price)
+        self.assertIn("Carlin", spell.cities)
+        self.assertFalse(spell.is_premium)
+
+    def test_spell_parser_from_content_variable_mana(self):
+        content = self.load_resource(FILE_SPELL_VARIABLE_MANA)
+
+        spell = SpellParser.from_content(content)
+
+        self.assertIsNone(spell.mana)
+
+    def test_spell_parser_from_content_multiline_description(self):
+        content = self.load_resource(FILE_SPELL_MULTILINE_DESC)
+
+        spell = SpellParser.from_content(content)
+
+        self.assertEqual(2, spell.description.count("\n"))
+
+    def test_spell_parser_from_content_rune(self):
+        """Testing parsing a rune spell."""
+        content = self.load_resource(FILE_SPELL_RUNE)
+
+        spell = SpellParser.from_content(content)
+
         self.assertEqual("Sudden Death Rune", spell.name)
-        self.assertEqual("adori gran mort", spell.words)
-        self.assertIn("Sorcerer", spell.vocations)
         self.assertEqual("Support", spell.group.value)
         self.assertEqual("Rune", spell.spell_type.value)
-        self.assertEqual(2, spell.cooldown)
-        self.assertEqual(2, spell.cooldown_group)
         self.assertEqual(5, spell.soul_points)
-        self.assertEqual(3, spell.amount)
-        self.assertEqual(45, spell.exp_level)
-        self.assertEqual(985, spell.mana)
-        self.assertEqual(3000, spell.price)
-        self.assertIn("Yalahar", spell.cities)
-        self.assertIn("Edron", spell.cities)
-        self.assertFalse(spell.is_premium)
         self.assertEqual("Sudden Death Rune", spell.rune.name)
         self.assertIn("Knight", spell.rune.vocations)
         self.assertEqual("Attack", spell.rune.group.value)
@@ -78,22 +104,21 @@ def test_spell_parser_from_content_secondary_group(self):
         spell = SpellParser.from_content(content)
 
         self.assertIsNotNone(spell)
-        self.assertEqual("Protector", spell.name)
-        self.assertEqual("utamo tempo", spell.words)
-        self.assertIn("Knight", spell.vocations)
         self.assertEqual("Support", spell.group.value)
         self.assertEqual("Focus", spell.group_secondary)
-        self.assertEqual("Instant", spell.spell_type.value)
         self.assertEqual(2, spell.cooldown)
         self.assertEqual(2, spell.cooldown_group)
         self.assertEqual(2, spell.cooldown_group_secondary)
-        self.assertIsNone(spell.soul_points)
-        self.assertIsNone(spell.amount)
-        self.assertEqual(55, spell.exp_level)
-        self.assertEqual(200, spell.mana)
-        self.assertEqual(6000, spell.price)
-        self.assertIn("Edron", spell.cities)
-        self.assertTrue(spell.is_premium)
+
+    def test_spell_parser_from_content_revelation_perk(self):
+        """Testing parsing a spell with a secondary group."""
+        content = self.load_resource(FILE_SPELL_REVELATION_PERK)
+        spell = SpellParser.from_content(content)
+
+        self.assertIsNotNone(spell)
+        self.assertIsNone(spell.exp_level)
+        self.assertEqual(0, spell.price)
+        self.assertIsEmpty(spell.cities)
 
     def test_spells_from_content_unknown_spell(self):
         """Testing parsing an unknown spell

tests/resources/spells/spellMultilneDescription.txt

@@ -50,7 +50,7 @@ class SpellEntry(BaseModel):
     spell_type: SpellType
     """The type of the spell"""
     exp_level: Optional[int] = None
-    """The required level to cast the spell."""
+    """The required level to cast the spell. If obj:`None`, the spell is obtained through a Revelation Perk."""
     mana: Optional[int] = None
     """The mana required to use the spell. If :obj:`None`, the mana cost is variable."""
     price: int

tests/resources/spells/spellRevelationPerk.txt

@@ -202,7 +202,7 @@ def _parse_spells_table(cls, builder: SpellBuilder, spell_table: bs4.Tag):
         builder.is_premium("yes" in attrs["premium"])
         builder.exp_level(parse_integer(attrs["exp_lvl"], None))
         builder.vocations([s.strip() for s in attrs["vocation"].split(",")])
-        builder.cities([s.strip() for s in attrs["city"].split(",")])
+        builder.cities([s.strip() for s in attrs["city"].split(",")] if "none" not in attrs["city"] else [])
         m = group_pattern.match(attrs["group"])
         groups = m.groupdict()
         builder.group(try_enum(SpellGroup, groups.get("group")))