mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Moved the test to test_store.cpp where it belongs

Browse Source
This commit is contained in:
florent.teppe 2023-01-04 00:17:45 +01:00
parent 64a9f742da
commit e80dbd7c95
3 changed files with 79 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
apps/openmw/mwworld/esmstore.cpp
View File

@ -196,28 +196,6 @@ namespace MWWorld
{
};
struct RecNameIntChar
{
char name[6];
RecNameIntChar(ESM::RecNameInts recName)
{
unsigned int FourCC = recName & ~ESM::sEsm4RecnameFlag; // Removes the flag
name[0] = FourCC & 0xFF;
name[1] = (FourCC >> 8) & 0xFF;
name[2] = (FourCC >> 16) & 0xFF;
name[3] = (FourCC >> 24) & 0xFF;
if (ESM::isESM4Rec(recName))
{
name[4] = '4';
name[5] = '\0';
}
else
{
name[4] = '\0';
}
}
};
template <typename T>
static bool typedReadRecordESM4(ESM4::Reader& reader, Store<T>& store)
{
@ -241,39 +219,6 @@ namespace MWWorld
return false;
}
template <typename T>
static unsigned int hasSameRecordId(const Store<T>& store, ESM::RecNameInts RecName)
{
if constexpr (HasRecordId<T>::value)
{
return T::sRecordId == RecName ? 1 : 0;
}
else
{
return 0;
}
}
template <typename T>
static void testRecNameIntCount(const Store<T>& store, const ESMStore::StoreTuple& stores)
{
if constexpr (HasRecordId<T>::value)
{
const unsigned int recordIdCount
= std::apply([](auto&&... x) { return (hasSameRecordId(x, T::sRecordId) + ...); }, stores);
if (recordIdCount != 1)
{
throw std::runtime_error(
"The same RecNameInt is used twice ESM::REC_" + std::string(RecNameIntChar(T::sRecordId).name));
}
}
}
static void testAllRecNameIntUnique(const ESMStore::StoreTuple& stores)
{
std::apply([&stores](auto&&... x) { (testRecNameIntCount(x, stores), ...); }, stores);
}
static bool readRecord(ESM4::Reader& reader, ESMStore& store)
{
return std::apply([&reader](auto&... x) { return (ESMStoreImp::typedReadRecordESM4(reader, x) || ...); },
@ -305,7 +250,6 @@ namespace MWWorld
{
mStoreImp = std::make_unique<ESMStoreImp>();
std::apply([this](auto&... x) { (ESMStoreImp::assignStoreToIndex(*this, x), ...); }, mStoreImp->mStores);
ESMStoreImp::testAllRecNameIntUnique(mStoreImp->mStores);
mDynamicCount = 0;
getWritable<ESM::Pathgrid>().setCells(getWritable<ESM::Cell>());
}

3
apps/openmw/mwworld/esmstore.hpp
View File

@ -86,7 +86,7 @@ namespace MWWorld
class ESMStore
{
friend struct ESMStoreImp; // This allows StoreImp to extend esmstore without beeing included everywhere
public:
using StoreTuple = std::tuple<Store<ESM::Activator>, Store<ESM::Potion>, Store<ESM::Apparatus>,
Store<ESM::Armor>, Store<ESM::BodyPart>, Store<ESM::Book>, Store<ESM::BirthSign>, Store<ESM::Class>,
Store<ESM::Clothing>, Store<ESM::Container>, Store<ESM::Creature>, Store<ESM::Dialogue>, Store<ESM::Door>,
@ -107,6 +107,7 @@ namespace MWWorld
Store<ESM4::Static>, Store<ESM4::Cell>, Store<ESM4::Reference>>;
private:
template <typename T>
static constexpr std::size_t getTypeIndex()
{

77
apps/openmw_test_suite/mwworld/test_store.cpp
View File

@ -8,6 +8,12 @@
#include <components/esm/records.hpp>
#include <components/esm3/esmreader.hpp>
#include <components/esm3/esmwriter.hpp>
#include <components/esm4/common.hpp>
#include <components/esm4/loadcell.hpp>
#include <components/esm4/loadrefr.hpp>
#include <components/esm4/loadstat.hpp>
#include <components/esm4/reader.hpp>
#include <components/esm4/readerutils.hpp>
#include <components/files/configurationmanager.hpp>
#include <components/files/conversion.hpp>
#include <components/loadinglistener/loadinglistener.hpp>
@ -289,6 +295,77 @@ TEST_F(StoreTest, delete_test)
ASSERT_TRUE(mEsmStore.get<RecordType>().getSize() == 1);
}
template <class T, class = std::void_t<>>
struct HasRecordId : std::false_type
{
};
template <class T>
struct HasRecordId<T, std::void_t<decltype(T::sRecordId)>> : std::true_type
{
};
struct RecNameIntChar
{
char name[6];
RecNameIntChar(ESM::RecNameInts recName)
{
unsigned int FourCC = recName & ~ESM::sEsm4RecnameFlag; // Removes the flag
name[0] = FourCC & 0xFF;
name[1] = (FourCC >> 8) & 0xFF;
name[2] = (FourCC >> 16) & 0xFF;
name[3] = (FourCC >> 24) & 0xFF;
if (ESM::isESM4Rec(recName))
{
name[4] = '4';
name[5] = '\0';
}
else
{
name[4] = '\0';
}
}
};
template <typename T>
static unsigned int hasSameRecordId(const MWWorld::Store<T>& store, ESM::RecNameInts RecName)
{
if constexpr (HasRecordId<T>::value)
{
return T::sRecordId == RecName ? 1 : 0;
}
else
{
return 0;
}
}
template <typename T>
static void testRecNameIntCount(const MWWorld::Store<T>& store, const MWWorld::ESMStore::StoreTuple& stores)
{
if constexpr (HasRecordId<T>::value)
{
const unsigned int recordIdCount
= std::apply([](auto&&... x) { return (hasSameRecordId(x, T::sRecordId) + ...); }, stores);
if (recordIdCount != 1)
{
std::cout << "The same RecNameInt is used twice ESM::REC_" + std::string(RecNameIntChar(T::sRecordId).name)
<< std::endl;
}
ASSERT_TRUE(recordIdCount == 1);
}
}
static void testAllRecNameIntUnique(const MWWorld::ESMStore::StoreTuple& stores)
{
std::apply([&stores](auto&&... x) { (testRecNameIntCount(x, stores), ...); }, stores);
}
TEST_F(StoreTest, recordId_Unique) // Test that each type has a unique recordId
{
testAllRecNameIntUnique(MWWorld::ESMStore::StoreTuple());
}
/// Tests overwriting of records.
TEST_F(StoreTest, overwrite_test)
{