mirror of
https://github.com/alexcrea/CustomAnvil.git
synced 2026-06-23 16:16:17 +02:00
upgrade mockbukkit to 4.9.3 and fix some broken test
This commit is contained in:
parent
70767aefd2
commit
6f2b15a0bc
4 changed files with 18 additions and 5 deletions
|
|
@ -66,7 +66,7 @@ dependencies {
|
||||||
implementation(kotlin("stdlib"))
|
implementation(kotlin("stdlib"))
|
||||||
|
|
||||||
// Test dependency
|
// Test dependency
|
||||||
testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.5.0")
|
testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.9.3") //lower bound: 4.9.2 upper bound: 4.9.3
|
||||||
testRuntimeOnly("commons-lang:commons-lang:2.6")
|
testRuntimeOnly("commons-lang:commons-lang:2.6")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,8 @@ import org.bukkit.event.inventory.InventoryType;
|
||||||
import org.bukkit.inventory.AnvilInventory;
|
import org.bukkit.inventory.AnvilInventory;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
import org.bukkit.inventory.meta.ItemMeta;
|
||||||
|
import org.bukkit.inventory.meta.Repairable;
|
||||||
import org.junit.jupiter.api.AfterAll;
|
import org.junit.jupiter.api.AfterAll;
|
||||||
import org.junit.jupiter.api.BeforeAll;
|
import org.junit.jupiter.api.BeforeAll;
|
||||||
import org.junit.jupiter.api.BeforeEach;
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
|
@ -49,11 +51,15 @@ public class AnvilFuseTests extends SharedCustomAnvilTest {
|
||||||
public void mergeFuseTest(){
|
public void mergeFuseTest(){
|
||||||
// Literally just test a sharpness 4 + sharpness 4
|
// Literally just test a sharpness 4 + sharpness 4
|
||||||
ItemStack sharpness4 = CommonItemUtil.sharpness(4);
|
ItemStack sharpness4 = CommonItemUtil.sharpness(4);
|
||||||
ItemStack sharpness5 = CommonItemUtil.sharpness(5);
|
|
||||||
|
ItemStack sharpness5Result = CommonItemUtil.sharpness(5);
|
||||||
|
Repairable meta = (Repairable) sharpness5Result.getItemMeta();
|
||||||
|
meta.setRepairCost(1);
|
||||||
|
sharpness5Result.setItemMeta(meta);
|
||||||
|
|
||||||
AnvilFuseTestData data = new AnvilFuseTestData(
|
AnvilFuseTestData data = new AnvilFuseTestData(
|
||||||
sharpness4, sharpness4,
|
sharpness4, sharpness4,
|
||||||
sharpness5
|
sharpness5Result
|
||||||
// TODO add expected price
|
// TODO add expected price
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -66,9 +72,14 @@ public class AnvilFuseTests extends SharedCustomAnvilTest {
|
||||||
ItemStack sharpness4 = CommonItemUtil.sharpness(4);
|
ItemStack sharpness4 = CommonItemUtil.sharpness(4);
|
||||||
ItemStack sharpness5 = CommonItemUtil.sharpness(5);
|
ItemStack sharpness5 = CommonItemUtil.sharpness(5);
|
||||||
|
|
||||||
|
ItemStack sharpness5Result = CommonItemUtil.sharpness(5);
|
||||||
|
Repairable meta = (Repairable) sharpness5Result.getItemMeta();
|
||||||
|
meta.setRepairCost(1);
|
||||||
|
sharpness5Result.setItemMeta(meta);
|
||||||
|
|
||||||
AnvilFuseTestData data = new AnvilFuseTestData(
|
AnvilFuseTestData data = new AnvilFuseTestData(
|
||||||
sharpness4, sharpness5,
|
sharpness4, sharpness5,
|
||||||
sharpness5
|
sharpness5Result
|
||||||
// TODO add expected price
|
// TODO add expected price
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ public class ConflictApiTests extends ConfigResetCustomAnvilTest {
|
||||||
ItemStack sharpness1 = CommonItemUtil.sharpness(1);
|
ItemStack sharpness1 = CommonItemUtil.sharpness(1);
|
||||||
ItemStack arthropods1 = CommonItemUtil.bane_of_arthropods(1);
|
ItemStack arthropods1 = CommonItemUtil.bane_of_arthropods(1);
|
||||||
ItemStack illegalResult = AnvilFuseTestUtil.prepareItem(
|
ItemStack illegalResult = AnvilFuseTestUtil.prepareItem(
|
||||||
Material.DIAMOND_SWORD,
|
Material.DIAMOND_SWORD, 1,
|
||||||
List.of("bane_of_arthropods", "sharpness"),
|
List.of("bane_of_arthropods", "sharpness"),
|
||||||
1, 1
|
1, 1
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@ public class UnitRepairApiTests extends ConfigResetCustomAnvilTest {
|
||||||
resultPickaxe.setDurability((short) (Material.DIAMOND_PICKAXE.getMaxDurability()/2));
|
resultPickaxe.setDurability((short) (Material.DIAMOND_PICKAXE.getMaxDurability()/2));
|
||||||
ItemMeta meta = resultPickaxe.getItemMeta();
|
ItemMeta meta = resultPickaxe.getItemMeta();
|
||||||
((Repairable) meta).setRepairCost(1);
|
((Repairable) meta).setRepairCost(1);
|
||||||
|
resultPickaxe.setItemMeta(meta);
|
||||||
|
|
||||||
ItemStack diamond2 = new ItemStackMock(Material.DIAMOND, 2);
|
ItemStack diamond2 = new ItemStackMock(Material.DIAMOND, 2);
|
||||||
|
|
||||||
|
|
@ -93,6 +94,7 @@ public class UnitRepairApiTests extends ConfigResetCustomAnvilTest {
|
||||||
resultPickaxe.setDurability((short) (Material.DIAMOND_PICKAXE.getMaxDurability()/2));
|
resultPickaxe.setDurability((short) (Material.DIAMOND_PICKAXE.getMaxDurability()/2));
|
||||||
ItemMeta meta = resultPickaxe.getItemMeta();
|
ItemMeta meta = resultPickaxe.getItemMeta();
|
||||||
((Repairable) meta).setRepairCost(1);
|
((Repairable) meta).setRepairCost(1);
|
||||||
|
resultPickaxe.setItemMeta(meta);
|
||||||
|
|
||||||
ItemStack stick2 = new ItemStackMock(Material.STICK, 2);
|
ItemStack stick2 = new ItemStackMock(Material.STICK, 2);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue