Move machine to same name model as DatItem

This commit is contained in:
Matt Nadareski
2025-05-02 16:05:08 -04:00
parent 90a7917ebe
commit 7754ca5bd7
34 changed files with 247 additions and 230 deletions

View File

@@ -47,7 +47,7 @@ namespace SabreTools.DatItems.Test
public void CopyMachineInformation_NewItem_Overwrite()
{
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "machineA");
machineA.SetName("machineA");
var romA = new Rom();
@@ -57,14 +57,14 @@ namespace SabreTools.DatItems.Test
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetFieldValue<Machine>(DatItem.MachineKey);
Assert.NotNull(actualMachineA);
Assert.Null(actualMachineA.GetStringFieldValue(Models.Metadata.Machine.NameKey));
Assert.Null(actualMachineA.GetName());
}
[Fact]
public void CopyMachineInformation_EmptyItem_NoChange()
{
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "machineA");
machineA.SetName("machineA");
var romA = new Rom();
romA.SetFieldValue(DatItem.MachineKey, machineA);
@@ -75,14 +75,14 @@ namespace SabreTools.DatItems.Test
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetFieldValue<Machine>(DatItem.MachineKey);
Assert.NotNull(actualMachineA);
Assert.Equal("machineA", actualMachineA.GetStringFieldValue(Models.Metadata.Machine.NameKey));
Assert.Equal("machineA", actualMachineA.GetName());
}
[Fact]
public void CopyMachineInformation_NullMachine_NoChange()
{
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "machineA");
machineA.SetName("machineA");
Machine? machineB = null;
@@ -95,14 +95,14 @@ namespace SabreTools.DatItems.Test
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetFieldValue<Machine>(DatItem.MachineKey);
Assert.NotNull(actualMachineA);
Assert.Equal("machineA", actualMachineA.GetStringFieldValue(Models.Metadata.Machine.NameKey));
Assert.Equal("machineA", actualMachineA.GetName());
}
[Fact]
public void CopyMachineInformation_EmptyMachine_Overwrite()
{
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "machineA");
machineA.SetName("machineA");
Machine? machineB = new Machine();
@@ -115,17 +115,17 @@ namespace SabreTools.DatItems.Test
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetFieldValue<Machine>(DatItem.MachineKey);
Assert.NotNull(actualMachineA);
Assert.Null(actualMachineA.GetStringFieldValue(Models.Metadata.Machine.NameKey));
Assert.Null(actualMachineA.GetName());
}
[Fact]
public void CopyMachineInformation_FilledMachine_Overwrite()
{
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "machineA");
machineA.SetName("machineA");
Machine? machineB = new Machine();
machineB.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "machineB");
machineB.SetName("machineB");
var romA = new Rom();
romA.SetFieldValue(DatItem.MachineKey, machineA);
@@ -136,17 +136,17 @@ namespace SabreTools.DatItems.Test
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetFieldValue<Machine>(DatItem.MachineKey);
Assert.NotNull(actualMachineA);
Assert.Equal("machineB", actualMachineA.GetStringFieldValue(Models.Metadata.Machine.NameKey));
Assert.Equal("machineB", actualMachineA.GetName());
}
[Fact]
public void CopyMachineInformation_MismatchedType_Overwrite()
{
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "machineA");
machineA.SetName("machineA");
Machine? machineB = new Machine();
machineB.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "machineB");
machineB.SetName("machineB");
var romA = new Rom();
romA.SetFieldValue(DatItem.MachineKey, machineA);
@@ -157,7 +157,7 @@ namespace SabreTools.DatItems.Test
romA.CopyMachineInformation(diskB);
var actualMachineA = romA.GetFieldValue<Machine>(DatItem.MachineKey);
Assert.NotNull(actualMachineA);
Assert.Equal("machineB", actualMachineA.GetStringFieldValue(Models.Metadata.Machine.NameKey));
Assert.Equal("machineB", actualMachineA.GetName());
}
#endregion
@@ -304,10 +304,10 @@ namespace SabreTools.DatItems.Test
public void GetDuplicateStatus_MismatchedHashes_NoDupe()
{
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineA.SetName("name-same");
Machine? machineB = new Machine();
machineB.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineB.SetName("name-same");
var romA = new Rom();
romA.SetName("same-name");
@@ -329,10 +329,10 @@ namespace SabreTools.DatItems.Test
public void GetDuplicateStatus_DifferentSource_NameMatch_ExternalAll()
{
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineA.SetName("name-same");
Machine? machineB = new Machine();
machineB.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineB.SetName("name-same");
var romA = new Rom();
romA.SetName("same-name");
@@ -354,10 +354,10 @@ namespace SabreTools.DatItems.Test
public void GetDuplicateStatus_DifferentSource_NoNameMatch_ExternalHash()
{
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineA.SetName("name-same");
Machine? machineB = new Machine();
machineB.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "not-name-same");
machineB.SetName("not-name-same");
var romA = new Rom();
romA.SetName("same-name");
@@ -379,10 +379,10 @@ namespace SabreTools.DatItems.Test
public void GetDuplicateStatus_SameSource_NameMatch_InternalAll()
{
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineA.SetName("name-same");
Machine? machineB = new Machine();
machineB.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineB.SetName("name-same");
var romA = new Rom();
romA.SetName("same-name");
@@ -404,10 +404,10 @@ namespace SabreTools.DatItems.Test
public void GetDuplicateStatus_SameSource_NoNameMatch_InternalHash()
{
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineA.SetName("name-same");
Machine? machineB = new Machine();
machineB.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "not-name-same");
machineB.SetName("not-name-same");
var romA = new Rom();
romA.SetName("same-name");
@@ -461,10 +461,10 @@ namespace SabreTools.DatItems.Test
Source? sourceB = new Source(1);
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineA.SetName("name-same");
Machine? machineB = new Machine();
machineB.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineB.SetName("name-same");
var romA = new Rom();
romA.SetName("same-name");
@@ -487,10 +487,10 @@ namespace SabreTools.DatItems.Test
Source? sourceB = new Source(1);
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineA.SetName("name-same");
Machine? machineB = new Machine();
machineB.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineB.SetName("name-same");
var romA = new Rom();
romA.SetName("same-name");
@@ -513,10 +513,10 @@ namespace SabreTools.DatItems.Test
Source? sourceB = new Source(1);
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineA.SetName("name-same");
Machine? machineB = new Machine();
machineB.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "not-name-same");
machineB.SetName("not-name-same");
var romA = new Rom();
romA.SetName("same-name");
@@ -539,10 +539,10 @@ namespace SabreTools.DatItems.Test
Source? sourceB = new Source(0);
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineA.SetName("name-same");
Machine? machineB = new Machine();
machineB.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineB.SetName("name-same");
var romA = new Rom();
romA.SetName("same-name");
@@ -565,10 +565,10 @@ namespace SabreTools.DatItems.Test
Source? sourceB = new Source(0);
Machine? machineA = new Machine();
machineA.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "name-same");
machineA.SetName("name-same");
Machine? machineB = new Machine();
machineB.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "not-name-same");
machineB.SetName("not-name-same");
var romA = new Rom();
romA.SetName("same-name");

