SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-09 02:16:55 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Rename "CRC" to "CRC32" where appropriate

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-06 07:44:19 -04:00
parent 6a7d6e16b7
commit e2b2f4d8a5
61 changed files with 375 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs
View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem datItem = new Rom
{
Name = "rom.bin",
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = machine,
Source = source
};
@@ -53,7 +53,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem datItem = new Rom
{
Name = "rom.bin",
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = machine,
Source = source
};

4
SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs
View File

@@ -795,8 +795,8 @@ namespace SabreTools.Metadata.DatFiles.Test
ClothCoverDetectionModuleVersion = "cloth_cover_detection_module_version",
CollectionCatalogNumber = "collection-catalog-number",
Comment = "comment",
CRC = HashType.CRC32.ZeroString,
CRC16 = HashType.CRC16.ZeroString,
CRC32 = HashType.CRC32.ZeroString,
CRC64 = HashType.CRC64.ZeroString,
Creator = "creator",
Date = "date",
@@ -1507,8 +1507,8 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal("cloth_cover_detection_module_version", rom.ClothCoverDetectionModuleVersion);
Assert.Equal("collection-catalog-number", rom.CollectionCatalogNumber);
Assert.Equal("comment", rom.Comment);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC);
Assert.Equal(HashType.CRC16.ZeroString, rom.CRC16);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC32);
Assert.Equal(HashType.CRC64.ZeroString, rom.CRC64);
Assert.Equal("creator", rom.Creator);
Assert.Equal("date", rom.Date);

76
SabreTools.Metadata.DatFiles.Test/DatFileTests.Splitting.cs
View File

@@ -27,7 +27,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -36,7 +36,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -45,7 +45,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -79,7 +79,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -88,7 +88,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -97,7 +97,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -131,7 +131,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -140,7 +140,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -149,7 +149,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -186,7 +186,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -195,7 +195,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -204,7 +204,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -245,7 +245,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -254,7 +254,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -263,7 +263,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -297,7 +297,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -306,7 +306,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -315,7 +315,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -375,7 +375,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = itemMachine,
Source = source
};
@@ -434,7 +434,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "deadbeef"
CRC32 = "deadbeef"
};
DatItem deviceRef = new DeviceRef
@@ -486,7 +486,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -495,7 +495,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -504,7 +504,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -538,7 +538,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -547,7 +547,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -556,7 +556,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -677,7 +677,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -686,7 +686,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -695,7 +695,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -737,7 +737,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -746,7 +746,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -755,7 +755,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -801,7 +801,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -810,7 +810,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -819,7 +819,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -857,7 +857,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -866,7 +866,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -875,7 +875,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};

2
SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs
View File

@@ -1039,8 +1039,8 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal("cloth_cover_detection_module_version", rom.ClothCoverDetectionModuleVersion);
Assert.Equal("collection-catalog-number", rom.CollectionCatalogNumber);
Assert.Equal("comment", rom.Comment);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC);
Assert.Equal(HashType.CRC16.ZeroString, rom.CRC16);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC32);
Assert.Equal(HashType.CRC64.ZeroString, rom.CRC64);
Assert.Equal("creator", rom.Creator);
Assert.Equal("date", rom.Date);

78
SabreTools.Metadata.DatFiles.Test/DatFileTests.cs
View File

