mirror of
https://github.com/SabreTools/SabreTools.Serialization.git
synced 2026-07-08 18:06:41 +00:00
Fix missing and unnecessary assignments
This commit is contained in:
@@ -54,8 +54,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
{
|
||||
Name = "rom.bin",
|
||||
CRC32 = "deadbeef",
|
||||
Machine = machine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatFile datFile = new Logiqx(datFile: null, useGame: false);
|
||||
|
||||
@@ -133,8 +133,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "parent_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "deadbeef",
|
||||
Machine = parentMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatItem matchChildItem = new Rom
|
||||
@@ -142,8 +140,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "match_child_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "deadbeef",
|
||||
Machine = childMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatItem noMatchChildItem = new Rom
|
||||
@@ -151,8 +147,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "no_match_child_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "beefdead",
|
||||
Machine = childMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatFile datFile = new Logiqx(datFile: null, useGame: false);
|
||||
@@ -198,8 +192,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "parent_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "deadbeef",
|
||||
Machine = parentMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatItem matchChildItem = new Rom
|
||||
@@ -207,8 +199,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "match_child_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "deadbeef",
|
||||
Machine = childMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatItem noMatchChildItem = new Rom
|
||||
@@ -216,8 +206,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "no_match_child_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "beefdead",
|
||||
Machine = childMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatFile datFile = new Logiqx(datFile: null, useGame: false);
|
||||
@@ -319,8 +307,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "parent_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "deadbeef",
|
||||
Machine = parentMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatItem matchChildItem = new Rom
|
||||
@@ -328,8 +314,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "match_child_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "deadbeef",
|
||||
Machine = childMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatItem noMatchChildItem = new Rom
|
||||
@@ -337,8 +321,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "no_match_child_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "beefdead",
|
||||
Machine = childMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatFile datFile = new Logiqx(datFile: null, useGame: false);
|
||||
@@ -585,8 +567,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "parent_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "deadbeef",
|
||||
Machine = parentMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatItem matchChildItem = new Rom
|
||||
@@ -594,8 +574,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "match_child_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "deadbeef",
|
||||
Machine = childMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatItem noMatchChildItem = new Rom
|
||||
@@ -603,8 +581,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "no_match_child_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "beefdead",
|
||||
Machine = childMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatFile datFile = new Logiqx(datFile: null, useGame: false);
|
||||
@@ -802,8 +778,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "parent_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "deadbeef",
|
||||
Machine = parentMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatItem matchChildItem = new Rom
|
||||
@@ -811,8 +785,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "match_child_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "deadbeef",
|
||||
Machine = childMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatItem noMatchChildItem = new Rom
|
||||
@@ -820,8 +792,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "no_match_child_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "beefdead",
|
||||
Machine = childMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatFile datFile = new Logiqx(datFile: null, useGame: false);
|
||||
@@ -932,8 +902,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "parent_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "deadbeef",
|
||||
Machine = parentMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatItem matchChildItem = new Rom
|
||||
@@ -941,8 +909,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "match_child_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "deadbeef",
|
||||
Machine = childMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatItem noMatchChildItem = new Rom
|
||||
@@ -950,8 +916,6 @@ namespace SabreTools.Metadata.DatFiles.Test
|
||||
Name = "no_match_child_rom",
|
||||
Size = 12345,
|
||||
CRC32 = "beefdead",
|
||||
Machine = childMachine,
|
||||
Source = source
|
||||
};
|
||||
|
||||
DatFile datFile = new Logiqx(datFile: null, useGame: false);
|
||||
|
||||
@@ -19,6 +19,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
||||
DiskAreaName = "name",
|
||||
DupeType = DupeType.All | DupeType.External,
|
||||
Machine = machine,
|
||||
MachineIndex = 1,
|
||||
MD5 = HashType.MD5.ZeroString,
|
||||
Merge = "merge",
|
||||
Name = "name",
|
||||
@@ -29,6 +30,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
||||
RemoveFlag = false,
|
||||
SHA1 = HashType.SHA1.ZeroString,
|
||||
Source = source,
|
||||
SourceIndex = 1,
|
||||
Status = Data.Models.Metadata.ItemStatus.Good,
|
||||
};
|
||||
|
||||
@@ -37,6 +39,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
||||
Assert.Equal(Data.Models.Metadata.Endianness.Little, actual.DataAreaEndianness);
|
||||
Assert.Equal("name", actual.DataAreaName);
|
||||
Assert.Equal(DupeType.All | DupeType.External, actual.DupeType);
|
||||
Assert.Equal(1, actual.MachineIndex);
|
||||
Assert.Equal(HashType.MD5.ZeroString, actual.MD5);
|
||||
Assert.Equal("merge", actual.Merge);
|
||||
Assert.Equal("name.chd", actual.Name);
|
||||
@@ -46,6 +49,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
||||
Assert.Equal("region", actual.Region);
|
||||
Assert.False(actual.RemoveFlag);
|
||||
Assert.Equal(HashType.SHA1.ZeroString, actual.SHA1);
|
||||
Assert.Equal(1, actual.SourceIndex);
|
||||
Assert.Equal(Data.Models.Metadata.ItemStatus.Good, actual.Status);
|
||||
|
||||
Machine? actualMachine = actual.Machine;
|
||||
|
||||
@@ -26,11 +26,11 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
||||
Format = "format",
|
||||
DupeType = DupeType.All | DupeType.External,
|
||||
Machine = machine,
|
||||
MachineIndex = 1,
|
||||
RemoveFlag = false,
|
||||
Source = source
|
||||
Source = source,
|
||||
SourceIndex = 1,
|
||||
};
|
||||
file.Machine = machine;
|
||||
file.Source = source;
|
||||
|
||||
Rom actual = file.ConvertToRom();
|
||||
|
||||
@@ -41,6 +41,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
||||
Assert.Equal("00000000000000000000000000000000deadbeef", actual.SHA1);
|
||||
Assert.Equal("00000000000000000000000000000000000000000000000000000000deadbeef", actual.SHA256);
|
||||
Assert.Equal(DupeType.All | DupeType.External, actual.DupeType);
|
||||
Assert.Equal(1, actual.MachineIndex);
|
||||
Assert.Equal(1, actual.SourceIndex);
|
||||
|
||||
Machine? actualMachine = actual.Machine;
|
||||
Assert.NotNull(actualMachine);
|
||||
|
||||
@@ -23,8 +23,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
||||
SpamSum = HashType.SpamSum.ZeroString,
|
||||
DupeType = DupeType.All | DupeType.External,
|
||||
Machine = machine,
|
||||
MachineIndex = 1,
|
||||
RemoveFlag = false,
|
||||
Source = source
|
||||
Source = source,
|
||||
SourceIndex = 1,
|
||||
};
|
||||
|
||||
Rom actual = media.ConvertToRom();
|
||||
@@ -35,6 +37,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
||||
Assert.Equal(HashType.SHA256.ZeroString, actual.SHA256);
|
||||
Assert.Equal(HashType.SpamSum.ZeroString, actual.SpamSum);
|
||||
Assert.Equal(DupeType.All | DupeType.External, actual.DupeType);
|
||||
Assert.Equal(1, actual.MachineIndex);
|
||||
Assert.Equal(1, actual.SourceIndex);
|
||||
|
||||
Machine? actualMachine = actual.Machine;
|
||||
Assert.NotNull(actualMachine);
|
||||
|
||||
@@ -156,10 +156,12 @@ namespace SabreTools.Metadata.DatItems.Formats
|
||||
|
||||
rom.DupeType = DupeType;
|
||||
rom.Machine = Machine?.Clone() as Machine;
|
||||
rom.MachineIndex = MachineIndex;
|
||||
rom.PartInterface = PartInterface;
|
||||
rom.PartName = PartName;
|
||||
rom.RemoveFlag = RemoveFlag;
|
||||
rom.Source = Source?.Clone() as Source;
|
||||
rom.SourceIndex = SourceIndex;
|
||||
|
||||
return rom;
|
||||
}
|
||||
|
||||
@@ -157,8 +157,10 @@ namespace SabreTools.Metadata.DatItems.Formats
|
||||
|
||||
rom.DupeType = DupeType;
|
||||
rom.Machine = Machine?.Clone() as Machine;
|
||||
rom.MachineIndex = MachineIndex;
|
||||
rom.RemoveFlag = RemoveFlag;
|
||||
rom.Source = Source?.Clone() as Source;
|
||||
rom.SourceIndex = SourceIndex;
|
||||
|
||||
return rom;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System.Xml.Serialization;
|
||||
using System.Xml.Serialization;
|
||||
using Newtonsoft.Json;
|
||||
using SabreTools.Data.Extensions;
|
||||
using SabreTools.Text.Extensions;
|
||||
@@ -114,8 +114,10 @@ namespace SabreTools.Metadata.DatItems.Formats
|
||||
|
||||
rom.DupeType = DupeType;
|
||||
rom.Machine = Machine?.Clone() as Machine;
|
||||
rom.MachineIndex = MachineIndex;
|
||||
rom.RemoveFlag = RemoveFlag;
|
||||
rom.Source = Source?.Clone() as Source;
|
||||
rom.SourceIndex = SourceIndex;
|
||||
|
||||
return rom;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user