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

[Fix] Conflicts

Browse Source
This commit is contained in:
Konstantin Dyachenko
2026-03-02 05:43:11 +07:00
parent 0cce4a74f0
commit d6b79036b7
13 changed files with 35 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Tests/Editor/DiceCollectionTests.cs
+10 -10
View File
@@ -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);
Assets/Scripts/Tests/Editor/ScoringSystemTests.cs
+2 -2
View File
@@ -14,12 +14,12 @@ namespace YachtDice.Tests
private CategoryDefinition twosCategory;
private CategoryDefinition chanceCategory;
private CategoryCatalog catalog;
private DiceDefinitionSO standardDice;
private DiceDefinition standardDice;
[SetUp]
public void SetUp()
{
standardDice = DiceDefinitionSO.CreateForTest<StandardDiceSO>("d6", "d6");
standardDice = DiceDefinition.CreateForTest<StandardDice>("d6", "d6");
yachtCategory = NOfAKindCategory.CreateForTest("yacht", "Яхта", 5, fixedScoreMode: true, score: 50);
onesCategory = SumOfValueCategory.CreateForTest("ones", "Единицы", 1);
Assets/Scripts/Tests/Editor/ShopModelTests.cs
+3 -3
View File
@@ -142,7 +142,7 @@ namespace YachtDice.Tests
[Test]
public void TryPurchase_DiceItem_AddsToDiceCollection()
{
var die = DiceDefinitionSO.CreateForTest<StandardDiceSO>("test_die", shopPrice: 100);
var die = DiceDefinition.CreateForTest<StandardDice>("test_die", shopPrice: 100);
bool result = shop.TryPurchase(die);
@@ -154,7 +154,7 @@ namespace YachtDice.Tests
[Test]
public void TryPurchase_DiceItem_CannotBeBoughtTwice()
{
var die = DiceDefinitionSO.CreateForTest<StandardDiceSO>("unique_die", shopPrice: 100);
var die = DiceDefinition.CreateForTest<StandardDice>("unique_die", shopPrice: 100);
shop.TryPurchase(die);
bool secondResult = shop.TryPurchase(die);
@@ -167,7 +167,7 @@ namespace YachtDice.Tests
[Test]
public void GetItemState_Dice_Owned_AfterPurchase()
{
var die = DiceDefinitionSO.CreateForTest<StandardDiceSO>("die1", shopPrice: 50);
var die = DiceDefinition.CreateForTest<StandardDice>("die1", shopPrice: 50);
shop.TryPurchase(die);