@@ -35,7 +35,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom = new Rom
{
Name = "rom",
CRC = "deadbeef",
CRC32 = "deadbeef",
Source = source,
Machine = machine
};
@@ -1378,7 +1378,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Name = "name",
Size = 12345,
CRC16 = "crc16",
CRC = "crc",
CRC32 = "crc32",
CRC64 = "crc64",
MD2 = "md2",
MD4 = "md4",
@@ -1481,7 +1481,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void FormatPrefixPostfix_Rom()
{
string fix = "%game%_%machine%_%name%_%manufacturer%_%publisher%_%category%_%crc16%_%crc%_%crc64%_%md2%_%md4%_%md5%_%ripemd128%_%ripemd160%_%sha1%_%sha256%_%sha384%_%sha512%_%size%_%spamsum%";
string expected = "machine_machine_name_manufacturer_publisher_category_crc16_crc_crc64_md2_md4_md5_ripemd128_ripemd160_sha1_sha256_sha384_sha512_12345_spamsum";
string expected = "machine_machine_name_manufacturer_publisher_category_crc16_crc32_crc64_md2_md4_md5_ripemd128_ripemd160_sha1_sha256_sha384_sha512_12345_spamsum";
Machine machine = new Machine
{
@@ -1496,7 +1496,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Name = "name",
Size = 12345,
CRC16 = "crc16",
CRC = "crc",
CRC32 = "crc32",
CRC64 = "crc64",
MD2 = "md2",
MD4 = "md4",
@@ -1531,7 +1531,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(rom);
Assert.Equal(12345, rom.Size);
Assert.Null(rom.CRC16);
Assert.Null(rom.CRC);
Assert.Null(rom.CRC32);
Assert.Null(rom.CRC64);
Assert.Null(rom.MD2);
Assert.Null(rom.MD4);
@@ -1550,14 +1550,14 @@ namespace SabreTools.Metadata.DatFiles.Test
{
DatItem item = new Rom
{
CRC = HashType.CRC32.ZeroString
CRC32 = HashType.CRC32.ZeroString
};
DatItem actual = DatFile.ProcessNullifiedItem(item);
Rom? rom = actual as Rom;
Assert.NotNull(rom);
Assert.Null(rom.Size);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC32);
Assert.Null(rom.MD2);
Assert.Null(rom.MD4);
Assert.Null(rom.MD5);
@@ -1576,7 +1576,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem item = new Rom
{
CRC16 = "null",
CRC = "null",
CRC32 = "null",
CRC64 = "null",
MD2 = "null",
MD4 = "null",
@@ -1595,7 +1595,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(rom);
Assert.Equal(0, rom.Size);
Assert.Equal(HashType.CRC16.ZeroString, rom.CRC16);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC32);
Assert.Equal(HashType.CRC64.ZeroString, rom.CRC64);
Assert.Equal(HashType.MD2.ZeroString, rom.MD2);
Assert.Equal(HashType.MD4.ZeroString, rom.MD4);
@@ -1793,12 +1793,12 @@ namespace SabreTools.Metadata.DatFiles.Test
}
[Fact]
public void GetDuplicateSuffix_Rom_CRC()
public void GetDuplicateSuffix_Rom_CRC32()
{
string hash = "XXXXXX";
DatItem datItem = new Rom
{
CRC = hash
CRC32 = hash
};
string actual = DatFile.GetDuplicateSuffix(datItem);
@@ -1982,7 +1982,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "name",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -1997,7 +1997,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("name", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
}
[Fact]
@@ -2011,7 +2011,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "romA",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2020,7 +2020,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "romB",
Size = 23456,
CRC = "crc2",
CRC32 = "crc2",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2036,13 +2036,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("romA", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
Rom? actualRomB = actual[1] as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("romB", actualRomB.Name);
Assert.Equal(23456, actualRomB.Size);
Assert.Equal("crc2", actualRomB.CRC);
Assert.Equal("crc2", actualRomB.CRC32);
}
[Fact]
@@ -2056,7 +2056,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2065,7 +2065,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2080,7 +2080,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("rom", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
}
[Fact]
@@ -2094,7 +2094,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2103,7 +2103,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 23456,
CRC = "crc2",
CRC32 = "crc2",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2119,13 +2119,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("rom", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
Rom? actualRomB = actual[1] as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("rom_crc2", actualRomB.Name);
Assert.Equal(23456, actualRomB.Size);
Assert.Equal("crc2", actualRomB.CRC);
Assert.Equal("crc2", actualRomB.CRC32);
}
#endregion
@@ -2154,7 +2154,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "name",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2171,7 +2171,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("name", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
}
[Fact]
@@ -2185,7 +2185,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "romA",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2194,7 +2194,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "romB",
Size = 23456,
CRC = "crc2",
CRC32 = "crc2",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2213,13 +2213,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("romA", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
Rom? actualRomB = actual[1].Value as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("romB", actualRomB.Name);
Assert.Equal(23456, actualRomB.Size);
Assert.Equal("crc2", actualRomB.CRC);
Assert.Equal("crc2", actualRomB.CRC32);
}
[Fact]
@@ -2237,7 +2237,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "crc"
CRC32 = "crc"
};
long romAIndex = datFile.AddItemDB(romA, machineIndex, sourceIndex, statsOnly: false);
@@ -2245,7 +2245,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "crc"
CRC32 = "crc"
};
long romBIndex = datFile.AddItemDB(romB, machineIndex, sourceIndex, statsOnly: false);
@@ -2261,7 +2261,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("rom", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
}
[Fact]
@@ -2275,7 +2275,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2284,7 +2284,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 23456,
CRC = "crc2",
CRC32 = "crc2",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2303,13 +2303,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("rom", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
Rom? actualRomB = actual[1].Value as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("rom_crc2", actualRomB.Name);
Assert.Equal(23456, actualRomB.Size);
Assert.Equal("crc2", actualRomB.CRC);
Assert.Equal("crc2", actualRomB.CRC32);
}
#endregion
@@ -2363,7 +2363,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "name",
Size = 12345,
CRC = "crc"
CRC32 = "crc"
};
DatFile datFile = new Logiqx(null, useGame: false);
@@ -2402,7 +2402,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "name",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
MD2 = "crc",
MD4 = "crc",
MD5 = "crc",

