claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ItemDictionary tests, fix null issues

Browse Source
This commit is contained in:
Matt Nadareski
2020-12-19 22:42:16 -08:00
parent a62da3cd4f
commit 199b8c01af
2 changed files with 208 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SabreTools.DatFiles/ItemDictionary.cs
View File

@@ -379,7 +379,10 @@ namespace SabreTools.DatFiles
set
{
Remove(key);
AddRange(key, value);
if (value == null)
items[key] = null;
else
AddRange(key, value);
}
}
@@ -428,6 +431,10 @@ namespace SabreTools.DatFiles
// Explicit lock for some weird corner cases
lock (key)
{
// If the value is null or empty, just return
if (value == null || !value.Any())
return;
// Ensure the key exists
EnsureKey(key);
@@ -949,7 +956,7 @@ namespace SabreTools.DatFiles
return;
// If the sorted type isn't the same, we want to sort the dictionary accordingly
if (bucketedBy != bucketBy)
if (bucketedBy != bucketBy && bucketBy != ItemKey.NULL)
{
logger.User($"Organizing roms by {bucketBy}");

199
SabreTools.Test/DatFiles/ItemDictionaryTests.cs Normal file
View File

@@ -0,0 +1,199 @@
using System.Collections.Generic;
using SabreTools.DatFiles;
using SabreTools.DatItems;
using Xunit;
namespace SabreTools.Test.DatFiles
{
public class ItemDictionaryTests
{
[Theory]
[InlineData(ItemKey.NULL, 2)]
[InlineData(ItemKey.Machine, 2)]
[InlineData(ItemKey.CRC, 1)]
[InlineData(ItemKey.SHA1, 4)]
public void BucketByTest(ItemKey itemKey, int expected)
{
// Setup the dictionary
var dict = new ItemDictionary
{
["game-1"] = new List<DatItem>
{
new Rom
{
Name = "rom-1",
Size = 1024,
CRC = "DEADBEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6",
Machine = new Machine { Name = "game-1" },
},
new Rom
{
Name = "rom-2",
Size = 1024,
CRC = "DEADBEEF",
SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44",
Machine = new Machine { Name = "game-1" },
},
},
["game-2"] = new List<DatItem>
{
new Rom
{
Name = "rom-3",
Size = 1024,
CRC = "DEADBEEF",
SHA1 = "00000ea4014ce66679e7e17d56ac510f67e39e26",
Machine = new Machine { Name = "game-2" },
},
new Rom
{
Name = "rom-4",
Size = 1024,
CRC = "DEADBEEF",
SHA1 = "00000151d437442e74e5134023fab8bf694a2487",
Machine = new Machine { Name = "game-2" },
},
},
};
dict.BucketBy(itemKey, DedupeType.None);
Assert.Equal(expected, dict.Keys.Count);
}
[Fact]
public void ClearEmptyTest()
{
// Setup the dictionary
var dict = new ItemDictionary
{
["game-1"] = new List<DatItem> { new Rom(), },
["game-2"] = new List<DatItem>(),
["game-3"] = null,
};
dict.ClearEmpty();
Assert.Single(dict.Keys);
}
[Fact]
public void ClearMarkedTest()
{
// Setup the dictionary
var dict = new ItemDictionary
{
["game-1"] = new List<DatItem>
{
new Rom
{
Name = "rom-1",
Size = 1024,
CRC = "DEADBEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6",
Machine = new Machine { Name = "game-1" },
},
new Rom
{
Name = "rom-2",
Size = 1024,
CRC = "DEADBEEF",
SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44",
Machine = new Machine { Name = "game-1" },
Remove = true,
},
},
};
dict.ClearMarked();
Assert.Single(dict.Keys);
Assert.Single(dict["game-1"]);
}
[Theory]
[InlineData(true, 1)]
[InlineData(false, 0)]
public void GetDuplicatesTest(bool hasDuplicate, int expected)
{
// Setup the dictionary
var dict = new ItemDictionary
{
["game-1"] = new List<DatItem>
{
new Rom
{
Name = "rom-1",
Size = 1024,
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6",
Machine = new Machine { Name = "game-1" },
},
new Rom
{
Name = "rom-2",
Size = 1024,
SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44",
Machine = new Machine { Name = "game-1" },
},
},
};
var rom = new Rom
{
Name = "rom-1",
Size = hasDuplicate ? 1024 : 2048,
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6",
Machine = new Machine { Name = "game-1" },
};
var actual = dict.GetDuplicates(rom);
Assert.Equal(expected, actual.Count);
}
[Theory]
[InlineData(true)]
[InlineData(false)]
public void HasDuplicatesTest(bool expected)
{
// Setup the dictionary
var dict = new ItemDictionary
{
["game-1"] = new List<DatItem>
{
new Rom
{
Name = "rom-1",
Size = 1024,
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6",
Machine = new Machine { Name = "game-1" },
},
new Rom
{
Name = "rom-2",
Size = 1024,
SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44",
Machine = new Machine { Name = "game-1" },
},
},
};
var rom = new Rom
{
Name = "rom-1",
Size = expected ? 1024 : 2048,
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6",
Machine = new Machine { Name = "game-1" },
};
bool actual = dict.HasDuplicates(rom);
Assert.Equal(expected, actual);
}
[Fact]
public void ResetStatisticsTest()
{
var dict = new ItemDictionary { GameCount = 1 };
dict.ResetStatistics();
Assert.Equal(0, dict.GameCount);
}
}
}