Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-31 06:07:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

UnitTests: |Hspell and |Htalent unit testing

Browse Source
This commit is contained in:
Treeston
2020-09-02 12:42:02 +02:00
committed by GitHub
parent d0b91f6927
commit 470f45db7a
8 changed files with 274 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/game/Chat/HyperlinkTags.cpp
View File

@@ -183,11 +183,23 @@ bool Trinity::Hyperlinks::LinkTags::talent::StoreTo(TalentLinkData& val, std::st
return false;
if (rank < -1 || rank >= MAX_TALENT_RANK)
return false;
val.Talent = sTalentStore.LookupEntry(talentId);
val.Rank = rank+1;
if (!(val.Talent = sTalentStore.LookupEntry(talentId)))
return false;
if (val.Rank > 0 && !val.Talent->SpellRank[val.Rank - 1])
if (!val.Talent)
return false;
if (val.Rank > 0)
{
uint32 const spellId = val.Talent->SpellRank[val.Rank - 1];
if (!spellId)
return false;
val.Spell = sSpellMgr->GetSpellInfo(spellId);
if (!val.Spell)
return false;
}
else
{
val.Spell = nullptr;
}
return true;
}

9
src/server/game/Chat/Hyperlinks.cpp
View File

@@ -277,9 +277,12 @@ struct LinkValidator<LinkTags::talent>
{
static bool IsTextValid(TalentLinkData const& data, std::string_view text)
{
if (SpellInfo const* info = sSpellMgr->GetSpellInfo(data.Talent->SpellRank[0]))
return LinkValidator<LinkTags::spell>::IsTextValid(info, text);
return false;
SpellInfo const* info = data.Spell;
if (!info)
info = sSpellMgr->GetSpellInfo(data.Talent->SpellRank[0]);
if (!info)
return false;
return LinkValidator<LinkTags::spell>::IsTextValid(info, text);
}
static bool IsColorValid(TalentLinkData const&, HyperlinkColor c)

1
src/server/game/Chat/Hyperlinks.h
View File

@@ -77,6 +77,7 @@ namespace Trinity::Hyperlinks
{
TalentEntry const* Talent;
uint8 Rank;
SpellInfo const* Spell;
};
struct TradeskillLinkData

2
src/server/game/Spells/SpellMgr.h
View File

@@ -733,6 +733,8 @@ class TC_GAME_API SpellMgr
PetLevelupSpellMap mPetLevelupSpellMap;
PetDefaultSpellsMap mPetDefaultSpellsMap; // only spells not listed in related mPetLevelupSpellMap entry
SpellInfoMap mSpellInfoMap;
friend class UnitTestDataLoader;
};
#define sSpellMgr SpellMgr::instance()

10
src/server/shared/DataStores/DBCStructure.h
View File

@@ -1663,15 +1663,15 @@ struct TalentEntry
uint32 TabID; // 1 index in TalentTab.dbc (TalentTabEntry)
uint32 TierID; // 2
uint32 ColumnIndex; // 3
uint32 SpellRank[MAX_TALENT_RANK]; // 4-8
//uint32 SpellRankUnused[4]; // 9-12
std::array<uint32, MAX_TALENT_RANK> SpellRank; // 4-8
//std::array<uint32, 4> SpellRankUnused; // 9-12
uint32 PrereqTalent; // 13 index in Talent.dbc (TalentEntry)
//uint32 PrereqTalentUnused[2]; // 14-15
//std::array<uint32, 2> PrereqTalentUnused; // 14-15
uint32 PrereqRank; // 16
//uint32 PrereqRankUnused[2]; // 17-18
//std::array<uint32, 2> PrereqRankUnused; // 17-18
//uint32 Flags; // 19
//uint32 RequiredSpellID; // 20 all 0
//uint32 CategoryMask[2]; // 21 its a 64 bit mask for pet 1<<CategoryEnumID in CreatureFamily.dbc
//std::array<uint32, 2> CategoryMask; // 21 its a 64 bit mask for pet 1<<CategoryEnumID in CreatureFamily.dbc
};
struct TalentTabEntry

