From bf7135dd112448729a536ba74ad227eade497554 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sat, 26 Aug 2023 02:06:45 +0200 Subject: [PATCH] Adjust tests to work with data driven levels (#6509) Co-authored-by: staphen --- test/pack_test.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/test/pack_test.cpp b/test/pack_test.cpp index 31fa8d522..77bb65262 100644 --- a/test/pack_test.cpp +++ b/test/pack_test.cpp @@ -3,6 +3,7 @@ #include #include "pack.h" +#include "playerdat.hpp" #include "utils/paths.h" namespace devilution { @@ -940,6 +941,7 @@ public: }; SwapLE(testPack); + LoadPlayerDataFiles(); UnPackPlayer(testPack, *MyPlayer); } }; @@ -980,15 +982,6 @@ TEST_F(NetPackTest, UnPackNetPlayer_invalid_plrlevel) ASSERT_FALSE(TestNetPackValidation()); } -TEST_F(NetPackTest, UnPackNetPlayer_invalid_pLevel) -{ - MyPlayer->_pLevel = 0; - ASSERT_FALSE(TestNetPackValidation()); - - MyPlayer->_pLevel = MaxCharacterLevel + 1; - ASSERT_FALSE(TestNetPackValidation()); -} - TEST_F(NetPackTest, UnPackNetPlayer_invalid_hpBase) { MyPlayer->_pHPBase = -64; @@ -1347,7 +1340,7 @@ TEST_F(NetPackTest, UnPackNetPlayer_invalid_townItemLevel) uint16_t createInfo = item._iCreateInfo; bool boyItem = (item._iCreateInfo & CF_BOY) != 0; item._iCreateInfo &= ~CF_LEVEL; - item._iCreateInfo |= boyItem ? MaxCharacterLevel + 1 : 31; + item._iCreateInfo |= boyItem ? MyPlayer->getMaxCharacterLevel() + 1 : 31; ASSERT_FALSE(TestNetPackValidation()); item._iCreateInfo = createInfo;