2
SabreTools.Metadata.DatFiles.Test/DatStatisticsTests.cs
View File

@@ -305,7 +305,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Size = 1
};
rom.CRC16 = HashType.CRC16.ZeroString;
rom.CRC = HashType.CRC32.ZeroString;
rom.CRC32 = HashType.CRC32.ZeroString;
rom.CRC64 = HashType.CRC64.ZeroString;
rom.MD2 = HashType.MD2.ZeroString;
rom.MD4 = HashType.MD4.ZeroString;

12
SabreTools.Metadata.DatFiles.Test/FormatsTests.cs
View File

@@ -289,7 +289,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.Size),
nameof(Data.Models.Metadata.Rom.CRC),
nameof(Data.Models.Metadata.Rom.CRC32),
]));
}
@@ -321,7 +321,7 @@ namespace SabreTools.Metadata.DatFiles.Test
nameof(Data.Models.Metadata.Rom.SHA256),
nameof(Data.Models.Metadata.Rom.SHA1),
nameof(Data.Models.Metadata.Rom.MD5),
nameof(Data.Models.Metadata.Rom.CRC),
nameof(Data.Models.Metadata.Rom.CRC32),
]));
}
@@ -350,7 +350,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.CRC),
nameof(Data.Models.Metadata.Rom.CRC32),
]));
}
@@ -742,7 +742,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.Size),
nameof(Data.Models.Metadata.Rom.CRC),
nameof(Data.Models.Metadata.Rom.CRC32),
nameof(Data.Models.Metadata.Rom.SHA1),
]));
}
@@ -1277,7 +1277,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Size),
nameof(Data.Models.Metadata.Rom.CRC),
nameof(Data.Models.Metadata.Rom.CRC32),
]));
}
@@ -1335,7 +1335,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.CRC),
nameof(Data.Models.Metadata.Rom.CRC32),
nameof(Data.Models.Metadata.Rom.Size),
]));
}

40
SabreTools.Metadata.DatFiles.Test/ItemDictionaryDBTests.cs
View File