252
tests/DummyData.cpp
View File

@@ -21,84 +21,25 @@
#include "ItemDefines.h"
#include "ItemTemplate.h"
#include "ObjectMgr.h"
#include "SpellInfo.h"
#include "SpellMgr.h"
/*static*/ ItemTemplate& UnitTestDataLoader::GetItemTemplate(uint32 itemId, std::string_view name)
{
ItemTemplate& t = sObjectMgr->_itemTemplateStore[itemId];
t = {};
t.ItemId = itemId;
t.Class = ItemClass::ITEM_CLASS_MISC;
t.SubClass = 0;
t.SoundOverrideSubclass = -1;
t.Name1 = name;
t.DisplayInfoID = 0;
t.Quality = ItemQualities::ITEM_QUALITY_ARTIFACT;
t.Flags = 0;
t.Flags2 = 0;
t.BuyCount = 1;
t.BuyPrice = 0;
t.SellPrice = 0;
t.InventoryType = InventoryType::INVTYPE_NON_EQUIP;
t.AllowableClass = static_cast<uint32>(-1);
t.AllowableRace = static_cast<uint32>(-1);
t.ItemLevel = 1;
t.RequiredLevel = 0;
t.RequiredSkill = 0;
t.RequiredSkillRank = 0;
t.RequiredSpell = 0;
t.RequiredHonorRank = 0;
t.RequiredCityRank = 0;
t.RequiredReputationFaction = 0;
t.RequiredReputationRank = 0;
t.MaxCount = 0;
t.Stackable = 1;
t.ContainerSlots = 0;
t.StatsCount = 0;
t.ItemStat = {};
t.ScalingStatDistribution = 0;
t.ScalingStatValue = 0;
t.Damage = {};
t.Armor = 0;
t.HolyRes = 0;
t.FireRes = 0;
t.NatureRes = 0;
t.FrostRes = 0;
t.ShadowRes = 0;
t.ArcaneRes = 0;
t.Delay = 0;
t.AmmoType = 0;
t.RangedModRange = 0.0f;
t.Spells = {};
t.Bonding = ItemBondingType::NO_BIND;
t.Description = "";
t.PageText = 0;
t.LanguageID = 0;
t.PageMaterial = 0;
t.StartQuest = 0;
t.LockID = 0;
t.Material = static_cast<uint32>(-1);
t.Sheath = 0;
t.RandomProperty = 0;
t.RandomSuffix = 0;
t.Block = 0;
t.ItemSet = 0;
t.MaxDurability = 0;
t.Area = 0;
t.Map = 0;
t.BagFamily = 0;
t.TotemCategory = 0;
t.Socket = {};
t.socketBonus = 0;
t.GemProperties = 0;
t.RequiredDisenchantSkill = static_cast<uint32>(-1);
t.ArmorDamageModifier = 0.0;
t.Duration = 0;
t.ItemLevel = 0;
t.HolidayId = 0;
t.ScriptId = 0;
t.DisenchantID = 0;
t.FoodType = 0;
t.MinMoneyLoot = 0;
t.MaxMoneyLoot = 0;
return t;
}
@@ -199,9 +140,13 @@ static UnitTestDataLoader::DBC<ItemRandomSuffixEntry, &ItemRandomSuffixEntry::ID
static UnitTestDataLoader::DBC<AchievementEntry, &AchievementEntry::ID> achievements(sAchievementStore);
/*static*/ void UnitTestDataLoader::LoadAchievementTemplates()
{
if (!achievements.Empty())
return;
auto loader = achievements.Loader();
AchievementEntry& toc5 = loader.Add();
toc5 = {};
toc5.ID = 4298;
toc5.Faction = 1;
toc5.InstanceID = 650;
@@ -210,7 +155,184 @@ static UnitTestDataLoader::DBC<AchievementEntry, &AchievementEntry::ID> achievem
toc5.Title[LOCALE_esES] = "Heroico: Prueba del Campe\xc3\xb3n";
toc5.Category = 14921;
toc5.Points = 10;
toc5.Flags = 0;
toc5.MinimumCriteria = 0;
toc5.SharesCriteria = 0;
}
static UnitTestDataLoader::DBC<SpellEntry, &SpellEntry::ID> spells(sSpellStore);
static UnitTestDataLoader::DBC<TalentEntry, &TalentEntry::ID> talents(sTalentStore);
/*static*/ void UnitTestDataLoader::LoadSpellInfo()
{
if (!sSpellMgr->mSpellInfoMap.empty())
return;
{
auto spellLoader = spells.Loader();
SpellEntry& tidalWaves1 = spellLoader.Add();
tidalWaves1 = {};
tidalWaves1.ID = 51562;
tidalWaves1.Attributes = 464;
tidalWaves1.AttributesExC = 524288;
tidalWaves1.CastingTimeIndex = 1;
tidalWaves1.ProcTypeMask = 17408;
tidalWaves1.ProcChance = 20;
tidalWaves1.SpellLevel = 1;
tidalWaves1.RangeIndex = 1;
tidalWaves1.EquippedItemClass = -1;
tidalWaves1.Effect = { 6,6,6 };
tidalWaves1.EffectDieSides = { 1,1,1 };
tidalWaves1.EffectBasePoints = { 19,3,1 };
tidalWaves1.EffectImplicitTargetA = { 1,1,1 };
tidalWaves1.EffectAura = { 42, 107, 107 };
tidalWaves1.EffectMiscValue = { 7,24,24 };
tidalWaves1.EffectTriggerSpell = { 53390 };
tidalWaves1.EffectSpellClassMask = { { { 192, 8192, 0}, { 64, 0, 0 }, { 128, 0, 0 } } };
tidalWaves1.SpellIconID = 3057;
tidalWaves1.SpellPriority = 50;
tidalWaves1.Name.fill("");
tidalWaves1.Name[LOCALE_enUS] = "Tidal Waves";
tidalWaves1.Name[LOCALE_esES] = "Maremotos";
tidalWaves1.NameSubtext.fill("");
tidalWaves1.NameSubtext[LOCALE_enUS] = "Rank 1";
tidalWaves1.NameSubtext[LOCALE_esES] = "Rango 1";
tidalWaves1.SpellClassSet = 11;
tidalWaves1.EffectChainAmplitude.fill(1.0);
tidalWaves1.SchoolMask = 1;
SpellEntry& tidalWaves2 = spellLoader.Add();
tidalWaves2 = tidalWaves1;
tidalWaves2.ID = 51563;
tidalWaves2.ProcChance = 40;
tidalWaves2.EffectBasePoints = { 39,7,3 };
tidalWaves2.NameSubtext[LOCALE_enUS] = "Rank 2";
tidalWaves2.NameSubtext[LOCALE_esES] = "Rango 2";
SpellEntry& tidalWaves3 = spellLoader.Add();
tidalWaves3 = tidalWaves1;
tidalWaves3.ID = 51564;
tidalWaves3.ProcChance = 60;
tidalWaves3.EffectBasePoints = { 59, 11, 5 };
tidalWaves3.NameSubtext[LOCALE_enUS] = "Rank 3";
tidalWaves3.NameSubtext[LOCALE_esES] = "Rango 3";
SpellEntry& tidalWaves4 = spellLoader.Add();
tidalWaves4 = tidalWaves1;
tidalWaves4.ID = 51565;
tidalWaves4.ProcChance = 80;
tidalWaves4.EffectBasePoints = { 79, 15, 7 };
tidalWaves4.NameSubtext[LOCALE_enUS] = "Rank 4";
tidalWaves4.NameSubtext[LOCALE_esES] = "Rango 4";
SpellEntry& tidalWaves5 = spellLoader.Add();
tidalWaves5 = tidalWaves1;
tidalWaves5.ID = 51566;
tidalWaves5.ProcChance = 100;
tidalWaves5.EffectBasePoints = { 99, 19, 9 };
tidalWaves5.NameSubtext[LOCALE_enUS] = "Rank 5";
tidalWaves5.NameSubtext[LOCALE_esES] = "Rango 5";
SpellEntry& earthShield1 = spellLoader.Add();
earthShield1 = {};
earthShield1.ID = 974;
earthShield1.Category = 1195;
earthShield1.DispelType = 1;
earthShield1.Attributes = 327680;
earthShield1.AttributesExD = 524288;
earthShield1.AttributesExE = 32;
earthShield1.AttributesExF = 67108864;
earthShield1.AttributesExG = 1073742848;
earthShield1.CastingTimeIndex = 1;
earthShield1.AuraInterruptFlags = 524288;
earthShield1.ProcTypeMask = 172712;
earthShield1.ProcChance = 100;
earthShield1.ProcCharges = 6;
earthShield1.MaxLevel = 59;
earthShield1.BaseLevel = 50;
earthShield1.SpellLevel = 50;
earthShield1.DurationIndex = 6;
earthShield1.RangeIndex = 5;
earthShield1.Effect = { 6,6,0 };
earthShield1.EffectDieSides = { 1,1,0 };
earthShield1.EffectBasePoints = { 149,29,0 };
earthShield1.EffectImplicitTargetA = { 21,21,0 };
earthShield1.EffectAura = { 4,149,0 };
earthShield1.EffectMiscValue = { 0,126,0 };
earthShield1.SpellVisualID = { 7362,0 };
earthShield1.SpellIconID = 2015;
earthShield1.Name.fill("");
earthShield1.Name[LOCALE_enUS] = "Earth Shield";
earthShield1.Name[LOCALE_esES] = "Escudo de tierra";
earthShield1.NameSubtext = tidalWaves1.NameSubtext;
earthShield1.ManaCostPct = 15;
earthShield1.StartRecoveryCategory = 133;
earthShield1.StartRecoveryTime = 1500;
earthShield1.SpellClassSet = 11;
earthShield1.SpellClassMask = { 0, 1024, 0 };
earthShield1.DefenseType = 1;
earthShield1.PreventionType = 1;
earthShield1.EffectChainAmplitude.fill(1.0);
earthShield1.SchoolMask = 8;
earthShield1.EffectBonusCoefficient = { 1.0, 0.0, 1.0 };
SpellEntry& impEarthShield1 = spellLoader.Add();
impEarthShield1 = {};
impEarthShield1.ID = 51560;
impEarthShield1.Attributes = 464;
impEarthShield1.CastingTimeIndex = 1;
impEarthShield1.ProcChance = 101;
impEarthShield1.RangeIndex = 1;
impEarthShield1.EquippedItemClass = -1;
impEarthShield1.Effect = { 6,6,0 };
impEarthShield1.EffectDieSides = { 1,1,0 };
impEarthShield1.EffectBasePoints = { 0,4,0 };
impEarthShield1.EffectImplicitTargetA = { 1,1,0 };
impEarthShield1.EffectAura = { 107,108,0 };
impEarthShield1.EffectMiscValue = { 4,3,0 };
impEarthShield1.EffectMiscValueB = { 3,0,0 };
impEarthShield1.EffectSpellClassMask = { { {0,1024,0}, {0,1024,0}, {0,0,0} } };
impEarthShield1.SpellIconID = 2015;
impEarthShield1.Name.fill("");
impEarthShield1.Name[LOCALE_enUS] = "Improved Earth Shield";
impEarthShield1.Name[LOCALE_esES] = "Escudo de tierra mejorado";
impEarthShield1.NameSubtext = tidalWaves1.NameSubtext;
impEarthShield1.SpellClassSet = 11;
impEarthShield1.EffectChainAmplitude.fill(1.0);
impEarthShield1.SchoolMask = 1;
impEarthShield1.EffectBonusCoefficient = { 0.0, 0.0, 1.0 };
SpellEntry& impEarthShield2 = spellLoader.Add();
impEarthShield2 = impEarthShield1;
impEarthShield2.ID = 51561;
impEarthShield2.EffectBasePoints = { 1,9,0 };
impEarthShield2.NameSubtext = tidalWaves2.NameSubtext;
auto talentLoader = talents.Loader();
TalentEntry& tidalWaves = talentLoader.Add();
tidalWaves.ID = 2063;
tidalWaves.TabID = 262;
tidalWaves.TierID = 9;
tidalWaves.ColumnIndex = 1;
tidalWaves.SpellRank = { 51562, 51563, 51564, 51565, 51566 };
tidalWaves.PrereqTalent = 0;
tidalWaves.PrereqRank = 0;
TalentEntry& earthShield = talentLoader.Add();
earthShield.ID = 1698;
earthShield.TabID = 262;
earthShield.TierID = 8;
earthShield.ColumnIndex = 1;
earthShield.SpellRank = { 974,0,0,0,0 };
earthShield.PrereqTalent = 0;
earthShield.PrereqRank = 2;
TalentEntry& impEarthShield = talentLoader.Add();
impEarthShield.ID = 2059;
impEarthShield.TabID = 262;
impEarthShield.TierID = 8;
impEarthShield.ColumnIndex = 2;
impEarthShield.SpellRank = { 51560, 51561, 0, 0, 0 };
impEarthShield.PrereqTalent = 1698;
impEarthShield.PrereqRank = 0;
}
// this needs to be after the loader destructors
sSpellMgr->LoadSpellInfoStore();
}

