mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-17 00:44:08 +00:00
Code Issues Projects Releases Wiki Activity

Replace usages of ItemFactory in tests with VanillaItems

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-12-06 23:45:36 +00:00
parent 0530cb72df
commit 0c012ca5d9
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/phpunit/inventory/BaseInventoryTest.php
View File

@ -25,16 +25,14 @@ namespace pocketmine\inventory;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\ItemIds;
use pocketmine\item\VanillaItems; use pocketmine\item\VanillaItems;
class BaseInventoryTest extends TestCase{ class BaseInventoryTest extends TestCase{
public function testAddItemDifferentUserData() : void{ public function testAddItemDifferentUserData() : void{
$inv = new SimpleInventory(1); $inv = new SimpleInventory(1);
$item1 = ItemFactory::getInstance()->get(ItemIds::ARROW, 0, 1); $item1 = VanillaItems::ARROW()->setCount(1);
$item2 = ItemFactory::getInstance()->get(ItemIds::ARROW, 0, 1)->setCustomName("TEST"); $item2 = VanillaItems::ARROW()->setCount(1)->setCustomName("TEST");
$inv->addItem(clone $item1); $inv->addItem(clone $item1);
self::assertFalse($inv->canAddItem($item2), "Item WITHOUT userdata should not stack with item WITH userdata"); self::assertFalse($inv->canAddItem($item2), "Item WITHOUT userdata should not stack with item WITH userdata");

9
tests/phpunit/item/ItemTest.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\item; namespace pocketmine\item;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use pocketmine\block\VanillaBlocks;
use pocketmine\item\enchantment\EnchantmentInstance; use pocketmine\item\enchantment\EnchantmentInstance;
use pocketmine\item\enchantment\VanillaEnchantments; use pocketmine\item\enchantment\VanillaEnchantments;
@ -33,14 +34,14 @@ class ItemTest extends TestCase{
private $item; private $item;
public function setUp() : void{ public function setUp() : void{
$this->item = ItemFactory::getInstance()->get(ItemIds::DIAMOND_SWORD); $this->item = VanillaItems::DIAMOND_SWORD();
} }
/** /**
* Test for issue #1145 (items aren't considered equal after NBT serializing and deserializing * Test for issue #1145 (items aren't considered equal after NBT serializing and deserializing
*/ */
public function testItemEquals() : void{ public function testItemEquals() : void{
$item = ItemFactory::getInstance()->get(ItemIds::STONE)->setCustomName("HI"); $item = VanillaBlocks::STONE()->asItem()->setCustomName("HI");
$item2 = Item::nbtDeserialize($item->nbtSerialize()); $item2 = Item::nbtDeserialize($item->nbtSerialize());
self::assertTrue($item2->equals($item)); self::assertTrue($item2->equals($item));
self::assertTrue($item->equals($item2)); self::assertTrue($item->equals($item2));
@ -50,7 +51,7 @@ class ItemTest extends TestCase{
* Test that same items without NBT are considered equal * Test that same items without NBT are considered equal
*/ */
public function testItemEqualsNoNbt() : void{ public function testItemEqualsNoNbt() : void{
$item1 = ItemFactory::getInstance()->get(ItemIds::DIAMOND_SWORD); $item1 = VanillaItems::DIAMOND_SWORD();
$item2 = clone $item1; $item2 = clone $item1;
self::assertTrue($item1->equals($item2)); self::assertTrue($item1->equals($item2));
} }
@ -62,7 +63,7 @@ class ItemTest extends TestCase{
public function testItemPersistsDisplayProperties() : void{ public function testItemPersistsDisplayProperties() : void{
$lore = ["Line A", "Line B"]; $lore = ["Line A", "Line B"];
$name = "HI"; $name = "HI";
$item = ItemFactory::getInstance()->get(ItemIds::DIAMOND_SWORD); $item = VanillaItems::DIAMOND_SWORD();
$item->setCustomName($name); $item->setCustomName($name);
$item->setLore($lore); $item->setLore($lore);
$item = Item::nbtDeserialize($item->nbtSerialize()); $item = Item::nbtDeserialize($item->nbtSerialize());