From ce05765d06979ce35a7ed948c1faede9dd8aba02 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 13 Jan 2025 15:21:24 -0500 Subject: [PATCH] Write RemoveItemsFromCloneOfChild tests, fix issues --- .../DatFileTests.Splitting.cs | 109 +++++++++++++++++- SabreTools.DatFiles/DatFile.Splitting.cs | 8 +- 2 files changed, 109 insertions(+), 8 deletions(-) diff --git a/SabreTools.DatFiles.Test/DatFileTests.Splitting.cs b/SabreTools.DatFiles.Test/DatFileTests.Splitting.cs index 4d20a971..49b29cfb 100644 --- a/SabreTools.DatFiles.Test/DatFileTests.Splitting.cs +++ b/SabreTools.DatFiles.Test/DatFileTests.Splitting.cs @@ -85,8 +85,8 @@ namespace SabreTools.DatFiles.Test long biosMachineIndex = datFile.AddMachineDB(biosMachine); long deviceMachineIndex = datFile.AddMachineDB(deviceMachine); long sourceIndex = datFile.AddSourceDB(source); - long biosItemId = datFile.AddItemDB(biosItem, biosMachineIndex, sourceIndex, statsOnly: false); - long deviceItemId = datFile.AddItemDB(deviceItem, deviceMachineIndex, sourceIndex, statsOnly: false); + _ = datFile.AddItemDB(biosItem, biosMachineIndex, sourceIndex, statsOnly: false); + _ = datFile.AddItemDB(deviceItem, deviceMachineIndex, sourceIndex, statsOnly: false); datFile.BucketBy(ItemKey.Machine, DedupeType.None); datFile.RemoveBiosAndDeviceSets(); @@ -98,7 +98,108 @@ namespace SabreTools.DatFiles.Test #region RemoveItemsFromCloneOfChild - // TODO: Implement RemoveItemsFromCloneOfChild tests + [Fact] + public void RemoveItemsFromCloneOfChild_Items() + { + Source source = new Source(0, source: null); + + Machine parentMachine = new Machine(); + parentMachine.SetFieldValue(Models.Metadata.Machine.NameKey, "parent"); + parentMachine.SetFieldValue(Models.Metadata.Machine.RomOfKey, "romof"); + + Machine childMachine = new Machine(); + childMachine.SetFieldValue(Models.Metadata.Machine.NameKey, "child"); + childMachine.SetFieldValue(Models.Metadata.Machine.CloneOfKey, "parent"); + + DatItem parentItem = new Rom(); + parentItem.SetName("parent_rom"); + parentItem.SetFieldValue(Models.Metadata.Rom.SizeKey, 12345); + parentItem.SetFieldValue(Models.Metadata.Rom.CRCKey, "deadbeef"); + parentItem.SetFieldValue(DatItem.MachineKey, parentMachine); + parentItem.SetFieldValue(DatItem.SourceKey, source); + + DatItem matchChildItem = new Rom(); + matchChildItem.SetName("match_child_rom"); + matchChildItem.SetFieldValue(Models.Metadata.Rom.SizeKey, 12345); + matchChildItem.SetFieldValue(Models.Metadata.Rom.CRCKey, "deadbeef"); + matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); + matchChildItem.SetFieldValue(DatItem.SourceKey, source); + + DatItem noMatchChildItem = new Rom(); + noMatchChildItem.SetName("no_match_child_rom"); + noMatchChildItem.SetFieldValue(Models.Metadata.Rom.SizeKey, 12345); + noMatchChildItem.SetFieldValue(Models.Metadata.Rom.CRCKey, "beefdead"); + noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); + noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); + + DatFile datFile = new Logiqx(datFile: null, deprecated: false); + datFile.AddItem(parentItem, statsOnly: false); + datFile.AddItem(matchChildItem, statsOnly: false); + datFile.AddItem(noMatchChildItem, statsOnly: false); + + datFile.BucketBy(ItemKey.Machine, DedupeType.None); + datFile.RemoveItemsFromCloneOfChild(); + + Assert.Single(datFile.GetItemsForBucket("parent")); + DatItem actual = Assert.Single(datFile.GetItemsForBucket("child")); + Machine? actualMachine = actual.GetFieldValue(DatItem.MachineKey); + Assert.NotNull(actualMachine); + Assert.Equal("child", actualMachine.GetStringFieldValue(Models.Metadata.Machine.NameKey)); + Assert.Equal("romof", actualMachine.GetStringFieldValue(Models.Metadata.Machine.RomOfKey)); + } + + [Fact] + public void RemoveItemsFromCloneOfChild_ItemsDB() + { + Source source = new Source(0, source: null); + + Machine parentMachine = new Machine(); + parentMachine.SetFieldValue(Models.Metadata.Machine.NameKey, "parent"); + parentMachine.SetFieldValue(Models.Metadata.Machine.RomOfKey, "romof"); + + Machine childMachine = new Machine(); + childMachine.SetFieldValue(Models.Metadata.Machine.NameKey, "child"); + childMachine.SetFieldValue(Models.Metadata.Machine.CloneOfKey, "parent"); + + DatItem parentItem = new Rom(); + parentItem.SetName("parent_rom"); + parentItem.SetFieldValue(Models.Metadata.Rom.SizeKey, 12345); + parentItem.SetFieldValue(Models.Metadata.Rom.CRCKey, "deadbeef"); + parentItem.SetFieldValue(DatItem.MachineKey, parentMachine); + parentItem.SetFieldValue(DatItem.SourceKey, source); + + DatItem matchChildItem = new Rom(); + matchChildItem.SetName("match_child_rom"); + matchChildItem.SetFieldValue(Models.Metadata.Rom.SizeKey, 12345); + matchChildItem.SetFieldValue(Models.Metadata.Rom.CRCKey, "deadbeef"); + matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); + matchChildItem.SetFieldValue(DatItem.SourceKey, source); + + DatItem noMatchChildItem = new Rom(); + noMatchChildItem.SetName("no_match_child_rom"); + noMatchChildItem.SetFieldValue(Models.Metadata.Rom.SizeKey, 12345); + noMatchChildItem.SetFieldValue(Models.Metadata.Rom.CRCKey, "beefdead"); + noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine); + noMatchChildItem.SetFieldValue(DatItem.SourceKey, source); + + DatFile datFile = new Logiqx(datFile: null, deprecated: false); + long biosMachineIndex = datFile.AddMachineDB(parentMachine); + long deviceMachineIndex = datFile.AddMachineDB(childMachine); + long sourceIndex = datFile.AddSourceDB(source); + _ = datFile.AddItemDB(parentItem, biosMachineIndex, sourceIndex, statsOnly: false); + _ = datFile.AddItemDB(matchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false); + _ = datFile.AddItemDB(noMatchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false); + + datFile.BucketBy(ItemKey.Machine, DedupeType.None); + datFile.RemoveItemsFromCloneOfChild(); + + Assert.Single(datFile.GetItemsForBucketDB("parent")); + long actual = Assert.Single(datFile.GetItemsForBucketDB("child")).Key; + Machine? actualMachine = datFile.ItemsDB.GetMachineForItem(actual).Value; + Assert.NotNull(actualMachine); + Assert.Equal("child", actualMachine.GetStringFieldValue(Models.Metadata.Machine.NameKey)); + Assert.Equal("romof", actualMachine.GetStringFieldValue(Models.Metadata.Machine.RomOfKey)); + } #endregion @@ -155,7 +256,7 @@ namespace SabreTools.DatFiles.Test DatFile datFile = new Logiqx(datFile: null, deprecated: false); long machineIndex = datFile.AddMachineDB(machine); long sourceIndex = datFile.AddSourceDB(source); - long itemId = datFile.AddItemDB(datItem, machineIndex, sourceIndex, statsOnly: false); + _ = datFile.AddItemDB(datItem, machineIndex, sourceIndex, statsOnly: false); datFile.BucketBy(ItemKey.Machine, DedupeType.None); datFile.RemoveMachineRelationshipTags(); diff --git a/SabreTools.DatFiles/DatFile.Splitting.cs b/SabreTools.DatFiles/DatFile.Splitting.cs index ac2e87bd..4978c7c1 100644 --- a/SabreTools.DatFiles/DatFile.Splitting.cs +++ b/SabreTools.DatFiles/DatFile.Splitting.cs @@ -989,10 +989,10 @@ namespace SabreTools.DatFiles // If the parent exists and has items, we remove the parent items from the current game foreach (DatItem item in parentItems) { - DatItem datItem = (DatItem)item.Clone(); - while (items.Contains(datItem)) + var matchedItems = items.FindAll(i => i.Equals(item)); + foreach (var match in matchedItems) { - Items.Remove(bucket, datItem); + Items.Remove(bucket, match); } } @@ -1037,7 +1037,7 @@ namespace SabreTools.DatFiles // If the parent exists and has items, we remove the parent items from the current game foreach (var item in parentItems) { - var matchedItems = items.Where(i => i.Value == item.Value); + var matchedItems = items.Where(i => i.Value.Equals(item.Value)); foreach (var match in matchedItems) { ItemsDB.RemoveItem(match.Key);