@@ -306,7 +306,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
@@ -314,7 +314,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-2",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
RemoveFlag = true,
SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
@@ -550,7 +550,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
@@ -579,7 +579,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
@@ -616,7 +616,7 @@ namespace SabreTools.Metadata.DatFiles.Test
[Theory]
[InlineData(ItemKey.NULL, 2)]
[InlineData(ItemKey.Machine, 2)]
[InlineData(ItemKey.CRC, 1)]
[InlineData(ItemKey.CRC32, 1)]
[InlineData(ItemKey.SHA1, 4)]
public void BucketByTest(ItemKey itemKey, int expected)
{
@@ -631,7 +631,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
@@ -639,7 +639,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-2",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
@@ -647,7 +647,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-3",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "00000ea4014ce66679e7e17d56ac510f67e39e26"
};
@@ -655,7 +655,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-4",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "00000151d437442e74e5134023fab8bf694a2487"
};
@@ -762,7 +762,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "BEEFDEAD"
CRC32 = "BEEFDEAD"
};
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
@@ -770,7 +770,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -798,7 +798,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
@@ -806,7 +806,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -834,7 +834,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
@@ -842,7 +842,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -870,7 +870,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
@@ -878,7 +878,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -906,7 +906,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
@@ -914,7 +914,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -1032,7 +1032,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "deadbeef"
CRC32 = "deadbeef"
};
var dict = new ItemDictionaryDB();

40
SabreTools.Metadata.DatFiles.Test/ItemDictionaryTests.cs
View File

@@ -291,7 +291,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
rom1.CopyMachineInformation(machine);
@@ -300,7 +300,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-2",
Size = 1024,
CRC = "DEAEEF",
CRC32 = "DEAEEF",
RemoveFlag = true,
SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
@@ -441,7 +441,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Size = 1024,
Name = "rom-1",
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
datItem.CopyMachineInformation(machine);
@@ -468,7 +468,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Size = 1024,
Name = "rom-1",
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
datItem.CopyMachineInformation(machine);
@@ -489,7 +489,7 @@ namespace SabreTools.Metadata.DatFiles.Test
[Theory]
[InlineData(ItemKey.NULL, 2)]
[InlineData(ItemKey.Machine, 2)]
[InlineData(ItemKey.CRC, 1)]
[InlineData(ItemKey.CRC32, 1)]
[InlineData(ItemKey.SHA1, 4)]
public void BucketByTest(ItemKey itemKey, int expected)
{
@@ -502,7 +502,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
rom1.CopyMachineInformation(machine1);
@@ -511,7 +511,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-2",
Size = 1024,
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
rom1.CopyMachineInformation(machine1);
@@ -520,7 +520,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-3",
Size = 1024,
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "00000ea4014ce66679e7e17d56ac510f67e39e26"
};
rom1.CopyMachineInformation(machine2);
@@ -529,7 +529,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-4",
Size = 1024,
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "00000151d437442e74e5134023fab8bf694a2487"
};
rom1.CopyMachineInformation(machine2);
@@ -616,7 +616,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "BEEFDEAD",
CRC32 = "BEEFDEAD",
Source = new Source(0)
};
romA.CopyMachineInformation(machineA);
@@ -624,7 +624,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(1)
};
romB.CopyMachineInformation(machineB);
@@ -645,7 +645,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(0)
};
romA.CopyMachineInformation(machineA);
@@ -653,7 +653,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(1)
};
romB.CopyMachineInformation(machineB);
@@ -674,7 +674,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(0)
};
romA.CopyMachineInformation(machineA);
@@ -682,7 +682,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(1)
};
romB.CopyMachineInformation(machineB);
@@ -703,7 +703,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(0)
};
romA.CopyMachineInformation(machineA);
@@ -711,7 +711,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(0)
};
romB.CopyMachineInformation(machineB);
@@ -732,7 +732,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(0)
};
romA.CopyMachineInformation(machineA);
@@ -740,7 +740,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(0)
};
romB.CopyMachineInformation(machineB);
@@ -856,7 +856,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Source = source,
Machine = machine
};