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

Reduce use of GetName and SetName, prefer direct

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-03 22:57:58 -04:00
parent cdc55e721e
commit 2fdecebe66
20 changed files with 557 additions and 906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,10 +55,7 @@ namespace SabreTools.Metadata.DatItems.Test
{
var romA = new Rom();
var romB = new Rom
{
Machine = null
};
var romB = new Rom { Machine = null };
romA.CopyMachineInformation(romB);
var actualMachineA = romA.Machine;
@@ -69,20 +66,11 @@ namespace SabreTools.Metadata.DatItems.Test
[Fact]
public void CopyMachineInformation_EmptyItem_NoChange()
{
Machine? machineA = new Machine
{
Name = "machineA"
};
Machine? machineA = new Machine { Name = "machineA" };
var romA = new Rom
{
Machine = machineA
};
var romA = new Rom { Machine = machineA };
var romB = new Rom
{
Machine = null
};
var romB = new Rom { Machine = null };
romA.CopyMachineInformation(romB);
var actualMachineA = romA.Machine;
@@ -93,22 +81,13 @@ namespace SabreTools.Metadata.DatItems.Test
[Fact]
public void CopyMachineInformation_NullMachine_NoChange()
{
Machine? machineA = new Machine
{
Name = "machineA"
};
Machine? machineA = new Machine { Name = "machineA" };
Machine? machineB = null;
var romA = new Rom
{
Machine = machineA
};
var romA = new Rom { Machine = machineA };
var romB = new Rom
{
Machine = machineB
};
var romB = new Rom { Machine = machineB };
romA.CopyMachineInformation(romB);
var actualMachineA = romA.Machine;
@@ -119,22 +98,13 @@ namespace SabreTools.Metadata.DatItems.Test
[Fact]
public void CopyMachineInformation_EmptyMachine_Overwrite()
{
Machine? machineA = new Machine
{
Name = "machineA"
};
Machine? machineA = new Machine { Name = "machineA" };
Machine? machineB = new Machine();
var romA = new Rom
{
Machine = machineA
};
var romA = new Rom { Machine = machineA };
var romB = new Rom
{
Machine = machineB
};
var romB = new Rom { Machine = machineB };
romA.CopyMachineInformation(romB);
var actualMachineA = romA.Machine;
@@ -145,25 +115,13 @@ namespace SabreTools.Metadata.DatItems.Test
[Fact]
public void CopyMachineInformation_FilledMachine_Overwrite()
{
Machine? machineA = new Machine
{
Name = "machineA"
};
Machine? machineA = new Machine { Name = "machineA" };
Machine? machineB = new Machine
{
Name = "machineB"
};
Machine? machineB = new Machine { Name = "machineB" };
var romA = new Rom
{
Machine = machineA
};
var romA = new Rom { Machine = machineA };
var romB = new Rom
{
Machine = machineB
};
var romB = new Rom { Machine = machineB };
romA.CopyMachineInformation(romB);
var actualMachineA = romA.Machine;
@@ -174,25 +132,13 @@ namespace SabreTools.Metadata.DatItems.Test
[Fact]
public void CopyMachineInformation_MismatchedType_Overwrite()
{
Machine? machineA = new Machine
{
Name = "machineA"
};
Machine? machineA = new Machine { Name = "machineA" };
Machine? machineB = new Machine
{
Name = "machineB"
};
Machine? machineB = new Machine { Name = "machineB" };
var romA = new Rom
{
Machine = machineA
};
var romA = new Rom { Machine = machineA };
var diskB = new Disk
{
Machine = machineB
};
var diskB = new Disk { Machine = machineB };
romA.CopyMachineInformation(diskB);
var actualMachineA = romA.Machine;
@@ -217,11 +163,9 @@ namespace SabreTools.Metadata.DatItems.Test
[Fact]
public void CompareTo_DifferentOther_Returns1()
{
DatItem self = new Rom();
self.SetName("name");
DatItem self = new Rom { Name = "name" };
DatItem? other = new Disk();
other.SetName("name");
DatItem? other = new Disk { Name = "name" };
int actual = self.CompareTo(other);
Assert.Equal(1, actual);
@@ -246,12 +190,10 @@ namespace SabreTools.Metadata.DatItems.Test
[InlineData("name", "name", 0)]
public void CompareTo_NamesOnly(string? selfName, string? otherName, int expected)
{
DatItem self = new Rom();
self.SetName(selfName);
DatItem self = new Rom { Name = selfName };
self.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
DatItem? other = new Rom();
other.SetName(otherName);
DatItem? other = new Rom { Name = otherName };
other.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
int actual = self.CompareTo(other);
@@ -388,10 +330,7 @@ namespace SabreTools.Metadata.DatItems.Test
{
Source source = new Source(0);
Machine machine = new Machine
{
Name = "Machine"
};
Machine machine = new Machine { Name = "Machine" };
DatItem datItem = new Blank();
@@ -464,10 +403,7 @@ namespace SabreTools.Metadata.DatItems.Test
{
Source source = new Source(0);
Machine machine = new Machine
{
Name = "Machine"
};
Machine machine = new Machine { Name = "Machine" };
DatItem datItem = new Rom();
datItem.Write(Data.Models.Metadata.Rom.CRC16Key, "DEADBEEF");
@@ -573,15 +509,12 @@ namespace SabreTools.Metadata.DatItems.Test
[Fact]
public void CloneTest()
{
DatItem item = new Sample
{
Name = "name"
};
DatItem item = new Sample { Name = "name" };
object clone = item.Clone();
Sample? actual = clone as Sample;
Assert.NotNull(actual);
Assert.Equal("name", actual.GetName());
Assert.Equal("name", actual.Name);
}
#endregion

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

@@ -15,10 +15,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Name = "name"
};
Machine machine = new Machine
{
Name = "name"
};
Machine machine = new Machine { Name = "name" };
Part part = new Part
{
@@ -27,10 +24,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Source source = new Source(0, "XXXXXX");
Disk disk = new Disk
{
Name = "name"
};
Disk disk = new Disk { Name = "name" };
disk.Write(Disk.DiskAreaKey, diskArea);
disk.Write(Data.Models.Metadata.Disk.MergeKey, "XXXXXX");
disk.Write(Data.Models.Metadata.Disk.RegionKey, "XXXXXX");
@@ -261,10 +255,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
{
Source source = new Source(0);
Machine machine = new Machine
{
Name = "Machine"
};
Machine machine = new Machine { Name = "Machine" };
DatItem datItem = new Disk();
datItem.Write(Data.Models.Metadata.Disk.MD5Key, "DEADBEEF");

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

@@ -10,10 +10,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void ConvertToRomTest()
{
Machine machine = new Machine
{
Name = "name"
};
Machine machine = new Machine { Name = "name" };
Source source = new Source(0, "XXXXXX");
@@ -37,7 +34,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom actual = file.ConvertToRom();
Assert.Equal("XXXXXX.XXXXXX", actual.GetName());
Assert.Equal("XXXXXX.XXXXXX", actual.Name);
Assert.Equal(12345, actual.Size);
Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.CRCKey));
Assert.Equal("000000000000000000000000deadbeef", actual.ReadString(Data.Models.Metadata.Rom.MD5Key));
@@ -47,7 +44,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Machine? actualMachine = actual.Machine;
Assert.NotNull(actualMachine);
Assert.Equal("name", actualMachine.GetName());
Assert.Equal("name", actualMachine.Name);
Assert.False(actual.RemoveFlag);
@@ -342,10 +339,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
{
Source source = new Source(0);
Machine machine = new Machine
{
Name = "Machine"
};
Machine machine = new Machine { Name = "Machine" };
DatItem datItem = new File
{

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

@@ -10,10 +10,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void ConvertToRomTest()
{
Machine machine = new Machine
{
Name = "name"
};
Machine machine = new Machine { Name = "name" };
Source source = new Source(0, "XXXXXX");
@@ -333,10 +330,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
{
Source source = new Source(0);
Machine machine = new Machine
{
Name = "Machine"
};
Machine machine = new Machine { Name = "Machine" };
DatItem datItem = new Media
{

5
SabreTools.Metadata.DatItems.Test/Formats/RomTests.cs
View File

@@ -799,10 +799,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
{
Source source = new Source(0);
Machine machine = new Machine
{
Name = "Machine"
};
Machine machine = new Machine { Name = "Machine" };
DatItem datItem = new Rom();
datItem.Write(Data.Models.Metadata.Rom.CRC16Key, "DEADBEEF");

30
SabreTools.Metadata.DatItems.Test/MachineTests.cs
View File

@@ -9,10 +9,7 @@ namespace SabreTools.Metadata.DatItems.Test
[Fact]
public void CloneTest()
{
Machine item = new Machine
{
Name = "name"
};
Machine item = new Machine { Name = "name" };
object clone = item.Clone();
Machine? actual = clone as Machine;
@@ -27,10 +24,7 @@ namespace SabreTools.Metadata.DatItems.Test
[Fact]
public void GetInternalCloneTest()
{
Machine item = new Machine
{
Name = "name"
};
Machine item = new Machine { Name = "name" };
Data.Models.Metadata.Machine actual = item.GetInternalClone();
Assert.Equal("name", actual.Name);
@@ -63,15 +57,9 @@ namespace SabreTools.Metadata.DatItems.Test
[Fact]
public void Equals_MismatchedInternal_False()
{
Machine self = new Machine
{
Name = "self"
};
Machine self = new Machine { Name = "self" };
Machine? other = new Machine
{
Name = "other"
};
Machine? other = new Machine { Name = "other" };
bool actual = self.Equals(other);
Assert.False(actual);
@@ -80,15 +68,9 @@ namespace SabreTools.Metadata.DatItems.Test
[Fact]
public void Equals_EqualInternal_True()
{
Machine self = new Machine
{
Name = "name"
};
Machine self = new Machine { Name = "name" };
Machine? other = new Machine
{
Name = "name"
};
Machine? other = new Machine { Name = "name" };
bool actual = self.Equals(other);
Assert.True(actual);