Remove need for GetMachineForItem

This commit is contained in:
Matt Nadareski
2026-04-16 16:11:25 -04:00
parent ff69b83e05
commit 2884dcab5b
11 changed files with 42 additions and 87 deletions

View File

@@ -205,12 +205,12 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal(2, actualDatItems.Count);
var actualRom = Assert.Single(actualDatItems, i => i.Value is Rom);
var actualRomMachine = datFile.GetMachineForItemDB(actualRom.Key);
var actualRomMachine = datFile.GetMachineDB(actualRom.Value.MachineIndex);
Assert.NotNull(actualRomMachine.Value);
Assert.Equal("machine/rom", actualRomMachine.Value.Name);
var actualDisk = Assert.Single(actualDatItems, i => i.Value is Disk);
var actualDiskMachine = datFile.GetMachineForItemDB(actualDisk.Key);
var actualDiskMachine = datFile.GetMachineDB(actualDisk.Value.MachineIndex);
Assert.NotNull(actualDiskMachine.Value);
Assert.Equal("machine/disk", actualDiskMachine.Value.Name);
}

View File

@@ -1,3 +1,4 @@
using System.Collections.Generic;
using SabreTools.Metadata.DatFiles.Formats;
using SabreTools.Metadata.DatItems;
using SabreTools.Metadata.DatItems.Formats;
@@ -845,8 +846,8 @@ namespace SabreTools.Metadata.DatFiles.Test
datFile.RemoveItemsFromCloneOfChild();
Assert.Single(datFile.GetItemsForBucketDB("parent"));
long actual = Assert.Single(datFile.GetItemsForBucketDB("child")).Key;
Machine? actualMachine = datFile.GetMachineForItemDB(actual).Value;
KeyValuePair<long, DatItem> actual = Assert.Single(datFile.GetItemsForBucketDB("child"));
Machine? actualMachine = datFile.GetMachineDB(actual.Value.MachineIndex).Value;
Assert.NotNull(actualMachine);
Assert.Equal("child", actualMachine.Name);
Assert.Equal("romof", actualMachine.RomOf);
@@ -975,8 +976,8 @@ namespace SabreTools.Metadata.DatFiles.Test
datFile.RemoveItemsFromRomOfChild();
Assert.Single(datFile.GetItemsForBucketDB("parent"));
long actual = Assert.Single(datFile.GetItemsForBucketDB("child")).Key;
Machine? actualMachine = datFile.GetMachineForItemDB(actual).Value;
KeyValuePair<long, DatItem> actual = Assert.Single(datFile.GetItemsForBucketDB("child"));
Machine? actualMachine = datFile.GetMachineDB(actual.Value.MachineIndex).Value;
Assert.NotNull(actualMachine);
Assert.Equal("child", actualMachine.Name);
}

View File

@@ -524,31 +524,6 @@ namespace SabreTools.Metadata.DatFiles.Test
#endregion
#region GetMachineForItem
[Fact]
public void GetMachineForItemTest()
{
Source source = new Source(0, source: null);
Machine machine = new Machine();
DatItem item = new Rom();
var dict = new ItemDatabase();
long sourceIndex = dict.AddSource(source);
item.SourceIndex = sourceIndex;
long machineIndex = dict.AddMachine(machine);
item.MachineIndex = machineIndex;
long itemIndex = dict.AddItem(item, statsOnly: false);
var actual = dict.GetMachineForItem(itemIndex);
Assert.Equal(0, actual.Key);
Assert.NotNull(actual.Value);
}
#endregion
#region GetSource
[Fact]
@@ -560,7 +535,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal(0, sourceIndex);
var actual = dict.GetSource(sourceIndex);
Assert.NotNull(actual);
Assert.NotNull(actual.Value);
}
#endregion