SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-09-22 06:45:11 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Make Machine inherent to DatItem instead of passing through

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-02 16:23:16 -04:00
parent ca95e96402
commit 355aa4b94c
21 changed files with 182 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
SabreTools.Metadata.DatItems.Test/DatItemTests.cs
View File

@@ -59,10 +59,10 @@ namespace SabreTools.Metadata.DatItems.Test
var romA = new Rom();
var romB = new Rom();
romB.Remove(DatItem.MachineKey);
romB.Machine = null;
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetMachine();
var actualMachineA = romA.Machine;
Assert.NotNull(actualMachineA);
Assert.Null(actualMachineA.Name);
}
@@ -74,13 +74,13 @@ namespace SabreTools.Metadata.DatItems.Test
machineA.Name = "machineA";
var romA = new Rom();
romA.Write(DatItem.MachineKey, machineA);
romA.Machine = machineA;
var romB = new Rom();
romB.Remove(DatItem.MachineKey);
romB.Machine = null;
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetMachine();
var actualMachineA = romA.Machine;
Assert.NotNull(actualMachineA);
Assert.Equal("machineA", actualMachineA.Name);
}
@@ -94,13 +94,13 @@ namespace SabreTools.Metadata.DatItems.Test
Machine? machineB = null;
var romA = new Rom();
romA.Write(DatItem.MachineKey, machineA);
romA.Machine = machineA;
var romB = new Rom();
romB.Write(DatItem.MachineKey, machineB);
romB.Machine = machineB;
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetMachine();
var actualMachineA = romA.Machine;
Assert.NotNull(actualMachineA);
Assert.Equal("machineA", actualMachineA.Name);
}
@@ -114,13 +114,13 @@ namespace SabreTools.Metadata.DatItems.Test
Machine? machineB = new Machine();
var romA = new Rom();
romA.Write(DatItem.MachineKey, machineA);
romA.Machine = machineA;
var romB = new Rom();
romB.Write(DatItem.MachineKey, machineB);
romB.Machine = machineB;
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetMachine();
var actualMachineA = romA.Machine;
Assert.NotNull(actualMachineA);
Assert.Null(actualMachineA.Name);
}
@@ -135,13 +135,13 @@ namespace SabreTools.Metadata.DatItems.Test
machineB.Name = "machineB";
var romA = new Rom();
romA.Write(DatItem.MachineKey, machineA);
romA.Machine = machineA;
var romB = new Rom();
romB.Write(DatItem.MachineKey, machineB);
romB.Machine = machineB;
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetMachine();
var actualMachineA = romA.Machine;
Assert.NotNull(actualMachineA);
Assert.Equal("machineB", actualMachineA.Name);
}
@@ -156,13 +156,13 @@ namespace SabreTools.Metadata.DatItems.Test
machineB.Name = "machineB";
var romA = new Rom();
romA.Write(DatItem.MachineKey, machineA);
romA.Machine = machineA;
var diskB = new Disk();
diskB.Write(DatItem.MachineKey, machineB);
diskB.Machine = machineB;
romA.CopyMachineInformation(diskB);
var actualMachineA = romA.GetMachine();
var actualMachineA = romA.Machine;
Assert.NotNull(actualMachineA);
Assert.Equal("machineB", actualMachineA.Name);
}

4
SabreTools.Metadata.DatItems.Test/Formats/DiskTests.cs
View File

@@ -31,7 +31,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
disk.Write(Data.Models.Metadata.Disk.MD5Key, HashType.MD5.ZeroString);
disk.Write(Data.Models.Metadata.Disk.SHA1Key, HashType.SHA1.ZeroString);
disk.Write(DatItem.DupeTypeKey, DupeType.All | DupeType.External);
disk.Write(DatItem.MachineKey, machine);
disk.Machine = machine;
disk.Write(Disk.PartKey, part);
disk.Write(DatItem.RemoveKey, (bool?)false);
disk.Write(DatItem.SourceKey, source);
@@ -51,7 +51,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Assert.NotNull(actualDataArea);
Assert.Equal("name", actualDataArea.Name);
Machine? actualMachine = actual.GetMachine();
Machine? actualMachine = actual.Machine;
Assert.NotNull(actualMachine);
Assert.Equal("name", actualMachine.Name);

6
SabreTools.Metadata.DatItems.Test/Formats/FileTests.cs
View File

@@ -27,10 +27,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Format = "XXXXXX"
};
file.Write(DatItem.DupeTypeKey, DupeType.All | DupeType.External);
file.Write(DatItem.MachineKey, machine);
file.Machine = machine;
file.Write(DatItem.RemoveKey, (bool?)false);
file.Write(DatItem.SourceKey, source);
file.Write(DatItem.MachineKey, machine);
file.Machine = machine;
file.Write(DatItem.SourceKey, source);
Rom actual = file.ConvertToRom();
@@ -43,7 +43,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Assert.Equal("00000000000000000000000000000000000000000000000000000000deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA256Key));
Assert.Equal(DupeType.All | DupeType.External, actual.Read<DupeType>(DatItem.DupeTypeKey));
Machine? actualMachine = actual.GetMachine();
Machine? actualMachine = actual.Machine;
Assert.NotNull(actualMachine);
Assert.Equal("name", actualMachine.GetName());

4
SabreTools.Metadata.DatItems.Test/Formats/MediaTests.cs
View File

@@ -22,7 +22,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
media.Write(Data.Models.Metadata.Media.SHA256Key, HashType.SHA256.ZeroString);
media.Write(Data.Models.Metadata.Media.SpamSumKey, HashType.SpamSum.ZeroString);
media.Write(DatItem.DupeTypeKey, DupeType.All | DupeType.External);
media.Write(DatItem.MachineKey, machine);
media.Machine = machine;
media.Write(DatItem.RemoveKey, (bool?)false);
media.Write(DatItem.SourceKey, source);
@@ -35,7 +35,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Assert.Equal(HashType.SpamSum.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SpamSumKey));
Assert.Equal(DupeType.All | DupeType.External, actual.Read<DupeType>(DatItem.DupeTypeKey));
Machine? actualMachine = actual.GetMachine();
Machine? actualMachine = actual.Machine;
Assert.NotNull(actualMachine);
Assert.Equal("name", actualMachine.Name);