upgrade mockbukkit to 4.9.3 and fix some broken test

alexcrea · Dec 4, 2024 · 6f2b15a · 6f2b15a
1 parent 70767ae
commit 6f2b15a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -66,7 +66,7 @@ dependencies {
     implementation(kotlin("stdlib"))
 
     // 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")
 }
 

diff --git a/src/test/java/xyz/alexcrea/cuanvil/anvil/AnvilFuseTests.java b/src/test/java/xyz/alexcrea/cuanvil/anvil/AnvilFuseTests.java
@@ -4,6 +4,8 @@
 import org.bukkit.inventory.AnvilInventory;
 import org.bukkit.inventory.Inventory;
 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.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -49,11 +51,15 @@ public static void tearDown() {
     public void mergeFuseTest(){
         // Literally just test a sharpness 4 + 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(
                 sharpness4, sharpness4,
-                sharpness5
+                sharpness5Result
                 // TODO add expected price
         );
 
@@ -66,9 +72,14 @@ public void overFuseTest(){
         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(
                 sharpness4, sharpness5,
-                sharpness5
+                sharpness5Result
                 // TODO add expected price
         );
 

diff --git a/src/test/java/xyz/alexcrea/cuanvil/api/ConflictApiTests.java b/src/test/java/xyz/alexcrea/cuanvil/api/ConflictApiTests.java
@@ -51,7 +51,7 @@ public void testConflict() {
         ItemStack sharpness1 = CommonItemUtil.sharpness(1);
         ItemStack arthropods1 = CommonItemUtil.bane_of_arthropods(1);
         ItemStack illegalResult = AnvilFuseTestUtil.prepareItem(
-                Material.DIAMOND_SWORD,
+                Material.DIAMOND_SWORD, 1,
                 List.of("bane_of_arthropods", "sharpness"),
                 1, 1
         );

diff --git a/src/test/java/xyz/alexcrea/cuanvil/api/UnitRepairApiTests.java b/src/test/java/xyz/alexcrea/cuanvil/api/UnitRepairApiTests.java
@@ -48,6 +48,7 @@ void vanillaUnitRepair(){
         resultPickaxe.setDurability((short) (Material.DIAMOND_PICKAXE.getMaxDurability()/2));
         ItemMeta meta = resultPickaxe.getItemMeta();
         ((Repairable) meta).setRepairCost(1);
+        resultPickaxe.setItemMeta(meta);
 
         ItemStack diamond2 = new ItemStackMock(Material.DIAMOND, 2);
 
@@ -93,6 +94,7 @@ void addUnitRepair(){
         resultPickaxe.setDurability((short) (Material.DIAMOND_PICKAXE.getMaxDurability()/2));
         ItemMeta meta = resultPickaxe.getItemMeta();
         ((Repairable) meta).setRepairCost(1);
+        resultPickaxe.setItemMeta(meta);
 
         ItemStack stick2 = new ItemStackMock(Material.STICK, 2);