mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 08:41:35 +00:00
Code Issues Releases Wiki Activity

Fix tests

Browse source
This commit is contained in:
Evil Eye 2022-04-16 22:58:08 +02:00
parent 61ea678a96
commit 86d7f5a988
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/openmw_test_suite/mwworld/test_store.cpp
View file

@ -29,13 +29,14 @@ struct ContentFileTest : public ::testing::Test
// load the content files // load the content files
int index=0; int index=0;
ESM::Dialogue* dialogue = nullptr;
for (const auto & mContentFile : mContentFiles) for (const auto & mContentFile : mContentFiles)
{ {
ESM::ESMReader lEsm; ESM::ESMReader lEsm;
lEsm.setEncoder(nullptr); lEsm.setEncoder(nullptr);
lEsm.setIndex(index); lEsm.setIndex(index);
lEsm.open(mContentFile.string()); lEsm.open(mContentFile.string());
mEsmStore.load(lEsm, &dummyListener); mEsmStore.load(lEsm, &dummyListener, dialogue);
++index; ++index;
} }
@ -249,17 +250,18 @@ TEST_F(StoreTest, delete_test)
record.mId = recordId; record.mId = recordId;
ESM::ESMReader reader; ESM::ESMReader reader;
ESM::Dialogue* dialogue = nullptr;
// master file inserts a record // master file inserts a record
reader.open(getEsmFile(record, false), "filename"); reader.open(getEsmFile(record, false), "filename");
mEsmStore.load(reader, &dummyListener); mEsmStore.load(reader, &dummyListener, dialogue);
mEsmStore.setUp(); mEsmStore.setUp();
ASSERT_TRUE (mEsmStore.get<RecordType>().getSize() == 1); ASSERT_TRUE (mEsmStore.get<RecordType>().getSize() == 1);
// now a plugin deletes it // now a plugin deletes it
reader.open(getEsmFile(record, true), "filename"); reader.open(getEsmFile(record, true), "filename");
mEsmStore.load(reader, &dummyListener); mEsmStore.load(reader, &dummyListener, dialogue);
mEsmStore.setUp(); mEsmStore.setUp();
ASSERT_TRUE (mEsmStore.get<RecordType>().getSize() == 0); ASSERT_TRUE (mEsmStore.get<RecordType>().getSize() == 0);
@ -267,7 +269,7 @@ TEST_F(StoreTest, delete_test)
// now another plugin inserts it again // now another plugin inserts it again
// expected behaviour is the record to reappear rather than staying deleted // expected behaviour is the record to reappear rather than staying deleted
reader.open(getEsmFile(record, false), "filename"); reader.open(getEsmFile(record, false), "filename");
mEsmStore.load(reader, &dummyListener); mEsmStore.load(reader, &dummyListener, dialogue);
mEsmStore.setUp(); mEsmStore.setUp();
ASSERT_TRUE (mEsmStore.get<RecordType>().getSize() == 1); ASSERT_TRUE (mEsmStore.get<RecordType>().getSize() == 1);
@ -286,17 +288,18 @@ TEST_F(StoreTest, overwrite_test)
record.mId = recordId; record.mId = recordId;
ESM::ESMReader reader; ESM::ESMReader reader;
ESM::Dialogue* dialogue = nullptr;
// master file inserts a record // master file inserts a record
reader.open(getEsmFile(record, false), "filename"); reader.open(getEsmFile(record, false), "filename");
mEsmStore.load(reader, &dummyListener); mEsmStore.load(reader, &dummyListener, dialogue);
mEsmStore.setUp(); mEsmStore.setUp();
// now a plugin overwrites it with changed data // now a plugin overwrites it with changed data
record.mId = recordIdUpper; // change id to uppercase, to test case smashing while we're at it record.mId = recordIdUpper; // change id to uppercase, to test case smashing while we're at it
record.mModel = "the_new_model"; record.mModel = "the_new_model";
reader.open(getEsmFile(record, false), "filename"); reader.open(getEsmFile(record, false), "filename");
mEsmStore.load(reader, &dummyListener); mEsmStore.load(reader, &dummyListener, dialogue);
mEsmStore.setUp(); mEsmStore.setUp();
// verify that changes were actually applied // verify that changes were actually applied