mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 05:09:41 +00:00
Code Issues Releases Wiki Activity

Use original RefId to remove info from InfoOrder

Browse source
This commit is contained in:
elsid 2023-06-03 01:03:36 +02:00
parent 25bbaa2343
commit 4a8471ce78
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/model/world/infocollection.cpp
View file

@ -80,7 +80,7 @@ void CSMWorld::InfoCollection::load(
if (base) if (base)
{ {
infoOrders.at(dialogue.mId).removeInfo(id); infoOrders.at(dialogue.mId).removeInfo(info.mId);
removeRows(index, 1); removeRows(index, 1);
return; return;
} }

25
apps/opencs_tests/model/world/testinfocollection.cpp
View file

@ -129,6 +129,11 @@ namespace CSMWorld
saveAndLoadDialogueWithInfos(data.mDialogue, data.mInfos, base, infoCollection, infoOrder); saveAndLoadDialogueWithInfos(data.mDialogue, data.mInfos, base, infoCollection, infoOrder);
} }
MATCHER_P(InfoId, v, "")
{
return arg.mId == v;
}
TEST(CSMWorldInfoCollectionTest, loadShouldAddRecord) TEST(CSMWorldInfoCollectionTest, loadShouldAddRecord)
{ {
ESM::Dialogue dialogue; ESM::Dialogue dialogue;
@ -152,6 +157,9 @@ namespace CSMWorld
EXPECT_EQ(record.mBase.mTopicId, dialogue.mId); EXPECT_EQ(record.mBase.mTopicId, dialogue.mId);
EXPECT_EQ(record.mBase.mOriginalId, info.mId); EXPECT_EQ(record.mBase.mOriginalId, info.mId);
EXPECT_EQ(record.mBase.mId, ESM::RefId::stringRefId("dialogue#info0")); EXPECT_EQ(record.mBase.mId, ESM::RefId::stringRefId("dialogue#info0"));
ASSERT_THAT(infoOrder, ElementsAre(Key(dialogue.mId)));
EXPECT_THAT(infoOrder.find(dialogue.mId)->second.getOrderedInfo(), ElementsAre(InfoId(info.mId)));
} }
TEST(CSMWorldInfoCollectionTest, loadShouldAddRecordAndMarkModifiedOnlyWhenNotBase) TEST(CSMWorldInfoCollectionTest, loadShouldAddRecordAndMarkModifiedOnlyWhenNotBase)
@ -177,6 +185,9 @@ namespace CSMWorld
EXPECT_EQ(record.mModified.mTopicId, dialogue.mId); EXPECT_EQ(record.mModified.mTopicId, dialogue.mId);
EXPECT_EQ(record.mModified.mOriginalId, info.mId); EXPECT_EQ(record.mModified.mOriginalId, info.mId);
EXPECT_EQ(record.mModified.mId, ESM::RefId::stringRefId("dialogue#info0")); EXPECT_EQ(record.mModified.mId, ESM::RefId::stringRefId("dialogue#info0"));
ASSERT_THAT(infoOrder, ElementsAre(Key(dialogue.mId)));
EXPECT_THAT(infoOrder.find(dialogue.mId)->second.getOrderedInfo(), ElementsAre(InfoId(info.mId)));
} }
TEST(CSMWorldInfoCollectionTest, loadShouldUpdateRecord) TEST(CSMWorldInfoCollectionTest, loadShouldUpdateRecord)
@ -204,6 +215,9 @@ namespace CSMWorld
const Record<Info>& record = collection.getRecord(0); const Record<Info>& record = collection.getRecord(0);
ASSERT_EQ(record.mState, RecordBase::State_BaseOnly); ASSERT_EQ(record.mState, RecordBase::State_BaseOnly);
EXPECT_EQ(record.mBase.mActor, ESM::RefId::stringRefId("newActor")); EXPECT_EQ(record.mBase.mActor, ESM::RefId::stringRefId("newActor"));
ASSERT_THAT(infoOrder, ElementsAre(Key(dialogue.mId)));
EXPECT_THAT(infoOrder.find(dialogue.mId)->second.getOrderedInfo(), ElementsAre(InfoId(info.mId)));
} }
TEST(CSMWorldInfoCollectionTest, loadShouldUpdateRecordAndMarkModifiedWhenNotBase) TEST(CSMWorldInfoCollectionTest, loadShouldUpdateRecordAndMarkModifiedWhenNotBase)
@ -231,6 +245,9 @@ namespace CSMWorld
const Record<Info>& record = collection.getRecord(0); const Record<Info>& record = collection.getRecord(0);
ASSERT_EQ(record.mState, RecordBase::State_Modified); ASSERT_EQ(record.mState, RecordBase::State_Modified);
EXPECT_EQ(record.mModified.mActor, ESM::RefId::stringRefId("newActor")); EXPECT_EQ(record.mModified.mActor, ESM::RefId::stringRefId("newActor"));
ASSERT_THAT(infoOrder, ElementsAre(Key(dialogue.mId)));
EXPECT_THAT(infoOrder.find(dialogue.mId)->second.getOrderedInfo(), ElementsAre(InfoId(info.mId)));
} }
TEST(CSMWorldInfoCollectionTest, loadShouldSkipAbsentDeletedRecord) TEST(CSMWorldInfoCollectionTest, loadShouldSkipAbsentDeletedRecord)
@ -251,6 +268,8 @@ namespace CSMWorld
saveAndLoadDialogueWithInfos(dialogue, std::array{ info }, base, collection, infoOrder); saveAndLoadDialogueWithInfos(dialogue, std::array{ info }, base, collection, infoOrder);
EXPECT_EQ(collection.getSize(), 0); EXPECT_EQ(collection.getSize(), 0);
ASSERT_THAT(infoOrder, ElementsAre());
} }
TEST(CSMWorldInfoCollectionTest, loadShouldRemovePresentDeletedBaseRecord) TEST(CSMWorldInfoCollectionTest, loadShouldRemovePresentDeletedBaseRecord)
@ -275,6 +294,9 @@ namespace CSMWorld
saveAndLoadDialogueWithInfos(dialogue, std::array{ info }, base, collection, infoOrder); saveAndLoadDialogueWithInfos(dialogue, std::array{ info }, base, collection, infoOrder);
EXPECT_EQ(collection.getSize(), 0); EXPECT_EQ(collection.getSize(), 0);
ASSERT_THAT(infoOrder, ElementsAre(Key(dialogue.mId)));
EXPECT_THAT(infoOrder.find(dialogue.mId)->second.getOrderedInfo(), ElementsAre());
} }
TEST(CSMWorldInfoCollectionTest, loadShouldMarkAsDeletedNotBaseRecord) TEST(CSMWorldInfoCollectionTest, loadShouldMarkAsDeletedNotBaseRecord)
@ -301,6 +323,9 @@ namespace CSMWorld
EXPECT_EQ(collection.getSize(), 1); EXPECT_EQ(collection.getSize(), 1);
EXPECT_EQ( EXPECT_EQ(
collection.getRecord(ESM::RefId::stringRefId("dialogue#info0")).mState, RecordBase::State_Deleted); collection.getRecord(ESM::RefId::stringRefId("dialogue#info0")).mState, RecordBase::State_Deleted);
ASSERT_THAT(infoOrder, ElementsAre(Key(dialogue.mId)));
EXPECT_THAT(infoOrder.find(dialogue.mId)->second.getOrderedInfo(), ElementsAre(InfoId(info.mValue.mId)));
} }
TEST(CSMWorldInfoCollectionTest, sortShouldOrderRecordsBasedOnPrevAndNext) TEST(CSMWorldInfoCollectionTest, sortShouldOrderRecordsBasedOnPrevAndNext)