horooko/YachtDice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Refactor project

Browse Source
This commit is contained in:
Konstantin Dyachenko
2026-03-02 12:49:12 +07:00
parent f65976796d
commit f52131f755
44 changed files with 449 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Tests/Editor/InventoryModelTests.cs
+50 -51
View File
@@ -1,5 +1,4 @@
using NUnit.Framework;
using UnityEngine;
using YachtDice.Inventory;
using YachtDice.Modifiers.Definition;
using YachtDice.Modifiers.Runtime;
@@ -8,14 +7,14 @@ namespace YachtDice.Tests
{
public class InventoryModelTests
{
private ModifierRegistry registry;
private InventoryModel inventory;
private ModifierRegistry _registry;
private InventoryModel _inventory;
[SetUp]
public void SetUp()
{
registry = new ModifierRegistry(3);
inventory = new InventoryModel(registry);
_registry = new ModifierRegistry(3);
_inventory = new InventoryModel(_registry);
}
private ModifierDefinition CreateTestDef(string id = "test",
@@ -28,22 +27,22 @@ namespace YachtDice.Tests
[Test]
public void AddModifier_IncreasesCount()
{
inventory.AddModifier(CreateTestDef());
_inventory.AddModifier(CreateTestDef());
Assert.AreEqual(1, inventory.OwnedModifiers.Count);
Assert.AreEqual(1, _inventory.OwnedModifiers.Count);
}
[Test]
public void TryActivate_SucceedsWithinSlotLimit()
{
inventory.AddModifier(CreateTestDef("a"));
var mod = inventory.OwnedModifiers[0];
_inventory.AddModifier(CreateTestDef("a"));
var mod = _inventory.OwnedModifiers[0];
bool result = inventory.TryActivate(mod);
bool result = _inventory.TryActivate(mod);
Assert.IsTrue(result);
Assert.IsTrue(mod.IsActive);
Assert.AreEqual(1, inventory.ActiveCount);
Assert.AreEqual(1, _inventory.ActiveCount);
}
[Test]
@@ -51,53 +50,53 @@ namespace YachtDice.Tests
{
for (int i = 0; i < 3; i++)
{
inventory.AddModifier(CreateTestDef($"m{i}"));
inventory.TryActivate(inventory.OwnedModifiers[i]);
_inventory.AddModifier(CreateTestDef($"m{i}"));
_inventory.TryActivate(_inventory.OwnedModifiers[i]);
}
inventory.AddModifier(CreateTestDef("extra"));
var extra = inventory.OwnedModifiers[3];
bool result = inventory.TryActivate(extra);
_inventory.AddModifier(CreateTestDef("extra"));
var extra = _inventory.OwnedModifiers[3];
bool result = _inventory.TryActivate(extra);
Assert.IsFalse(result);
Assert.IsFalse(extra.IsActive);
Assert.AreEqual(3, inventory.ActiveCount);
Assert.AreEqual(3, _inventory.ActiveCount);
}
[Test]
public void Deactivate_FreesSlot()
{
inventory.AddModifier(CreateTestDef());
var mod = inventory.OwnedModifiers[0];
inventory.TryActivate(mod);
_inventory.AddModifier(CreateTestDef());
var mod = _inventory.OwnedModifiers[0];
_inventory.TryActivate(mod);
inventory.Deactivate(mod);
_inventory.Deactivate(mod);
Assert.IsFalse(mod.IsActive);
Assert.AreEqual(0, inventory.ActiveCount);
Assert.AreEqual(0, _inventory.ActiveCount);
}
[Test]
public void RemoveModifier_DeactivatesAndRemoves()
{
inventory.AddModifier(CreateTestDef());
var mod = inventory.OwnedModifiers[0];
inventory.TryActivate(mod);
_inventory.AddModifier(CreateTestDef());
var mod = _inventory.OwnedModifiers[0];
_inventory.TryActivate(mod);
inventory.RemoveModifier(mod);
_inventory.RemoveModifier(mod);
Assert.AreEqual(0, inventory.OwnedModifiers.Count);
Assert.AreEqual(0, inventory.ActiveCount);
Assert.AreEqual(0, _inventory.OwnedModifiers.Count);
Assert.AreEqual(0, _inventory.ActiveCount);
}
[Test]
public void ConsumeUseOnActive_DecrementsUses()
{
inventory.AddModifier(CreateTestDef("ltd", hasLimitedUses: true, maxUses: 3));
var mod = inventory.OwnedModifiers[0];
inventory.TryActivate(mod);
_inventory.AddModifier(CreateTestDef("ltd", hasLimitedUses: true, maxUses: 3));
var mod = _inventory.OwnedModifiers[0];
_inventory.TryActivate(mod);
inventory.ConsumeUseOnActive();
_inventory.ConsumeUseOnActive();
Assert.AreEqual(2, mod.RemainingUses);
}
@@ -105,36 +104,36 @@ namespace YachtDice.Tests
[Test]
public void ConsumeUseOnActive_RemovesExpired()
{
inventory.AddModifier(CreateTestDef("ltd", hasLimitedUses: true, maxUses: 1));
var mod = inventory.OwnedModifiers[0];
inventory.TryActivate(mod);
_inventory.AddModifier(CreateTestDef("ltd", hasLimitedUses: true, maxUses: 1));
var mod = _inventory.OwnedModifiers[0];
_inventory.TryActivate(mod);
inventory.ConsumeUseOnActive();
_inventory.ConsumeUseOnActive();
Assert.AreEqual(0, inventory.OwnedModifiers.Count);
Assert.AreEqual(0, _inventory.OwnedModifiers.Count);
}
[Test]
public void ConsumeUseOnActive_IgnoresPermanent()
{
inventory.AddModifier(CreateTestDef("perm"));
var mod = inventory.OwnedModifiers[0];
inventory.TryActivate(mod);
_inventory.AddModifier(CreateTestDef("perm"));
var mod = _inventory.OwnedModifiers[0];
_inventory.TryActivate(mod);
inventory.ConsumeUseOnActive();
_inventory.ConsumeUseOnActive();
Assert.AreEqual(1, inventory.OwnedModifiers.Count);
Assert.AreEqual(1, _inventory.OwnedModifiers.Count);
Assert.IsTrue(mod.IsActive);
}
[Test]
public void GetActiveModifierDefinitions_ReturnsOnlyActive()
{
inventory.AddModifier(CreateTestDef("a"));
inventory.AddModifier(CreateTestDef("b"));
inventory.TryActivate(inventory.OwnedModifiers[0]);
_inventory.AddModifier(CreateTestDef("a"));
_inventory.AddModifier(CreateTestDef("b"));
_inventory.TryActivate(_inventory.OwnedModifiers[0]);
var active = inventory.GetActiveModifierDefinitions();
var active = _inventory.GetActiveModifierDefinitions();
Assert.AreEqual(1, active.Count);
}
@@ -142,19 +141,19 @@ namespace YachtDice.Tests
[Test]
public void SetMaxActiveSlots_AllowsExpansion()
{
inventory.SetMaxActiveSlots(10);
_inventory.SetMaxActiveSlots(10);
Assert.AreEqual(10, inventory.MaxActiveSlots);
Assert.AreEqual(10, _inventory.MaxActiveSlots);
}
[Test]
public void OnActiveModifiersChanged_FiredOnActivate()
{
bool fired = false;
inventory.OnActiveModifiersChanged += _ => fired = true;
inventory.AddModifier(CreateTestDef());
_inventory.OnActiveModifiersChanged += _ => fired = true;
_inventory.AddModifier(CreateTestDef());
inventory.TryActivate(inventory.OwnedModifiers[0]);
_inventory.TryActivate(_inventory.OwnedModifiers[0]);
Assert.IsTrue(fired);
}