View File

@@ -54,7 +54,7 @@ namespace SabreTools.DatItems.Test.Formats
Machine? actualMachine = actual.GetFieldValue<Machine?>(DatItem.MachineKey);
Assert.NotNull(actualMachine);
Assert.Equal("XXXXXX", actualMachine.GetStringFieldValue(Models.Metadata.Machine.NameKey));
Assert.Equal("XXXXXX", actualMachine.GetName());
Assert.Equal(false, actual.GetBoolFieldValue(DatItem.RemoveKey));

View File

@@ -42,7 +42,7 @@ namespace SabreTools.DatItems.Test.Formats
Machine? actualMachine = actual.GetFieldValue<Machine?>(DatItem.MachineKey);
Assert.NotNull(actualMachine);
Assert.Equal("XXXXXX", actualMachine.GetStringFieldValue(Models.Metadata.Machine.NameKey));
Assert.Equal("XXXXXX", actualMachine.GetName());
Assert.Equal(false, actual.GetBoolFieldValue(DatItem.RemoveKey));

View File

@@ -38,7 +38,7 @@ namespace SabreTools.DatItems.Test.Formats
Machine? actualMachine = actual.GetFieldValue<Machine?>(DatItem.MachineKey);
Assert.NotNull(actualMachine);
Assert.Equal("XXXXXX", actualMachine.GetStringFieldValue(Models.Metadata.Machine.NameKey));
Assert.Equal("XXXXXX", actualMachine.GetName());
Assert.Equal(false, actual.GetBoolFieldValue(DatItem.RemoveKey));

View File

@@ -15,7 +15,7 @@ namespace SabreTools.DatItems.Test
object clone = item.Clone();
Machine? actual = clone as Machine;
Assert.NotNull(actual);
Assert.Equal("name", actual.GetStringFieldValue(Models.Metadata.Machine.NameKey));
Assert.Equal("name", actual.GetName());
}
#endregion