11
tests/DummyData.h
View File

@@ -22,10 +22,13 @@
#include "Define.h"
#include "DBCStore.h"
#include <list>
#include <string_view>
struct ItemTemplate;
class SpellInfo;
class UnitTestDataLoader
{
public:
@@ -59,13 +62,19 @@ class UnitTestDataLoader
_store._indexTable.AsT[entry.*ID] = &entry;
}
bool Empty() const
{
return !_store._indexTable.AsT;
}
private:
std::vector<T> _storage;
std::list<T> _storage;
DBCStorage<T>& _store;
};
static void LoadAchievementTemplates();
static void LoadItemTemplates();
static void LoadSpellInfo();
private:
static ItemTemplate& GetItemTemplate(uint32 id, std::string_view name);

48
tests/game/Hyperlinks.cpp
View File

@@ -118,3 +118,51 @@ TEST_CASE("|Hachievement validation", "[Hyperlinks]")
REQUIRE(true == CheckAllLinks("|cffffff00|Hachievement:4298:00000000000000FD:1:12:20:12:0:0:0:0|h[Heroico: Prueba del Campe\xc3\xb3n]|h|r"));
}
TEST_CASE("|Htalent validation", "[Hyperlinks]")
{
UnitTestDataLoader::LoadSpellInfo();
sWorld->setIntConfig(CONFIG_CHAT_STRICT_LINK_CHECKING_SEVERITY, 1);
REQUIRE(false == CheckAllLinks("|cff4e96f7|Htalent:2063:-2|h[Tidal Waves]|h|r"));
REQUIRE(true == CheckAllLinks("|cff4e96f7|Htalent:2063:-1|h[Tidal Waves]|h|r"));
REQUIRE(true == CheckAllLinks("|cff4e96f7|Htalent:2063:0|h[Tidal Waves]|h|r"));
REQUIRE(true == CheckAllLinks("|cff4e96f7|Htalent:2063:1|h[Tidal Waves]|h|r"));
REQUIRE(true == CheckAllLinks("|cff4e96f7|Htalent:2063:2|h[Tidal Waves]|h|r"));
REQUIRE(true == CheckAllLinks("|cff4e96f7|Htalent:2063:3|h[Tidal Waves]|h|r"));
REQUIRE(true == CheckAllLinks("|cff4e96f7|Htalent:2063:4|h[Tidal Waves]|h|r"));
REQUIRE(false == CheckAllLinks("|cff4e96f7|Htalent:2063:5|h[Tidal Waves]|h|r"));
REQUIRE(false == CheckAllLinks("|cff4e96f7|Htalent:2063:6|h[Tidal Waves]|h|r"));
REQUIRE(false == CheckAllLinks("|cff4e96f7|Htalent:2063:4|h[Tidal Waves (Rank 5)|h|r"));
REQUIRE(true == CheckAllLinks("|cff4e96f7|Htalent:2063:-1|h[Maremotos]|h|r"));
REQUIRE(true == CheckAllLinks("|cff4e96f7|Htalent:2063:4|h[Maremotos]|h|r"));
REQUIRE(false == CheckAllLinks("|cff4e96f7|Htalent:2063:4|h[Maremotos (Rango 5)]|h|r"));
REQUIRE(false == CheckAllLinks("|cff4e96f7|Htalent:2059:-2|h[Improved Earth Shield]|h|r"));
REQUIRE(true == CheckAllLinks("|cff4e96f7|Htalent:2059:-1|h[Improved Earth Shield]|h|r"));
REQUIRE(true == CheckAllLinks("|cff4e96f7|Htalent:2059:0|h[Improved Earth Shield]|h|r"));
REQUIRE(true == CheckAllLinks("|cff4e96f7|Htalent:2059:1|h[Improved Earth Shield]|h|r"));
REQUIRE(false == CheckAllLinks("|cff4e96f7|Htalent:2059:2|h[Improved Earth Shield]|h|r"));
REQUIRE(false == CheckAllLinks("|cff4e96f7|Htalent:2059:3|h[Improved Earth Shield]|h|r"));
REQUIRE(false == CheckAllLinks("|cff4e96f7|Htalent:2059:4|h[Improved Earth Shield]|h|r"));
REQUIRE(false == CheckAllLinks("|cff4e96f7|Htalent:2059:5|h[Improved Earth Shield]|h|r"));
REQUIRE(true == CheckAllLinks("|cff4e96f7|Htalent:1698:0|h[Earth Shield]|h|r"));
REQUIRE(false == CheckAllLinks("|cff71d5ff|Htalent:1698:0|h[Earth Shield]|h|r"));
REQUIRE(false == CheckAllLinks("|cff4e96f7|Htalent:974:0|h[Earth Shield]|h|r"));
REQUIRE(false == CheckAllLinks("|cff71d5ff|Htalent:974:0|h[Earth Shield]|h|r"));
}
TEST_CASE("|Hspell validation", "[Hyperlinks]")
{
UnitTestDataLoader::LoadSpellInfo();
sWorld->setIntConfig(CONFIG_CHAT_STRICT_LINK_CHECKING_SEVERITY, 1);
REQUIRE(true == CheckAllLinks("|cff71d5ff|Hspell:974|h[Earth Shield]|h|r"));
REQUIRE(false == CheckAllLinks("|cff4e96f7|Hspell:974|h[Earth Shield]|h|r"));
REQUIRE(true == CheckAllLinks("|cff71d5ff|Hspell:974|h[Escudo de tierra]|h|r"));
REQUIRE(false == CheckAllLinks("|cff71d5ff|Hspell:974|h[Earth Shield (Rank 1)]|h|r"));
REQUIRE(false == CheckAllLinks("|cff71d5ff|Hspell:974|h[Escudo de tierra (Rango 1)]|h|r"));
REQUIRE(false == CheckAllLinks("|cff71d5ff|Hspell:1698|h[Earth Shield]|h|r"));
}