[Fix] Conflicts

This commit is contained in:
2026-03-02 05:43:11 +07:00
parent 0cce4a74f0
commit d6b79036b7
13 changed files with 35 additions and 53 deletions
@@ -18,7 +18,7 @@ namespace YachtDice.Tests
[Test]
public void Add_IncreasesCount()
{
var die = StandardDiceSO.CreateStandardD6ForTest();
var die = StandardDice.CreateStandardD6ForTest();
collection.Add(die);
@@ -28,7 +28,7 @@ namespace YachtDice.Tests
[Test]
public void Add_DuplicateId_Ignored()
{
var die = StandardDiceSO.CreateStandardD6ForTest();
var die = StandardDice.CreateStandardD6ForTest();
collection.Add(die);
collection.Add(die);
@@ -47,7 +47,7 @@ namespace YachtDice.Tests
[Test]
public void OwnsById_ReturnsTrueWhenOwned()
{
var die = StandardDiceSO.CreateStandardD6ForTest();
var die = StandardDice.CreateStandardD6ForTest();
collection.Add(die);
@@ -63,7 +63,7 @@ namespace YachtDice.Tests
[Test]
public void Remove_DecreasesCount()
{
var die = StandardDiceSO.CreateStandardD6ForTest();
var die = StandardDice.CreateStandardD6ForTest();
collection.Add(die);
collection.Remove(die);
@@ -74,7 +74,7 @@ namespace YachtDice.Tests
[Test]
public void GetSaveData_ReturnsIds()
{
var die = StandardDiceSO.CreateStandardD6ForTest();
var die = StandardDice.CreateStandardD6ForTest();
collection.Add(die);
@@ -86,8 +86,8 @@ namespace YachtDice.Tests
[Test]
public void LoadSaveData_RestoresDice()
{
var die = StandardDiceSO.CreateStandardD6ForTest();
var catalog = DiceCatalog.CreateForTest(new List<DiceDefinitionSO> { die });
var die = StandardDice.CreateStandardD6ForTest();
var catalog = DiceCatalog.CreateForTest(new List<DiceDefinition> { die });
var ids = new List<string> { "standard_d6" };
collection.LoadSaveData(ids, catalog);
@@ -99,7 +99,7 @@ namespace YachtDice.Tests
[Test]
public void LoadSaveData_SkipsMissingIds()
{
var catalog = DiceCatalog.CreateForTest(new List<DiceDefinitionSO>());
var catalog = DiceCatalog.CreateForTest(new List<DiceDefinition>());
var ids = new List<string> { "nonexistent" };
collection.LoadSaveData(ids, catalog);
@@ -110,7 +110,7 @@ namespace YachtDice.Tests
[Test]
public void Clear_RemovesAll()
{
var die = StandardDiceSO.CreateStandardD6ForTest();
var die = StandardDice.CreateStandardD6ForTest();
collection.Add(die);
collection.Clear();
@@ -124,7 +124,7 @@ namespace YachtDice.Tests
bool fired = false;
collection.OnChanged += () => fired = true;
var die = StandardDiceSO.CreateStandardD6ForTest();
var die = StandardDice.CreateStandardD6ForTest();
collection.Add(die);
Assert.IsTrue(fired);