From af84ba56f035dd49c4c62a30dd0696295de09f43 Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Sat, 25 Jan 2025 02:03:09 +0100 Subject: [PATCH] Add rename to null test --- .../io/delilaheve/util/ConfigOptions.kt | 4 +-- .../cuanvil/anvil/AnvilFuseTests.java | 28 +++++++++++++++++-- .../cuanvil/util/AnvilFuseTestData.java | 15 ++++++++++ 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt b/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt index f192ff9..dc47bc6 100644 --- a/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt +++ b/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt @@ -48,8 +48,8 @@ object ConfigOptions { private const val KEY_ITEM = "item" // Debug flag - private const val DEBUG_LOGGING = "debug_log" - private const val VERBOSE_DEBUG_LOGGING = "debug_log_verbose" + const val DEBUG_LOGGING = "debug_log" + const val VERBOSE_DEBUG_LOGGING = "debug_log_verbose" // ---------------------- // Default config values diff --git a/src/test/java/xyz/alexcrea/cuanvil/anvil/AnvilFuseTests.java b/src/test/java/xyz/alexcrea/cuanvil/anvil/AnvilFuseTests.java index fde2a68..16a01e3 100644 --- a/src/test/java/xyz/alexcrea/cuanvil/anvil/AnvilFuseTests.java +++ b/src/test/java/xyz/alexcrea/cuanvil/anvil/AnvilFuseTests.java @@ -1,11 +1,15 @@ package xyz.alexcrea.cuanvil.anvil; +import io.delilaheve.util.ConfigOptions; +import net.kyori.adventure.text.Component; +import org.bukkit.Material; import org.bukkit.event.inventory.InventoryType; 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.eclipse.aether.util.ConfigUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -32,8 +36,9 @@ public class AnvilFuseTests extends SharedCustomAnvilTest { AnvilFuseTests.anvil = (AnvilInventory) anvil; player.openInventory(anvil); - ConfigHolder.DEFAULT_CONFIG.getConfig().set("debug_log", true); - ConfigHolder.DEFAULT_CONFIG.getConfig().set("debug_log_verbose", true); + ConfigHolder.DEFAULT_CONFIG.getConfig().set(ConfigOptions.DEBUG_LOGGING, true); + ConfigHolder.DEFAULT_CONFIG.getConfig().set(ConfigOptions.VERBOSE_DEBUG_LOGGING, true); + ConfigHolder.DEFAULT_CONFIG.getConfig().set(ConfigOptions.ALLOW_COLOR_CODE, true); // For rename test } @BeforeEach @@ -100,4 +105,23 @@ public class AnvilFuseTests extends SharedCustomAnvilTest { AnvilFuseTestUtil.executeAnvilTest(anvil, player, data); } + // Note: currently anvil can only have null name. maybe handle differently later + @Test + public void nullNameResetTest(){ + ItemStack base = new ItemStack(Material.NETHERITE_SWORD); + ItemStack expected = base.clone(); + + ItemMeta meta = expected.getItemMeta(); + meta.displayName(Component.text("test")); + base.setItemMeta(meta); + + AnvilFuseTestData data = new AnvilFuseTestData( + base, null, + expected, expected, null + // TODO add expected price + ); + + AnvilFuseTestUtil.executeAnvilTest(anvil, player, data); + } + } diff --git a/src/test/java/xyz/alexcrea/cuanvil/util/AnvilFuseTestData.java b/src/test/java/xyz/alexcrea/cuanvil/util/AnvilFuseTestData.java index 2268d44..cc042f2 100644 --- a/src/test/java/xyz/alexcrea/cuanvil/util/AnvilFuseTestData.java +++ b/src/test/java/xyz/alexcrea/cuanvil/util/AnvilFuseTestData.java @@ -36,4 +36,19 @@ public record AnvilFuseTestData( this(leftItem, rightItem, expectedResult, null ); } + + public AnvilFuseTestData( + @Nullable ItemStack leftItem, + @Nullable ItemStack rightItem, + @Nullable ItemStack expectedResult, + + @Nullable ItemStack expectedAfterLeftPlaced, + @Nullable ItemStack expectedAfterRightPlaced + ){ + this(leftItem, rightItem, + expectedResult, expectedAfterLeftPlaced, expectedAfterRightPlaced, + null, null, null + ); + } + }