From 22da08bca58f9483bf820b181ed4f43dc8e56549 Mon Sep 17 00:00:00 2001 From: sp-tarkov-bot Date: Tue, 22 Jul 2025 18:42:12 +0000 Subject: [PATCH 1/2] .NET Format Style Fixes --- .../SPTarkov.Server.Core.csproj | 3 +-- UnitTests/DI.cs | 4 +++- .../Tests/Helpers/BotGeneratorHelperTests.cs | 15 ++++++++++++++- UnitTests/Tests/Helpers/InventoryHelperTests.cs | 8 +------- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj b/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj index cf4b9b45..d2d92cb1 100644 --- a/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj +++ b/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj @@ -33,9 +33,8 @@ - + - () where T : notnull + public T GetService() + where T : notnull { return _serviceProvider.GetRequiredService(); } diff --git a/UnitTests/Tests/Helpers/BotGeneratorHelperTests.cs b/UnitTests/Tests/Helpers/BotGeneratorHelperTests.cs index bccd1e1f..1a40bd02 100644 --- a/UnitTests/Tests/Helpers/BotGeneratorHelperTests.cs +++ b/UnitTests/Tests/Helpers/BotGeneratorHelperTests.cs @@ -127,7 +127,20 @@ public class BotGeneratorHelperTests botInventory ); - _botLootGenerator.AddLootFromPool(new Dictionary{{ItemTpl.BARTER_MALBORO_CIGARETTES, 1}, {ItemTpl.FOREGRIP_SAKO_TRG_M10_GRIP_PAD, 1}, {ItemTpl.BARTER_GOLD_SKULL_RING, 1}, {ItemTpl.BARTER_PACK_OF_NAILS, 1}}, [EquipmentSlots.Backpack], 4, botInventory, "assault", null); + _botLootGenerator.AddLootFromPool( + new Dictionary + { + { ItemTpl.BARTER_MALBORO_CIGARETTES, 1 }, + { ItemTpl.FOREGRIP_SAKO_TRG_M10_GRIP_PAD, 1 }, + { ItemTpl.BARTER_GOLD_SKULL_RING, 1 }, + { ItemTpl.BARTER_PACK_OF_NAILS, 1 }, + }, + [EquipmentSlots.Backpack], + 4, + botInventory, + "assault", + null + ); Assert.AreEqual(ItemAddedResult.SUCCESS, result); diff --git a/UnitTests/Tests/Helpers/InventoryHelperTests.cs b/UnitTests/Tests/Helpers/InventoryHelperTests.cs index b3ed09ae..860a0f8d 100644 --- a/UnitTests/Tests/Helpers/InventoryHelperTests.cs +++ b/UnitTests/Tests/Helpers/InventoryHelperTests.cs @@ -173,13 +173,7 @@ public class InventoryHelperTests Template = "6699249f3c4fda6471005cba", ParentId = root.Id, SlotId = "mod_stock", - Upd = new Upd - { - Foldable = new UpdFoldable - { - Folded = true - } - }, + Upd = new Upd { Foldable = new UpdFoldable { Folded = true } }, }; weaponWithChildren.Add(stock); From 7aa535d010cd9f2b3c601e267680e1b8f9b51b5f Mon Sep 17 00:00:00 2001 From: Chomp Date: Tue, 22 Jul 2025 20:27:46 +0100 Subject: [PATCH 2/2] Fix asserts --- UnitTests/Tests/Helpers/BotGeneratorHelperTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UnitTests/Tests/Helpers/BotGeneratorHelperTests.cs b/UnitTests/Tests/Helpers/BotGeneratorHelperTests.cs index 1a40bd02..228e893c 100644 --- a/UnitTests/Tests/Helpers/BotGeneratorHelperTests.cs +++ b/UnitTests/Tests/Helpers/BotGeneratorHelperTests.cs @@ -145,8 +145,8 @@ public class BotGeneratorHelperTests Assert.AreEqual(ItemAddedResult.SUCCESS, result); var weaponRoot = weaponWithChildren.FirstOrDefault(item => item.Id == rootWeaponId); - Assert.AreEqual((weaponRoot.Location as ItemLocation).X, 0); - Assert.AreEqual((weaponRoot.Location as ItemLocation).Y, 0); + Assert.AreNotEqual((weaponRoot.Location as ItemLocation).X, 0); + Assert.AreNotEqual((weaponRoot.Location as ItemLocation).Y, 0); Assert.AreEqual((weaponRoot.Location as ItemLocation).R, ItemRotation.Horizontal); }