From 71d00a39f1abb83e847f61e6b6396f9708b9405b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 28 Mar 2026 18:43:45 +0000 Subject: [PATCH 01/31] Initial plan From 2edcca8c0f96f5bb45e374865a8422c3ed43837d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 28 Mar 2026 18:50:01 +0000 Subject: [PATCH 02/31] Add latest transaction placeholder for bank islands Add a new placeholder `{gamemode}_latest_transaction` that displays the most recent bank transaction for a user's island in the format "[Username] [TxType] $[Amount]" (e.g., "tastybento Deposited $500.0"). - Add BankManager.getLatestHistory(Island) to retrieve latest transaction - Register new placeholder in PhManager.registerPlaceholders() - Add helper methods for formatting transaction display - Add comprehensive unit tests for the new placeholder Agent-Logs-Url: https://github.com/BentoBoxWorld/Bank/sessions/dbe38bf1-aeda-4c8e-94ee-b3201aaad055 Co-authored-by: tastybento <4407265+tastybento@users.noreply.github.com> --- .../java/world/bentobox/bank/BankManager.java | 24 +++++++ .../java/world/bentobox/bank/PhManager.java | 48 +++++++++++++ .../world/bentobox/bank/PhManagerTest.java | 70 ++++++++++++++++++- 3 files changed, 141 insertions(+), 1 deletion(-) diff --git a/src/main/java/world/bentobox/bank/BankManager.java b/src/main/java/world/bentobox/bank/BankManager.java index fc0a434..6351c99 100644 --- a/src/main/java/world/bentobox/bank/BankManager.java +++ b/src/main/java/world/bentobox/bank/BankManager.java @@ -331,6 +331,30 @@ public List getHistory(Island island) { } } + /** + * Get the latest transaction history entry for an island + * @param island - island + * @return latest {@link AccountHistory} or null if no history exists + */ + public AccountHistory getLatestHistory(Island island) { + if (island == null) return null; + try { + BankAccounts account = getAccount(island.getUniqueId()); + Map history = account.getHistory(); + if (history.isEmpty()) return null; + Long latestKey = Collections.max(history.keySet()); + String value = history.get(latestKey); + String[] split = value.split(":"); + if (split.length == 3) { + TxType type = Enums.getIfPresent(TxType.class, split[1]).or(TxType.UNKNOWN); + return new AccountHistory(latestKey, split[0], Double.parseDouble(split[2]), type); + } + return null; + } catch (IOException e) { + return null; + } + } + /** * Get balances for a world * @param world - world diff --git a/src/main/java/world/bentobox/bank/PhManager.java b/src/main/java/world/bentobox/bank/PhManager.java index 06d6d76..49dd993 100644 --- a/src/main/java/world/bentobox/bank/PhManager.java +++ b/src/main/java/world/bentobox/bank/PhManager.java @@ -10,10 +10,13 @@ import org.bukkit.World; +import world.bentobox.bank.data.AccountHistory; import world.bentobox.bank.data.Money; +import world.bentobox.bank.data.TxType; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; /** * Registers placeholders for the addon @@ -77,6 +80,11 @@ protected boolean registerPlaceholders(GameModeAddon gm) { plugin.getPlaceholdersManager().registerPlaceholder(addon, gm.getDescription().getName().toLowerCase() + "_visited_island_balance_formatted", user -> getVisitedIslandBalance(gm, user, true, false)); + // Latest Transaction + plugin.getPlaceholdersManager().registerPlaceholder(addon, + gm.getDescription().getName().toLowerCase() + "_latest_transaction", + user -> getLatestTransaction(user, gm.getOverWorld())); + // Register Ranked Placeholders for (int i = 1; i <= Objects.requireNonNull(addon.getSettings()).getRanksNumber(); i++) { final int rank = i; @@ -110,6 +118,46 @@ String getVisitedIslandBalance(GameModeAddon gm, User user, boolean formatted, b return formatted ? format(balance) : addon.getVault().format(balance); } + /** + * Get the latest transaction for a user's island as a formatted string + * @param user - user + * @param world - world + * @return formatted latest transaction string, e.g., "tastybento Deposited $500.0", or empty string if none + */ + String getLatestTransaction(User user, World world) { + if (user == null || !user.isPlayer()) return ""; + Island island = addon.getIslands().getIsland(world, user); + if (island == null) return ""; + return formatTransaction(bankManager.getLatestHistory(island)); + } + + /** + * Format an AccountHistory entry as "[Name] [TxType] [Amount]" + * @param history - the account history entry + * @return formatted string or empty string if null + */ + private String formatTransaction(AccountHistory history) { + if (history == null) return ""; + return history.getName() + " " + getTxTypeDisplay(history.getType()) + " " + addon.getVault().format(history.getAmount()); + } + + /** + * Get display-friendly name for transaction type + * @param type - transaction type + * @return display name + */ + private String getTxTypeDisplay(TxType type) { + switch (type) { + case DEPOSIT: return "Deposited"; + case WITHDRAW: return "Withdrew"; + case GIVE: return "Received"; + case TAKE: return "Lost"; + case SET: return "Set"; + case INTEREST: return "Earned"; + default: return "Unknown"; + } + } + /** * @param world - world to check * @param rank - value from 1 to setting in config.yml diff --git a/src/test/java/world/bentobox/bank/PhManagerTest.java b/src/test/java/world/bentobox/bank/PhManagerTest.java index 0e82564..7f6e060 100644 --- a/src/test/java/world/bentobox/bank/PhManagerTest.java +++ b/src/test/java/world/bentobox/bank/PhManagerTest.java @@ -30,7 +30,9 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import world.bentobox.bank.data.AccountHistory; import world.bentobox.bank.data.Money; +import world.bentobox.bank.data.TxType; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.AddonDescription; import world.bentobox.bentobox.api.addons.GameModeAddon; @@ -109,6 +111,7 @@ public void setUp() { }); when(plm.getName(any())).thenAnswer(arg -> arg.getArgument(0, UUID.class).toString()); when(user.isPlayer()).thenReturn(true); + when(im.getIsland(any(World.class), any(User.class))).thenReturn(island); pm = new PhManager(addon, bm); } @@ -301,7 +304,7 @@ public void testCheckCacheNoChange() { } /** - * Test method for {@link world.bentobox.bank.PhManager#checkCache(World, int)}. + * Test method for {@link world.bentobox.bank.PhManager#registerPlaceholders(world.bentobox.bentobox.api.addons.GameModeAddon)}. */ @Test public void testCheckCacheOutOfBounds() { @@ -309,4 +312,69 @@ public void testCheckCacheOutOfBounds() { assertEquals(10, pm.checkCache(world, 100)); } + /** + * Test method for {@link world.bentobox.bank.PhManager#getLatestTransaction(world.bentobox.bentobox.api.user.User, org.bukkit.World)}. + */ + @Test + public void testGetLatestTransactionDeposit() { + AccountHistory ah = new AccountHistory(System.currentTimeMillis(), "tastybento", 500.0, TxType.DEPOSIT); + when(bm.getLatestHistory(eq(island))).thenReturn(ah); + assertEquals("tastybento Deposited $500.0", pm.getLatestTransaction(user, world)); + } + + /** + * Test method for {@link world.bentobox.bank.PhManager#getLatestTransaction(world.bentobox.bentobox.api.user.User, org.bukkit.World)}. + */ + @Test + public void testGetLatestTransactionWithdraw() { + AccountHistory ah = new AccountHistory(System.currentTimeMillis(), "tastybento", 200.0, TxType.WITHDRAW); + when(bm.getLatestHistory(eq(island))).thenReturn(ah); + assertEquals("tastybento Withdrew $200.0", pm.getLatestTransaction(user, world)); + } + + /** + * Test method for {@link world.bentobox.bank.PhManager#getLatestTransaction(world.bentobox.bentobox.api.user.User, org.bukkit.World)}. + */ + @Test + public void testGetLatestTransactionNoHistory() { + when(bm.getLatestHistory(eq(island))).thenReturn(null); + assertEquals("", pm.getLatestTransaction(user, world)); + } + + /** + * Test method for {@link world.bentobox.bank.PhManager#getLatestTransaction(world.bentobox.bentobox.api.user.User, org.bukkit.World)}. + */ + @Test + public void testGetLatestTransactionNoIsland() { + when(im.getIsland(any(World.class), any(User.class))).thenReturn(null); + assertEquals("", pm.getLatestTransaction(user, world)); + } + + /** + * Test method for {@link world.bentobox.bank.PhManager#getLatestTransaction(world.bentobox.bentobox.api.user.User, org.bukkit.World)}. + */ + @Test + public void testGetLatestTransactionNullUser() { + assertEquals("", pm.getLatestTransaction(null, world)); + } + + /** + * Test method for {@link world.bentobox.bank.PhManager#getLatestTransaction(world.bentobox.bentobox.api.user.User, org.bukkit.World)}. + */ + @Test + public void testGetLatestTransactionNotPlayer() { + when(user.isPlayer()).thenReturn(false); + assertEquals("", pm.getLatestTransaction(user, world)); + } + + /** + * Test method for {@link world.bentobox.bank.PhManager#registerPlaceholders(world.bentobox.bentobox.api.addons.GameModeAddon)}. + * Verifies that the latest_transaction placeholder is registered. + */ + @Test + public void testRegisterPlaceholdersLatestTransaction() { + assertTrue(pm.registerPlaceholders(gm)); + verify(phm).registerPlaceholder(eq(addon), eq("acidisland_latest_transaction"), any()); + } + } From 1aad613d0dd7f73125af1db4318653355235e6ac Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 28 Mar 2026 11:55:59 -0700 Subject: [PATCH 03/31] Upgrade GitHub Actions to version 4 --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76d9ee6..b9e7ea1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,22 +10,22 @@ jobs: name: Build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: '21' - name: Cache SonarCloud packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - name: Cache Maven packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -40,4 +40,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: Package - path: staging \ No newline at end of file + path: staging From a5cf9a2027fb492a49a7ba3098862719a3cc9d66 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 28 Mar 2026 11:57:35 -0700 Subject: [PATCH 04/31] Remove coverage badge from README Removed coverage badge from README. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index aaec4c3..3aa1e34 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # Bank [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_Bank&metric=bugs)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_Bank) -[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_Bank&metric=coverage)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_Bank) [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_Bank&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_Bank) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_Bank&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_Bank) [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_Bank&metric=security_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_Bank) From 1c6b346634b6ace199fbf7e61983ee785d1f3ed2 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 28 Mar 2026 11:59:10 -0700 Subject: [PATCH 05/31] Update upload-artifact action to version 4 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b9e7ea1..77a06f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar - run: mkdir staging && cp target/*.jar staging - name: Save artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Package path: staging From ad4ef25efa038232fab97e97f84f789fc69a165a Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 28 Mar 2026 12:03:42 -0700 Subject: [PATCH 06/31] Fix 120 SonarCloud issues: complexity, shadowing, test smells - Reduce cognitive complexity in DepositCommand by extracting notifyMembers() - Replace Stream.collect(Collectors.toList()) with Stream.toList() in BankManager - Fix empty tearDown() and unnecessary throws in MoneyTest - Use assertEquals/assertNotEquals instead of assertTrue/assertFalse in MoneyTest - Remove commented-out code blocks in WithdrawCommandTest - Rename shadowing local variable 'plugin' to 'pluginMock' in 9 test setUp() methods - Remove ~100 unnecessary Mockito eq() wrappers across all test files Co-Authored-By: Claude Opus 4.6 (1M context) --- .../java/world/bentobox/bank/BankManager.java | 2 +- .../bank/commands/user/DepositCommand.java | 29 +++++++------ .../world/bentobox/bank/BankManagerTest.java | 5 +-- .../world/bentobox/bank/PhManagerTest.java | 18 ++++---- .../admin/AdminBalanceCommandTest.java | 22 +++++----- .../commands/admin/AdminGiveCommandTest.java | 34 +++++++-------- .../commands/admin/AdminSetCommandTest.java | 32 +++++++------- .../admin/AdminStatementCommandTest.java | 22 +++++----- .../commands/admin/AdminTakeCommandTest.java | 36 ++++++++-------- .../commands/user/BalanceCommandTest.java | 20 ++++----- .../commands/user/DepositCommandTest.java | 36 ++++++++-------- .../commands/user/StatementCommandTest.java | 20 ++++----- .../commands/user/WithdrawCommandTest.java | 42 +++++++++---------- .../world/bentobox/bank/data/MoneyTest.java | 26 ++++++------ 14 files changed, 168 insertions(+), 176 deletions(-) diff --git a/src/main/java/world/bentobox/bank/BankManager.java b/src/main/java/world/bentobox/bank/BankManager.java index 6351c99..7ca899d 100644 --- a/src/main/java/world/bentobox/bank/BankManager.java +++ b/src/main/java/world/bentobox/bank/BankManager.java @@ -325,7 +325,7 @@ public List getHistory(Island island) { return new AccountHistory(en.getKey(), split[0], Double.parseDouble(split[2]), type); } return null; - }).filter(Objects::nonNull).collect(Collectors.toList()); + }).filter(Objects::nonNull).toList(); } catch (IOException e) { return Collections.emptyList(); } diff --git a/src/main/java/world/bentobox/bank/commands/user/DepositCommand.java b/src/main/java/world/bentobox/bank/commands/user/DepositCommand.java index 058de2e..3059607 100644 --- a/src/main/java/world/bentobox/bank/commands/user/DepositCommand.java +++ b/src/main/java/world/bentobox/bank/commands/user/DepositCommand.java @@ -61,21 +61,7 @@ public boolean execute(User user, String label, List args) { case FAILURE_NO_ISLAND -> user.sendMessage("general.errors.no-island"); case SUCCESS -> { user.sendMessage("bank.deposit.success", TextVariables.NUMBER, vault.format(addon.getBankManager().getBalance(island).getValue())); - - if(!addon.getSettings().isSendBankAlert()) return; - - Island island = addon.getIslands().getIsland(getWorld(), user); - - final Set members = island.getMemberSet(RanksManager.MEMBER_RANK); - for (UUID member : members) { - final Player player = Bukkit.getPlayer(member); - - if (player == null || user.getUniqueId().equals(member)) continue; - - User otherUser = User.getInstance(player); - - otherUser.sendMessage("bank.deposit.alert", "[name]", user.getName(), "[number]", String.valueOf(value.getValue())); - } + notifyMembers(user, value); } } }); @@ -85,6 +71,19 @@ public boolean execute(User user, String label, List args) { return false; } + private void notifyMembers(User user, Money amount) { + if (!addon.getSettings().isSendBankAlert()) return; + + Island island = addon.getIslands().getIsland(getWorld(), user); + final Set members = island.getMemberSet(RanksManager.MEMBER_RANK); + for (UUID member : members) { + final Player player = Bukkit.getPlayer(member); + if (player == null || user.getUniqueId().equals(member)) continue; + User otherUser = User.getInstance(player); + otherUser.sendMessage("bank.deposit.alert", "[name]", user.getName(), "[number]", String.valueOf(amount.getValue())); + } + } + @Override public Optional> tabComplete(User user, String alias, List args) { VaultHook vault = addon.getVault(); diff --git a/src/test/java/world/bentobox/bank/BankManagerTest.java b/src/test/java/world/bentobox/bank/BankManagerTest.java index 2ed1271..dcf7077 100644 --- a/src/test/java/world/bentobox/bank/BankManagerTest.java +++ b/src/test/java/world/bentobox/bank/BankManagerTest.java @@ -3,7 +3,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -118,7 +117,7 @@ public void setUp() { when(location.getWorld()).thenReturn(world); when(location.clone()).thenReturn(location); island.setCenter(location); - when(im.getIsland(eq(world), eq(user))).thenReturn(island); + when(im.getIsland(world, user)).thenReturn(island); PowerMockito.mockStatic(Util.class); when(Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, World.class)); @@ -257,7 +256,7 @@ public void testOnIslandDelete() { e = e.getNewEvent().get(); } bm.onIslandDelete((IslandPreclearEvent)e); - verify(h).deleteID(eq(uniqueId)); + verify(h).deleteID(uniqueId); } /** diff --git a/src/test/java/world/bentobox/bank/PhManagerTest.java b/src/test/java/world/bentobox/bank/PhManagerTest.java index 7f6e060..e31100c 100644 --- a/src/test/java/world/bentobox/bank/PhManagerTest.java +++ b/src/test/java/world/bentobox/bank/PhManagerTest.java @@ -89,15 +89,15 @@ public void setUp() { when(plugin.getPlaceholdersManager()).thenReturn(phm); when(addon.getSettings()).thenReturn(new Settings()); when(user.getWorld()).thenReturn(world); - when(gm.inWorld(eq(world))).thenReturn(true); + when(gm.inWorld(world)).thenReturn(true); VaultHook vh = mock(VaultHook.class); when(vh.format(anyDouble())).thenAnswer(args -> "$" + args.getArgument(0, Double.class)); when(addon.getVault()).thenReturn(vh); when(addon.getIslands()).thenReturn(im); when(user.getLocation()).thenReturn(location); - - when(im.getIslandAt(eq(location))).thenReturn(Optional.of(island)); - when(bm.getBalance(eq(island))).thenReturn(new Money(1234.56D)); + + when(im.getIslandAt(location)).thenReturn(Optional.of(island)); + when(bm.getBalance(island)).thenReturn(new Money(1234.56D)); map = new LinkedHashMap<>(); when(bm.getBalances(any())).thenReturn(map); when(addon.getPlayers()).thenReturn(plm); @@ -144,7 +144,7 @@ public void testRegisterPlaceholders() { */ @Test public void testGetVisitedIslandBalanceWrongWorld() { - when(gm.inWorld(eq(world))).thenReturn(false); + when(gm.inWorld(world)).thenReturn(false); assertEquals("$0.0", pm.getVisitedIslandBalance(gm, user, false, false)); assertEquals("$0.0", pm.getVisitedIslandBalance(gm, user, true, false)); assertEquals("0.0", pm.getVisitedIslandBalance(gm, user, false, true)); @@ -156,7 +156,7 @@ public void testGetVisitedIslandBalanceWrongWorld() { */ @Test public void testGetVisitedIslandBalanceNoIsland() { - when(im.getIslandAt(eq(location))).thenReturn(Optional.empty()); + when(im.getIslandAt(location)).thenReturn(Optional.empty()); assertEquals("$0.0", pm.getVisitedIslandBalance(gm, user, false, false)); assertEquals("$0.0", pm.getVisitedIslandBalance(gm, user, true, false)); assertEquals("0.0", pm.getVisitedIslandBalance(gm, user, false, true)); @@ -179,7 +179,7 @@ public void testGetVisitedIslandBalance() { */ @Test public void testGetVisitedIslandBalanceLargest() { - when(bm.getBalance(eq(island))).thenReturn(new Money(Double.MAX_VALUE)); + when(bm.getBalance(island)).thenReturn(new Money(Double.MAX_VALUE)); assertEquals("9223372T", pm.getVisitedIslandBalance(gm, user, true, false)); assertEquals("1.7976931348623157E308", pm.getVisitedIslandBalance(gm, user, true, true)); } @@ -189,7 +189,7 @@ public void testGetVisitedIslandBalanceLargest() { */ @Test public void testGetVisitedIslandBalanceBig() { - when(bm.getBalance(eq(island))).thenReturn(new Money(123456789D)); + when(bm.getBalance(island)).thenReturn(new Money(123456789D)); assertEquals("123.5M", pm.getVisitedIslandBalance(gm, user, true, false)); assertEquals("1.23456789E8", pm.getVisitedIslandBalance(gm, user, true, true)); } @@ -287,7 +287,7 @@ public void testCheckCacheWithBalances() { public void testCheckCacheNoNamesChange() { pm.setLastSorted(System.currentTimeMillis() + 10000); assertEquals(5, pm.checkCache(world, 5)); - verify(bm).getBalances(eq(world)); + verify(bm).getBalances(world); } /** diff --git a/src/test/java/world/bentobox/bank/commands/admin/AdminBalanceCommandTest.java b/src/test/java/world/bentobox/bank/commands/admin/AdminBalanceCommandTest.java index 7ecddf3..7411ed4 100644 --- a/src/test/java/world/bentobox/bank/commands/admin/AdminBalanceCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/admin/AdminBalanceCommandTest.java @@ -77,8 +77,8 @@ public class AdminBalanceCommandTest { public void setUp() { PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin - BentoBox plugin = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", plugin); + BentoBox pluginMock = mock(BentoBox.class); + Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); when(ic.getWorld()).thenReturn(world); when(user.getWorld()).thenReturn(world); @@ -86,16 +86,16 @@ public void setUp() { // IWM friendly name IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(plugin.getIWM()).thenReturn(iwm); + when(pluginMock.getIWM()).thenReturn(iwm); when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(plugin.getIslands()).thenReturn(im); - when(im.getIsland(eq(world), eq(user))).thenReturn(island); + when(pluginMock.getIslands()).thenReturn(im); + when(im.getIsland(world, user)).thenReturn(island); // Players when(addon.getPlayers()).thenReturn(pm); - when(pm.getUser(eq("tastybento"))).thenReturn(user); + when(pm.getUser("tastybento")).thenReturn(user); // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); @@ -134,7 +134,7 @@ public void testSetup() { @Test public void testCanExecuteArgsNoArgs() { assertFalse(bc.canExecute(user, "balance", Collections.emptyList())); - verify(user).sendMessage(eq("commands.help.header"), eq(TextVariables.LABEL), eq("BSkyBlock")); + verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } /** @@ -142,9 +142,9 @@ public void testCanExecuteArgsNoArgs() { */ @Test public void testCanExecuteNoIsland() { - when(im.getIsland(eq(world), eq(user))).thenReturn(null); + when(im.getIsland(world, user)).thenReturn(null); assertFalse(bc.canExecute(user, "balance", Collections.singletonList("tastybento"))); - verify(user).sendMessage(eq("general.errors.no-island")); + verify(user).sendMessage("general.errors.no-island"); } /** @@ -154,7 +154,7 @@ public void testCanExecuteNoIsland() { public void testCanExecuteUnknownTarget() { when(pm.getUser(anyString())).thenReturn(null); assertFalse(bc.canExecute(user, "balance", Collections.singletonList("bonne"))); - verify(user).sendMessage(eq("general.errors.unknown-player"), eq(TextVariables.NAME), eq("bonne")); + verify(user).sendMessage("general.errors.unknown-player", TextVariables.NAME, "bonne"); } /** @@ -181,7 +181,7 @@ public void testCanExecuteSuccess() { @Test public void testExecuteUserStringListOfString() { assertTrue(bc.execute(user, "balance", Collections.singletonList("tastybento"))); - verify(user).sendMessage(eq("bank.balance.island-balance"), eq(TextVariables.NUMBER), eq("0.0")); + verify(user).sendMessage("bank.balance.island-balance", TextVariables.NUMBER, "0.0"); } diff --git a/src/test/java/world/bentobox/bank/commands/admin/AdminGiveCommandTest.java b/src/test/java/world/bentobox/bank/commands/admin/AdminGiveCommandTest.java index 7e2e85c..7d0a7ae 100644 --- a/src/test/java/world/bentobox/bank/commands/admin/AdminGiveCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/admin/AdminGiveCommandTest.java @@ -76,8 +76,8 @@ public class AdminGiveCommandTest { @Before public void setUp() { // Set up plugin - BentoBox plugin = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", plugin); + BentoBox pluginMock = mock(BentoBox.class); + Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); when(ic.getWorld()).thenReturn(world); when(user.getWorld()).thenReturn(world); @@ -85,16 +85,16 @@ public void setUp() { // IWM friendly name IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(plugin.getIWM()).thenReturn(iwm); + when(pluginMock.getIWM()).thenReturn(iwm); when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(plugin.getIslands()).thenReturn(im); - when(im.getIsland(eq(world), eq(user))).thenReturn(island); + when(pluginMock.getIslands()).thenReturn(im); + when(im.getIsland(world, user)).thenReturn(island); // Players when(addon.getPlayers()).thenReturn(pm); - when(pm.getUser(eq("tastybento"))).thenReturn(user); + when(pm.getUser("tastybento")).thenReturn(user); when(user.getName()).thenReturn("tastybento"); // Island flag allowed @@ -132,7 +132,7 @@ public void testSetup() { @Test public void testCanExecuteArgsNoArgs() { assertFalse(bc.canExecute(user, "give", Collections.emptyList())); - verify(user).sendMessage(eq("commands.help.header"), eq(TextVariables.LABEL), eq("BSkyBlock")); + verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } /** @@ -141,7 +141,7 @@ public void testCanExecuteArgsNoArgs() { @Test public void testCanExecuteArgsOneArg() { assertFalse(bc.canExecute(user, "give", Collections.singletonList("tastybento"))); - verify(user).sendMessage(eq("commands.help.header"), eq(TextVariables.LABEL), eq("BSkyBlock")); + verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } /** @@ -149,9 +149,9 @@ public void testCanExecuteArgsOneArg() { */ @Test public void testCanExecuteNoIsland() { - when(im.getIsland(eq(world), eq(user))).thenReturn(null); + when(im.getIsland(world, user)).thenReturn(null); assertFalse(bc.canExecute(user, "give", Arrays.asList("tastybento", "100"))); - verify(user).sendMessage(eq("general.errors.no-island")); + verify(user).sendMessage("general.errors.no-island"); } /** @@ -161,7 +161,7 @@ public void testCanExecuteNoIsland() { public void testCanExecuteUnknownTarget() { when(pm.getUser(anyString())).thenReturn(null); assertFalse(bc.canExecute(user, "give", Arrays.asList("bonne", "100"))); - verify(user).sendMessage(eq("general.errors.unknown-player"), eq(TextVariables.NAME), eq("bonne")); + verify(user).sendMessage("general.errors.unknown-player", TextVariables.NAME, "bonne"); } /** @@ -170,7 +170,7 @@ public void testCanExecuteUnknownTarget() { @Test public void testCanExecuteNotANumber() { assertFalse(bc.canExecute(user, "give", Arrays.asList("tastybento", "xxx"))); - verify(user).sendMessage(eq("bank.errors.must-be-a-number")); + verify(user).sendMessage("bank.errors.must-be-a-number"); } /** @@ -179,7 +179,7 @@ public void testCanExecuteNotANumber() { @Test public void testCanExecuteNegativeNumber() { assertFalse(bc.canExecute(user, "give", Arrays.asList("tastybento", "-99"))); - verify(user).sendMessage(eq("bank.errors.value-must-be-positive")); + verify(user).sendMessage("bank.errors.value-must-be-positive"); } /** @@ -207,9 +207,9 @@ public void testCanExecuteSuccess() { public void testExecuteUserStringListOfString() { assertTrue(bc.canExecute(user, "give", Arrays.asList("tastybento", "100"))); assertTrue(bc.execute(user, "give", Arrays.asList("tastybento", "100"))); - verify(user).sendMessage(eq("bank.admin.give.success"), - eq(TextVariables.NAME), eq("tastybento"), - eq(TextVariables.NUMBER), eq("0.0")); + verify(user).sendMessage("bank.admin.give.success", + TextVariables.NAME, "tastybento", + TextVariables.NUMBER, "0.0"); } /** @@ -219,7 +219,7 @@ public void testExecuteUserStringListOfString() { public void testExecuteUserStringListOfStringError() { when(bankManager.deposit(eq(user), any(), any(Money.class), eq(TxType.GIVE))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOAD_ERROR)); assertTrue(bc.execute(user, "give", Arrays.asList("tastybento", "100"))); - verify(user).sendMessage(eq("bank.errors.bank-error")); + verify(user).sendMessage("bank.errors.bank-error"); } } diff --git a/src/test/java/world/bentobox/bank/commands/admin/AdminSetCommandTest.java b/src/test/java/world/bentobox/bank/commands/admin/AdminSetCommandTest.java index 9e1b8e1..120b5ca 100644 --- a/src/test/java/world/bentobox/bank/commands/admin/AdminSetCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/admin/AdminSetCommandTest.java @@ -77,8 +77,8 @@ public class AdminSetCommandTest { @Before public void setUp() { // Set up plugin - BentoBox plugin = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", plugin); + BentoBox pluginMock = mock(BentoBox.class); + Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); when(ic.getWorld()).thenReturn(world); when(user.getWorld()).thenReturn(world); @@ -87,16 +87,16 @@ public void setUp() { // IWM friendly name IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(plugin.getIWM()).thenReturn(iwm); + when(pluginMock.getIWM()).thenReturn(iwm); when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(plugin.getIslands()).thenReturn(im); - when(im.getIsland(eq(world), eq(user))).thenReturn(island); + when(pluginMock.getIslands()).thenReturn(im); + when(im.getIsland(world, user)).thenReturn(island); // Players when(addon.getPlayers()).thenReturn(pm); - when(pm.getUser(eq("tastybento"))).thenReturn(user); + when(pm.getUser("tastybento")).thenReturn(user); // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); @@ -109,7 +109,7 @@ public void setUp() { when(vh.withdraw(eq(user), anyDouble(), eq(world))).thenReturn(er); // Always successful setting when(bankManager.set(eq(user), anyString(), any(), any(), eq(TxType.SET))).thenReturn(CompletableFuture.completedFuture(BankResponse.SUCCESS)); - when(bankManager.getBalance(eq(island))).thenReturn(new Money(100D)); + when(bankManager.getBalance(island)).thenReturn(new Money(100D)); // Island when(island.getUniqueId()).thenReturn(UUID.randomUUID().toString()); @@ -134,7 +134,7 @@ public void testSetup() { @Test public void testCanExecuteArgsNoArgs() { assertFalse(bc.canExecute(user, "set", Collections.emptyList())); - verify(user).sendMessage(eq("commands.help.header"), eq(TextVariables.LABEL), eq("BSkyBlock")); + verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } /** @@ -143,7 +143,7 @@ public void testCanExecuteArgsNoArgs() { @Test public void testCanExecuteArgsOneArg() { assertFalse(bc.canExecute(user, "set", Collections.singletonList("tastybento"))); - verify(user).sendMessage(eq("commands.help.header"), eq(TextVariables.LABEL), eq("BSkyBlock")); + verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } /** @@ -151,9 +151,9 @@ public void testCanExecuteArgsOneArg() { */ @Test public void testCanExecuteNoIsland() { - when(im.getIsland(eq(world), eq(user))).thenReturn(null); + when(im.getIsland(world, user)).thenReturn(null); assertFalse(bc.canExecute(user, "set", Arrays.asList("tastybento", "100"))); - verify(user).sendMessage(eq("general.errors.no-island")); + verify(user).sendMessage("general.errors.no-island"); } /** @@ -163,7 +163,7 @@ public void testCanExecuteNoIsland() { public void testCanExecuteUnknownTarget() { when(pm.getUser(anyString())).thenReturn(null); assertFalse(bc.canExecute(user, "set", Arrays.asList("bonne", "100"))); - verify(user).sendMessage(eq("general.errors.unknown-player"), eq(TextVariables.NAME), eq("bonne")); + verify(user).sendMessage("general.errors.unknown-player", TextVariables.NAME, "bonne"); } /** @@ -172,7 +172,7 @@ public void testCanExecuteUnknownTarget() { @Test public void testCanExecuteNotANumber() { assertFalse(bc.canExecute(user, "set", Arrays.asList("tastybento", "xxx"))); - verify(user).sendMessage(eq("bank.errors.must-be-a-number")); + verify(user).sendMessage("bank.errors.must-be-a-number"); } /** @@ -181,7 +181,7 @@ public void testCanExecuteNotANumber() { @Test public void testCanExecuteNegativeNumber() { assertFalse(bc.canExecute(user, "set", Arrays.asList("tastybento", "-99"))); - verify(user).sendMessage(eq("bank.errors.value-must-be-positive")); + verify(user).sendMessage("bank.errors.value-must-be-positive"); } /** @@ -209,7 +209,7 @@ public void testCanExecuteSuccess() { public void testExecuteUserStringListOfString() { testCanExecuteSuccess(); assertTrue(bc.execute(user, "set", Arrays.asList("tastybento", "100"))); - verify(user).sendMessage(eq("bank.admin.set.success"), eq(TextVariables.NAME), eq("tastybento"), eq(TextVariables.NUMBER), eq("100.0")); + verify(user).sendMessage("bank.admin.set.success", TextVariables.NAME, "tastybento", TextVariables.NUMBER, "100.0"); } /** @@ -220,7 +220,7 @@ public void testExecuteUserStringListOfStringError() { testCanExecuteSuccess(); when(bankManager.set(eq(user), any(), any(), any(), eq(TxType.SET))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOAD_ERROR)); assertTrue(bc.execute(user, "set", Arrays.asList("tastybento", "100"))); - verify(user).sendMessage(eq("bank.errors.bank-error")); + verify(user).sendMessage("bank.errors.bank-error"); } } diff --git a/src/test/java/world/bentobox/bank/commands/admin/AdminStatementCommandTest.java b/src/test/java/world/bentobox/bank/commands/admin/AdminStatementCommandTest.java index c4b17c2..5822c17 100644 --- a/src/test/java/world/bentobox/bank/commands/admin/AdminStatementCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/admin/AdminStatementCommandTest.java @@ -81,8 +81,8 @@ public class AdminStatementCommandTest { @Before public void setUp() { // Set up plugin - BentoBox plugin = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", plugin); + BentoBox pluginMock = mock(BentoBox.class); + Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); when(ic.getWorld()).thenReturn(world); when(user.getWorld()).thenReturn(world); @@ -91,16 +91,16 @@ public void setUp() { // IWM friendly name IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(plugin.getIWM()).thenReturn(iwm); + when(pluginMock.getIWM()).thenReturn(iwm); when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(plugin.getIslands()).thenReturn(im); - when(im.getIsland(eq(world), eq(user))).thenReturn(island); + when(pluginMock.getIslands()).thenReturn(im); + when(im.getIsland(world, user)).thenReturn(island); // Players when(addon.getPlayers()).thenReturn(pm); - when(pm.getUser(eq("tastybento"))).thenReturn(user); + when(pm.getUser("tastybento")).thenReturn(user); // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); @@ -113,7 +113,7 @@ public void setUp() { when(vh.withdraw(eq(user), anyDouble(), eq(world))).thenReturn(er); // Settings - when(plugin.getSettings()).thenReturn(new Settings()); + when(pluginMock.getSettings()).thenReturn(new Settings()); PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); @@ -142,7 +142,7 @@ public void testSetup() { @Test public void testCanExecuteArgsNoArgs() { assertFalse(bc.canExecute(user, "statement", Collections.emptyList())); - verify(user).sendMessage(eq("commands.help.header"), eq(TextVariables.LABEL), eq("BSkyBlock")); + verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } /** @@ -150,9 +150,9 @@ public void testCanExecuteArgsNoArgs() { */ @Test public void testCanExecuteNoIsland() { - when(im.getIsland(eq(world), eq(user))).thenReturn(null); + when(im.getIsland(world, user)).thenReturn(null); assertFalse(bc.canExecute(user, "statement", Collections.singletonList("tastybento"))); - verify(user).sendMessage(eq("general.errors.no-island")); + verify(user).sendMessage("general.errors.no-island"); } /** @@ -162,7 +162,7 @@ public void testCanExecuteNoIsland() { public void testCanExecuteUnknownTarget() { when(pm.getUser(anyString())).thenReturn(null); assertFalse(bc.canExecute(user, "statement", Collections.singletonList("bonne"))); - verify(user).sendMessage(eq("general.errors.unknown-player"), eq(TextVariables.NAME), eq("bonne")); } + verify(user).sendMessage("general.errors.unknown-player", TextVariables.NAME, "bonne"); } /** * Test method for {@link world.bentobox.bank.commands.admin.AdminStatementCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. diff --git a/src/test/java/world/bentobox/bank/commands/admin/AdminTakeCommandTest.java b/src/test/java/world/bentobox/bank/commands/admin/AdminTakeCommandTest.java index 53ecd99..0cb94fe 100644 --- a/src/test/java/world/bentobox/bank/commands/admin/AdminTakeCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/admin/AdminTakeCommandTest.java @@ -77,8 +77,8 @@ public class AdminTakeCommandTest { @Before public void setUp() { // Set up plugin - BentoBox plugin = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", plugin); + BentoBox pluginMock = mock(BentoBox.class); + Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); when(ic.getWorld()).thenReturn(world); when(user.getWorld()).thenReturn(world); @@ -86,16 +86,16 @@ public void setUp() { // IWM friendly name IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(plugin.getIWM()).thenReturn(iwm); + when(pluginMock.getIWM()).thenReturn(iwm); when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(plugin.getIslands()).thenReturn(im); - when(im.getIsland(eq(world), eq(user))).thenReturn(island); + when(pluginMock.getIslands()).thenReturn(im); + when(im.getIsland(world, user)).thenReturn(island); // Players when(addon.getPlayers()).thenReturn(pm); - when(pm.getUser(eq("tastybento"))).thenReturn(user); + when(pm.getUser("tastybento")).thenReturn(user); when(user.getName()).thenReturn("tastybento"); // Island flag allowed @@ -133,7 +133,7 @@ public void testSetup() { @Test public void testCanExecuteArgsNoArgs() { assertFalse(bc.canExecute(user, "take", Collections.emptyList())); - verify(user).sendMessage(eq("commands.help.header"), eq(TextVariables.LABEL), eq("BSkyBlock")); + verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } /** @@ -142,7 +142,7 @@ public void testCanExecuteArgsNoArgs() { @Test public void testCanExecuteArgsOneArg() { assertFalse(bc.canExecute(user, "take", Collections.singletonList("tastybento"))); - verify(user).sendMessage(eq("commands.help.header"), eq(TextVariables.LABEL), eq("BSkyBlock")); + verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } /** @@ -150,9 +150,9 @@ public void testCanExecuteArgsOneArg() { */ @Test public void testCanExecuteNoIsland() { - when(im.getIsland(eq(world), eq(user))).thenReturn(null); + when(im.getIsland(world, user)).thenReturn(null); assertFalse(bc.canExecute(user, "take", Arrays.asList("tastybento", "100"))); - verify(user).sendMessage(eq("general.errors.no-island")); + verify(user).sendMessage("general.errors.no-island"); } /** @@ -162,7 +162,7 @@ public void testCanExecuteNoIsland() { public void testCanExecuteUnknownTarget() { when(pm.getUser(anyString())).thenReturn(null); assertFalse(bc.canExecute(user, "take", Arrays.asList("bonne", "100"))); - verify(user).sendMessage(eq("general.errors.unknown-player"), eq(TextVariables.NAME), eq("bonne")); + verify(user).sendMessage("general.errors.unknown-player", TextVariables.NAME, "bonne"); } /** @@ -171,7 +171,7 @@ public void testCanExecuteUnknownTarget() { @Test public void testCanExecuteNotANumber() { assertFalse(bc.canExecute(user, "take", Arrays.asList("tastybento", "xxx"))); - verify(user).sendMessage(eq("bank.errors.must-be-a-number")); + verify(user).sendMessage("bank.errors.must-be-a-number"); } /** @@ -180,7 +180,7 @@ public void testCanExecuteNotANumber() { @Test public void testCanExecuteNegativeNumber() { assertFalse(bc.canExecute(user, "take", Arrays.asList("tastybento", "-99"))); - verify(user).sendMessage(eq("bank.errors.value-must-be-positive")); + verify(user).sendMessage("bank.errors.value-must-be-positive"); } /** @@ -208,9 +208,9 @@ public void testCanExecuteSuccess() { public void testExecuteUserStringListOfString() { testCanExecuteSuccess(); assertTrue(bc.execute(user, "take", Arrays.asList("tastybento", "100"))); - verify(user).sendMessage(eq("bank.admin.give.success"), - eq(TextVariables.NAME), eq("tastybento"), - eq(TextVariables.NUMBER), eq("0.0")); + verify(user).sendMessage("bank.admin.give.success", + TextVariables.NAME, "tastybento", + TextVariables.NUMBER, "0.0"); } /** @@ -221,7 +221,7 @@ public void testExecuteUserStringListOfStringLowBalance() { testCanExecuteSuccess(); when(bankManager.withdraw(eq(user), any(), any(), eq(TxType.TAKE))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOW_BALANCE)); assertTrue(bc.execute(user, "take", Arrays.asList("tastybento", "100"))); - verify(user).sendMessage(eq("bank.errors.too-low")); + verify(user).sendMessage("bank.errors.too-low"); } /** @@ -231,7 +231,7 @@ public void testExecuteUserStringListOfStringLowBalance() { public void testExecuteUserStringListOfStringError() { when(bankManager.withdraw(eq(user), any(), any(), eq(TxType.TAKE))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOAD_ERROR)); assertTrue(bc.execute(user, "take", Arrays.asList("tastybento", "100"))); - verify(user).sendMessage(eq("bank.errors.bank-error")); + verify(user).sendMessage("bank.errors.bank-error"); } diff --git a/src/test/java/world/bentobox/bank/commands/user/BalanceCommandTest.java b/src/test/java/world/bentobox/bank/commands/user/BalanceCommandTest.java index d214b8e..5524d4e 100644 --- a/src/test/java/world/bentobox/bank/commands/user/BalanceCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/user/BalanceCommandTest.java @@ -74,8 +74,8 @@ public class BalanceCommandTest { public void setUp() { PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin - BentoBox plugin = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", plugin); + BentoBox pluginMock = mock(BentoBox.class); + Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); when(ic.getWorld()).thenReturn(world); when(user.getWorld()).thenReturn(world); @@ -83,12 +83,12 @@ public void setUp() { // IWM friendly name IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(plugin.getIWM()).thenReturn(iwm); + when(pluginMock.getIWM()).thenReturn(iwm); when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(plugin.getIslands()).thenReturn(im); - when(im.getIsland(eq(world), eq(user))).thenReturn(island); + when(pluginMock.getIslands()).thenReturn(im); + when(im.getIsland(world, user)).thenReturn(island); // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); @@ -124,7 +124,7 @@ public void testSetup() { @Test public void testCanExecuteArgs() { assertFalse(bc.canExecute(user, "balance", Collections.singletonList("fff"))); - verify(user).sendMessage(eq("commands.help.header"), eq(TextVariables.LABEL), eq("BSkyBlock")); + verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } /** @@ -132,9 +132,9 @@ public void testCanExecuteArgs() { */ @Test public void testCanExecuteNoIsland() { - when(im.getIsland(eq(world), eq(user))).thenReturn(null); + when(im.getIsland(world, user)).thenReturn(null); assertFalse(bc.canExecute(user, "balance", Collections.emptyList())); - verify(user).sendMessage(eq("general.errors.no-island")); + verify(user).sendMessage("general.errors.no-island"); } /** @@ -144,7 +144,7 @@ public void testCanExecuteNoIsland() { public void testCanExecuteNoRank() { when(island.isAllowed(eq(user), any())).thenReturn(false); assertFalse(bc.canExecute(user, "balance", Collections.emptyList())); - verify(user).sendMessage(eq("bank.errors.no-rank")); + verify(user).sendMessage("bank.errors.no-rank"); } @@ -162,7 +162,7 @@ public void testCanExecuteSuccess() { @Test public void testExecuteUserStringListOfString() { assertTrue(bc.execute(user, "balance", Collections.emptyList())); - verify(user).sendMessage(eq("bank.balance.island-balance"), eq(TextVariables.NUMBER), eq("0.0")); + verify(user).sendMessage("bank.balance.island-balance", TextVariables.NUMBER, "0.0"); } } diff --git a/src/test/java/world/bentobox/bank/commands/user/DepositCommandTest.java b/src/test/java/world/bentobox/bank/commands/user/DepositCommandTest.java index 6653cb8..b7120f5 100644 --- a/src/test/java/world/bentobox/bank/commands/user/DepositCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/user/DepositCommandTest.java @@ -85,8 +85,8 @@ public class DepositCommandTest { public void setUp() { PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin - BentoBox plugin = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", plugin); + BentoBox pluginMock = mock(BentoBox.class); + Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); when(ic.getWorld()).thenReturn(world); when(user.getWorld()).thenReturn(world); @@ -96,12 +96,12 @@ public void setUp() { // IWM friendly name IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(plugin.getIWM()).thenReturn(iwm); + when(pluginMock.getIWM()).thenReturn(iwm); when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(plugin.getIslands()).thenReturn(im); - when(im.getIsland(eq(world), eq(user))).thenReturn(island); + when(pluginMock.getIslands()).thenReturn(im); + when(im.getIsland(world, user)).thenReturn(island); // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); @@ -112,9 +112,9 @@ public void setUp() { when(ic.getAddon()).thenReturn(addon); when(addon.getBankManager()).thenReturn(bankManager); - when(bankManager.getBalance(eq(island))).thenReturn(new Money(100D)); + when(bankManager.getBalance(island)).thenReturn(new Money(100D)); when(addon.getVault()).thenReturn(vh); - when(vh.getBalance(eq(user), eq(world))).thenReturn(1000D); + when(vh.getBalance(user, world)).thenReturn(1000D); when(vh.format(anyDouble())).thenAnswer(i -> String.valueOf(i.getArgument(0, Double.class))); EconomyResponse er = new EconomyResponse(0, 0, ResponseType.SUCCESS, ""); when(vh.withdraw(eq(user), anyDouble(), eq(world))).thenReturn(er); @@ -142,7 +142,7 @@ public void testSetup() { @Test public void testCanExecuteNoArgs() { assertFalse(dct.canExecute(user, "deposit", Collections.emptyList())); - verify(user).sendMessage(eq("commands.help.header"), eq(TextVariables.LABEL), eq("BSkyBlock")); + verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } /** @@ -151,7 +151,7 @@ public void testCanExecuteNoArgs() { @Test public void testCanExecuteOneArgNotANumber() { assertFalse(dct.canExecute(user, "deposit", Collections.singletonList("hello"))); - verify(user).sendMessage(eq("bank.errors.must-be-a-number")); + verify(user).sendMessage("bank.errors.must-be-a-number"); } /** @@ -160,7 +160,7 @@ public void testCanExecuteOneArgNotANumber() { @Test public void testCanExecuteOneArgNegativeNumber() { assertFalse(dct.canExecute(user, "deposit", Collections.singletonList("-50"))); - verify(user).sendMessage(eq("bank.errors.value-must-be-positive")); + verify(user).sendMessage("bank.errors.value-must-be-positive"); } /** @@ -170,7 +170,7 @@ public void testCanExecuteOneArgNegativeNumber() { public void testCanExecuteOneArgNumberNoRank() { when(island.isAllowed(eq(user), any())).thenReturn(false); assertFalse(dct.canExecute(user, "deposit", Collections.singletonList("123.30"))); - verify(user).sendMessage(eq("bank.errors.no-rank")); + verify(user).sendMessage("bank.errors.no-rank"); } /** @@ -178,9 +178,9 @@ public void testCanExecuteOneArgNumberNoRank() { */ @Test public void testCanExecuteOneArgNumberNoIsland() { - when(im.getIsland(eq(world), eq(user))).thenReturn(null); + when(im.getIsland(world, user)).thenReturn(null); assertFalse(dct.canExecute(user, "deposit", Collections.singletonList("123.30"))); - verify(user).sendMessage(eq("general.errors.no-island")); + verify(user).sendMessage("general.errors.no-island"); } /** @@ -188,7 +188,7 @@ public void testCanExecuteOneArgNumberNoIsland() { */ @Test public void testCanExecuteAllSuccess() { - when(bankManager.getBalance(eq(user), eq(world))).thenReturn(new Money(555D)); + when(bankManager.getBalance(user, world)).thenReturn(new Money(555D)); assertTrue(dct.canExecute(user, "deposit", Collections.singletonList("all"))); verify(user, never()).sendMessage(any()); } @@ -198,7 +198,7 @@ public void testCanExecuteAllSuccess() { */ @Test public void testCanExecuteOneArgNumberSuccess() { - when(bankManager.getBalance(eq(user), eq(world))).thenReturn(new Money(555D)); + when(bankManager.getBalance(user, world)).thenReturn(new Money(555D)); assertTrue(dct.canExecute(user, "deposit", Collections.singletonList("123.30"))); verify(user, never()).sendMessage(any()); } @@ -254,8 +254,8 @@ public void testExecuteUserStringListOfStringSuccess() { testCanExecuteOneArgNumberSuccess(); when(bankManager.deposit(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.SUCCESS)); assertTrue(dct.execute(user, "deposit", Collections.singletonList("123.30"))); - verify(vh).withdraw(eq(user), eq(123.3D), eq(world)); - verify(user).sendMessage(eq("bank.deposit.success"), eq(TextVariables.NUMBER), eq("100.0")); + verify(vh).withdraw(user, 123.3D, world); + verify(user).sendMessage("bank.deposit.success", TextVariables.NUMBER, "100.0"); } /** @@ -265,7 +265,7 @@ public void testExecuteUserStringListOfStringSuccess() { public void testCanExecuteOneArgNumberLowBalance() { when(bankManager.deposit(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOW_BALANCE)); assertTrue(dct.execute(user, "deposit", Collections.singletonList("123.30"))); - verify(user).sendMessage(eq("bank.errors.low-balance")); + verify(user).sendMessage("bank.errors.low-balance"); } /** diff --git a/src/test/java/world/bentobox/bank/commands/user/StatementCommandTest.java b/src/test/java/world/bentobox/bank/commands/user/StatementCommandTest.java index 408da9d..77df048 100644 --- a/src/test/java/world/bentobox/bank/commands/user/StatementCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/user/StatementCommandTest.java @@ -77,8 +77,8 @@ public class StatementCommandTest { @Before public void setUp() { // Set up plugin - BentoBox plugin = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", plugin); + BentoBox pluginMock = mock(BentoBox.class); + Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); when(ic.getWorld()).thenReturn(world); when(user.getWorld()).thenReturn(world); @@ -87,12 +87,12 @@ public void setUp() { // IWM friendly name IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(plugin.getIWM()).thenReturn(iwm); + when(pluginMock.getIWM()).thenReturn(iwm); when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(plugin.getIslands()).thenReturn(im); - when(im.getIsland(eq(world), eq(user))).thenReturn(island); + when(pluginMock.getIslands()).thenReturn(im); + when(im.getIsland(world, user)).thenReturn(island); // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); @@ -105,7 +105,7 @@ public void setUp() { when(vh.withdraw(eq(user), anyDouble(), eq(world))).thenReturn(er); // Settings - when(plugin.getSettings()).thenReturn(new Settings()); + when(pluginMock.getSettings()).thenReturn(new Settings()); PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); PowerMockito.mockStatic(Util.class); @@ -131,7 +131,7 @@ public void testSetup() { @Test public void testCanExecuteArgs() { assertFalse(sc.canExecute(user, "statement", Collections.singletonList("fff"))); - verify(user).sendMessage(eq("commands.help.header"), eq(TextVariables.LABEL), eq("BSkyBlock")); + verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } /** @@ -139,9 +139,9 @@ public void testCanExecuteArgs() { */ @Test public void testCanExecuteNoIsland() { - when(im.getIsland(eq(world), eq(user))).thenReturn(null); + when(im.getIsland(world, user)).thenReturn(null); assertFalse(sc.canExecute(user, "statement", Collections.emptyList())); - verify(user).sendMessage(eq("general.errors.no-island")); + verify(user).sendMessage("general.errors.no-island"); } /** @@ -151,7 +151,7 @@ public void testCanExecuteNoIsland() { public void testCanExecuteNoRank() { when(island.isAllowed(eq(user), any())).thenReturn(false); assertFalse(sc.canExecute(user, "statement", Collections.emptyList())); - verify(user).sendMessage(eq("bank.errors.no-rank")); + verify(user).sendMessage("bank.errors.no-rank"); } diff --git a/src/test/java/world/bentobox/bank/commands/user/WithdrawCommandTest.java b/src/test/java/world/bentobox/bank/commands/user/WithdrawCommandTest.java index 96d79f4..aaa9969 100644 --- a/src/test/java/world/bentobox/bank/commands/user/WithdrawCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/user/WithdrawCommandTest.java @@ -83,8 +83,8 @@ public class WithdrawCommandTest { public void setUp() { PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); // Set up plugin - BentoBox plugin = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", plugin); + BentoBox pluginMock = mock(BentoBox.class); + Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); when(ic.getWorld()).thenReturn(world); when(user.getWorld()).thenReturn(world); @@ -93,12 +93,12 @@ public void setUp() { // IWM friendly name IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(plugin.getIWM()).thenReturn(iwm); + when(pluginMock.getIWM()).thenReturn(iwm); when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(plugin.getIslands()).thenReturn(im); - when(im.getIsland(eq(world), eq(user))).thenReturn(island); + when(pluginMock.getIslands()).thenReturn(im); + when(im.getIsland(world, user)).thenReturn(island); // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); @@ -111,7 +111,7 @@ public void setUp() { when(ic.getAddon()).thenReturn(addon); when(addon.getBankManager()).thenReturn(bankManager); when(bankManager.getBalance(any(), any())).thenReturn(new Money()); - when(bankManager.getBalance(eq(island))).thenReturn(new Money(100D)); + when(bankManager.getBalance(island)).thenReturn(new Money(100D)); when(addon.getVault()).thenReturn(vh); when(vh.format(anyDouble())).thenAnswer(i -> String.valueOf(i.getArgument(0, Double.class))); @@ -141,7 +141,7 @@ public void testSetup() { @Test public void testCanExecuteNoArgs() { assertFalse(wct.canExecute(user, "withdraw", Collections.emptyList())); - verify(user).sendMessage(eq("commands.help.header"), eq(TextVariables.LABEL), eq("BSkyBlock")); + verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } /** @@ -150,7 +150,7 @@ public void testCanExecuteNoArgs() { @Test public void testCanExecuteOneArgNotANumber() { assertFalse(wct.canExecute(user, "withdraw", Collections.singletonList("hello"))); - verify(user).sendMessage(eq("bank.errors.must-be-a-number")); + verify(user).sendMessage("bank.errors.must-be-a-number"); } /** @@ -159,7 +159,7 @@ public void testCanExecuteOneArgNotANumber() { @Test public void testCanExecuteOneArgNegativeNumber() { assertFalse(wct.canExecute(user, "withdraw", Collections.singletonList("-50"))); - verify(user).sendMessage(eq("bank.errors.value-must-be-positive")); + verify(user).sendMessage("bank.errors.value-must-be-positive"); } /** @@ -168,8 +168,8 @@ public void testCanExecuteOneArgNegativeNumber() { @Test public void testCanExecuteOneArgNumberLowBalance() { assertFalse(wct.canExecute(user, "withdraw", Collections.singletonList("123.30"))); - verify(user, never()).sendMessage(eq("bank.errors.must-be-a-number")); - verify(user).sendMessage(eq("bank.errors.low-balance")); + verify(user, never()).sendMessage("bank.errors.must-be-a-number"); + verify(user).sendMessage("bank.errors.low-balance"); } /** @@ -177,9 +177,9 @@ public void testCanExecuteOneArgNumberLowBalance() { */ @Test public void testCanExecuteAllArg() { - when(bankManager.getBalance(eq(user), eq(world))).thenReturn(new Money(555D)); + when(bankManager.getBalance(user, world)).thenReturn(new Money(555D)); assertTrue(wct.canExecute(user, "withdraw", Collections.singletonList("all"))); - verify(user, never()).sendMessage(eq("bank.errors.must-be-a-number")); + verify(user, never()).sendMessage("bank.errors.must-be-a-number"); verify(user, never()).sendMessage(any()); } @@ -190,7 +190,7 @@ public void testCanExecuteAllArg() { public void testCanExecuteOneArgNumberNoRank() { when(island.isAllowed(eq(user), any())).thenReturn(false); assertFalse(wct.canExecute(user, "withdraw", Collections.singletonList("123.30"))); - verify(user).sendMessage(eq("bank.errors.no-rank")); + verify(user).sendMessage("bank.errors.no-rank"); } /** @@ -198,9 +198,9 @@ public void testCanExecuteOneArgNumberNoRank() { */ @Test public void testCanExecuteOneArgNumberNoIsland() { - when(im.getIsland(eq(world), eq(user))).thenReturn(null); + when(im.getIsland(world, user)).thenReturn(null); assertFalse(wct.canExecute(user, "withdraw", Collections.singletonList("123.30"))); - verify(user).sendMessage(eq("general.errors.no-island")); + verify(user).sendMessage("general.errors.no-island"); } /** @@ -208,7 +208,7 @@ public void testCanExecuteOneArgNumberNoIsland() { */ @Test public void testCanExecuteOneArgNumberSuccess() { - when(bankManager.getBalance(eq(user), eq(world))).thenReturn(new Money(555D)); + when(bankManager.getBalance(user, world)).thenReturn(new Money(555D)); assertTrue(wct.canExecute(user, "withdraw", Collections.singletonList("123.30"))); verify(user, never()).sendMessage(any()); } @@ -219,7 +219,6 @@ public void testCanExecuteOneArgNumberSuccess() { @Test public void testExecuteUserStringListOfStringLoadError() { when(bankManager.withdraw(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOAD_ERROR)); - //testCanExecuteOneArgNumberSuccess(); assertTrue(wct.execute(user, "withdraw", Collections.emptyList())); verify(user).sendMessage("bank.errors.bank-error"); } @@ -230,7 +229,6 @@ public void testExecuteUserStringListOfStringLoadError() { @Test public void testExecuteUserStringListOfStringLowBalance() { when(bankManager.withdraw(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOW_BALANCE)); - //testCanExecuteOneArgNumberSuccess(); assertTrue(wct.execute(user, "withdraw", Collections.emptyList())); verify(user).sendMessage("bank.errors.low-balance"); } @@ -241,7 +239,6 @@ public void testExecuteUserStringListOfStringLowBalance() { @Test public void testExecuteUserStringListOfStringNoIsland() { when(bankManager.withdraw(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_NO_ISLAND)); - //testCanExecuteOneArgNumberSuccess(); assertTrue(wct.execute(user, "withdraw", Collections.emptyList())); verify(user).sendMessage("general.errors.no-island"); } @@ -253,10 +250,9 @@ public void testExecuteUserStringListOfStringNoIsland() { public void testExecuteUserStringListOfStringSuccess() { testCanExecuteOneArgNumberSuccess(); when(bankManager.withdraw(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.SUCCESS)); - //testCanExecuteOneArgNumberSuccess(); assertTrue(wct.execute(user, "withdraw", Collections.singletonList("123.30"))); - verify(vh).deposit(eq(user), eq(123.3D), eq(world)); - verify(user).sendMessage(eq("bank.withdraw.success"), eq(TextVariables.NUMBER), eq("100.0")); + verify(vh).deposit(user, 123.3D, world); + verify(user).sendMessage("bank.withdraw.success", TextVariables.NUMBER, "100.0"); } /** diff --git a/src/test/java/world/bentobox/bank/data/MoneyTest.java b/src/test/java/world/bentobox/bank/data/MoneyTest.java index 36babef..f5f835a 100644 --- a/src/test/java/world/bentobox/bank/data/MoneyTest.java +++ b/src/test/java/world/bentobox/bank/data/MoneyTest.java @@ -1,6 +1,9 @@ package world.bentobox.bank.data; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; import java.math.BigDecimal; @@ -19,19 +22,14 @@ public class MoneyTest { Money m; - /** - * @throws java.lang.Exception - */ @Before - public void setUp() throws Exception { + public void setUp() { m = new Money(); } - /** - * @throws java.lang.Exception - */ @After - public void tearDown() throws Exception { + public void tearDown() { + // Nothing to tear down } /** @@ -204,12 +202,12 @@ public void testParseMoney() { @SuppressWarnings("unlikely-arg-type") @Test public void testEqualsObject() { - assertTrue(m.equals(m)); - assertFalse(m.equals("string")); - assertFalse(m.equals(null)); - assertFalse(m.equals(new Money(123))); + assertEquals(m, m); + assertNotEquals("string", m); + assertNotEquals(null, m); + assertNotEquals(new Money(123), m); m = new Money(345); - assertTrue(m.equals(new Money(345))); + assertEquals(m, new Money(345)); } /** From 309f2b33354b31f5dd9b240b550758390b387174 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 28 Mar 2026 12:09:23 -0700 Subject: [PATCH 07/31] Update all Maven plugins to latest stable versions Co-Authored-By: Claude Opus 4.6 (1M context) --- pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 27094d2..1129ed8 100644 --- a/pom.xml +++ b/pom.xml @@ -204,12 +204,12 @@ org.apache.maven.plugins maven-clean-plugin - 3.1.0 + 3.5.0 org.apache.maven.plugins maven-resources-plugin - 3.2.0 + 3.5.0 blu @@ -219,14 +219,14 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.15.0 ${java.version} org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.5.5 ${argLine} @@ -263,12 +263,12 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.5.0 org.apache.maven.plugins maven-javadoc-plugin - 3.3.0 + 3.12.0 false -Xdoclint:none @@ -285,7 +285,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.4.0 attach-sources @@ -298,17 +298,17 @@ org.apache.maven.plugins maven-install-plugin - 3.0.0-M1 + 3.1.4 org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M1 + 3.1.4 org.jacoco jacoco-maven-plugin - 0.8.10 + 0.8.13 true From 59b476dc3835788336570f6899e56cafd532dad8 Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 4 Jun 2026 07:19:21 -0700 Subject: [PATCH 08/31] Add Russian locale and all missing BentoBox languages Incorporate the Russian translation from issue #62 as ru.yml, sync the two newer alert keys (bank.deposit.alert, bank.withdraw.alert) into cs/de/ja, and add the 10 languages BentoBox supports that Bank was missing: hr, hu, lv, nl, pl, pt-BR, pt, ro, tr, zh-HK. Bank's locale set now matches BentoBox's 23-language set. All files validated as YAML and confirmed in sync with en-US (55 keys each). Closes #62 Co-Authored-By: Claude Opus 4.8 --- src/main/resources/locales/cs.yml | 2 + src/main/resources/locales/de.yml | 2 + src/main/resources/locales/hr.yml | 81 +++++++++++++++++++++++++++ src/main/resources/locales/hu.yml | 81 +++++++++++++++++++++++++++ src/main/resources/locales/ja.yml | 2 + src/main/resources/locales/lv.yml | 81 +++++++++++++++++++++++++++ src/main/resources/locales/nl.yml | 81 +++++++++++++++++++++++++++ src/main/resources/locales/pl.yml | 81 +++++++++++++++++++++++++++ src/main/resources/locales/pt-BR.yml | 81 +++++++++++++++++++++++++++ src/main/resources/locales/pt.yml | 81 +++++++++++++++++++++++++++ src/main/resources/locales/ro.yml | 81 +++++++++++++++++++++++++++ src/main/resources/locales/ru.yml | 82 ++++++++++++++++++++++++++++ src/main/resources/locales/tr.yml | 81 +++++++++++++++++++++++++++ src/main/resources/locales/zh-HK.yml | 80 +++++++++++++++++++++++++++ 14 files changed, 897 insertions(+) create mode 100644 src/main/resources/locales/hr.yml create mode 100644 src/main/resources/locales/hu.yml create mode 100644 src/main/resources/locales/lv.yml create mode 100644 src/main/resources/locales/nl.yml create mode 100644 src/main/resources/locales/pl.yml create mode 100644 src/main/resources/locales/pt-BR.yml create mode 100644 src/main/resources/locales/pt.yml create mode 100644 src/main/resources/locales/ro.yml create mode 100644 src/main/resources/locales/ru.yml create mode 100644 src/main/resources/locales/tr.yml create mode 100644 src/main/resources/locales/zh-HK.yml diff --git a/src/main/resources/locales/cs.yml b/src/main/resources/locales/cs.yml index bf0bd83..d78d521 100644 --- a/src/main/resources/locales/cs.yml +++ b/src/main/resources/locales/cs.yml @@ -33,6 +33,7 @@ bank: description: vložte částku na svůj ostrovní účet parameters: "" success: "&a Úspěch! Váš nový zůstatek na ostrovní bance je [number]." + alert: "&a [name] vložil [number] do ostrovní banky." errors: bank-error: "&c Chyba při načítání informací o bankovním účtu - zkuste to znovu později" @@ -70,6 +71,7 @@ bank: description: vybrat částku ze svého ostrovního účtu parameters: "" success: "&a Úspěch! Váš nový zůstatek na ostrovní bance je [number]." + alert: "&a [name] vybral [number] z ostrovní banky." protection: flags: BANK_ACCESS: diff --git a/src/main/resources/locales/de.yml b/src/main/resources/locales/de.yml index fbee7c7..1081a36 100644 --- a/src/main/resources/locales/de.yml +++ b/src/main/resources/locales/de.yml @@ -33,6 +33,7 @@ bank: description: Betrag auf Ihr Inselkonto einzahlen parameters: "" success: "&ein Erfolg! Ihr neuer Kontostand auf der Insel beträgt [number]." + alert: "&a [name] hat [number] in die Inselbank eingezahlt." errors: bank-error: "&c Fehler beim Laden der Bankkontoinformationen - bitte versuchen Sie es später erneut" @@ -70,6 +71,7 @@ bank: description: Betrag von Ihrem Inselkonto abheben parameters: "" success: "&ein Erfolg! Ihr neuer Kontostand auf der Insel beträgt [number]." + alert: "&a [name] hat [number] von der Inselbank abgehoben." protection: flags: BANK_ACCESS: diff --git a/src/main/resources/locales/hr.yml b/src/main/resources/locales/hr.yml new file mode 100644 index 0000000..b1cb629 --- /dev/null +++ b/src/main/resources/locales/hr.yml @@ -0,0 +1,81 @@ +--- +bank: + admin: + description: admin naredba za otočnu banku + give: + parameters: " " + description: dodaj iznos na igračev otočni račun + success: "&a Uspjeh! Stanje otočne banke igrača [name] sada je [number]." + take: + parameters: " " + description: uzmi iznos s igračeva otočnog računa + balance: + parameters: "" + description: prikaži stanje igračeva otočnog računa + set: + parameters: " " + description: postavi iznos na igračevu otočnom računu + success: "&a Račun igrača [name] postavljen je na [number]." + statement: + parameters: "" + description: prikaži izvod otočne banke za igrača + balance: + description: prikazuje stanje vaše otočne banke + island-balance: "&a Stanje otočne banke je [number]." + baltop: + description: prikaži poredak po stanju + description-syntax: "&d [number]" + highest: Poredaj po najvišem + lowest: Poredaj po najnižem + name-syntax: "&d [name]" + title: Najveća stanja + deposit: + description: položi iznos na svoj otočni račun + parameters: "" + success: "&a Uspjeh! Vaše novo stanje otočne banke je [number]." + alert: "&a [name] je položio [number] u otočnu banku." + errors: + bank-error: "&c Pogreška pri učitavanju podataka o bankovnom računu - pokušajte + ponovno kasnije" + low-balance: "&c Stanje vaše otočne banke nije dovoljno visoko!" + too-low: "&c Stanje otoka je prenisko." + must-be-a-number: "&c Iznos mora biti broj" + no-rank: "&c Vaš rang nije dovoljno visok za korištenje banke." + too-much: "&c Nemate toliki iznos za polaganje." + value-must-be-positive: "&c Iznos mora biti pozitivan." + scientific: "&c Znanstveni zapis nije podržan." + too-long: "&c Vrijednost mora imati manje od 10 znamenki" + statement: + balance: + name: "&9 Stanje:" + description: "&6 [number]" + deposit: Polog + description: prikaži povijest vaše otočne banke + give: Admin dodjela + interest: Kamate + latest: Poredaj po najnovijem + oldest: Poredaj po najstarijem + set: Admin postavljanje + syntax: | + &9 [date] + &9 [time] + &7 [name] + &6 [number] + take: Admin oduzimanje + title: Povijest računa + unknown: Nepoznata vrsta + withdrawal: Podizanje + user: + description: naredba otočne banke + withdraw: + description: podigni iznos sa svog otočnog računa + parameters: "" + success: "&a Uspjeh! Vaše novo stanje otočne banke je [number]." + alert: "&a [name] je podigao [number] iz otočne banke." +protection: + flags: + BANK_ACCESS: + description: |- + &f Dopusti pristup + &f otočnoj banci + name: Pristup otočnoj banci diff --git a/src/main/resources/locales/hu.yml b/src/main/resources/locales/hu.yml new file mode 100644 index 0000000..8054408 --- /dev/null +++ b/src/main/resources/locales/hu.yml @@ -0,0 +1,81 @@ +--- +bank: + admin: + description: admin parancs a sziget bankhoz + give: + parameters: " " + description: összeg hozzáadása a játékos sziget számlájához + success: "&a Siker! [name] sziget bankegyenlege most [number]." + take: + parameters: " " + description: összeg levonása a játékos sziget számlájáról + balance: + parameters: "" + description: a játékos sziget számlájának egyenlege + set: + parameters: " " + description: összeg beállítása a játékos sziget számláján + success: "&a [name] számlája [number] értékre állítva." + statement: + parameters: "" + description: a játékos sziget bank kivonatának megtekintése + balance: + description: megmutatja a sziget bankegyenlegedet + island-balance: "&a A sziget bankegyenlege [number]." + baltop: + description: egyenleg rangsor megjelenítése + description-syntax: "&d [number]" + highest: Rendezés a legmagasabb szerint + lowest: Rendezés a legalacsonyabb szerint + name-syntax: "&d [name]" + title: Legjobb egyenlegek + deposit: + description: összeg befizetése a sziget számládra + parameters: "" + success: "&a Siker! Az új sziget bankegyenleged [number]." + alert: "&a [name] befizetett [number] összeget a sziget bankba." + errors: + bank-error: "&c Hiba a bankszámla adatainak betöltésekor - kérlek próbáld újra + később" + low-balance: "&c A sziget bankegyenleged nem elég magas!" + too-low: "&c A sziget egyenlege túl alacsony." + must-be-a-number: "&c Az összegnek számnak kell lennie" + no-rank: "&c A rangod nem elég magas a bank használatához." + too-much: "&c Nincs ennyi befizetni való összeged." + value-must-be-positive: "&c Az összegnek pozitívnak kell lennie." + scientific: "&c A tudományos jelölés nem támogatott." + too-long: "&c Az értéknek kevesebb mint 10 számjegyűnek kell lennie" + statement: + balance: + name: "&9 Egyenleg:" + description: "&6 [number]" + deposit: Befizetés + description: a sziget bank előzményeinek megjelenítése + give: Admin adás + interest: Kamat + latest: Rendezés a legújabb szerint + oldest: Rendezés a legrégebbi szerint + set: Admin beállítás + syntax: | + &9 [date] + &9 [time] + &7 [name] + &6 [number] + take: Admin elvétel + title: Számlatörténet + unknown: Ismeretlen típus + withdrawal: Kivétel + user: + description: sziget bank parancs + withdraw: + description: összeg kivétele a sziget számládról + parameters: "" + success: "&a Siker! Az új sziget bankegyenleged [number]." + alert: "&a [name] kivett [number] összeget a sziget bankból." +protection: + flags: + BANK_ACCESS: + description: |- + &f Hozzáférés engedélyezése + &f a sziget bankhoz + name: Sziget bank hozzáférés diff --git a/src/main/resources/locales/ja.yml b/src/main/resources/locales/ja.yml index 37d33e9..a58fb37 100644 --- a/src/main/resources/locales/ja.yml +++ b/src/main/resources/locales/ja.yml @@ -33,6 +33,7 @@ bank: description: 島の口座に入金金額 parameters: "<金額>" success: "&a成功！新しい島の銀行の残高は[number]です。" + alert: "&a[name]が島の銀行に[number]を入金しました。" errors: bank-error: "&c銀行口座情報の読み込み中にエラーが発生しました-後でもう一度お試しください" low-balance: "&cあなたの島の銀行の残高は十分に高くありません！" @@ -65,6 +66,7 @@ bank: description: アイランドアカウントから金額を引き出す parameters: "<金額>" success: "&a成功！新しい島の銀行の残高は[number]です。" + alert: "&a[name]が島の銀行から[number]を引き出しました。" protection: flags: BANK_ACCESS: diff --git a/src/main/resources/locales/lv.yml b/src/main/resources/locales/lv.yml new file mode 100644 index 0000000..efec0d8 --- /dev/null +++ b/src/main/resources/locales/lv.yml @@ -0,0 +1,81 @@ +--- +bank: + admin: + description: administratora komanda salas bankai + give: + parameters: " " + description: pievienot summu spēlētāja salas kontam + success: "&a Veiksmīgi! Spēlētāja [name] salas bankas atlikums tagad ir [number]." + take: + parameters: " " + description: noņemt summu no spēlētāja salas konta + balance: + parameters: "" + description: skatīt spēlētāja salas konta atlikumu + set: + parameters: " " + description: iestatīt summu spēlētāja salas kontā + success: "&a Spēlētāja [name] konts iestatīts uz [number]." + statement: + parameters: "" + description: skatīt spēlētāja salas bankas izrakstu + balance: + description: parāda jūsu salas bankas atlikumu + island-balance: "&a Salas bankas atlikums ir [number]." + baltop: + description: rādīt atlikumu reitingu + description-syntax: "&d [number]" + highest: Kārtot pēc augstākā + lowest: Kārtot pēc zemākā + name-syntax: "&d [name]" + title: Lielākie atlikumi + deposit: + description: iemaksāt summu jūsu salas kontā + parameters: "" + success: "&a Veiksmīgi! Jūsu jaunais salas bankas atlikums ir [number]." + alert: "&a [name] iemaksāja [number] salas bankā." + errors: + bank-error: "&c Kļūda, ielādējot bankas konta informāciju - lūdzu, mēģiniet vēlreiz + vēlāk" + low-balance: "&c Jūsu salas bankas atlikums nav pietiekami liels!" + too-low: "&c Salas atlikums ir pārāk zems." + must-be-a-number: "&c Summai jābūt skaitlim" + no-rank: "&c Jūsu rangs nav pietiekami augsts, lai izmantotu banku." + too-much: "&c Jums nav tādas summas, ko iemaksāt." + value-must-be-positive: "&c Summai jābūt pozitīvai." + scientific: "&c Zinātniskais pieraksts netiek atbalstīts." + too-long: "&c Vērtībai jābūt mazākai par 10 cipariem" + statement: + balance: + name: "&9 Atlikums:" + description: "&6 [number]" + deposit: Iemaksa + description: parādīt jūsu salas bankas vēsturi + give: Administratora piešķīrums + interest: Procenti + latest: Kārtot pēc jaunākā + oldest: Kārtot pēc vecākā + set: Administratora iestatījums + syntax: | + &9 [date] + &9 [time] + &7 [name] + &6 [number] + take: Administratora noņemšana + title: Konta vēsture + unknown: Nezināms tips + withdrawal: Izņemšana + user: + description: salas bankas komanda + withdraw: + description: izņemt summu no jūsu salas konta + parameters: "" + success: "&a Veiksmīgi! Jūsu jaunais salas bankas atlikums ir [number]." + alert: "&a [name] izņēma [number] no salas bankas." +protection: + flags: + BANK_ACCESS: + description: |- + &f Atļaut piekļuvi + &f salas bankai + name: Piekļuve salas bankai diff --git a/src/main/resources/locales/nl.yml b/src/main/resources/locales/nl.yml new file mode 100644 index 0000000..100f415 --- /dev/null +++ b/src/main/resources/locales/nl.yml @@ -0,0 +1,81 @@ +--- +bank: + admin: + description: admin-commando voor de eilandbank + give: + parameters: " " + description: voeg bedrag toe aan de eilandrekening van de speler + success: "&a Succes! Het eilandbanksaldo van [name] is nu [number]." + take: + parameters: " " + description: neem bedrag van de eilandrekening van de speler + balance: + parameters: "" + description: bekijk het saldo van de eilandrekening van de speler + set: + parameters: " " + description: stel bedrag in op de eilandrekening van de speler + success: "&a Rekening van [name] ingesteld op [number]." + statement: + parameters: "" + description: bekijk het eilandbankafschrift van de speler + balance: + description: toont je eilandbanksaldo + island-balance: "&a Eilandbanksaldo is [number]." + baltop: + description: toon saldoranglijst + description-syntax: "&d [number]" + highest: Sorteer op hoogste + lowest: Sorteer op laagste + name-syntax: "&d [name]" + title: Hoogste saldi + deposit: + description: stort bedrag op je eilandrekening + parameters: "" + success: "&a Succes! Je nieuwe eilandbanksaldo is [number]." + alert: "&a [name] heeft [number] op de eilandbank gestort." + errors: + bank-error: "&c Fout bij het laden van bankrekeninggegevens - probeer het later + opnieuw" + low-balance: "&c Je eilandbanksaldo is niet hoog genoeg!" + too-low: "&c Het eilandsaldo is te laag." + must-be-a-number: "&c Bedrag moet een getal zijn" + no-rank: "&c Je rang is niet hoog genoeg om de bank te gebruiken." + too-much: "&c Je hebt dat bedrag niet om te storten." + value-must-be-positive: "&c Bedrag moet positief zijn." + scientific: "&c Wetenschappelijke notatie wordt niet ondersteund." + too-long: "&c Waarde moet minder dan 10 cijfers hebben" + statement: + balance: + name: "&9 Saldo:" + description: "&6 [number]" + deposit: Storting + description: toon je eilandbankgeschiedenis + give: Admin geven + interest: Rente + latest: Sorteer op nieuwste + oldest: Sorteer op oudste + set: Admin instellen + syntax: | + &9 [date] + &9 [time] + &7 [name] + &6 [number] + take: Admin afnemen + title: Rekeninggeschiedenis + unknown: Onbekend type + withdrawal: Opname + user: + description: eilandbankcommando + withdraw: + description: neem bedrag op van je eilandrekening + parameters: "" + success: "&a Succes! Je nieuwe eilandbanksaldo is [number]." + alert: "&a [name] heeft [number] van de eilandbank opgenomen." +protection: + flags: + BANK_ACCESS: + description: |- + &f Sta toegang toe tot + &f de eilandbank + name: Toegang tot eilandbank diff --git a/src/main/resources/locales/pl.yml b/src/main/resources/locales/pl.yml new file mode 100644 index 0000000..56d9dc7 --- /dev/null +++ b/src/main/resources/locales/pl.yml @@ -0,0 +1,81 @@ +--- +bank: + admin: + description: komenda administratora dla banku wyspy + give: + parameters: " " + description: dodaj kwotę do konta wyspy gracza + success: "&a Sukces! Saldo banku wyspy gracza [name] wynosi teraz [number]." + take: + parameters: " " + description: zabierz kwotę z konta wyspy gracza + balance: + parameters: "" + description: zobacz saldo konta wyspy gracza + set: + parameters: " " + description: ustaw kwotę na koncie wyspy gracza + success: "&a Konto gracza [name] ustawione na [number]." + statement: + parameters: "" + description: zobacz wyciąg z banku wyspy gracza + balance: + description: pokazuje saldo twojego banku wyspy + island-balance: "&a Saldo banku wyspy wynosi [number]." + baltop: + description: pokaż ranking sald + description-syntax: "&d [number]" + highest: Sortuj od najwyższego + lowest: Sortuj od najniższego + name-syntax: "&d [name]" + title: Najwyższe salda + deposit: + description: wpłać kwotę na konto swojej wyspy + parameters: "" + success: "&a Sukces! Twoje nowe saldo banku wyspy wynosi [number]." + alert: "&a [name] wpłacił [number] do banku wyspy." + errors: + bank-error: "&c Błąd podczas ładowania informacji o koncie bankowym - spróbuj + ponownie później" + low-balance: "&c Saldo twojego banku wyspy jest za niskie!" + too-low: "&c Saldo wyspy jest za niskie." + must-be-a-number: "&c Kwota musi być liczbą" + no-rank: "&c Twoja ranga nie jest wystarczająco wysoka, aby korzystać z banku." + too-much: "&c Nie masz takiej kwoty do wpłaty." + value-must-be-positive: "&c Kwota musi być dodatnia." + scientific: "&c Notacja naukowa nie jest obsługiwana." + too-long: "&c Wartość musi mieć mniej niż 10 cyfr" + statement: + balance: + name: "&9 Saldo:" + description: "&6 [number]" + deposit: Wpłata + description: pokaż historię twojego banku wyspy + give: Przyznanie administratora + interest: Odsetki + latest: Sortuj od najnowszych + oldest: Sortuj od najstarszych + set: Ustawienie administratora + syntax: | + &9 [date] + &9 [time] + &7 [name] + &6 [number] + take: Pobranie administratora + title: Historia konta + unknown: Nieznany typ + withdrawal: Wypłata + user: + description: komenda banku wyspy + withdraw: + description: wypłać kwotę z konta swojej wyspy + parameters: "" + success: "&a Sukces! Twoje nowe saldo banku wyspy wynosi [number]." + alert: "&a [name] wypłacił [number] z banku wyspy." +protection: + flags: + BANK_ACCESS: + description: |- + &f Zezwól na dostęp do + &f banku wyspy + name: Dostęp do banku wyspy diff --git a/src/main/resources/locales/pt-BR.yml b/src/main/resources/locales/pt-BR.yml new file mode 100644 index 0000000..c194482 --- /dev/null +++ b/src/main/resources/locales/pt-BR.yml @@ -0,0 +1,81 @@ +--- +bank: + admin: + description: comando de admin para o banco da ilha + give: + parameters: " " + description: adicionar quantia à conta da ilha do jogador + success: "&a Sucesso! O saldo do banco da ilha de [name] agora é [number]." + take: + parameters: " " + description: retirar quantia da conta da ilha do jogador + balance: + parameters: "" + description: ver o saldo da conta da ilha do jogador + set: + parameters: " " + description: definir quantia na conta da ilha do jogador + success: "&a Conta de [name] definida para [number]." + statement: + parameters: "" + description: ver o extrato do banco da ilha do jogador + balance: + description: mostra o saldo do banco da sua ilha + island-balance: "&a O saldo do banco da ilha é [number]." + baltop: + description: mostrar a classificação de saldos + description-syntax: "&d [number]" + highest: Ordenar do maior + lowest: Ordenar do menor + name-syntax: "&d [name]" + title: Maiores saldos + deposit: + description: depositar quantia na conta da sua ilha + parameters: "" + success: "&a Sucesso! O novo saldo do banco da sua ilha é [number]." + alert: "&a [name] depositou [number] no banco da ilha." + errors: + bank-error: "&c Erro ao carregar as informações da conta bancária - por favor + tente novamente mais tarde" + low-balance: "&c O saldo do banco da sua ilha não é alto o suficiente!" + too-low: "&c O saldo da ilha é muito baixo." + must-be-a-number: "&c A quantia deve ser um número" + no-rank: "&c Seu cargo não é alto o suficiente para usar o banco." + too-much: "&c Você não tem essa quantia para depositar." + value-must-be-positive: "&c A quantia deve ser positiva." + scientific: "&c Notação científica não é suportada." + too-long: "&c O valor deve ter menos de 10 dígitos" + statement: + balance: + name: "&9 Saldo:" + description: "&6 [number]" + deposit: Depósito + description: mostrar o histórico do banco da sua ilha + give: Dádiva do admin + interest: Juros + latest: Ordenar do mais recente + oldest: Ordenar do mais antigo + set: Definição do admin + syntax: | + &9 [date] + &9 [time] + &7 [name] + &6 [number] + take: Retirada do admin + title: Histórico da conta + unknown: Tipo desconhecido + withdrawal: Saque + user: + description: comando do banco da ilha + withdraw: + description: sacar quantia da conta da sua ilha + parameters: "" + success: "&a Sucesso! O novo saldo do banco da sua ilha é [number]." + alert: "&a [name] sacou [number] do banco da ilha." +protection: + flags: + BANK_ACCESS: + description: |- + &f Permitir acesso ao + &f banco da ilha + name: Acesso ao banco da ilha diff --git a/src/main/resources/locales/pt.yml b/src/main/resources/locales/pt.yml new file mode 100644 index 0000000..4b7f726 --- /dev/null +++ b/src/main/resources/locales/pt.yml @@ -0,0 +1,81 @@ +--- +bank: + admin: + description: comando de administrador para o banco da ilha + give: + parameters: " " + description: adicionar quantia à conta da ilha do jogador + success: "&a Sucesso! O saldo do banco da ilha de [name] é agora [number]." + take: + parameters: " " + description: retirar quantia da conta da ilha do jogador + balance: + parameters: "" + description: ver o saldo da conta da ilha do jogador + set: + parameters: " " + description: definir quantia na conta da ilha do jogador + success: "&a Conta de [name] definida para [number]." + statement: + parameters: "" + description: ver o extrato do banco da ilha do jogador + balance: + description: mostra o saldo do banco da tua ilha + island-balance: "&a O saldo do banco da ilha é [number]." + baltop: + description: mostrar a classificação de saldos + description-syntax: "&d [number]" + highest: Ordenar do mais alto + lowest: Ordenar do mais baixo + name-syntax: "&d [name]" + title: Maiores saldos + deposit: + description: depositar quantia na conta da tua ilha + parameters: "" + success: "&a Sucesso! O novo saldo do banco da tua ilha é [number]." + alert: "&a [name] depositou [number] no banco da ilha." + errors: + bank-error: "&c Erro ao carregar as informações da conta bancária - por favor + tenta novamente mais tarde" + low-balance: "&c O saldo do banco da tua ilha não é suficientemente alto!" + too-low: "&c O saldo da ilha é demasiado baixo." + must-be-a-number: "&c A quantia deve ser um número" + no-rank: "&c A tua categoria não é suficientemente alta para usar o banco." + too-much: "&c Não tens essa quantia para depositar." + value-must-be-positive: "&c A quantia deve ser positiva." + scientific: "&c Notação científica não é suportada." + too-long: "&c O valor deve ter menos de 10 dígitos" + statement: + balance: + name: "&9 Saldo:" + description: "&6 [number]" + deposit: Depósito + description: mostrar o histórico do banco da tua ilha + give: Dádiva do administrador + interest: Juros + latest: Ordenar do mais recente + oldest: Ordenar do mais antigo + set: Definição do administrador + syntax: | + &9 [date] + &9 [time] + &7 [name] + &6 [number] + take: Retirada do administrador + title: Histórico da conta + unknown: Tipo desconhecido + withdrawal: Levantamento + user: + description: comando do banco da ilha + withdraw: + description: levantar quantia da conta da tua ilha + parameters: "" + success: "&a Sucesso! O novo saldo do banco da tua ilha é [number]." + alert: "&a [name] levantou [number] do banco da ilha." +protection: + flags: + BANK_ACCESS: + description: |- + &f Permitir acesso ao + &f banco da ilha + name: Acesso ao banco da ilha diff --git a/src/main/resources/locales/ro.yml b/src/main/resources/locales/ro.yml new file mode 100644 index 0000000..90120c7 --- /dev/null +++ b/src/main/resources/locales/ro.yml @@ -0,0 +1,81 @@ +--- +bank: + admin: + description: comandă de administrator pentru banca insulei + give: + parameters: " " + description: adaugă sumă în contul de insulă al jucătorului + success: "&a Succes! Soldul băncii insulei lui [name] este acum [number]." + take: + parameters: " " + description: ia sumă din contul de insulă al jucătorului + balance: + parameters: "" + description: vezi soldul contului de insulă al jucătorului + set: + parameters: " " + description: setează sumă în contul de insulă al jucătorului + success: "&a Contul lui [name] a fost setat la [number]." + statement: + parameters: "" + description: vezi extrasul băncii insulei pentru jucător + balance: + description: arată soldul băncii insulei tale + island-balance: "&a Soldul băncii insulei este [number]." + baltop: + description: arată clasamentul soldurilor + description-syntax: "&d [number]" + highest: Sortează după cel mai mare + lowest: Sortează după cel mai mic + name-syntax: "&d [name]" + title: Cele mai mari solduri + deposit: + description: depune sumă în contul insulei tale + parameters: "" + success: "&a Succes! Noul tău sold al băncii insulei este [number]." + alert: "&a [name] a depus [number] în banca insulei." + errors: + bank-error: "&c Eroare la încărcarea informațiilor contului bancar - te rog + încearcă din nou mai târziu" + low-balance: "&c Soldul băncii insulei tale nu este suficient de mare!" + too-low: "&c Soldul insulei este prea mic." + must-be-a-number: "&c Suma trebuie să fie un număr" + no-rank: "&c Rangul tău nu este suficient de mare pentru a folosi banca." + too-much: "&c Nu ai această sumă pentru a o depune." + value-must-be-positive: "&c Suma trebuie să fie pozitivă." + scientific: "&c Notația științifică nu este acceptată." + too-long: "&c Valoarea trebuie să aibă mai puțin de 10 cifre" + statement: + balance: + name: "&9 Sold:" + description: "&6 [number]" + deposit: Depunere + description: arată istoricul băncii insulei tale + give: Acordare admin + interest: Dobândă + latest: Sortează după cele mai noi + oldest: Sortează după cele mai vechi + set: Setare admin + syntax: | + &9 [date] + &9 [time] + &7 [name] + &6 [number] + take: Retragere admin + title: Istoricul contului + unknown: Tip necunoscut + withdrawal: Retragere + user: + description: comanda băncii insulei + withdraw: + description: retrage sumă din contul insulei tale + parameters: "" + success: "&a Succes! Noul tău sold al băncii insulei este [number]." + alert: "&a [name] a retras [number] din banca insulei." +protection: + flags: + BANK_ACCESS: + description: |- + &f Permite accesul la + &f banca insulei + name: Acces la banca insulei diff --git a/src/main/resources/locales/ru.yml b/src/main/resources/locales/ru.yml new file mode 100644 index 0000000..9ccd7a9 --- /dev/null +++ b/src/main/resources/locales/ru.yml @@ -0,0 +1,82 @@ +# ######################################################################################## # +# Это YML файл. Будьте осторожны при редактировании. Проверяйте свои правки # +# в YAML валидаторе, например, на http://yaml-online-parser.appspot.com # +# ######################################################################################## # + +bank: + admin: + description: административная команда островного банка + give: + parameters: <игрок> <сумма> + description: добавить сумму на счёт банка игрока + success: Успешно! Баланс банка острова [name] теперь [number]. + take: + parameters: <игрок> <сумма> + description: снять сумму со счёта банка игрока + balance: + parameters: <игрок> + description: просмотреть баланс банка острова игрока + set: + parameters: <игрок> <сумма> + description: установить сумму на счёте банка игрока + success: Счёт [name] установлен на [number]. + statement: + parameters: <игрок> + description: просмотреть выписку по банку острова игрока + balance: + description: показывает баланс вашего островного банка + island-balance: 'Баланс островного банка: [number].' + baltop: + description: показать рейтинг балансов + description-syntax: [number] + highest: Сортировать по убыванию + lowest: Сортировать по возрастанию + name-syntax: [name] + title: Топ балансов + deposit: + description: внести сумму на счёт вашего острова + parameters: <сумма> + success: 'Успешно! Ваш новый баланс островного банка: [number].' + alert: [name] внёс [number] в островной банк. + errors: + bank-error: Ошибка загрузки информации о банковском счёте — попробуйте позже. + low-balance: Баланс вашего островного банка недостаточно высок! + too-low: Баланс острова слишком низкий. + must-be-a-number: Сумма должна быть числом. + no-rank: Ваш ранг недостаточно высок для использования банка. + too-much: У вас нет такой суммы для внесения. + value-must-be-positive: Сумма должна быть положительной. + scientific: Научная нотация не поддерживается. + too-long: Значение должно содержать менее 10 цифр. + statement: + balance: + name: Баланс: + description: [number] + deposit: Внесение + description: показать историю вашего островного банка + give: Выдача администратором + interest: Проценты + latest: Сортировать по новизне + oldest: Сортировать по давности + set: Установка администратором + syntax: |- + [date] + [time] + [name] + [number] + take: Снятие администратором + title: История операций + unknown: Неизвестный тип + withdrawal: Снятие + user: + description: команда островного банка + withdraw: + description: снять сумму со счёта вашего острова + parameters: <сумма> + success: 'Успешно! Ваш новый баланс островного банка: [number].' + alert: [name] снял [number] с островного банка. +protection: + flags: + BANK_ACCESS: + description: Переключает доступ к островному банку + name: Доступ к островному банку \ No newline at end of file diff --git a/src/main/resources/locales/tr.yml b/src/main/resources/locales/tr.yml new file mode 100644 index 0000000..2a330de --- /dev/null +++ b/src/main/resources/locales/tr.yml @@ -0,0 +1,81 @@ +--- +bank: + admin: + description: ada bankası için yönetici komutu + give: + parameters: " " + description: oyuncunun ada hesabına miktar ekle + success: "&a Başarılı! [name] adlı oyuncunun ada banka bakiyesi şimdi [number]." + take: + parameters: " " + description: oyuncunun ada hesabından miktar al + balance: + parameters: "" + description: oyuncunun ada hesabının bakiyesini görüntüle + set: + parameters: " " + description: oyuncunun ada hesabındaki miktarı ayarla + success: "&a [name] adlı oyuncunun hesabı [number] olarak ayarlandı." + statement: + parameters: "" + description: oyuncunun ada banka ekstresini görüntüle + balance: + description: ada banka bakiyenizi gösterir + island-balance: "&a Ada banka bakiyesi [number]." + baltop: + description: bakiye sıralamasını göster + description-syntax: "&d [number]" + highest: En yüksekten sırala + lowest: En düşükten sırala + name-syntax: "&d [name]" + title: En yüksek bakiyeler + deposit: + description: ada hesabınıza miktar yatırın + parameters: "" + success: "&a Başarılı! Yeni ada banka bakiyeniz [number]." + alert: "&a [name] ada bankasına [number] yatırdı." + errors: + bank-error: "&c Banka hesabı bilgileri yüklenirken hata oluştu - lütfen daha + sonra tekrar deneyin" + low-balance: "&c Ada banka bakiyeniz yeterince yüksek değil!" + too-low: "&c Ada bakiyesi çok düşük." + must-be-a-number: "&c Miktar bir sayı olmalı" + no-rank: "&c Rütbeniz bankayı kullanmak için yeterince yüksek değil." + too-much: "&c Yatıracak o kadar miktarınız yok." + value-must-be-positive: "&c Miktar pozitif olmalı." + scientific: "&c Bilimsel gösterim desteklenmiyor." + too-long: "&c Değer 10 haneden az olmalı" + statement: + balance: + name: "&9 Bakiye:" + description: "&6 [number]" + deposit: Yatırma + description: ada banka geçmişinizi göster + give: Yönetici verme + interest: Faiz + latest: En yeniden sırala + oldest: En eskiden sırala + set: Yönetici ayarlama + syntax: | + &9 [date] + &9 [time] + &7 [name] + &6 [number] + take: Yönetici alma + title: Hesap geçmişi + unknown: Bilinmeyen tür + withdrawal: Çekme + user: + description: ada bankası komutu + withdraw: + description: ada hesabınızdan miktar çekin + parameters: "" + success: "&a Başarılı! Yeni ada banka bakiyeniz [number]." + alert: "&a [name] ada bankasından [number] çekti." +protection: + flags: + BANK_ACCESS: + description: |- + &f Ada bankasına + &f erişime izin ver + name: Ada bankası erişimi diff --git a/src/main/resources/locales/zh-HK.yml b/src/main/resources/locales/zh-HK.yml new file mode 100644 index 0000000..16eba80 --- /dev/null +++ b/src/main/resources/locales/zh-HK.yml @@ -0,0 +1,80 @@ +--- +bank: + admin: + description: 島嶼銀行的管理員指令 + give: + parameters: " " + description: 將金額加入玩家的島嶼帳戶 + success: "&a 成功！[name] 的島嶼銀行餘額現在是 [number]。" + take: + parameters: " " + description: 從玩家的島嶼帳戶扣除金額 + balance: + parameters: "" + description: 查看玩家島嶼帳戶的餘額 + set: + parameters: " " + description: 設定玩家島嶼帳戶的金額 + success: "&a [name] 的帳戶已設定為 [number]。" + statement: + parameters: "" + description: 查看玩家的島嶼銀行明細 + balance: + description: 顯示你的島嶼銀行餘額 + island-balance: "&a 島嶼銀行餘額是 [number]。" + baltop: + description: 顯示餘額排行榜 + description-syntax: "&d [number]" + highest: 由高至低排序 + lowest: 由低至高排序 + name-syntax: "&d [name]" + title: 餘額排行榜 + deposit: + description: 將金額存入你的島嶼帳戶 + parameters: "" + success: "&a 成功！你新的島嶼銀行餘額是 [number]。" + alert: "&a [name] 存入了 [number] 到島嶼銀行。" + errors: + bank-error: "&c 載入銀行帳戶資料時發生錯誤 - 請稍後再試" + low-balance: "&c 你的島嶼銀行餘額不足！" + too-low: "&c 島嶼餘額太低。" + must-be-a-number: "&c 金額必須是數字" + no-rank: "&c 你的等級不足以使用銀行。" + too-much: "&c 你沒有那麼多金額可以存入。" + value-must-be-positive: "&c 金額必須為正數。" + scientific: "&c 不支援科學記數法。" + too-long: "&c 數值必須少於 10 位數" + statement: + balance: + name: "&9 餘額：" + description: "&6 [number]" + deposit: 存款 + description: 顯示你的島嶼銀行紀錄 + give: 管理員給予 + interest: 利息 + latest: 由最新排序 + oldest: 由最舊排序 + set: 管理員設定 + syntax: | + &9 [date] + &9 [time] + &7 [name] + &6 [number] + take: 管理員扣除 + title: 帳戶紀錄 + unknown: 未知類型 + withdrawal: 提款 + user: + description: 島嶼銀行指令 + withdraw: + description: 從你的島嶼帳戶提取金額 + parameters: "" + success: "&a 成功！你新的島嶼銀行餘額是 [number]。" + alert: "&a [name] 從島嶼銀行提取了 [number]。" +protection: + flags: + BANK_ACCESS: + description: |- + &f 允許存取 + &f 島嶼銀行 + name: 島嶼銀行存取 From 93a6ebcada27ce8091981039c68d0cef92ded94b Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 4 Jun 2026 07:40:06 -0700 Subject: [PATCH 09/31] Add CLAUDE.md project guidance Document build/test commands, architecture, dependencies, localization (23-language set matching BentoBox), CI, and project layout for Claude Code. Co-Authored-By: Claude Opus 4.8 --- CLAUDE.md | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 CLAUDE.md diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 0000000..1654f4d --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,144 @@ +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +## Project Overview + +Bank is a BentoBox addon for Minecraft (Spigot) that provides an island-based banking/economy system. It integrates with Vault for economy operations and supports multiple BentoBox game modes (BSkyBlock, AOneBlock, AcidIsland, SkyGrid, CaveBlock). + +## Build Commands + +```bash +mvn clean package # Build the plugin JAR +mvn test # Run tests only +mvn verify # Build + tests + coverage +``` + +Output JAR goes to `target/`. The build requires Java 17+. + +## Testing + +- JUnit 4 with PowerMock (required to mock Bukkit/BentoBox static methods) +- Run a single test: `mvn test -Dtest=BankManagerTest` +- Tests are in `src/test/java/world/bentobox/bank/` mirroring main source structure +- JaCoCo coverage reports: `target/site/jacoco/` + +## Architecture + +**Entry point:** `BankPladdon` → `Bank` (addon lifecycle: onEnable loads Vault, config, BankManager, registers commands with each game mode) + +**Core layers:** +- **BankManager** — Central business logic: deposit/withdraw/balance operations, compound interest calculation, LRU cache (max 20 accounts), async database persistence. Listens for island deletion events to clean up accounts. +- **Money** — Value type wrapping `BigDecimal` with 2 decimal places. All currency arithmetic goes through this class. +- **BankAccounts** — Persisted data object per island (balance, transaction history, interest timestamp). Uses BentoBox's database layer. +- **Settings** — Maps to `config.yml`. Interest rate, compound period, cooldown, game modes, command names. + +**Command hierarchy:** +- `commands/user/` — Player commands (balance, deposit, withdraw, statement, baltop) registered under each game mode's island command +- `commands/admin/` — Admin commands (balance, give, set, take, statement) with AbstractAdminBankCommand handling target player resolution +- Both extend `AbstractBankCommand` which provides shared argument parsing + +**PhManager** — Registers BentoBox placeholders for each game mode (balance, top-N rankings). Caches top-10 for 10 seconds. + +## Key Dependencies (provided at runtime, not bundled) + +- Spigot API 1.21.3 +- BentoBox 2.7.1-SNAPSHOT +- Vault API 1.7 + +## Localization + +23 language files in `src/main/resources/locales/`, matching BentoBox's full locale set (cs, de, en-US, es, fr, hr, hu, id, it, ja, ko, lv, nl, pl, pt, pt-BR, ro, ru, tr, uk, vi, zh-CN, zh-HK). `en-US.yml` is the reference; all other files must carry the same keys. Message keys are referenced in commands via BentoBox's `user.sendMessage()` system. Use the `/sync-locales` skill to find and fill missing keys. + +## CI + +GitHub Actions (`.github/workflows/build.yml`): triggers on push to `develop` and PRs. Runs Maven verify with SonarCloud analysis using Java 21. + +## Dependency Source Lookup + +When you need to inspect source code for a dependency (e.g., BentoBox, addons): + +1. **Check local Maven repo first**: `~/.m2/repository/` — sources jars are named `*-sources.jar` +2. **Check the workspace**: Look for sibling directories or Git submodules that may contain the dependency as a local project (e.g., `../bentoBox`, `../addon-*`) +3. **Check Maven local cache for already-extracted sources** before downloading anything +4. Only download a jar or fetch from the internet if the above steps yield nothing useful + +Prefer reading `.java` source files directly from a local Git clone over decompiling or extracting a jar. + +In general, the latest version of BentoBox should be targeted. + +## Project Layout + +Related projects are checked out as siblings under `~/git/`: + +**Core:** +- `bentobox/` — core BentoBox framework + +**Game modes:** +- `addon-acidisland/` — AcidIsland game mode +- `addon-bskyblock/` — BSkyBlock game mode +- `Boxed/` — Boxed game mode (expandable box area) +- `CaveBlock/` — CaveBlock game mode +- `OneBlock/` — AOneBlock game mode +- `SkyGrid/` — SkyGrid game mode +- `RaftMode/` — Raft survival game mode +- `StrangerRealms/` — StrangerRealms game mode +- `Brix/` — plot game mode +- `parkour/` — Parkour game mode +- `poseidon/` — Poseidon game mode +- `gg/` — gg game mode + +**Addons:** +- `addon-level/` — island level calculation +- `addon-challenges/` — challenges system +- `addon-welcomewarpsigns/` — warp signs +- `addon-limits/` — block/entity limits +- `addon-invSwitcher/` / `invSwitcher/` — inventory switcher +- `addon-biomes/` / `Biomes/` — biomes management +- `Bank/` — island bank +- `Border/` — world border for islands +- `Chat/` — island chat +- `CheckMeOut/` — island submission/voting +- `ControlPanel/` — game mode control panel +- `Converter/` — ASkyBlock to BSkyBlock converter +- `DimensionalTrees/` — dimension-specific trees +- `discordwebhook/` — Discord integration +- `Downloads/` — BentoBox downloads site +- `DragonFights/` — per-island ender dragon fights +- `ExtraMobs/` — additional mob spawning rules +- `FarmersDance/` — twerking crop growth +- `GravityFlux/` — gravity addon +- `Greenhouses-addon/` — greenhouse biomes +- `IslandFly/` — island flight permission +- `IslandRankup/` — island rankup system +- `Likes/` — island likes/dislikes +- `Limits/` — block/entity limits +- `lost-sheep/` — lost sheep adventure +- `MagicCobblestoneGenerator/` — custom cobblestone generator +- `PortalStart/` — portal-based island start +- `pp/` — pp addon +- `Regionerator/` — region management +- `Residence/` — residence addon +- `TopBlock/` — top ten for OneBlock +- `TwerkingForTrees/` — twerking tree growth +- `Upgrades/` — island upgrades (Vault) +- `Visit/` — island visiting +- `weblink/` — web link addon +- `CrowdBound/` — CrowdBound addon + +**Data packs:** +- `BoxedDataPack/` — advancement datapack for Boxed + +**Documentation & tools:** +- `docs/` — main documentation site +- `docs-chinese/` — Chinese documentation +- `docs-french/` — French documentation +- `BentoBoxWorld.github.io/` — GitHub Pages site +- `website/` — website +- `translation-tool/` — translation tool + +Check these for source before any network fetch. + +## Key Dependencies (source locations) + +- `world.bentobox:bentobox` → `~/git/bentobox/src/` From 8ec8c69f829f511330cf762762c86bdf225952f7 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 5 Jun 2026 18:23:22 -0700 Subject: [PATCH 10/31] Update to Java 21, Paper 1.21.11, BentoBox 3.14.0 Modernise the build: bump java.version to 21, replace the Spigot API with Paper 1.21.11, and target BentoBox 3.14.0-SNAPSHOT. Production code compiles unchanged against the new API. Swap the test stack from JUnit 4 + PowerMock to JUnit 5 + MockBukkit + Mockito 5. Replace the Spigot repository with PaperMC and add the codemc snapshots repository for MockBukkit. Add true to the compiler plugin for Java 21. Co-Authored-By: Claude Opus 4.8 --- pom.xml | 70 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index 1129ed8..22c446f 100644 --- a/pom.xml +++ b/pom.xml @@ -50,13 +50,14 @@ UTF-8 UTF-8 - 17 + 21 1.7 - - 2.0.9 - 1.21.3-R0.1-SNAPSHOT - 2.7.1-SNAPSHOT + 1.21.11-R0.1-SNAPSHOT + 3.14.0-SNAPSHOT + 5.10.2 + 5.11.0 + 4.110.0 ${build.version}-SNAPSHOT @@ -112,8 +113,8 @@ - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots + papermc + https://repo.papermc.io/repository/maven-public/ bentoboxworld @@ -124,8 +125,8 @@ https://repo.codemc.org/repository/maven-public/ - codemc-public - https://repo.codemc.org/repository/maven-public/ + codemc + https://repo.codemc.org/repository/maven-snapshots/ jitpack.io @@ -135,37 +136,51 @@ - + - org.spigotmc - spigot-api - ${spigot.version} + io.papermc.paper + paper-api + ${paper.version} provided - - org.mockito - mockito-core - 3.0.0 + world.bentobox + bentobox + ${bentobox.version} + provided + + + + org.mockbukkit.mockbukkit + mockbukkit-v1.21 + ${mock-bukkit.version} test + - org.powermock - powermock-module-junit4 - ${powermock.version} + org.junit.jupiter + junit-jupiter-api + ${junit.version} test - org.powermock - powermock-api-mockito2 - ${powermock.version} + org.junit.jupiter + junit-jupiter-engine + ${junit.version} test + - world.bentobox - bentobox - ${bentobox.version} - provided + org.mockito + mockito-core + ${mockito.version} + test + + + org.mockito + mockito-junit-jupiter + ${mockito.version} + test @@ -222,6 +237,7 @@ 3.15.0 ${java.version} + true org.apache.maven.plugins From bf180c3e758753d3c4648fe0e676cbf8060d28a0 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 5 Jun 2026 18:23:29 -0700 Subject: [PATCH 11/31] Migrate test suite to JUnit 5 + MockBukkit Rewrite all 13 test classes (158 tests) from JUnit 4 + PowerMock to JUnit 5 + MockBukkit + Mockito 5, preserving full coverage and the same 158 test cases. Add shared MockBukkit infrastructure (WhiteBox, TestWorldSettings, CommonTestSetup) adapted from the CaveBlock pattern. PowerMock static mocking is replaced with Mockito inline static mocks (Bukkit, Util, DatabaseSetup) and a real MockBukkit server. MoneyTest and PhManagerTest run as standalone Mockito tests since they need no Bukkit server. Co-Authored-By: Claude Opus 4.8 --- .../world/bentobox/bank/BankManagerTest.java | 163 +++------ .../java/world/bentobox/bank/BankTest.java | 262 ++++--------- .../world/bentobox/bank/CommonTestSetup.java | 221 +++++++++++ .../world/bentobox/bank/PhManagerTest.java | 111 +++--- .../bentobox/bank/TestWorldSettings.java | 345 ++++++++++++++++++ .../java/world/bentobox/bank/WhiteBox.java | 13 + .../admin/AdminBalanceCommandTest.java | 78 ++-- .../commands/admin/AdminGiveCommandTest.java | 82 ++--- .../commands/admin/AdminSetCommandTest.java | 80 ++-- .../admin/AdminStatementCommandTest.java | 89 ++--- .../commands/admin/AdminTakeCommandTest.java | 88 ++--- .../commands/user/BalanceCommandTest.java | 74 ++-- .../commands/user/DepositCommandTest.java | 95 ++--- .../commands/user/StatementCommandTest.java | 83 ++--- .../commands/user/WithdrawCommandTest.java | 96 ++--- .../world/bentobox/bank/data/MoneyTest.java | 32 +- 16 files changed, 1010 insertions(+), 902 deletions(-) create mode 100644 src/test/java/world/bentobox/bank/CommonTestSetup.java create mode 100644 src/test/java/world/bentobox/bank/TestWorldSettings.java create mode 100644 src/test/java/world/bentobox/bank/WhiteBox.java diff --git a/src/test/java/world/bentobox/bank/BankManagerTest.java b/src/test/java/world/bentobox/bank/BankManagerTest.java index dcf7077..9dfebf6 100644 --- a/src/test/java/world/bentobox/bank/BankManagerTest.java +++ b/src/test/java/world/bentobox/bank/BankManagerTest.java @@ -1,43 +1,27 @@ package world.bentobox.bank; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.beans.IntrospectionException; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Comparator; import java.util.UUID; import java.util.concurrent.CompletableFuture; import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.World; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; +import org.mockito.MockedStatic; import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; import world.bentobox.bank.data.BankAccounts; import world.bentobox.bank.data.Money; import world.bentobox.bank.data.TxType; -import world.bentobox.bentobox.BentoBox; -import world.bentobox.bentobox.Settings; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.api.events.island.IslandEvent; import world.bentobox.bentobox.api.events.island.IslandEvent.Reason; @@ -45,82 +29,56 @@ import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.AbstractDatabaseHandler; import world.bentobox.bentobox.database.DatabaseSetup; -import world.bentobox.bentobox.database.DatabaseSetup.DatabaseType; import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.util.Util; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class, DatabaseSetup.class, Util.class, IslandsManager.class }) -public class BankManagerTest { +class BankManagerTest extends CommonTestSetup { @Mock private Bank addon; // Class under test private BankManager bm; - private static AbstractDatabaseHandler h; - @Mock - private BentoBox plugin; - @Mock - private Settings pluginSettings; + @SuppressWarnings("rawtypes") + private AbstractDatabaseHandler h; @Mock private User user; - @Mock - private World world; private Island island; - @Mock - private IslandsManager im; private String uniqueId; - @Mock - private Location location; private world.bentobox.bank.Settings settings; - + private MockedStatic mockDb; @SuppressWarnings("unchecked") - @BeforeClass - public static void beforeClass() throws IllegalAccessException, InvocationTargetException, IntrospectionException { - // This has to be done beforeClass otherwise the tests will interfere with each other + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); + + // Database mock h = mock(AbstractDatabaseHandler.class); - // Database - PowerMockito.mockStatic(DatabaseSetup.class); + mockDb = Mockito.mockStatic(DatabaseSetup.class); DatabaseSetup dbSetup = mock(DatabaseSetup.class); - when(DatabaseSetup.getDatabase()).thenReturn(dbSetup); + mockDb.when(DatabaseSetup::getDatabase).thenReturn(dbSetup); when(dbSetup.getHandler(any())).thenReturn(h); when(h.saveObject(any())).thenReturn(CompletableFuture.completedFuture(true)); - } - /** - */ - @Before - public void setUp() { when(addon.getPlugin()).thenReturn(plugin); - // Set up plugin - Whitebox.setInternalState(BentoBox.class, "instance", plugin); - - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); - PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); - // The database type has to be created one line before the thenReturn() to work! - DatabaseType value = DatabaseType.JSON; - when(plugin.getSettings()).thenReturn(pluginSettings); - when(pluginSettings.getDatabaseType()).thenReturn(value); + // Island manager when(addon.getIslands()).thenReturn(im); uniqueId = UUID.randomUUID().toString(); island = new Island(); island.setUniqueId(uniqueId); - when(location.getWorld()).thenReturn(world); - when(location.clone()).thenReturn(location); island.setCenter(location); when(im.getIsland(world, user)).thenReturn(island); - PowerMockito.mockStatic(Util.class); - when(Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, World.class)); + // Util.getWorld returns the world passed in + mockedUtil.when(() -> Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, org.bukkit.World.class)); // Addon settings settings = new world.bentobox.bank.Settings(); @@ -129,75 +87,63 @@ public void setUp() { bm = new BankManager(addon); } - /** - * @throws java.lang.Exception - exception - */ - @After + @Override + @AfterEach public void tearDown() throws Exception { - deleteAll(new File("database")); - User.clearUsers(); - Mockito.framework().clearInlineMocks(); - } - - private static void deleteAll(File file) throws IOException { - if (file.exists()) { - Files.walk(file.toPath()) - .sorted(Comparator.reverseOrder()) - .map(Path::toFile) - .forEach(File::delete); + if (mockDb != null) { + mockDb.closeOnDemand(); } + super.tearDown(); } /** * Test method for {@link world.bentobox.bank.BankManager#BankManager(world.bentobox.bank.Bank)}. */ @Test - public void testBankManager() { - PowerMockito.verifyStatic(Bukkit.class); - Bukkit.getScheduler(); + void testBankManager() { + mockedBukkit.verify(Bukkit::getScheduler); } /** * Test method for {@link world.bentobox.bank.BankManager#loadBalances()}. */ @Test - public void testLoadBalances() { + void testLoadBalances() { bm.loadBalances(); - PowerMockito.verifyStatic(Bukkit.class, times(2)); - Bukkit.getScheduler(); + mockedBukkit.verify(Bukkit::getScheduler, times(2)); } /** - * Test method for {@link world.bentobox.bank.BankManager#deposit(world.bentobox.bentobox.api.user.User, double, org.bukkit.World)}. + * Test method for {@link world.bentobox.bank.BankManager#deposit(world.bentobox.bentobox.api.user.User, world.bentobox.bank.data.Money, org.bukkit.World)}. */ @Test - public void testDepositUserDoubleWorld() { + void testDepositUserDoubleWorld() { bm.deposit(user, new Money(100), world).thenAccept(r -> assertEquals(BankResponse.SUCCESS, r)); } /** - * Test method for {@link world.bentobox.bank.BankManager#deposit(world.bentobox.bentobox.api.user.User, world.bentobox.bentobox.database.objects.Island, double, world.bentobox.bank.data.TxType)}. + * Test method for {@link world.bentobox.bank.BankManager#deposit(world.bentobox.bentobox.api.user.User, world.bentobox.bentobox.database.objects.Island, world.bentobox.bank.data.Money, world.bentobox.bank.data.TxType)}. */ @Test - public void testDepositUserIslandDoubleTxType() { + void testDepositUserIslandDoubleTxType() { for (TxType type : TxType.values()) { bm.deposit(user, island, new Money(100), type).thenAccept(r -> assertEquals(BankResponse.SUCCESS, r)); } } /** - * Test method for {@link world.bentobox.bank.BankManager#withdraw(world.bentobox.bentobox.api.user.User, double, org.bukkit.World)}. + * Test method for {@link world.bentobox.bank.BankManager#withdraw(world.bentobox.bentobox.api.user.User, world.bentobox.bank.data.Money, org.bukkit.World)}. */ @Test - public void testWithdrawUserDoubleWorld() { + void testWithdrawUserDoubleWorld() { bm.withdraw(user, new Money(100), world).thenAccept(r -> assertEquals(BankResponse.SUCCESS, r)); } /** - * Test method for {@link world.bentobox.bank.BankManager#withdraw(world.bentobox.bentobox.api.user.User, world.bentobox.bentobox.database.objects.Island, double, world.bentobox.bank.data.TxType)}. + * Test method for {@link world.bentobox.bank.BankManager#withdraw(world.bentobox.bentobox.api.user.User, world.bentobox.bentobox.database.objects.Island, world.bentobox.bank.data.Money, world.bentobox.bank.data.TxType)}. */ @Test - public void testWithdrawUserIslandDoubleTxType() { + void testWithdrawUserIslandDoubleTxType() { for (TxType type : TxType.values()) { bm.withdraw(user, island, new Money(100), type).thenAccept(r -> assertEquals(BankResponse.SUCCESS, r)); } @@ -207,7 +153,7 @@ public void testWithdrawUserIslandDoubleTxType() { * Test method for {@link world.bentobox.bank.BankManager#getBalance(world.bentobox.bentobox.database.objects.Island)}. */ @Test - public void testGetBalanceIsland() { + void testGetBalanceIsland() { assertEquals(0D, bm.getBalance(island).getValue(), 0D); } @@ -215,7 +161,7 @@ public void testGetBalanceIsland() { * Test method for {@link world.bentobox.bank.BankManager#getBalance(world.bentobox.bentobox.api.user.User, org.bukkit.World)}. */ @Test - public void testGetBalanceUserWorld() { + void testGetBalanceUserWorld() { assertEquals(0D, bm.getBalance(user, world).getValue(), 0D); } @@ -223,23 +169,23 @@ public void testGetBalanceUserWorld() { * Test method for {@link world.bentobox.bank.BankManager#getHistory(world.bentobox.bentobox.database.objects.Island)}. */ @Test - public void testGetHistory() { + void testGetHistory() { assertTrue(bm.getHistory(island).isEmpty()); } /** - * Test method for {@link world.bentobox.bank.BankManager#getBalances(World)}. + * Test method for {@link world.bentobox.bank.BankManager#getBalances(org.bukkit.World)}. */ @Test - public void testGetBalances() { + void testGetBalances() { assertTrue(bm.getBalances(world).isEmpty()); } /** - * Test method for {@link world.bentobox.bank.BankManager#set(world.bentobox.bentobox.api.user.User, java.lang.String, double, double, world.bentobox.bank.data.TxType)}. + * Test method for {@link world.bentobox.bank.BankManager#set(world.bentobox.bentobox.api.user.User, java.lang.String, world.bentobox.bank.data.Money, world.bentobox.bank.data.Money, world.bentobox.bank.data.TxType)}. */ @Test - public void testSet() { + void testSet() { String islandID = ""; for (TxType type : TxType.values()) { bm.set(user, islandID, new Money(10), new Money(100), type).thenAccept(r -> assertEquals(BankResponse.SUCCESS, r)); @@ -250,12 +196,12 @@ public void testSet() { * Test method for {@link world.bentobox.bank.BankManager#onIslandDelete(world.bentobox.bentobox.api.events.island.IslandEvent.IslandPreclearEvent)}. */ @Test - public void testOnIslandDelete() { + void testOnIslandDelete() { IslandBaseEvent e = new IslandEvent.IslandEventBuilder().oldIsland(island).reason(Reason.PRECLEAR).island(island).build(); if (e.getNewEvent().isPresent()) { e = e.getNewEvent().get(); } - bm.onIslandDelete((IslandPreclearEvent)e); + bm.onIslandDelete((IslandPreclearEvent) e); verify(h).deleteID(uniqueId); } @@ -263,7 +209,7 @@ public void testOnIslandDelete() { * Test method for {@link world.bentobox.bank.BankManager#calculateInterest(world.bentobox.bank.data.BankAccounts)}. */ @Test - public void testOnCalculateInterestZeroBalance() { + void testOnCalculateInterestZeroBalance() { BankAccounts ba = new BankAccounts(); assertEquals(0D, bm.calculateInterest(ba).getValue(), 0D); } @@ -272,7 +218,7 @@ public void testOnCalculateInterestZeroBalance() { * Test method for {@link world.bentobox.bank.BankManager#calculateInterest(world.bentobox.bank.data.BankAccounts)}. */ @Test - public void testOnCalculateInterestOneYear10() { + void testOnCalculateInterestOneYear10() { calculate(10, 11051.56D, BankManager.MILLISECONDS_IN_YEAR); BankAccounts ba = new BankAccounts(); settings.setInterestRate(10); // 10% @@ -285,15 +231,15 @@ public void testOnCalculateInterestOneYear10() { * Test method for {@link world.bentobox.bank.BankManager#calculateInterest(world.bentobox.bank.data.BankAccounts)}. */ @Test - public void testOnCalculateInterestOneDay10() { - calculate(10, 10002.74D, (long)24 * 60 * 60 * 1000); + void testOnCalculateInterestOneDay10() { + calculate(10, 10002.74D, (long) 24 * 60 * 60 * 1000); } /** * Test method for {@link world.bentobox.bank.BankManager#calculateInterest(world.bentobox.bank.data.BankAccounts)}. */ @Test - public void testOnCalculateInterestOneYear25() { + void testOnCalculateInterestOneYear25() { calculate(25, 12839.16D, BankManager.MILLISECONDS_IN_YEAR); } @@ -301,17 +247,16 @@ public void testOnCalculateInterestOneYear25() { * Test method for {@link world.bentobox.bank.BankManager#calculateInterest(world.bentobox.bank.data.BankAccounts)}. */ @Test - public void testOnCalculateInterestOneYear0() { + void testOnCalculateInterestOneYear0() { calculate(0, 10000D, BankManager.MILLISECONDS_IN_YEAR); } private void calculate(int i, double d, long milliseconds) { BankAccounts ba = new BankAccounts(); - settings.setInterestRate(i); // 10% + settings.setInterestRate(i); ba.setBalance(new Money(10000)); ba.setInterestLastPaid(System.currentTimeMillis() - milliseconds); assertEquals(d, bm.calculateInterest(ba).getValue(), 0D); - } } diff --git a/src/test/java/world/bentobox/bank/BankTest.java b/src/test/java/world/bentobox/bank/BankTest.java index 303b7aa..72318fc 100644 --- a/src/test/java/world/bentobox/bank/BankTest.java +++ b/src/test/java/world/bentobox/bank/BankTest.java @@ -1,266 +1,145 @@ package world.bentobox.bank; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collections; -import java.util.Comparator; import java.util.Optional; -import java.util.UUID; +import java.util.concurrent.CompletableFuture; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; -import java.util.logging.Logger; -import org.bukkit.Bukkit; -import org.bukkit.Server; -import org.bukkit.UnsafeValues; -import org.bukkit.World; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemFactory; -import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.plugin.PluginManager; -import org.bukkit.scheduler.BukkitScheduler; -import org.eclipse.jdt.annotation.NonNull; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; +import org.mockito.MockedStatic; import org.mockito.Mockito; -import org.mockito.stubbing.Answer; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; -import world.bentobox.bentobox.BentoBox; -import world.bentobox.bentobox.Settings; import world.bentobox.bentobox.api.addons.AddonDescription; import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.DatabaseSetup.DatabaseType; -import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.AbstractDatabaseHandler; +import world.bentobox.bentobox.database.DatabaseSetup; import world.bentobox.bentobox.hooks.VaultHook; import world.bentobox.bentobox.managers.AddonsManager; import world.bentobox.bentobox.managers.CommandsManager; -import world.bentobox.bentobox.managers.FlagsManager; -import world.bentobox.bentobox.managers.IslandWorldManager; -import world.bentobox.bentobox.managers.IslandsManager; -import world.bentobox.bentobox.managers.PlaceholdersManager; +/** + * Tests for {@link Bank}. + */ +class BankTest extends CommonTestSetup { -@SuppressWarnings("deprecation") -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class, User.class, IslandsManager.class }) -public class BankTest { - - private static File jFile; - @Mock - private User user; - @Mock - private IslandsManager im; - @Mock - private Island island; - @Mock - private BentoBox plugin; - @Mock - private FlagsManager fm; @Mock private GameModeAddon gameMode; @Mock private AddonsManager am; @Mock - private BukkitScheduler scheduler; - - @Mock - private Settings pluginSettings; - - private Bank addon; - - @Mock - private Logger logger; - @Mock - private PlaceholdersManager phm; - @Mock private CompositeCommand cmd; @Mock private CompositeCommand adminCmd; @Mock - private World world; - private UUID uuid; - - @Mock - private PluginManager pim; - @Mock private VaultHook vh; - @BeforeClass - public static void beforeClass() throws IOException { - // Make the addon jar - jFile = new File("addon.jar"); - // Copy over config file from src folder - Path fromPath = Paths.get("src/main/resources/config.yml"); - Path path = Paths.get("config.yml"); - Files.copy(fromPath, path); - try (JarOutputStream tempJarOutputStream = new JarOutputStream(new FileOutputStream(jFile))) { - //Added the new files to the jar. - try (FileInputStream fis = new FileInputStream(path.toFile())) { - byte[] buffer = new byte[1024]; - int bytesRead = 0; - JarEntry entry = new JarEntry(path.toString()); - tempJarOutputStream.putNextEntry(entry); - while((bytesRead = fis.read(buffer)) != -1) { - tempJarOutputStream.write(buffer, 0, bytesRead); - } - } - } - } + private Bank addon; + private File jFile; + private MockedStatic mockDb; - @Before + @SuppressWarnings("unchecked") + @Override + @BeforeEach public void setUp() throws Exception { - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); - PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); - // Set up plugin - Whitebox.setInternalState(BentoBox.class, "instance", plugin); + super.setUp(); - // The database type has to be created one line before the thenReturn() to work! - DatabaseType value = DatabaseType.JSON; - when(plugin.getSettings()).thenReturn(pluginSettings); - when(pluginSettings.getDatabaseType()).thenReturn(value); + // Database mock + AbstractDatabaseHandler h = mock(AbstractDatabaseHandler.class); + mockDb = Mockito.mockStatic(DatabaseSetup.class); + DatabaseSetup dbSetup = mock(DatabaseSetup.class); + mockDb.when(DatabaseSetup::getDatabase).thenReturn(dbSetup); + when(dbSetup.getHandler(any())).thenReturn(h); + when(h.saveObject(any())).thenReturn(CompletableFuture.completedFuture(true)); // Command manager CommandsManager cm = mock(CommandsManager.class); when(plugin.getCommandsManager()).thenReturn(cm); - // Player - Player p = mock(Player.class); - when(user.isOp()).thenReturn(false); - uuid = UUID.randomUUID(); - when(user.getUniqueId()).thenReturn(uuid); - when(user.getPlayer()).thenReturn(p); - when(user.getName()).thenReturn("tastybento"); - User.setPlugin(plugin); - - // Island World Manager - IslandWorldManager iwm = mock(IslandWorldManager.class); - when(plugin.getIWM()).thenReturn(iwm); - - // Player has island to begin with - when(im.getIsland(any(), any(UUID.class))).thenReturn(island); - when(plugin.getIslands()).thenReturn(im); - - // Locales - // Return the reference (USE THIS IN THE FUTURE) - when(user.getTranslation(anyString())).thenAnswer((Answer) invocation -> invocation.getArgument(0, String.class)); - - // Server - Server server = mock(Server.class); - when(Bukkit.getServer()).thenReturn(server); - when(Bukkit.getLogger()).thenReturn(Logger.getAnonymousLogger()); - when(Bukkit.getPluginManager()).thenReturn(mock(PluginManager.class)); - - // Addon - addon = new Bank(); - File dataFolder = new File("addons/Bank"); - addon.setDataFolder(dataFolder); - addon.setFile(jFile); - AddonDescription desc = new AddonDescription.Builder("bentobox", "Bank", "1.3").description("test").authors("tastybento").build(); - addon.setDescription(desc); - // Addons manager + // Addons manager - one game mode (BSkyBlock) when(plugin.getAddonsManager()).thenReturn(am); - // One game mode when(am.getGameModeAddons()).thenReturn(Collections.singletonList(gameMode)); - AddonDescription desc2 = new AddonDescription.Builder("bentobox", "BSkyBlock", "1.3").description("test").authors("tasty").build(); + AddonDescription desc2 = new AddonDescription.Builder("bentobox", "BSkyBlock", "1.3").description("test") + .authors("tasty").build(); when(gameMode.getDescription()).thenReturn(desc2); when(gameMode.getOverWorld()).thenReturn(world); - - // Player command - @NonNull - Optional opCmd = Optional.of(cmd); - when(gameMode.getPlayerCommand()).thenReturn(opCmd); - // Admin command - Optional opAdminCmd = Optional.of(adminCmd); - when(gameMode.getAdminCommand()).thenReturn(opAdminCmd); + when(gameMode.getPlayerCommand()).thenReturn(Optional.of(cmd)); + when(gameMode.getAdminCommand()).thenReturn(Optional.of(adminCmd)); // Flags manager when(plugin.getFlagsManager()).thenReturn(fm); when(fm.getFlags()).thenReturn(Collections.emptyList()); - - // Bukkit - when(Bukkit.getScheduler()).thenReturn(scheduler); - ItemMeta meta = mock(ItemMeta.class); - ItemFactory itemFactory = mock(ItemFactory.class); - when(itemFactory.getItemMeta(any())).thenReturn(meta); - when(Bukkit.getItemFactory()).thenReturn(itemFactory); - UnsafeValues unsafe = mock(UnsafeValues.class); - when(unsafe.getDataVersion()).thenReturn(777); - when(Bukkit.getUnsafe()).thenReturn(unsafe); - when(Bukkit.getPluginManager()).thenReturn(pim); - - // placeholders + // Placeholders when(plugin.getPlaceholdersManager()).thenReturn(phm); // World when(world.getName()).thenReturn("bskyblock-world"); - // Island - when(island.getWorld()).thenReturn(world); - when(island.getOwner()).thenReturn(uuid); // Vault when(plugin.getVault()).thenReturn(Optional.of(vh)); - } - /** - * @throws java.lang.Exception - */ - @After - public void tearDown() throws Exception { - deleteAll(new File("database")); + // Build the addon jar containing the real config.yml + jFile = new File("addon.jar"); + String configYml = new String(Files.readAllBytes(Paths.get("src/main/resources/config.yml")), + StandardCharsets.UTF_8); + try (JarOutputStream jos = new JarOutputStream(new FileOutputStream(jFile))) { + addJarEntry(jos, "config.yml", configYml); + } + + addon = new Bank(); + addon.setDataFolder(new File("addons/Bank")); + addon.setFile(jFile); + AddonDescription desc = new AddonDescription.Builder("bentobox", "Bank", "1.3").description("test") + .authors("tastybento").build(); + addon.setDescription(desc); } - @AfterClass - public static void cleanUp() throws Exception { + @Override + @AfterEach + public void tearDown() throws Exception { + if (mockDb != null) { + mockDb.closeOnDemand(); + } + super.tearDown(); new File("addon.jar").delete(); new File("config.yml").delete(); deleteAll(new File("addons")); } - private static void deleteAll(File file) throws IOException { - if (file.exists()) { - Files.walk(file.toPath()) - .sorted(Comparator.reverseOrder()) - .map(Path::toFile) - .forEach(File::delete); - } + private static void addJarEntry(JarOutputStream jos, String name, String content) throws Exception { + JarEntry entry = new JarEntry(name); + jos.putNextEntry(entry); + jos.write(content.getBytes(StandardCharsets.UTF_8)); + jos.closeEntry(); } @Test - public void testOnEnableNoVault() { + void testOnEnableNoVault() { when(plugin.getVault()).thenReturn(Optional.empty()); addon.onEnable(); verify(plugin).logError("[Bank] Vault is required - disabling Bank - please install the Vault plugin"); } @Test - public void testOnEnableNoPlaceholderManager() { + void testOnEnableNoPlaceholderManager() { when(plugin.getPlaceholdersManager()).thenReturn(null); addon.onEnable(); verify(plugin).log("[Bank] Hooking into BSkyBlock"); @@ -268,7 +147,7 @@ public void testOnEnableNoPlaceholderManager() { } @Test - public void testOnEnable() { + void testOnEnable() { addon.onEnable(); verify(plugin).log("[Bank] Hooking into BSkyBlock"); // Placeholders @@ -278,26 +157,21 @@ public void testOnEnable() { verify(phm).registerPlaceholder(eq(addon), eq("bskyblock_top_name_" + i), any()); verify(phm).registerPlaceholder(eq(addon), eq("bskyblock_top_value_" + i), any()); } - } - @Rule - public ExpectedException exceptionRule = ExpectedException.none(); - @Test - public void testGetSettings() { - exceptionRule.expect(NullPointerException.class); - exceptionRule.expectMessage("Settings not initialized?"); - addon.getSettings(); + void testGetSettings() { + NullPointerException ex = assertThrows(NullPointerException.class, () -> addon.getSettings()); + org.junit.jupiter.api.Assertions.assertEquals("Settings not initialized?", ex.getMessage()); } @Test - public void testGetVault() { + void testGetVault() { assertNull(addon.getVault()); } @Test - public void testGetBankManager() { + void testGetBankManager() { assertNull(addon.getBankManager()); } diff --git a/src/test/java/world/bentobox/bank/CommonTestSetup.java b/src/test/java/world/bentobox/bank/CommonTestSetup.java new file mode 100644 index 0000000..1393916 --- /dev/null +++ b/src/test/java/world/bentobox/bank/CommonTestSetup.java @@ -0,0 +1,221 @@ +package world.bentobox.bank; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Comparator; +import java.util.Optional; +import java.util.UUID; +import java.util.logging.Logger; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.Player; +import org.bukkit.entity.Player.Spigot; +import org.bukkit.inventory.ItemFactory; +import org.bukkit.inventory.PlayerInventory; +import org.bukkit.plugin.PluginManager; +import org.bukkit.scheduler.BukkitScheduler; +import org.bukkit.util.Vector; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.mockito.stubbing.Answer; + +import com.google.common.collect.ImmutableSet; + +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.Notifier; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.objects.Players; +import world.bentobox.bentobox.managers.BlueprintsManager; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.HooksManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlaceholdersManager; +import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; + +/** + * Common test setup for Bank tests. Call super.setUp() in subclass @BeforeEach. + */ +public abstract class CommonTestSetup { + + protected UUID uuid = UUID.randomUUID(); + + @Mock + protected Player mockPlayer; + @Mock + protected PluginManager pim; + @Mock + protected ItemFactory itemFactory; + @Mock + protected Location location; + @Mock + protected World world; + @Mock + protected IslandWorldManager iwm; + @Mock + protected IslandsManager im; + @Mock + protected Island island; + @Mock + protected BentoBox plugin; + @Mock + protected PlayerInventory inv; + @Mock + protected Notifier notifier; + @Mock + protected FlagsManager fm; + @Mock + protected Spigot spigot; + @Mock + protected HooksManager hooksManager; + @Mock + protected BlueprintsManager bm; + @Mock + protected BukkitScheduler sch; + @Mock + protected LocalesManager lm; + @Mock + protected PlaceholdersManager phm; + + protected ServerMock server; + protected MockedStatic mockedBukkit; + protected MockedStatic mockedUtil; + protected AutoCloseable closeable; + + @BeforeEach + @SuppressWarnings("java:S1130") + public void setUp() throws Exception { + closeable = MockitoAnnotations.openMocks(this); + server = MockBukkit.mock(); + + // Inject BentoBox singleton + WhiteBox.setInternalState(BentoBox.class, "instance", plugin); + + // Force Tag static fields to initialise under the real server + @SuppressWarnings("unused") + var unusedTagRef = org.bukkit.Tag.LEAVES; + + // Static Bukkit mock + mockedBukkit = Mockito.mockStatic(Bukkit.class, Mockito.RETURNS_DEEP_STUBS); + mockedBukkit.when(Bukkit::getMinecraftVersion).thenReturn("1.21.10"); + mockedBukkit.when(Bukkit::getBukkitVersion).thenReturn(""); + mockedBukkit.when(Bukkit::getPluginManager).thenReturn(pim); + mockedBukkit.when(Bukkit::getItemFactory).thenReturn(itemFactory); + mockedBukkit.when(Bukkit::getServer).thenReturn(server); + mockedBukkit.when(Bukkit::getScheduler).thenReturn(sch); + + // Location + when(location.getWorld()).thenReturn(world); + when(location.getBlockX()).thenReturn(0); + when(location.getBlockY()).thenReturn(0); + when(location.getBlockZ()).thenReturn(0); + when(location.toVector()).thenReturn(new Vector(0, 0, 0)); + when(location.clone()).thenReturn(location); + + // PlayersManager + PlayersManager pm = mock(PlayersManager.class); + when(plugin.getPlayers()).thenReturn(pm); + Players players = mock(Players.class); + when(players.getMetaData()).thenReturn(Optional.empty()); + when(pm.getPlayer(any(UUID.class))).thenReturn(players); + + // Player + when(mockPlayer.getUniqueId()).thenReturn(uuid); + when(mockPlayer.getLocation()).thenReturn(location); + when(mockPlayer.getWorld()).thenReturn(world); + when(mockPlayer.getName()).thenReturn("tastybento"); + when(mockPlayer.getInventory()).thenReturn(inv); + when(mockPlayer.spigot()).thenReturn(spigot); + when(mockPlayer.getType()).thenReturn(EntityType.PLAYER); + + User.setPlugin(plugin); + User.clearUsers(); + User.getInstance(mockPlayer); + + // IWM + when(plugin.getIWM()).thenReturn(iwm); + when(iwm.inWorld(any(Location.class))).thenReturn(true); + when(iwm.inWorld(any(World.class))).thenReturn(true); + when(iwm.getFriendlyName(any())).thenReturn("Bank"); + when(iwm.getAddon(any())).thenReturn(Optional.empty()); + + // WorldSettings + WorldSettings worldSet = new TestWorldSettings(); + when(iwm.getWorldSettings(any())).thenReturn(worldSet); + + // IslandsManager + when(plugin.getIslands()).thenReturn(im); + when(im.getProtectedIslandAt(any())).thenReturn(Optional.of(island)); + when(island.isAllowed(any())).thenReturn(false); + when(island.isAllowed(any(User.class), any())).thenReturn(false); + when(island.getOwner()).thenReturn(uuid); + when(island.getMemberSet()).thenReturn(ImmutableSet.of(uuid)); + + // Locales & Placeholders + when(lm.get(any(), any())).thenAnswer((Answer) invocation -> invocation.getArgument(1, String.class)); + when(plugin.getPlaceholdersManager()).thenReturn(phm); + when(phm.replacePlaceholders(any(), any())).thenAnswer((Answer) invocation -> invocation.getArgument(1, String.class)); + when(plugin.getLocalesManager()).thenReturn(lm); + + // Notifier + when(plugin.getNotifier()).thenReturn(notifier); + + // Logger — Addon.getLogger() delegates to plugin.getLogger() + when(plugin.getLogger()).thenReturn(Logger.getLogger("Bank-test")); + + // BentoBox settings + world.bentobox.bentobox.Settings settings = new world.bentobox.bentobox.Settings(); + when(plugin.getSettings()).thenReturn(settings); + + // Util static mock + mockedUtil = Mockito.mockStatic(Util.class, Mockito.CALLS_REAL_METHODS); + mockedUtil.when(() -> Util.getWorld(any())).thenReturn(mock(World.class)); + Util.setPlugin(plugin); + mockedUtil.when(() -> Util.findFirstMatchingEnum(any(), any())).thenCallRealMethod(); + + // Hooks + when(hooksManager.getHook(anyString())).thenReturn(Optional.empty()); + when(plugin.getHooks()).thenReturn(hooksManager); + + // BlueprintsManager + when(plugin.getBlueprintsManager()).thenReturn(bm); + } + + @AfterEach + public void tearDown() throws Exception { + mockedBukkit.closeOnDemand(); + mockedUtil.closeOnDemand(); + closeable.close(); + MockBukkit.unmock(); + User.clearUsers(); + Mockito.framework().clearInlineMocks(); + deleteAll(new File("database")); + deleteAll(new File("database_backup")); + } + + protected static void deleteAll(File file) throws IOException { + if (file.exists()) { + Files.walk(file.toPath()).sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete); + } + } +} diff --git a/src/test/java/world/bentobox/bank/PhManagerTest.java b/src/test/java/world/bentobox/bank/PhManagerTest.java index e31100c..6819ce8 100644 --- a/src/test/java/world/bentobox/bank/PhManagerTest.java +++ b/src/test/java/world/bentobox/bank/PhManagerTest.java @@ -1,8 +1,8 @@ package world.bentobox.bank; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.anyString; @@ -17,18 +17,16 @@ import java.util.Optional; import java.util.UUID; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; import org.eclipse.jdt.annotation.Nullable; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import world.bentobox.bank.data.AccountHistory; import world.bentobox.bank.data.Money; @@ -37,7 +35,6 @@ import world.bentobox.bentobox.api.addons.AddonDescription; import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.DatabaseSetup; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.hooks.VaultHook; import world.bentobox.bentobox.managers.IslandsManager; @@ -48,9 +45,9 @@ * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Bukkit.class, BentoBox.class, DatabaseSetup.class, IslandsManager.class }) -public class PhManagerTest { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class PhManagerTest { // Class under test private PhManager pm; @@ -78,11 +75,8 @@ public class PhManagerTest { @Mock private PlayersManager plm; - @Before + @BeforeEach public void setUp() { - - PowerMockito.mockStatic(IslandsManager.class, Mockito.RETURNS_MOCKS); - AddonDescription desc = new AddonDescription.Builder("main", "AcidIsland", "1.0.2").build(); when(gm.getDescription()).thenReturn(desc); when(addon.getPlugin()).thenReturn(plugin); @@ -119,16 +113,16 @@ public void setUp() { * Test method for {@link world.bentobox.bank.PhManager#registerPlaceholders(world.bentobox.bentobox.api.addons.GameModeAddon)}. */ @Test - public void testRegisterPlaceholdersNoPHM() { + void testRegisterPlaceholdersNoPHM() { when(plugin.getPlaceholdersManager()).thenReturn(null); assertFalse(pm.registerPlaceholders(gm)); - } + /** * Test method for {@link world.bentobox.bank.PhManager#registerPlaceholders(world.bentobox.bentobox.api.addons.GameModeAddon)}. */ @Test - public void testRegisterPlaceholders() { + void testRegisterPlaceholders() { assertTrue(pm.registerPlaceholders(gm)); verify(phm).registerPlaceholder(eq(addon), eq("acidisland_island_balance"), any()); for (int i = 1; i < 11; i++) { @@ -140,10 +134,10 @@ public void testRegisterPlaceholders() { } /** - * Test method for {@link world.bentobox.bank.PhManager#getVisitedIslandBalance(world.bentobox.bentobox.api.addons.GameModeAddon, world.bentobox.bentobox.api.user.User)}. + * Test method for {@link world.bentobox.bank.PhManager#getVisitedIslandBalance(world.bentobox.bentobox.api.addons.GameModeAddon, world.bentobox.bentobox.api.user.User, boolean, boolean)}. */ @Test - public void testGetVisitedIslandBalanceWrongWorld() { + void testGetVisitedIslandBalanceWrongWorld() { when(gm.inWorld(world)).thenReturn(false); assertEquals("$0.0", pm.getVisitedIslandBalance(gm, user, false, false)); assertEquals("$0.0", pm.getVisitedIslandBalance(gm, user, true, false)); @@ -152,10 +146,10 @@ public void testGetVisitedIslandBalanceWrongWorld() { } /** - * Test method for {@link world.bentobox.bank.PhManager#getVisitedIslandBalance(world.bentobox.bentobox.api.addons.GameModeAddon, world.bentobox.bentobox.api.user.User)}. + * Test method for {@link world.bentobox.bank.PhManager#getVisitedIslandBalance(world.bentobox.bentobox.api.addons.GameModeAddon, world.bentobox.bentobox.api.user.User, boolean, boolean)}. */ @Test - public void testGetVisitedIslandBalanceNoIsland() { + void testGetVisitedIslandBalanceNoIsland() { when(im.getIslandAt(location)).thenReturn(Optional.empty()); assertEquals("$0.0", pm.getVisitedIslandBalance(gm, user, false, false)); assertEquals("$0.0", pm.getVisitedIslandBalance(gm, user, true, false)); @@ -164,10 +158,10 @@ public void testGetVisitedIslandBalanceNoIsland() { } /** - * Test method for {@link world.bentobox.bank.PhManager#getVisitedIslandBalance(world.bentobox.bentobox.api.addons.GameModeAddon, world.bentobox.bentobox.api.user.User)}. + * Test method for {@link world.bentobox.bank.PhManager#getVisitedIslandBalance(world.bentobox.bentobox.api.addons.GameModeAddon, world.bentobox.bentobox.api.user.User, boolean, boolean)}. */ @Test - public void testGetVisitedIslandBalance() { + void testGetVisitedIslandBalance() { assertEquals("$1234.56", pm.getVisitedIslandBalance(gm, user, false, false)); assertEquals("1.2k", pm.getVisitedIslandBalance(gm, user, true, false)); assertEquals("1234.56", pm.getVisitedIslandBalance(gm, user, false, true)); @@ -175,39 +169,38 @@ public void testGetVisitedIslandBalance() { } /** - * Test method for {@link world.bentobox.bank.PhManager#getVisitedIslandBalance(world.bentobox.bentobox.api.addons.GameModeAddon, world.bentobox.bentobox.api.user.User)}. + * Test method for {@link world.bentobox.bank.PhManager#getVisitedIslandBalance(world.bentobox.bentobox.api.addons.GameModeAddon, world.bentobox.bentobox.api.user.User, boolean, boolean)}. */ @Test - public void testGetVisitedIslandBalanceLargest() { + void testGetVisitedIslandBalanceLargest() { when(bm.getBalance(island)).thenReturn(new Money(Double.MAX_VALUE)); assertEquals("9223372T", pm.getVisitedIslandBalance(gm, user, true, false)); assertEquals("1.7976931348623157E308", pm.getVisitedIslandBalance(gm, user, true, true)); } /** - * Test method for {@link world.bentobox.bank.PhManager#getVisitedIslandBalance(world.bentobox.bentobox.api.addons.GameModeAddon, world.bentobox.bentobox.api.user.User)}. + * Test method for {@link world.bentobox.bank.PhManager#getVisitedIslandBalance(world.bentobox.bentobox.api.addons.GameModeAddon, world.bentobox.bentobox.api.user.User, boolean, boolean)}. */ @Test - public void testGetVisitedIslandBalanceBig() { + void testGetVisitedIslandBalanceBig() { when(bm.getBalance(island)).thenReturn(new Money(123456789D)); assertEquals("123.5M", pm.getVisitedIslandBalance(gm, user, true, false)); assertEquals("1.23456789E8", pm.getVisitedIslandBalance(gm, user, true, true)); } - /** * Test method for {@link world.bentobox.bank.PhManager#getRankName(org.bukkit.World, int)}. */ @Test - public void testGetRankNameSub0() { - assertEquals("",pm.getRankName(world, -1)); + void testGetRankNameSub0() { + assertEquals("", pm.getRankName(world, -1)); } /** * Test method for {@link world.bentobox.bank.PhManager#getRankName(org.bukkit.World, int)}. */ @Test - public void testGetRankNameOverMax() { + void testGetRankNameOverMax() { assertEquals("", pm.getRankName(world, 100)); } @@ -215,7 +208,7 @@ public void testGetRankNameOverMax() { * Test method for {@link world.bentobox.bank.PhManager#getRankName(org.bukkit.World, int)}. */ @Test - public void testGetRankNameNone() { + void testGetRankNameNone() { for (int i = 1; i < 11; i++) { assertEquals("", pm.getRankName(world, i)); } @@ -225,7 +218,7 @@ public void testGetRankNameNone() { * Test method for {@link world.bentobox.bank.PhManager#getRankName(org.bukkit.World, int)}. */ @Test - public void testGetRankName() { + void testGetRankName() { assertEquals("", pm.getRankName(world, 5)); } @@ -233,7 +226,7 @@ public void testGetRankName() { * Test method for {@link world.bentobox.bank.PhManager#getRankIsland(org.bukkit.World, int)}. */ @Test - public void testGetRankIsland() { + void testGetRankIsland() { assertEquals("", pm.getRankIsland(world, 5)); } @@ -241,24 +234,24 @@ public void testGetRankIsland() { * Test method for {@link world.bentobox.bank.PhManager#getRankBalance(org.bukkit.World, int)}. */ @Test - public void testGetRankBalance() { + void testGetRankBalance() { assertEquals("", pm.getRankBalance(world, 5)); } /** - * Test method for {@link world.bentobox.bank.PhManager#checkCache(World, int)}. + * Test method for {@link world.bentobox.bank.PhManager#checkCache(org.bukkit.World, int)}. */ @Test - public void testCheckCache() { + void testCheckCache() { assertEquals(5, pm.checkCache(world, 5)); verify(bm).getBalances(world); } /** - * Test method for {@link world.bentobox.bank.PhManager#checkCache(World, int)}. + * Test method for {@link world.bentobox.bank.PhManager#checkCache(org.bukkit.World, int)}. */ @Test - public void testCheckCacheWithBalances() { + void testCheckCacheWithBalances() { map.put(UUID.randomUUID().toString(), new Money(123.45)); map.put(UUID.randomUUID().toString(), new Money(1230.45)); map.put(UUID.randomUUID().toString(), new Money(12300.45)); @@ -275,26 +268,26 @@ public void testCheckCacheWithBalances() { when(bm.getBalances(world)).thenReturn(map); for (int i = 1; i < 11; i++) { pm.checkCache(world, i); - assertEquals(pm.getBalances().get(i-1), "$" + map.get(pm.getNames().get(i - 1)).getValue()); - assertEquals(pm.getBalances().get(i-1), "$" + map.get(pm.getIslands().get(i - 1)).getValue()); + assertEquals(pm.getBalances().get(i - 1), "$" + map.get(pm.getNames().get(i - 1)).getValue()); + assertEquals(pm.getBalances().get(i - 1), "$" + map.get(pm.getIslands().get(i - 1)).getValue()); } } /** - * Test method for {@link world.bentobox.bank.PhManager#checkCache(World, int)}. + * Test method for {@link world.bentobox.bank.PhManager#checkCache(org.bukkit.World, int)}. */ @Test - public void testCheckCacheNoNamesChange() { + void testCheckCacheNoNamesChange() { pm.setLastSorted(System.currentTimeMillis() + 10000); assertEquals(5, pm.checkCache(world, 5)); verify(bm).getBalances(world); } /** - * Test method for {@link world.bentobox.bank.PhManager#checkCache(World, int)}. + * Test method for {@link world.bentobox.bank.PhManager#checkCache(org.bukkit.World, int)}. */ @Test - public void testCheckCacheNoChange() { + void testCheckCacheNoChange() { // Cache should not refresh because there is a name and the time is in the future pm.setNames(Collections.singletonList("tastybento")); pm.setLastSorted(System.currentTimeMillis() + 10000); @@ -304,10 +297,10 @@ public void testCheckCacheNoChange() { } /** - * Test method for {@link world.bentobox.bank.PhManager#registerPlaceholders(world.bentobox.bentobox.api.addons.GameModeAddon)}. + * Test method for {@link world.bentobox.bank.PhManager#checkCache(org.bukkit.World, int)}. */ @Test - public void testCheckCacheOutOfBounds() { + void testCheckCacheOutOfBounds() { assertEquals(1, pm.checkCache(world, 0)); assertEquals(10, pm.checkCache(world, 100)); } @@ -316,7 +309,7 @@ public void testCheckCacheOutOfBounds() { * Test method for {@link world.bentobox.bank.PhManager#getLatestTransaction(world.bentobox.bentobox.api.user.User, org.bukkit.World)}. */ @Test - public void testGetLatestTransactionDeposit() { + void testGetLatestTransactionDeposit() { AccountHistory ah = new AccountHistory(System.currentTimeMillis(), "tastybento", 500.0, TxType.DEPOSIT); when(bm.getLatestHistory(eq(island))).thenReturn(ah); assertEquals("tastybento Deposited $500.0", pm.getLatestTransaction(user, world)); @@ -326,7 +319,7 @@ public void testGetLatestTransactionDeposit() { * Test method for {@link world.bentobox.bank.PhManager#getLatestTransaction(world.bentobox.bentobox.api.user.User, org.bukkit.World)}. */ @Test - public void testGetLatestTransactionWithdraw() { + void testGetLatestTransactionWithdraw() { AccountHistory ah = new AccountHistory(System.currentTimeMillis(), "tastybento", 200.0, TxType.WITHDRAW); when(bm.getLatestHistory(eq(island))).thenReturn(ah); assertEquals("tastybento Withdrew $200.0", pm.getLatestTransaction(user, world)); @@ -336,7 +329,7 @@ public void testGetLatestTransactionWithdraw() { * Test method for {@link world.bentobox.bank.PhManager#getLatestTransaction(world.bentobox.bentobox.api.user.User, org.bukkit.World)}. */ @Test - public void testGetLatestTransactionNoHistory() { + void testGetLatestTransactionNoHistory() { when(bm.getLatestHistory(eq(island))).thenReturn(null); assertEquals("", pm.getLatestTransaction(user, world)); } @@ -345,7 +338,7 @@ public void testGetLatestTransactionNoHistory() { * Test method for {@link world.bentobox.bank.PhManager#getLatestTransaction(world.bentobox.bentobox.api.user.User, org.bukkit.World)}. */ @Test - public void testGetLatestTransactionNoIsland() { + void testGetLatestTransactionNoIsland() { when(im.getIsland(any(World.class), any(User.class))).thenReturn(null); assertEquals("", pm.getLatestTransaction(user, world)); } @@ -354,7 +347,7 @@ public void testGetLatestTransactionNoIsland() { * Test method for {@link world.bentobox.bank.PhManager#getLatestTransaction(world.bentobox.bentobox.api.user.User, org.bukkit.World)}. */ @Test - public void testGetLatestTransactionNullUser() { + void testGetLatestTransactionNullUser() { assertEquals("", pm.getLatestTransaction(null, world)); } @@ -362,7 +355,7 @@ public void testGetLatestTransactionNullUser() { * Test method for {@link world.bentobox.bank.PhManager#getLatestTransaction(world.bentobox.bentobox.api.user.User, org.bukkit.World)}. */ @Test - public void testGetLatestTransactionNotPlayer() { + void testGetLatestTransactionNotPlayer() { when(user.isPlayer()).thenReturn(false); assertEquals("", pm.getLatestTransaction(user, world)); } @@ -372,7 +365,7 @@ public void testGetLatestTransactionNotPlayer() { * Verifies that the latest_transaction placeholder is registered. */ @Test - public void testRegisterPlaceholdersLatestTransaction() { + void testRegisterPlaceholdersLatestTransaction() { assertTrue(pm.registerPlaceholders(gm)); verify(phm).registerPlaceholder(eq(addon), eq("acidisland_latest_transaction"), any()); } diff --git a/src/test/java/world/bentobox/bank/TestWorldSettings.java b/src/test/java/world/bentobox/bank/TestWorldSettings.java new file mode 100644 index 0000000..0ce8699 --- /dev/null +++ b/src/test/java/world/bentobox/bank/TestWorldSettings.java @@ -0,0 +1,345 @@ +package world.bentobox.bank; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.bukkit.Difficulty; +import org.bukkit.GameMode; +import org.bukkit.entity.EntityType; +import org.eclipse.jdt.annotation.NonNull; + +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.flags.Flag; + +/** + * Minimal WorldSettings implementation for use in tests. + */ +public class TestWorldSettings implements WorldSettings { + + private long epoch; + + @Override + public GameMode getDefaultGameMode() { + return GameMode.SURVIVAL; + } + + @SuppressWarnings("removal") + @Override + public Map getDefaultIslandFlags() { + return Collections.emptyMap(); + } + + @SuppressWarnings("removal") + @Override + public Map getDefaultIslandSettings() { + return Collections.emptyMap(); + } + + @Override + public Difficulty getDifficulty() { + return Difficulty.NORMAL; + } + + @Override + public void setDifficulty(Difficulty difficulty) { + // unused + } + + @Override + public String getFriendlyName() { + return "Bank"; + } + + @Override + public int getIslandDistance() { + return 0; + } + + @Override + public int getIslandHeight() { + return 0; + } + + @Override + public int getIslandProtectionRange() { + return 0; + } + + @Override + public int getIslandStartX() { + return 0; + } + + @Override + public int getIslandStartZ() { + return 0; + } + + @Override + public int getIslandXOffset() { + return 0; + } + + @Override + public int getIslandZOffset() { + return 0; + } + + @Override + public List getIvSettings() { + return Collections.emptyList(); + } + + @Override + public int getMaxHomes() { + return 3; + } + + @Override + public int getMaxIslands() { + return 0; + } + + @Override + public int getMaxTeamSize() { + return 4; + } + + @Override + public int getNetherSpawnRadius() { + return 10; + } + + @Override + public String getPermissionPrefix() { + return "bank."; + } + + @Override + public Set getRemoveMobsWhitelist() { + return Collections.emptySet(); + } + + @Override + public int getSeaHeight() { + return 0; + } + + @Override + public List getHiddenFlags() { + return Collections.emptyList(); + } + + @Override + public List getVisitorBannedCommands() { + return Collections.emptyList(); + } + + @Override + public Map getWorldFlags() { + return new HashMap<>(); + } + + @Override + public String getWorldName() { + return "bank-world"; + } + + @Override + public boolean isDragonSpawn() { + return false; + } + + @Override + public boolean isEndGenerate() { + return true; + } + + @Override + public boolean isEndIslands() { + return true; + } + + @Override + public boolean isNetherGenerate() { + return true; + } + + @Override + public boolean isNetherIslands() { + return true; + } + + @Override + public boolean isOnJoinResetEnderChest() { + return false; + } + + @Override + public boolean isOnJoinResetInventory() { + return false; + } + + @Override + public boolean isOnJoinResetMoney() { + return false; + } + + @Override + public boolean isOnJoinResetHealth() { + return false; + } + + @Override + public boolean isOnJoinResetHunger() { + return false; + } + + @Override + public boolean isOnJoinResetXP() { + return false; + } + + @Override + public @NonNull List getOnJoinCommands() { + return Collections.emptyList(); + } + + @Override + public boolean isOnLeaveResetEnderChest() { + return false; + } + + @Override + public boolean isOnLeaveResetInventory() { + return false; + } + + @Override + public boolean isOnLeaveResetMoney() { + return false; + } + + @Override + public boolean isOnLeaveResetHealth() { + return false; + } + + @Override + public boolean isOnLeaveResetHunger() { + return false; + } + + @Override + public boolean isOnLeaveResetXP() { + return false; + } + + @Override + public @NonNull List getOnLeaveCommands() { + return Collections.emptyList(); + } + + @Override + public boolean isUseOwnGenerator() { + return false; + } + + @Override + public boolean isWaterUnsafe() { + return false; + } + + @Override + public List getGeoLimitSettings() { + return Collections.emptyList(); + } + + @Override + public int getResetLimit() { + return 0; + } + + @Override + public long getResetEpoch() { + return epoch; + } + + @Override + public void setResetEpoch(long timestamp) { + this.epoch = timestamp; + } + + @Override + public boolean isTeamJoinDeathReset() { + return false; + } + + @Override + public int getDeathsMax() { + return 0; + } + + @Override + public boolean isDeathsCounted() { + return true; + } + + @Override + public boolean isDeathsResetOnNewIsland() { + return true; + } + + @Override + public boolean isAllowSetHomeInNether() { + return false; + } + + @Override + public boolean isAllowSetHomeInTheEnd() { + return false; + } + + @Override + public boolean isRequireConfirmationToSetHomeInNether() { + return false; + } + + @Override + public boolean isRequireConfirmationToSetHomeInTheEnd() { + return false; + } + + @Override + public int getBanLimit() { + return 10; + } + + @Override + public boolean isLeaversLoseReset() { + return true; + } + + @Override + public boolean isKickedKeepInventory() { + return true; + } + + @Override + public boolean isCreateIslandOnFirstLoginEnabled() { + return false; + } + + @Override + public int getCreateIslandOnFirstLoginDelay() { + return 0; + } + + @Override + public boolean isCreateIslandOnFirstLoginAbortOnLogout() { + return false; + } +} diff --git a/src/test/java/world/bentobox/bank/WhiteBox.java b/src/test/java/world/bentobox/bank/WhiteBox.java new file mode 100644 index 0000000..84e614c --- /dev/null +++ b/src/test/java/world/bentobox/bank/WhiteBox.java @@ -0,0 +1,13 @@ +package world.bentobox.bank; + +public class WhiteBox { + public static void setInternalState(Class targetClass, String fieldName, Object value) { + try { + java.lang.reflect.Field field = targetClass.getDeclaredField(fieldName); + field.setAccessible(true); + field.set(null, value); + } catch (NoSuchFieldException | IllegalAccessException e) { + throw new RuntimeException("Failed to set static field '" + fieldName + "' on class " + targetClass.getName(), e); + } + } +} diff --git a/src/test/java/world/bentobox/bank/commands/admin/AdminBalanceCommandTest.java b/src/test/java/world/bentobox/bank/commands/admin/AdminBalanceCommandTest.java index 7411ed4..85264b8 100644 --- a/src/test/java/world/bentobox/bank/commands/admin/AdminBalanceCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/admin/AdminBalanceCommandTest.java @@ -1,44 +1,31 @@ package world.bentobox.bank.commands.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Collections; -import org.bukkit.Bukkit; -import org.bukkit.World; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse.ResponseType; import world.bentobox.bank.Bank; import world.bentobox.bank.BankManager; +import world.bentobox.bank.CommonTestSetup; import world.bentobox.bank.data.Money; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.hooks.VaultHook; -import world.bentobox.bentobox.managers.IslandWorldManager; -import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.PlayersManager; import world.bentobox.bentobox.util.Util; @@ -46,51 +33,36 @@ * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({ BentoBox.class, Util.class, Bukkit.class }) -public class AdminBalanceCommandTest { +class AdminBalanceCommandTest extends CommonTestSetup { @Mock private CompositeCommand ic; @Mock private User user; @Mock - private World world; - @Mock - private BentoBox plugin; - @Mock - private IslandsManager im; - @Mock - private @Nullable Island island; - @Mock private Bank addon; @Mock private BankManager bankManager; @Mock private VaultHook vh; - // Class under test - private AdminBalanceCommand bc; @Mock private PlayersManager pm; + // Class under test + private AdminBalanceCommand bc; - @Before - public void setUp() { - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); - // Set up plugin - BentoBox pluginMock = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); when(ic.getWorld()).thenReturn(world); + when(ic.getAddon()).thenReturn(addon); when(user.getWorld()).thenReturn(world); // IWM friendly name - IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(pluginMock.getIWM()).thenReturn(iwm); - when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(pluginMock.getIslands()).thenReturn(im); when(im.getIsland(world, user)).thenReturn(island); // Players @@ -100,39 +72,36 @@ public void setUp() { // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); - when(ic.getAddon()).thenReturn(addon); when(addon.getBankManager()).thenReturn(bankManager); when(addon.getVault()).thenReturn(vh); when(vh.format(anyDouble())).thenAnswer(i -> String.valueOf(i.getArgument(0, Double.class))); EconomyResponse er = new EconomyResponse(0, 0, ResponseType.SUCCESS, ""); when(vh.withdraw(eq(user), anyDouble(), eq(world))).thenReturn(er); - PowerMockito.mockStatic(Util.class); - when(Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, World.class)); + // Util.getWorld returns the world passed in + mockedUtil.when(() -> Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, org.bukkit.World.class)); // Default 0 balance for unknown islands when(bankManager.getBalance(any())).thenReturn(new Money()); bc = new AdminBalanceCommand(ic); } - /** * Test method for {@link world.bentobox.bank.commands.admin.AdminBalanceCommand#setup()}. */ @Test - public void testSetup() { + void testSetup() { assertFalse(bc.isOnlyPlayer()); assertEquals("bank.admin.balance", bc.getPermission()); assertEquals("bank.admin.balance.parameters", bc.getParameters()); assertEquals("bank.admin.balance.description", bc.getDescription()); - } /** * Test method for {@link world.bentobox.bank.commands.admin.AdminBalanceCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteArgsNoArgs() { + void testCanExecuteArgsNoArgs() { assertFalse(bc.canExecute(user, "balance", Collections.emptyList())); verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } @@ -141,7 +110,7 @@ public void testCanExecuteArgsNoArgs() { * Test method for {@link world.bentobox.bank.commands.admin.AdminBalanceCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoIsland() { + void testCanExecuteNoIsland() { when(im.getIsland(world, user)).thenReturn(null); assertFalse(bc.canExecute(user, "balance", Collections.singletonList("tastybento"))); verify(user).sendMessage("general.errors.no-island"); @@ -151,7 +120,7 @@ public void testCanExecuteNoIsland() { * Test method for {@link world.bentobox.bank.commands.admin.AdminBalanceCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteUnknownTarget() { + void testCanExecuteUnknownTarget() { when(pm.getUser(anyString())).thenReturn(null); assertFalse(bc.canExecute(user, "balance", Collections.singletonList("bonne"))); verify(user).sendMessage("general.errors.unknown-player", TextVariables.NAME, "bonne"); @@ -161,7 +130,7 @@ public void testCanExecuteUnknownTarget() { * Test method for {@link world.bentobox.bank.commands.admin.AdminBalanceCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoRank() { + void testCanExecuteNoRank() { // Should be ignored because this is an admin command when(island.isAllowed(eq(user), any())).thenReturn(false); assertTrue(bc.canExecute(user, "balance", Collections.singletonList("tastybento"))); @@ -171,7 +140,7 @@ public void testCanExecuteNoRank() { * Test method for {@link world.bentobox.bank.commands.admin.AdminBalanceCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteSuccess() { + void testCanExecuteSuccess() { assertTrue(bc.canExecute(user, "balance", Collections.singletonList("tastybento"))); } @@ -179,10 +148,9 @@ public void testCanExecuteSuccess() { * Test method for {@link world.bentobox.bank.commands.admin.AdminBalanceCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfString() { + void testExecuteUserStringListOfString() { assertTrue(bc.execute(user, "balance", Collections.singletonList("tastybento"))); verify(user).sendMessage("bank.balance.island-balance", TextVariables.NUMBER, "0.0"); } - } diff --git a/src/test/java/world/bentobox/bank/commands/admin/AdminGiveCommandTest.java b/src/test/java/world/bentobox/bank/commands/admin/AdminGiveCommandTest.java index 7d0a7ae..f351bfe 100644 --- a/src/test/java/world/bentobox/bank/commands/admin/AdminGiveCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/admin/AdminGiveCommandTest.java @@ -1,13 +1,12 @@ package world.bentobox.bank.commands.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -15,92 +14,69 @@ import java.util.Collections; import java.util.concurrent.CompletableFuture; -import org.bukkit.World; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse.ResponseType; import world.bentobox.bank.Bank; import world.bentobox.bank.BankManager; import world.bentobox.bank.BankResponse; +import world.bentobox.bank.CommonTestSetup; import world.bentobox.bank.data.Money; import world.bentobox.bank.data.TxType; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.hooks.VaultHook; -import world.bentobox.bentobox.managers.IslandWorldManager; -import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest(BentoBox.class) -public class AdminGiveCommandTest { +class AdminGiveCommandTest extends CommonTestSetup { @Mock private CompositeCommand ic; @Mock private User user; @Mock - private World world; - @Mock - private BentoBox plugin; - @Mock - private IslandsManager im; - @Mock - private @Nullable Island island; - @Mock private Bank addon; @Mock private BankManager bankManager; @Mock private VaultHook vh; - // Class under test - private AdminGiveCommand bc; @Mock private PlayersManager pm; + // Class under test + private AdminGiveCommand bc; - @Before - public void setUp() { - // Set up plugin - BentoBox pluginMock = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); when(ic.getWorld()).thenReturn(world); + when(ic.getAddon()).thenReturn(addon); when(user.getWorld()).thenReturn(world); + when(user.getName()).thenReturn("tastybento"); // IWM friendly name - IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(pluginMock.getIWM()).thenReturn(iwm); - when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(pluginMock.getIslands()).thenReturn(im); when(im.getIsland(world, user)).thenReturn(island); // Players when(addon.getPlayers()).thenReturn(pm); when(pm.getUser("tastybento")).thenReturn(user); - when(user.getName()).thenReturn("tastybento"); // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); - when(ic.getAddon()).thenReturn(addon); when(addon.getBankManager()).thenReturn(bankManager); when(addon.getVault()).thenReturn(vh); when(vh.format(anyDouble())).thenAnswer(i -> String.valueOf(i.getArgument(0, Double.class))); @@ -111,6 +87,9 @@ public void setUp() { // Default 0 balance for unknown islands when(bankManager.getBalance(any())).thenReturn(new Money()); + // Util.getWorld returns the world passed in + mockedUtil.when(() -> Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, org.bukkit.World.class)); + bc = new AdminGiveCommand(ic); } @@ -118,19 +97,18 @@ public void setUp() { * Test method for {@link world.bentobox.bank.commands.admin.AdminGiveCommand#setup()}. */ @Test - public void testSetup() { + void testSetup() { assertFalse(bc.isOnlyPlayer()); assertEquals("bank.admin.give", bc.getPermission()); assertEquals("bank.admin.give.parameters", bc.getParameters()); assertEquals("bank.admin.give.description", bc.getDescription()); - } /** * Test method for {@link world.bentobox.bank.commands.admin.AdminGiveCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteArgsNoArgs() { + void testCanExecuteArgsNoArgs() { assertFalse(bc.canExecute(user, "give", Collections.emptyList())); verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } @@ -139,7 +117,7 @@ public void testCanExecuteArgsNoArgs() { * Test method for {@link world.bentobox.bank.commands.admin.AdminGiveCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteArgsOneArg() { + void testCanExecuteArgsOneArg() { assertFalse(bc.canExecute(user, "give", Collections.singletonList("tastybento"))); verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } @@ -148,7 +126,7 @@ public void testCanExecuteArgsOneArg() { * Test method for {@link world.bentobox.bank.commands.admin.AdminGiveCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoIsland() { + void testCanExecuteNoIsland() { when(im.getIsland(world, user)).thenReturn(null); assertFalse(bc.canExecute(user, "give", Arrays.asList("tastybento", "100"))); verify(user).sendMessage("general.errors.no-island"); @@ -158,7 +136,7 @@ public void testCanExecuteNoIsland() { * Test method for {@link world.bentobox.bank.commands.admin.AdminGiveCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteUnknownTarget() { + void testCanExecuteUnknownTarget() { when(pm.getUser(anyString())).thenReturn(null); assertFalse(bc.canExecute(user, "give", Arrays.asList("bonne", "100"))); verify(user).sendMessage("general.errors.unknown-player", TextVariables.NAME, "bonne"); @@ -168,7 +146,7 @@ public void testCanExecuteUnknownTarget() { * Test method for {@link world.bentobox.bank.commands.admin.AdminGiveCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNotANumber() { + void testCanExecuteNotANumber() { assertFalse(bc.canExecute(user, "give", Arrays.asList("tastybento", "xxx"))); verify(user).sendMessage("bank.errors.must-be-a-number"); } @@ -177,7 +155,7 @@ public void testCanExecuteNotANumber() { * Test method for {@link world.bentobox.bank.commands.admin.AdminGiveCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNegativeNumber() { + void testCanExecuteNegativeNumber() { assertFalse(bc.canExecute(user, "give", Arrays.asList("tastybento", "-99"))); verify(user).sendMessage("bank.errors.value-must-be-positive"); } @@ -186,7 +164,7 @@ public void testCanExecuteNegativeNumber() { * Test method for {@link world.bentobox.bank.commands.admin.AdminGiveCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoRank() { + void testCanExecuteNoRank() { // Should be ignored because this is an admin command when(island.isAllowed(eq(user), any())).thenReturn(false); assertTrue(bc.canExecute(user, "give", Arrays.asList("tastybento", "100"))); @@ -196,7 +174,7 @@ public void testCanExecuteNoRank() { * Test method for {@link world.bentobox.bank.commands.admin.AdminGiveCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteSuccess() { + void testCanExecuteSuccess() { assertTrue(bc.canExecute(user, "give", Arrays.asList("tastybento", "100"))); } @@ -204,7 +182,7 @@ public void testCanExecuteSuccess() { * Test method for {@link world.bentobox.bank.commands.admin.AdminGiveCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfString() { + void testExecuteUserStringListOfString() { assertTrue(bc.canExecute(user, "give", Arrays.asList("tastybento", "100"))); assertTrue(bc.execute(user, "give", Arrays.asList("tastybento", "100"))); verify(user).sendMessage("bank.admin.give.success", @@ -216,7 +194,7 @@ public void testExecuteUserStringListOfString() { * Test method for {@link world.bentobox.bank.commands.admin.AdminGiveCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfStringError() { + void testExecuteUserStringListOfStringError() { when(bankManager.deposit(eq(user), any(), any(Money.class), eq(TxType.GIVE))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOAD_ERROR)); assertTrue(bc.execute(user, "give", Arrays.asList("tastybento", "100"))); verify(user).sendMessage("bank.errors.bank-error"); diff --git a/src/test/java/world/bentobox/bank/commands/admin/AdminSetCommandTest.java b/src/test/java/world/bentobox/bank/commands/admin/AdminSetCommandTest.java index 120b5ca..771f4cc 100644 --- a/src/test/java/world/bentobox/bank/commands/admin/AdminSetCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/admin/AdminSetCommandTest.java @@ -1,13 +1,12 @@ package world.bentobox.bank.commands.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -16,82 +15,60 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; -import org.bukkit.World; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse.ResponseType; import world.bentobox.bank.Bank; import world.bentobox.bank.BankManager; import world.bentobox.bank.BankResponse; +import world.bentobox.bank.CommonTestSetup; import world.bentobox.bank.data.Money; import world.bentobox.bank.data.TxType; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.hooks.VaultHook; -import world.bentobox.bentobox.managers.IslandWorldManager; -import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest(BentoBox.class) -public class AdminSetCommandTest { +class AdminSetCommandTest extends CommonTestSetup { @Mock private CompositeCommand ic; @Mock private User user; @Mock - private World world; - @Mock - private BentoBox plugin; - @Mock - private IslandsManager im; - @Mock - private @Nullable Island island; - @Mock private Bank addon; @Mock private BankManager bankManager; @Mock private VaultHook vh; - // Class under test - private AdminSetCommand bc; @Mock private PlayersManager pm; + // Class under test + private AdminSetCommand bc; - @Before - public void setUp() { - // Set up plugin - BentoBox pluginMock = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); when(ic.getWorld()).thenReturn(world); + when(ic.getAddon()).thenReturn(addon); when(user.getWorld()).thenReturn(world); when(user.getName()).thenReturn("tastybento"); // IWM friendly name - IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(pluginMock.getIWM()).thenReturn(iwm); - when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(pluginMock.getIslands()).thenReturn(im); when(im.getIsland(world, user)).thenReturn(island); // Players @@ -101,7 +78,6 @@ public void setUp() { // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); - when(ic.getAddon()).thenReturn(addon); when(addon.getBankManager()).thenReturn(bankManager); when(addon.getVault()).thenReturn(vh); when(vh.format(anyDouble())).thenAnswer(i -> String.valueOf(i.getArgument(0, Double.class))); @@ -113,6 +89,9 @@ public void setUp() { // Island when(island.getUniqueId()).thenReturn(UUID.randomUUID().toString()); + // Util.getWorld returns the world passed in + mockedUtil.when(() -> Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, org.bukkit.World.class)); + bc = new AdminSetCommand(ic); } @@ -120,19 +99,18 @@ public void setUp() { * Test method for {@link world.bentobox.bank.commands.admin.AdminSetCommand#setup()}. */ @Test - public void testSetup() { + void testSetup() { assertFalse(bc.isOnlyPlayer()); assertEquals("bank.admin.set", bc.getPermission()); assertEquals("bank.admin.set.parameters", bc.getParameters()); assertEquals("bank.admin.set.description", bc.getDescription()); - } /** * Test method for {@link world.bentobox.bank.commands.admin.AdminSetCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteArgsNoArgs() { + void testCanExecuteArgsNoArgs() { assertFalse(bc.canExecute(user, "set", Collections.emptyList())); verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } @@ -141,7 +119,7 @@ public void testCanExecuteArgsNoArgs() { * Test method for {@link world.bentobox.bank.commands.admin.AdminSetCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteArgsOneArg() { + void testCanExecuteArgsOneArg() { assertFalse(bc.canExecute(user, "set", Collections.singletonList("tastybento"))); verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } @@ -150,7 +128,7 @@ public void testCanExecuteArgsOneArg() { * Test method for {@link world.bentobox.bank.commands.admin.AdminSetCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoIsland() { + void testCanExecuteNoIsland() { when(im.getIsland(world, user)).thenReturn(null); assertFalse(bc.canExecute(user, "set", Arrays.asList("tastybento", "100"))); verify(user).sendMessage("general.errors.no-island"); @@ -160,7 +138,7 @@ public void testCanExecuteNoIsland() { * Test method for {@link world.bentobox.bank.commands.admin.AdminSetCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteUnknownTarget() { + void testCanExecuteUnknownTarget() { when(pm.getUser(anyString())).thenReturn(null); assertFalse(bc.canExecute(user, "set", Arrays.asList("bonne", "100"))); verify(user).sendMessage("general.errors.unknown-player", TextVariables.NAME, "bonne"); @@ -170,7 +148,7 @@ public void testCanExecuteUnknownTarget() { * Test method for {@link world.bentobox.bank.commands.admin.AdminSetCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNotANumber() { + void testCanExecuteNotANumber() { assertFalse(bc.canExecute(user, "set", Arrays.asList("tastybento", "xxx"))); verify(user).sendMessage("bank.errors.must-be-a-number"); } @@ -179,7 +157,7 @@ public void testCanExecuteNotANumber() { * Test method for {@link world.bentobox.bank.commands.admin.AdminSetCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNegativeNumber() { + void testCanExecuteNegativeNumber() { assertFalse(bc.canExecute(user, "set", Arrays.asList("tastybento", "-99"))); verify(user).sendMessage("bank.errors.value-must-be-positive"); } @@ -188,7 +166,7 @@ public void testCanExecuteNegativeNumber() { * Test method for {@link world.bentobox.bank.commands.admin.AdminSetCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoRank() { + void testCanExecuteNoRank() { // Should be ignored because this is an admin command when(island.isAllowed(eq(user), any())).thenReturn(false); assertTrue(bc.canExecute(user, "set", Arrays.asList("tastybento", "100"))); @@ -198,7 +176,7 @@ public void testCanExecuteNoRank() { * Test method for {@link world.bentobox.bank.commands.admin.AdminSetCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteSuccess() { + void testCanExecuteSuccess() { assertTrue(bc.canExecute(user, "set", Arrays.asList("tastybento", "100"))); } @@ -206,7 +184,7 @@ public void testCanExecuteSuccess() { * Test method for {@link world.bentobox.bank.commands.admin.AdminSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfString() { + void testExecuteUserStringListOfString() { testCanExecuteSuccess(); assertTrue(bc.execute(user, "set", Arrays.asList("tastybento", "100"))); verify(user).sendMessage("bank.admin.set.success", TextVariables.NAME, "tastybento", TextVariables.NUMBER, "100.0"); @@ -216,7 +194,7 @@ public void testExecuteUserStringListOfString() { * Test method for {@link world.bentobox.bank.commands.admin.AdminSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfStringError() { + void testExecuteUserStringListOfStringError() { testCanExecuteSuccess(); when(bankManager.set(eq(user), any(), any(), any(), eq(TxType.SET))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOAD_ERROR)); assertTrue(bc.execute(user, "set", Arrays.asList("tastybento", "100"))); diff --git a/src/test/java/world/bentobox/bank/commands/admin/AdminStatementCommandTest.java b/src/test/java/world/bentobox/bank/commands/admin/AdminStatementCommandTest.java index 5822c17..17b9727 100644 --- a/src/test/java/world/bentobox/bank/commands/admin/AdminStatementCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/admin/AdminStatementCommandTest.java @@ -1,46 +1,32 @@ package world.bentobox.bank.commands.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Collections; -import org.bukkit.Bukkit; -import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse.ResponseType; import world.bentobox.bank.Bank; import world.bentobox.bank.BankManager; -import world.bentobox.bentobox.BentoBox; -import world.bentobox.bentobox.Settings; +import world.bentobox.bank.CommonTestSetup; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.hooks.VaultHook; -import world.bentobox.bentobox.managers.IslandWorldManager; -import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.PlayersManager; import world.bentobox.bentobox.util.Util; @@ -48,54 +34,39 @@ * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({Bukkit.class, BentoBox.class, Util.class}) -public class AdminStatementCommandTest { +class AdminStatementCommandTest extends CommonTestSetup { @Mock private CompositeCommand ic; @Mock private User user; @Mock - private World world; - @Mock - private BentoBox plugin; - @Mock - private IslandsManager im; - @Mock - private @Nullable Island island; - @Mock private Bank addon; @Mock private BankManager bankManager; @Mock private VaultHook vh; - // Class under test - private AdminStatementCommand bc; @Mock private PlayersManager pm; @Mock private Player player; - /** - */ - @Before - public void setUp() { - // Set up plugin - BentoBox pluginMock = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); + // Class under test + private AdminStatementCommand bc; + + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); when(ic.getWorld()).thenReturn(world); + when(ic.getAddon()).thenReturn(addon); when(user.getWorld()).thenReturn(world); when(user.getPlayer()).thenReturn(player); // IWM friendly name - IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(pluginMock.getIWM()).thenReturn(iwm); - when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(pluginMock.getIslands()).thenReturn(im); when(im.getIsland(world, user)).thenReturn(island); // Players @@ -105,42 +76,34 @@ public void setUp() { // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); - when(ic.getAddon()).thenReturn(addon); when(addon.getBankManager()).thenReturn(bankManager); when(addon.getVault()).thenReturn(vh); when(vh.format(anyDouble())).thenAnswer(i -> String.valueOf(i.getArgument(0, Double.class))); EconomyResponse er = new EconomyResponse(0, 0, ResponseType.SUCCESS, ""); when(vh.withdraw(eq(user), anyDouble(), eq(world))).thenReturn(er); - // Settings - when(pluginMock.getSettings()).thenReturn(new Settings()); - - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); - - PowerMockito.mockStatic(Util.class); - when(Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, World.class)); + // Util.getWorld returns the world passed in + mockedUtil.when(() -> Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, org.bukkit.World.class)); bc = new AdminStatementCommand(ic); } - /** * Test method for {@link world.bentobox.bank.commands.admin.AdminStatementCommand#setup()}. */ @Test - public void testSetup() { + void testSetup() { assertTrue(bc.isOnlyPlayer()); assertEquals("bank.admin.statement", bc.getPermission()); assertEquals("bank.admin.statement.parameters", bc.getParameters()); assertEquals("bank.admin.statement.description", bc.getDescription()); - } /** * Test method for {@link world.bentobox.bank.commands.admin.AdminStatementCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteArgsNoArgs() { + void testCanExecuteArgsNoArgs() { assertFalse(bc.canExecute(user, "statement", Collections.emptyList())); verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } @@ -149,7 +112,7 @@ public void testCanExecuteArgsNoArgs() { * Test method for {@link world.bentobox.bank.commands.admin.AdminStatementCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoIsland() { + void testCanExecuteNoIsland() { when(im.getIsland(world, user)).thenReturn(null); assertFalse(bc.canExecute(user, "statement", Collections.singletonList("tastybento"))); verify(user).sendMessage("general.errors.no-island"); @@ -159,16 +122,17 @@ public void testCanExecuteNoIsland() { * Test method for {@link world.bentobox.bank.commands.admin.AdminStatementCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteUnknownTarget() { + void testCanExecuteUnknownTarget() { when(pm.getUser(anyString())).thenReturn(null); assertFalse(bc.canExecute(user, "statement", Collections.singletonList("bonne"))); - verify(user).sendMessage("general.errors.unknown-player", TextVariables.NAME, "bonne"); } + verify(user).sendMessage("general.errors.unknown-player", TextVariables.NAME, "bonne"); + } /** * Test method for {@link world.bentobox.bank.commands.admin.AdminStatementCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoRank() { + void testCanExecuteNoRank() { // Should be ignored because this is an admin command when(island.isAllowed(eq(user), any())).thenReturn(false); assertTrue(bc.canExecute(user, "statement", Collections.singletonList("tastybento"))); @@ -178,7 +142,7 @@ public void testCanExecuteNoRank() { * Test method for {@link world.bentobox.bank.commands.admin.AdminStatementCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteSuccess() { + void testCanExecuteSuccess() { assertTrue(bc.canExecute(user, "statement", Collections.singletonList("tastybento"))); } @@ -186,11 +150,10 @@ public void testCanExecuteSuccess() { * Test method for {@link world.bentobox.bank.commands.admin.AdminStatementCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfString() { + void testExecuteUserStringListOfString() { assertTrue(bc.execute(user, "statement", Collections.singletonList("tastybento"))); verify(user).closeInventory(); verify(player).openInventory(any(Inventory.class)); } - } diff --git a/src/test/java/world/bentobox/bank/commands/admin/AdminTakeCommandTest.java b/src/test/java/world/bentobox/bank/commands/admin/AdminTakeCommandTest.java index 0cb94fe..4d80807 100644 --- a/src/test/java/world/bentobox/bank/commands/admin/AdminTakeCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/admin/AdminTakeCommandTest.java @@ -1,13 +1,12 @@ package world.bentobox.bank.commands.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -15,93 +14,69 @@ import java.util.Collections; import java.util.concurrent.CompletableFuture; -import org.bukkit.World; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse.ResponseType; import world.bentobox.bank.Bank; import world.bentobox.bank.BankManager; import world.bentobox.bank.BankResponse; +import world.bentobox.bank.CommonTestSetup; import world.bentobox.bank.data.Money; import world.bentobox.bank.data.TxType; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.hooks.VaultHook; -import world.bentobox.bentobox.managers.IslandWorldManager; -import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest(BentoBox.class) -public class AdminTakeCommandTest { +class AdminTakeCommandTest extends CommonTestSetup { @Mock private CompositeCommand ic; @Mock private User user; @Mock - private World world; - @Mock - private BentoBox plugin; - @Mock - private IslandsManager im; - @Mock - private @Nullable Island island; - @Mock private Bank addon; @Mock private BankManager bankManager; @Mock private VaultHook vh; - // Class under test - private AdminTakeCommand bc; @Mock private PlayersManager pm; - /** - */ - @Before - public void setUp() { - // Set up plugin - BentoBox pluginMock = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); + // Class under test + private AdminTakeCommand bc; + + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); when(ic.getWorld()).thenReturn(world); + when(ic.getAddon()).thenReturn(addon); when(user.getWorld()).thenReturn(world); + when(user.getName()).thenReturn("tastybento"); // IWM friendly name - IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(pluginMock.getIWM()).thenReturn(iwm); - when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(pluginMock.getIslands()).thenReturn(im); when(im.getIsland(world, user)).thenReturn(island); // Players when(addon.getPlayers()).thenReturn(pm); when(pm.getUser("tastybento")).thenReturn(user); - when(user.getName()).thenReturn("tastybento"); // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); - when(ic.getAddon()).thenReturn(addon); when(addon.getBankManager()).thenReturn(bankManager); when(addon.getVault()).thenReturn(vh); when(vh.format(anyDouble())).thenAnswer(i -> String.valueOf(i.getArgument(0, Double.class))); @@ -112,6 +87,9 @@ public void setUp() { // set default balance to 0 for unknown island when(bankManager.getBalance(any())).thenReturn(new Money()); + // Util.getWorld returns the world passed in + mockedUtil.when(() -> Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, org.bukkit.World.class)); + bc = new AdminTakeCommand(ic); } @@ -119,19 +97,18 @@ public void setUp() { * Test method for {@link world.bentobox.bank.commands.admin.AdminTakeCommand#setup()}. */ @Test - public void testSetup() { + void testSetup() { assertFalse(bc.isOnlyPlayer()); assertEquals("bank.admin.take", bc.getPermission()); assertEquals("bank.admin.take.parameters", bc.getParameters()); assertEquals("bank.admin.take.description", bc.getDescription()); - } /** * Test method for {@link world.bentobox.bank.commands.admin.AdminTakeCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteArgsNoArgs() { + void testCanExecuteArgsNoArgs() { assertFalse(bc.canExecute(user, "take", Collections.emptyList())); verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } @@ -140,7 +117,7 @@ public void testCanExecuteArgsNoArgs() { * Test method for {@link world.bentobox.bank.commands.admin.AdminTakeCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteArgsOneArg() { + void testCanExecuteArgsOneArg() { assertFalse(bc.canExecute(user, "take", Collections.singletonList("tastybento"))); verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } @@ -149,7 +126,7 @@ public void testCanExecuteArgsOneArg() { * Test method for {@link world.bentobox.bank.commands.admin.AdminTakeCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoIsland() { + void testCanExecuteNoIsland() { when(im.getIsland(world, user)).thenReturn(null); assertFalse(bc.canExecute(user, "take", Arrays.asList("tastybento", "100"))); verify(user).sendMessage("general.errors.no-island"); @@ -159,7 +136,7 @@ public void testCanExecuteNoIsland() { * Test method for {@link world.bentobox.bank.commands.admin.AdminTakeCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteUnknownTarget() { + void testCanExecuteUnknownTarget() { when(pm.getUser(anyString())).thenReturn(null); assertFalse(bc.canExecute(user, "take", Arrays.asList("bonne", "100"))); verify(user).sendMessage("general.errors.unknown-player", TextVariables.NAME, "bonne"); @@ -169,7 +146,7 @@ public void testCanExecuteUnknownTarget() { * Test method for {@link world.bentobox.bank.commands.admin.AdminTakeCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNotANumber() { + void testCanExecuteNotANumber() { assertFalse(bc.canExecute(user, "take", Arrays.asList("tastybento", "xxx"))); verify(user).sendMessage("bank.errors.must-be-a-number"); } @@ -178,7 +155,7 @@ public void testCanExecuteNotANumber() { * Test method for {@link world.bentobox.bank.commands.admin.AdminTakeCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNegativeNumber() { + void testCanExecuteNegativeNumber() { assertFalse(bc.canExecute(user, "take", Arrays.asList("tastybento", "-99"))); verify(user).sendMessage("bank.errors.value-must-be-positive"); } @@ -187,7 +164,7 @@ public void testCanExecuteNegativeNumber() { * Test method for {@link world.bentobox.bank.commands.admin.AdminTakeCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoRank() { + void testCanExecuteNoRank() { // Should be ignored because this is an admin command when(island.isAllowed(eq(user), any())).thenReturn(false); assertTrue(bc.canExecute(user, "take", Arrays.asList("tastybento", "100"))); @@ -197,7 +174,7 @@ public void testCanExecuteNoRank() { * Test method for {@link world.bentobox.bank.commands.admin.AdminTakeCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteSuccess() { + void testCanExecuteSuccess() { assertTrue(bc.canExecute(user, "take", Arrays.asList("tastybento", "100"))); } @@ -205,7 +182,7 @@ public void testCanExecuteSuccess() { * Test method for {@link world.bentobox.bank.commands.admin.AdminTakeCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfString() { + void testExecuteUserStringListOfString() { testCanExecuteSuccess(); assertTrue(bc.execute(user, "take", Arrays.asList("tastybento", "100"))); verify(user).sendMessage("bank.admin.give.success", @@ -217,7 +194,7 @@ public void testExecuteUserStringListOfString() { * Test method for {@link world.bentobox.bank.commands.admin.AdminTakeCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfStringLowBalance() { + void testExecuteUserStringListOfStringLowBalance() { testCanExecuteSuccess(); when(bankManager.withdraw(eq(user), any(), any(), eq(TxType.TAKE))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOW_BALANCE)); assertTrue(bc.execute(user, "take", Arrays.asList("tastybento", "100"))); @@ -228,11 +205,10 @@ public void testExecuteUserStringListOfStringLowBalance() { * Test method for {@link world.bentobox.bank.commands.admin.AdminTakeCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfStringError() { + void testExecuteUserStringListOfStringError() { when(bankManager.withdraw(eq(user), any(), any(), eq(TxType.TAKE))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOAD_ERROR)); assertTrue(bc.execute(user, "take", Arrays.asList("tastybento", "100"))); verify(user).sendMessage("bank.errors.bank-error"); } - } diff --git a/src/test/java/world/bentobox/bank/commands/user/BalanceCommandTest.java b/src/test/java/world/bentobox/bank/commands/user/BalanceCommandTest.java index 5524d4e..eb6a90c 100644 --- a/src/test/java/world/bentobox/bank/commands/user/BalanceCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/user/BalanceCommandTest.java @@ -1,66 +1,43 @@ package world.bentobox.bank.commands.user; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Collections; -import org.bukkit.Bukkit; -import org.bukkit.World; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse.ResponseType; import world.bentobox.bank.Bank; import world.bentobox.bank.BankManager; +import world.bentobox.bank.CommonTestSetup; import world.bentobox.bank.data.Money; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.hooks.VaultHook; -import world.bentobox.bentobox.managers.IslandWorldManager; -import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.util.Util; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({ BentoBox.class, Util.class, Bukkit.class }) -public class BalanceCommandTest { +class BalanceCommandTest extends CommonTestSetup { @Mock private CompositeCommand ic; @Mock private User user; @Mock - private World world; - @Mock - private BentoBox plugin; - @Mock - private IslandsManager im; - @Mock - private @Nullable Island island; - @Mock private Bank addon; @Mock private BankManager bankManager; @@ -68,40 +45,32 @@ public class BalanceCommandTest { private VaultHook vh; // Class under test private BalanceCommand bc; - /** - */ - @Before - public void setUp() { - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); - // Set up plugin - BentoBox pluginMock = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); + + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); when(ic.getWorld()).thenReturn(world); + when(ic.getAddon()).thenReturn(addon); when(user.getWorld()).thenReturn(world); // IWM friendly name - IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(pluginMock.getIWM()).thenReturn(iwm); - when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(pluginMock.getIslands()).thenReturn(im); when(im.getIsland(world, user)).thenReturn(island); - // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); - when(ic.getAddon()).thenReturn(addon); when(addon.getBankManager()).thenReturn(bankManager); when(addon.getVault()).thenReturn(vh); when(vh.format(anyDouble())).thenAnswer(i -> String.valueOf(i.getArgument(0, Double.class))); EconomyResponse er = new EconomyResponse(0, 0, ResponseType.SUCCESS, ""); when(vh.withdraw(eq(user), anyDouble(), eq(world))).thenReturn(er); - PowerMockito.mockStatic(Util.class); - when(Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, World.class)); + // Util.getWorld returns the world passed in + mockedUtil.when(() -> Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, org.bukkit.World.class)); when(bankManager.getBalance(any())).thenReturn(new Money()); @@ -112,7 +81,7 @@ public void setUp() { * Test method for {@link world.bentobox.bank.commands.user.BalanceCommand#setup()}. */ @Test - public void testSetup() { + void testSetup() { assertTrue(bc.isOnlyPlayer()); assertEquals("bank.user.balance", bc.getPermission()); assertEquals("bank.balance.description", bc.getDescription()); @@ -122,7 +91,7 @@ public void testSetup() { * Test method for {@link world.bentobox.bank.commands.user.BalanceCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteArgs() { + void testCanExecuteArgs() { assertFalse(bc.canExecute(user, "balance", Collections.singletonList("fff"))); verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } @@ -131,7 +100,7 @@ public void testCanExecuteArgs() { * Test method for {@link world.bentobox.bank.commands.user.BalanceCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoIsland() { + void testCanExecuteNoIsland() { when(im.getIsland(world, user)).thenReturn(null); assertFalse(bc.canExecute(user, "balance", Collections.emptyList())); verify(user).sendMessage("general.errors.no-island"); @@ -141,18 +110,17 @@ public void testCanExecuteNoIsland() { * Test method for {@link world.bentobox.bank.commands.user.BalanceCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoRank() { + void testCanExecuteNoRank() { when(island.isAllowed(eq(user), any())).thenReturn(false); assertFalse(bc.canExecute(user, "balance", Collections.emptyList())); verify(user).sendMessage("bank.errors.no-rank"); - } /** * Test method for {@link world.bentobox.bank.commands.user.BalanceCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteSuccess() { + void testCanExecuteSuccess() { assertTrue(bc.canExecute(user, "balance", Collections.emptyList())); } @@ -160,7 +128,7 @@ public void testCanExecuteSuccess() { * Test method for {@link world.bentobox.bank.commands.user.BalanceCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfString() { + void testExecuteUserStringListOfString() { assertTrue(bc.execute(user, "balance", Collections.emptyList())); verify(user).sendMessage("bank.balance.island-balance", TextVariables.NUMBER, "0.0"); } diff --git a/src/test/java/world/bentobox/bank/commands/user/DepositCommandTest.java b/src/test/java/world/bentobox/bank/commands/user/DepositCommandTest.java index b7120f5..99eef24 100644 --- a/src/test/java/world/bentobox/bank/commands/user/DepositCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/user/DepositCommandTest.java @@ -1,12 +1,11 @@ package world.bentobox.bank.commands.user; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -17,43 +16,29 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; -import org.bukkit.Bukkit; -import org.bukkit.World; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse.ResponseType; import world.bentobox.bank.Bank; import world.bentobox.bank.BankManager; import world.bentobox.bank.BankResponse; +import world.bentobox.bank.CommonTestSetup; import world.bentobox.bank.Settings; import world.bentobox.bank.data.Money; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.hooks.VaultHook; -import world.bentobox.bentobox.managers.IslandWorldManager; -import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.util.Util; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({ BentoBox.class, Util.class, Bukkit.class }) -public class DepositCommandTest { +class DepositCommandTest extends CommonTestSetup { /** * Class under test @@ -64,14 +49,6 @@ public class DepositCommandTest { @Mock private User user; @Mock - private World world; - @Mock - private BentoBox plugin; - @Mock - private IslandsManager im; - @Mock - private @Nullable Island island; - @Mock private Bank addon; @Mock private BankManager bankManager; @@ -79,30 +56,21 @@ public class DepositCommandTest { private VaultHook vh; private Settings settings; - /** - */ - @Before - public void setUp() { - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); - // Set up plugin - BentoBox pluginMock = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); when(ic.getWorld()).thenReturn(world); + when(ic.getAddon()).thenReturn(addon); when(user.getWorld()).thenReturn(world); when(user.getUniqueId()).thenReturn(UUID.randomUUID()); - // IWM friendly name - IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(pluginMock.getIWM()).thenReturn(iwm); - when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(pluginMock.getIslands()).thenReturn(im); when(im.getIsland(world, user)).thenReturn(island); - // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); @@ -110,7 +78,6 @@ public void setUp() { settings = new Settings(); when(addon.getSettings()).thenReturn(settings); - when(ic.getAddon()).thenReturn(addon); when(addon.getBankManager()).thenReturn(bankManager); when(bankManager.getBalance(island)).thenReturn(new Money(100D)); when(addon.getVault()).thenReturn(vh); @@ -118,18 +85,18 @@ public void setUp() { when(vh.format(anyDouble())).thenAnswer(i -> String.valueOf(i.getArgument(0, Double.class))); EconomyResponse er = new EconomyResponse(0, 0, ResponseType.SUCCESS, ""); when(vh.withdraw(eq(user), anyDouble(), eq(world))).thenReturn(er); - PowerMockito.mockStatic(Util.class); - when(Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, World.class)); - dct = new DepositCommand(ic); + // Util.getWorld returns the world passed in + mockedUtil.when(() -> Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, org.bukkit.World.class)); + dct = new DepositCommand(ic); } /** * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#setup()}. */ @Test - public void testSetup() { + void testSetup() { assertTrue(dct.isOnlyPlayer()); assertEquals("bank.user.deposit", dct.getPermission()); assertEquals("bank.deposit.parameters", dct.getParameters()); @@ -140,7 +107,7 @@ public void testSetup() { * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoArgs() { + void testCanExecuteNoArgs() { assertFalse(dct.canExecute(user, "deposit", Collections.emptyList())); verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } @@ -149,7 +116,7 @@ public void testCanExecuteNoArgs() { * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteOneArgNotANumber() { + void testCanExecuteOneArgNotANumber() { assertFalse(dct.canExecute(user, "deposit", Collections.singletonList("hello"))); verify(user).sendMessage("bank.errors.must-be-a-number"); } @@ -158,7 +125,7 @@ public void testCanExecuteOneArgNotANumber() { * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteOneArgNegativeNumber() { + void testCanExecuteOneArgNegativeNumber() { assertFalse(dct.canExecute(user, "deposit", Collections.singletonList("-50"))); verify(user).sendMessage("bank.errors.value-must-be-positive"); } @@ -167,7 +134,7 @@ public void testCanExecuteOneArgNegativeNumber() { * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteOneArgNumberNoRank() { + void testCanExecuteOneArgNumberNoRank() { when(island.isAllowed(eq(user), any())).thenReturn(false); assertFalse(dct.canExecute(user, "deposit", Collections.singletonList("123.30"))); verify(user).sendMessage("bank.errors.no-rank"); @@ -177,7 +144,7 @@ public void testCanExecuteOneArgNumberNoRank() { * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteOneArgNumberNoIsland() { + void testCanExecuteOneArgNumberNoIsland() { when(im.getIsland(world, user)).thenReturn(null); assertFalse(dct.canExecute(user, "deposit", Collections.singletonList("123.30"))); verify(user).sendMessage("general.errors.no-island"); @@ -187,7 +154,7 @@ public void testCanExecuteOneArgNumberNoIsland() { * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteAllSuccess() { + void testCanExecuteAllSuccess() { when(bankManager.getBalance(user, world)).thenReturn(new Money(555D)); assertTrue(dct.canExecute(user, "deposit", Collections.singletonList("all"))); verify(user, never()).sendMessage(any()); @@ -197,7 +164,7 @@ public void testCanExecuteAllSuccess() { * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteOneArgNumberSuccess() { + void testCanExecuteOneArgNumberSuccess() { when(bankManager.getBalance(user, world)).thenReturn(new Money(555D)); assertTrue(dct.canExecute(user, "deposit", Collections.singletonList("123.30"))); verify(user, never()).sendMessage(any()); @@ -207,7 +174,7 @@ public void testCanExecuteOneArgNumberSuccess() { * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfStringLoadError() { + void testExecuteUserStringListOfStringLoadError() { when(bankManager.deposit(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOAD_ERROR)); assertTrue(dct.execute(user, "deposit", Collections.emptyList())); @@ -218,7 +185,7 @@ public void testExecuteUserStringListOfStringLoadError() { * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfStringVaultError() { + void testExecuteUserStringListOfStringVaultError() { EconomyResponse er = new EconomyResponse(0, 0, ResponseType.FAILURE, ""); when(vh.withdraw(eq(user), anyDouble(), eq(world))).thenReturn(er); assertFalse(dct.execute(user, "deposit", Collections.emptyList())); @@ -229,7 +196,7 @@ public void testExecuteUserStringListOfStringVaultError() { * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfStringLowBalance() { + void testExecuteUserStringListOfStringLowBalance() { when(bankManager.deposit(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOW_BALANCE)); assertTrue(dct.execute(user, "deposit", Collections.emptyList())); @@ -240,7 +207,7 @@ public void testExecuteUserStringListOfStringLowBalance() { * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfStringNoIsland() { + void testExecuteUserStringListOfStringNoIsland() { when(bankManager.deposit(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_NO_ISLAND)); assertTrue(dct.execute(user, "deposit", Collections.emptyList())); verify(user).sendMessage("general.errors.no-island"); @@ -250,7 +217,7 @@ public void testExecuteUserStringListOfStringNoIsland() { * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfStringSuccess() { + void testExecuteUserStringListOfStringSuccess() { testCanExecuteOneArgNumberSuccess(); when(bankManager.deposit(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.SUCCESS)); assertTrue(dct.execute(user, "deposit", Collections.singletonList("123.30"))); @@ -262,17 +229,17 @@ public void testExecuteUserStringListOfStringSuccess() { * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteOneArgNumberLowBalance() { + void testCanExecuteOneArgNumberLowBalance() { when(bankManager.deposit(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOW_BALANCE)); assertTrue(dct.execute(user, "deposit", Collections.singletonList("123.30"))); verify(user).sendMessage("bank.errors.low-balance"); } /** - * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#tabComplete(User, String, java.util.List) + * Test method for {@link world.bentobox.bank.commands.user.DepositCommand#tabComplete(User, String, java.util.List)}. */ @Test - public void testTabComplete() { + void testTabComplete() { Optional> value = dct.tabComplete(user, "", Collections.emptyList()); assertTrue(value.isPresent()); assertEquals("1000.0", value.get().get(0)); diff --git a/src/test/java/world/bentobox/bank/commands/user/StatementCommandTest.java b/src/test/java/world/bentobox/bank/commands/user/StatementCommandTest.java index 77df048..9bb7ca8 100644 --- a/src/test/java/world/bentobox/bank/commands/user/StatementCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/user/StatementCommandTest.java @@ -1,115 +1,80 @@ package world.bentobox.bank.commands.user; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Collections; -import org.bukkit.Bukkit; -import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse.ResponseType; import world.bentobox.bank.Bank; import world.bentobox.bank.BankManager; -import world.bentobox.bentobox.BentoBox; -import world.bentobox.bentobox.Settings; +import world.bentobox.bank.CommonTestSetup; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.hooks.VaultHook; -import world.bentobox.bentobox.managers.IslandWorldManager; -import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.util.Util; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({Bukkit.class, BentoBox.class, Util.class}) -public class StatementCommandTest { +class StatementCommandTest extends CommonTestSetup { + @Mock private CompositeCommand ic; @Mock private User user; @Mock - private World world; - @Mock - private BentoBox plugin; - @Mock - private IslandsManager im; - @Mock - private @Nullable Island island; - @Mock private Bank addon; @Mock private BankManager bankManager; @Mock private VaultHook vh; - // Class under test - private StatementCommand sc; @Mock private Player player; + // Class under test + private StatementCommand sc; - /** - */ - @Before - public void setUp() { - // Set up plugin - BentoBox pluginMock = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); when(ic.getWorld()).thenReturn(world); + when(ic.getAddon()).thenReturn(addon); when(user.getWorld()).thenReturn(world); when(user.getPlayer()).thenReturn(player); // IWM friendly name - IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(pluginMock.getIWM()).thenReturn(iwm); - when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(pluginMock.getIslands()).thenReturn(im); when(im.getIsland(world, user)).thenReturn(island); - // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); - when(ic.getAddon()).thenReturn(addon); when(addon.getBankManager()).thenReturn(bankManager); when(addon.getVault()).thenReturn(vh); when(vh.format(anyDouble())).thenAnswer(i -> String.valueOf(i.getArgument(0, Double.class))); EconomyResponse er = new EconomyResponse(0, 0, ResponseType.SUCCESS, ""); when(vh.withdraw(eq(user), anyDouble(), eq(world))).thenReturn(er); - // Settings - when(pluginMock.getSettings()).thenReturn(new Settings()); - - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); - PowerMockito.mockStatic(Util.class); - when(Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, World.class)); + // Util.getWorld returns the world passed in + mockedUtil.when(() -> Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, org.bukkit.World.class)); sc = new StatementCommand(ic); } @@ -118,18 +83,17 @@ public void setUp() { * Test method for {@link world.bentobox.bank.commands.user.StatementCommand#setup()}. */ @Test - public void testSetup() { + void testSetup() { assertTrue(sc.isOnlyPlayer()); assertEquals("bank.user.statement", sc.getPermission()); assertEquals("bank.statement.description", sc.getDescription()); - } /** * Test method for {@link world.bentobox.bank.commands.user.StatementCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteArgs() { + void testCanExecuteArgs() { assertFalse(sc.canExecute(user, "statement", Collections.singletonList("fff"))); verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } @@ -138,7 +102,7 @@ public void testCanExecuteArgs() { * Test method for {@link world.bentobox.bank.commands.user.StatementCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoIsland() { + void testCanExecuteNoIsland() { when(im.getIsland(world, user)).thenReturn(null); assertFalse(sc.canExecute(user, "statement", Collections.emptyList())); verify(user).sendMessage("general.errors.no-island"); @@ -148,18 +112,17 @@ public void testCanExecuteNoIsland() { * Test method for {@link world.bentobox.bank.commands.user.StatementCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoRank() { + void testCanExecuteNoRank() { when(island.isAllowed(eq(user), any())).thenReturn(false); assertFalse(sc.canExecute(user, "statement", Collections.emptyList())); verify(user).sendMessage("bank.errors.no-rank"); - } /** * Test method for {@link world.bentobox.bank.commands.user.StatementCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteSuccess() { + void testCanExecuteSuccess() { assertTrue(sc.canExecute(user, "statement", Collections.emptyList())); } @@ -167,7 +130,7 @@ public void testCanExecuteSuccess() { * Test method for {@link world.bentobox.bank.commands.user.StatementCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfString() { + void testExecuteUserStringListOfString() { assertTrue(sc.execute(user, "statement", Collections.emptyList())); verify(user).closeInventory(); verify(player).openInventory(any(Inventory.class)); diff --git a/src/test/java/world/bentobox/bank/commands/user/WithdrawCommandTest.java b/src/test/java/world/bentobox/bank/commands/user/WithdrawCommandTest.java index aaa9969..b51c7a4 100644 --- a/src/test/java/world/bentobox/bank/commands/user/WithdrawCommandTest.java +++ b/src/test/java/world/bentobox/bank/commands/user/WithdrawCommandTest.java @@ -1,11 +1,11 @@ package world.bentobox.bank.commands.user; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -16,41 +16,27 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; -import org.bukkit.Bukkit; -import org.bukkit.World; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; import world.bentobox.bank.Bank; import world.bentobox.bank.BankManager; import world.bentobox.bank.BankResponse; +import world.bentobox.bank.CommonTestSetup; import world.bentobox.bank.Settings; import world.bentobox.bank.data.Money; -import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.hooks.VaultHook; -import world.bentobox.bentobox.managers.IslandWorldManager; -import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.util.Util; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({ BentoBox.class, Util.class, Bukkit.class }) -public class WithdrawCommandTest { +class WithdrawCommandTest extends CommonTestSetup { /** * Class under test @@ -61,14 +47,6 @@ public class WithdrawCommandTest { @Mock private User user; @Mock - private World world; - @Mock - private BentoBox plugin; - @Mock - private IslandsManager im; - @Mock - private @Nullable Island island; - @Mock private Bank addon; @Mock private BankManager bankManager; @@ -76,30 +54,21 @@ public class WithdrawCommandTest { private VaultHook vh; private Settings settings; - - /** - */ - @Before - public void setUp() { - PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); - // Set up plugin - BentoBox pluginMock = mock(BentoBox.class); - Whitebox.setInternalState(BentoBox.class, "instance", pluginMock); + @Override + @BeforeEach + public void setUp() throws Exception { + super.setUp(); when(ic.getWorld()).thenReturn(world); + when(ic.getAddon()).thenReturn(addon); when(user.getWorld()).thenReturn(world); when(user.getUniqueId()).thenReturn(UUID.randomUUID()); // IWM friendly name - IslandWorldManager iwm = mock(IslandWorldManager.class); when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock"); - when(pluginMock.getIWM()).thenReturn(iwm); - when(iwm.inWorld(any(World.class))).thenReturn(true); // Islands - when(pluginMock.getIslands()).thenReturn(im); when(im.getIsland(world, user)).thenReturn(island); - // Island flag allowed when(island.isAllowed(eq(user), any())).thenReturn(true); @@ -107,28 +76,23 @@ public void setUp() { settings = new Settings(); when(addon.getSettings()).thenReturn(settings); - - when(ic.getAddon()).thenReturn(addon); when(addon.getBankManager()).thenReturn(bankManager); when(bankManager.getBalance(any(), any())).thenReturn(new Money()); when(bankManager.getBalance(island)).thenReturn(new Money(100D)); when(addon.getVault()).thenReturn(vh); when(vh.format(anyDouble())).thenAnswer(i -> String.valueOf(i.getArgument(0, Double.class))); - PowerMockito.mockStatic(Util.class); - when(Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, World.class)); - - when(ic.getWorld()).thenReturn(world); + // Util.getWorld returns the world passed in + mockedUtil.when(() -> Util.getWorld(any())).thenAnswer(arg -> arg.getArgument(0, org.bukkit.World.class)); wct = new WithdrawCommand(ic); - } /** * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#setup()}. */ @Test - public void testSetup() { + void testSetup() { assertTrue(wct.isOnlyPlayer()); assertEquals("bank.user.withdraw", wct.getPermission()); assertEquals("bank.withdraw.parameters", wct.getParameters()); @@ -139,7 +103,7 @@ public void testSetup() { * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteNoArgs() { + void testCanExecuteNoArgs() { assertFalse(wct.canExecute(user, "withdraw", Collections.emptyList())); verify(user).sendMessage("commands.help.header", TextVariables.LABEL, "BSkyBlock"); } @@ -148,7 +112,7 @@ public void testCanExecuteNoArgs() { * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteOneArgNotANumber() { + void testCanExecuteOneArgNotANumber() { assertFalse(wct.canExecute(user, "withdraw", Collections.singletonList("hello"))); verify(user).sendMessage("bank.errors.must-be-a-number"); } @@ -157,7 +121,7 @@ public void testCanExecuteOneArgNotANumber() { * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteOneArgNegativeNumber() { + void testCanExecuteOneArgNegativeNumber() { assertFalse(wct.canExecute(user, "withdraw", Collections.singletonList("-50"))); verify(user).sendMessage("bank.errors.value-must-be-positive"); } @@ -166,7 +130,7 @@ public void testCanExecuteOneArgNegativeNumber() { * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteOneArgNumberLowBalance() { + void testCanExecuteOneArgNumberLowBalance() { assertFalse(wct.canExecute(user, "withdraw", Collections.singletonList("123.30"))); verify(user, never()).sendMessage("bank.errors.must-be-a-number"); verify(user).sendMessage("bank.errors.low-balance"); @@ -176,7 +140,7 @@ public void testCanExecuteOneArgNumberLowBalance() { * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteAllArg() { + void testCanExecuteAllArg() { when(bankManager.getBalance(user, world)).thenReturn(new Money(555D)); assertTrue(wct.canExecute(user, "withdraw", Collections.singletonList("all"))); verify(user, never()).sendMessage("bank.errors.must-be-a-number"); @@ -187,7 +151,7 @@ public void testCanExecuteAllArg() { * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteOneArgNumberNoRank() { + void testCanExecuteOneArgNumberNoRank() { when(island.isAllowed(eq(user), any())).thenReturn(false); assertFalse(wct.canExecute(user, "withdraw", Collections.singletonList("123.30"))); verify(user).sendMessage("bank.errors.no-rank"); @@ -197,7 +161,7 @@ public void testCanExecuteOneArgNumberNoRank() { * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteOneArgNumberNoIsland() { + void testCanExecuteOneArgNumberNoIsland() { when(im.getIsland(world, user)).thenReturn(null); assertFalse(wct.canExecute(user, "withdraw", Collections.singletonList("123.30"))); verify(user).sendMessage("general.errors.no-island"); @@ -207,7 +171,7 @@ public void testCanExecuteOneArgNumberNoIsland() { * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testCanExecuteOneArgNumberSuccess() { + void testCanExecuteOneArgNumberSuccess() { when(bankManager.getBalance(user, world)).thenReturn(new Money(555D)); assertTrue(wct.canExecute(user, "withdraw", Collections.singletonList("123.30"))); verify(user, never()).sendMessage(any()); @@ -217,7 +181,7 @@ public void testCanExecuteOneArgNumberSuccess() { * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfStringLoadError() { + void testExecuteUserStringListOfStringLoadError() { when(bankManager.withdraw(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOAD_ERROR)); assertTrue(wct.execute(user, "withdraw", Collections.emptyList())); verify(user).sendMessage("bank.errors.bank-error"); @@ -227,7 +191,7 @@ public void testExecuteUserStringListOfStringLoadError() { * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfStringLowBalance() { + void testExecuteUserStringListOfStringLowBalance() { when(bankManager.withdraw(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_LOW_BALANCE)); assertTrue(wct.execute(user, "withdraw", Collections.emptyList())); verify(user).sendMessage("bank.errors.low-balance"); @@ -237,7 +201,7 @@ public void testExecuteUserStringListOfStringLowBalance() { * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfStringNoIsland() { + void testExecuteUserStringListOfStringNoIsland() { when(bankManager.withdraw(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.FAILURE_NO_ISLAND)); assertTrue(wct.execute(user, "withdraw", Collections.emptyList())); verify(user).sendMessage("general.errors.no-island"); @@ -247,7 +211,7 @@ public void testExecuteUserStringListOfStringNoIsland() { * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test - public void testExecuteUserStringListOfStringSuccess() { + void testExecuteUserStringListOfStringSuccess() { testCanExecuteOneArgNumberSuccess(); when(bankManager.withdraw(eq(user), any(), eq(world))).thenReturn(CompletableFuture.completedFuture(BankResponse.SUCCESS)); assertTrue(wct.execute(user, "withdraw", Collections.singletonList("123.30"))); @@ -256,10 +220,10 @@ public void testExecuteUserStringListOfStringSuccess() { } /** - * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#tabComplete(User, String, java.util.List) + * Test method for {@link world.bentobox.bank.commands.user.WithdrawCommand#tabComplete(User, String, java.util.List)}. */ @Test - public void testTabComplete() { + void testTabComplete() { Optional> value = wct.tabComplete(user, "", Collections.emptyList()); assertTrue(value.isPresent()); assertEquals("0.0", value.get().get(0)); diff --git a/src/test/java/world/bentobox/bank/data/MoneyTest.java b/src/test/java/world/bentobox/bank/data/MoneyTest.java index f5f835a..5722f6a 100644 --- a/src/test/java/world/bentobox/bank/data/MoneyTest.java +++ b/src/test/java/world/bentobox/bank/data/MoneyTest.java @@ -1,37 +1,29 @@ package world.bentobox.bank.data; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.math.BigDecimal; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.modules.junit4.PowerMockRunner; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author tastybento * */ -@RunWith(PowerMockRunner.class) public class MoneyTest { Money m; - @Before + @BeforeEach public void setUp() { m = new Money(); } - @After - public void tearDown() { - // Nothing to tear down - } - /** * Test method for {@link world.bentobox.bank.data.Money#hashCode()}. */ @@ -175,17 +167,17 @@ public void testIsPositive() { /** * Test method for {@link world.bentobox.bank.data.Money#parseMoney(java.lang.String)}. */ - @Test(expected = NullPointerException.class) + @Test public void testParseMoneyNPE() { - Money.parseMoney(null); + assertThrows(NullPointerException.class, () -> Money.parseMoney(null)); } /** * Test method for {@link world.bentobox.bank.data.Money#parseMoney(java.lang.String)}. */ - @Test(expected = NumberFormatException.class) + @Test public void testParseMoneyNFE() { - Money.parseMoney("tastybento"); + assertThrows(NumberFormatException.class, () -> Money.parseMoney("tastybento")); } /** From 067f101cf2aee356b07fe9f5321df568fbe0895a Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 5 Jun 2026 18:31:37 -0700 Subject: [PATCH 12/31] Bump plugin.yml api-version to 1.21 Match the Paper 1.21.11 / Java 21 target. Co-Authored-By: Claude Opus 4.8 --- src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 15889a6..32ef19b 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: BentoBox-Bank main: world.bentobox.bank.BankPladdon version: ${project.version}${build.number} -api-version: "1.16" +api-version: "1.21" authors: [tastybento] contributors: ["The BentoBoxWorld Community"] From 786adde87addbe0ba2991e3967ea38bf88132b87 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 6 Jun 2026 07:09:05 -0700 Subject: [PATCH 13/31] Convert locale color codes to MiniMessage format Replace all legacy ampersand color codes (&a, &c, &9, etc.) with their MiniMessage tag equivalents (, , , ...) across the 12 locale files. BentoBox renders MiniMessage natively. 292 codes converted; all files validated as YAML and rendering is unchanged (open tags apply to the rest of the string, matching legacy semantics). Co-Authored-By: Claude Opus 4.8 --- src/main/resources/locales/cs.yml | 48 ++++++++++++------------- src/main/resources/locales/de.yml | 48 ++++++++++++------------- src/main/resources/locales/en-US.yml | 52 ++++++++++++++-------------- src/main/resources/locales/es.yml | 48 ++++++++++++------------- src/main/resources/locales/fr.yml | 52 ++++++++++++++-------------- src/main/resources/locales/id.yml | 52 ++++++++++++++-------------- src/main/resources/locales/it.yml | 50 +++++++++++++------------- src/main/resources/locales/ja.yml | 38 ++++++++++---------- src/main/resources/locales/ko.yml | 52 ++++++++++++++-------------- src/main/resources/locales/uk.yml | 50 +++++++++++++------------- src/main/resources/locales/vi.yml | 52 ++++++++++++++-------------- src/main/resources/locales/zh-CN.yml | 30 ++++++++-------- 12 files changed, 286 insertions(+), 286 deletions(-) diff --git a/src/main/resources/locales/cs.yml b/src/main/resources/locales/cs.yml index bf0bd83..4a8c275 100644 --- a/src/main/resources/locales/cs.yml +++ b/src/main/resources/locales/cs.yml @@ -5,7 +5,7 @@ bank: give: parameters: " " description: přidat částku na hráčův ostrovní účet - success: "&a Úspěch! Zůstatek ostrovní banky [name] je nyní [number]." + success: " Úspěch! Zůstatek ostrovní banky [name] je nyní [number]." take: parameters: " " description: vezměte částku z hráčova ostrova @@ -15,39 +15,39 @@ bank: set: parameters: " " description: nastavit částku na hráčově ostrovním účtu - success: "&a Účet uživatele [name] byl nastaven na [number]." + success: " Účet uživatele [name] byl nastaven na [number]." statement: parameters: "" description: zobrazit výpis z banky pro hráče balance: description: ukazuje zůstatek vaší ostrovní banky - island-balance: "&a Zůstatek na ostrovní bance je [number]." + island-balance: " Zůstatek na ostrovní bance je [number]." baltop: description: zobrazit hodnocení zůstatku - description-syntax: "&d [number]" + description-syntax: " [number]" highest: Řadit podle nejvyššího lowest: Řadit podle nejnižší - name-syntax: "&d [name]" + name-syntax: " [name]" title: Nejlepší zůstatky deposit: description: vložte částku na svůj ostrovní účet parameters: "" - success: "&a Úspěch! Váš nový zůstatek na ostrovní bance je [number]." + success: " Úspěch! Váš nový zůstatek na ostrovní bance je [number]." errors: - bank-error: "&c Chyba při načítání informací o bankovním účtu - zkuste to znovu + bank-error: " Chyba při načítání informací o bankovním účtu - zkuste to znovu později" - low-balance: "&c Váš zůstatek na ostrovní bance není dostatečně vysoký!" - too-low: "&c Rovnováha na ostrově je příliš nízká." - must-be-a-number: "&c Částka musí být číslo" - no-rank: "&c Vaše pozice není dostatečně vysoká, abyste mohli banku používat." - too-much: "&c Tuto částku nemáte k uložení." - value-must-be-positive: "&c Částka musí být kladná." - scientific: "&c Vědecká notace není podporována." - too-long: "&c Hodnota musí být menší než 10 číslic" + low-balance: " Váš zůstatek na ostrovní bance není dostatečně vysoký!" + too-low: " Rovnováha na ostrově je příliš nízká." + must-be-a-number: " Částka musí být číslo" + no-rank: " Vaše pozice není dostatečně vysoká, abyste mohli banku používat." + too-much: " Tuto částku nemáte k uložení." + value-must-be-positive: " Částka musí být kladná." + scientific: " Vědecká notace není podporována." + too-long: " Hodnota musí být menší než 10 číslic" statement: balance: - name: "&9 Zůstatek:" - description: "&6 [number]" + name: " Zůstatek:" + description: " [number]" deposit: Vklad description: ukažte historii své ostrovní banky give: Správce dát @@ -56,10 +56,10 @@ bank: oldest: Řadit podle nejstarších set: Sada správce syntax: |- - &9 [date] - &9 [time] - &7 [name] - &6 [number] + [date] + [time] + [name] + [number] take: Admin Vezměte title: Historie účtu unknown: Neznámý typ @@ -69,11 +69,11 @@ bank: withdraw: description: vybrat částku ze svého ostrovního účtu parameters: "" - success: "&a Úspěch! Váš nový zůstatek na ostrovní bance je [number]." + success: " Úspěch! Váš nový zůstatek na ostrovní bance je [number]." protection: flags: BANK_ACCESS: description: |- - &f Povolit přístup k - &f a ostrovní banka + Povolit přístup k + a ostrovní banka name: Přístup na ostrovní banku diff --git a/src/main/resources/locales/de.yml b/src/main/resources/locales/de.yml index fbee7c7..c8373ce 100644 --- a/src/main/resources/locales/de.yml +++ b/src/main/resources/locales/de.yml @@ -5,7 +5,7 @@ bank: give: parameters: " " description: Betrag zum Inselkonto des Spielers hinzufügen - success: "&a Erfolgreich! [name]'s Insel Bank Balance ist nun [number]." + success: " Erfolgreich! [name]'s Insel Bank Balance ist nun [number]." take: parameters: " " description: Betrag vom Inselkonto des Spielers nehmen @@ -15,39 +15,39 @@ bank: set: parameters: " " description: festgelegten Betrag auf dem Inselkonto des Spielers - success: "&a [name]'s Konto auf [number] gesetzt." + success: " [name]'s Konto auf [number] gesetzt." statement: parameters: "" description: Kontoauszug der Insel für den Spieler anzeigen balance: description: zeigt Ihren Kontostand auf der Insel an - island-balance: "&a Bankguthaben auf der Insel ist [number]." + island-balance: " Bankguthaben auf der Insel ist [number]." baltop: description: Balance-Rankings anzeigen - description-syntax: "&d [number]" + description-syntax: " [number]" highest: Nach Höchsten sortieren lowest: Nach Niedrigster sortieren - name-syntax: "&d [name]" + name-syntax: " [name]" title: Top-Balancen deposit: description: Betrag auf Ihr Inselkonto einzahlen parameters: "" - success: "&ein Erfolg! Ihr neuer Kontostand auf der Insel beträgt [number]." + success: "in Erfolg! Ihr neuer Kontostand auf der Insel beträgt [number]." errors: - bank-error: "&c Fehler beim Laden der Bankkontoinformationen - bitte versuchen + bank-error: " Fehler beim Laden der Bankkontoinformationen - bitte versuchen Sie es später erneut" - low-balance: "&c Ihr Bankguthaben auf der Insel ist nicht hoch genug!" - too-low: "&c Der Insel Geld ist zu niedrig." - must-be-a-number: "&c Betrag muss eine Zahl sein" - no-rank: "&c Ihr Rang ist nicht hoch genug, um die Bank zu benutzen." - too-much: "&c Sie haben nicht genug Geld zum einzahlen." - value-must-be-positive: "&c Betrag muss positiv sein." - scientific: "&c Wissenschaftliche Notation wird nicht unterstützt." - too-long: "&c Wert muss kleiner als 10 Stellen sein" + low-balance: " Ihr Bankguthaben auf der Insel ist nicht hoch genug!" + too-low: " Der Insel Geld ist zu niedrig." + must-be-a-number: " Betrag muss eine Zahl sein" + no-rank: " Ihr Rang ist nicht hoch genug, um die Bank zu benutzen." + too-much: " Sie haben nicht genug Geld zum einzahlen." + value-must-be-positive: " Betrag muss positiv sein." + scientific: " Wissenschaftliche Notation wird nicht unterstützt." + too-long: " Wert muss kleiner als 10 Stellen sein" statement: balance: - name: "&9 Balance:" - description: "&6 [number]" + name: " Balance:" + description: " [number]" deposit: Einzahlen description: Zeigen Sie Ihre Inselbankgeschichte give: Admin gibt @@ -56,10 +56,10 @@ bank: oldest: Nach Ältesten sortieren set: Admin-Setzt syntax: | - &9 [date] - &9 [time] - &7 [name] - &6 [number] + [date] + [time] + [name] + [number] take: Admin-nimmt title: Kontoverlauf unknown: Unbekannter Typ @@ -69,11 +69,11 @@ bank: withdraw: description: Betrag von Ihrem Inselkonto abheben parameters: "" - success: "&ein Erfolg! Ihr neuer Kontostand auf der Insel beträgt [number]." + success: "in Erfolg! Ihr neuer Kontostand auf der Insel beträgt [number]." protection: flags: BANK_ACCESS: description: |- - &f Zugriff erlauben auf - &f das Inselufer + Zugriff erlauben auf + das Inselufer name: Zugriff zur Inselbank diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 16eef9c..52b1f71 100644 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -4,7 +4,7 @@ bank: give: parameters: " " description: "add amount to player's island account" - success: "&a Success! [name]'s island bank balance is now [number]." + success: " Success! [name]'s island bank balance is now [number]." take: parameters: " " description: "take amount from player's island account" @@ -14,39 +14,39 @@ bank: set: parameters: " " description: "set amount in player's island account" - success: "&a [name]'s account set to [number]." + success: " [name]'s account set to [number]." statement: parameters: "" description: "view island bank statement for player" balance: description: "shows your island bank balance" - island-balance: "&a Island bank balance is [number]." + island-balance: " Island bank balance is [number]." baltop: description: "show balance rankings" - description-syntax: "&d [number]" + description-syntax: " [number]" highest: "Sort by Highest" lowest: "Sort by Lowest" - name-syntax: "&d [name]" + name-syntax: " [name]" title: "Top Balances" deposit: description: "deposit amount into your island account" parameters: - success: "&a Success! Your new island bank balance is [number]." - alert: '&a [name] deposited [number] into the island bank.' + success: " Success! Your new island bank balance is [number]." + alert: ' [name] deposited [number] into the island bank.' errors: - bank-error: "&c Error loading bank account info - please try again later" - low-balance: "&c Your island bank balance is not high enough!" - too-low: "&c The island balance is too low." - must-be-a-number: "&c Amount must be a number" - no-rank: "&c Your rank is not high enough to use the bank." - too-much: "&c You do not have that amount to deposit." - value-must-be-positive: "&c Amount must be positive." - scientific: "&c Scientific notation is not supported." - too-long: "&c Value must be less than 10 digits" + bank-error: " Error loading bank account info - please try again later" + low-balance: " Your island bank balance is not high enough!" + too-low: " The island balance is too low." + must-be-a-number: " Amount must be a number" + no-rank: " Your rank is not high enough to use the bank." + too-much: " You do not have that amount to deposit." + value-must-be-positive: " Amount must be positive." + scientific: " Scientific notation is not supported." + too-long: " Value must be less than 10 digits" statement: balance: - name: "&9 Balance:" - description: "&6 [number]" + name: " Balance:" + description: " [number]" deposit: Deposit description: "show your island bank history" give: "Admin Give" @@ -55,10 +55,10 @@ bank: oldest: "Sort by oldest" set: "Admin Set" syntax: | - &9 [date] - &9 [time] - &7 [name] - &6 [number] + [date] + [time] + [name] + [number] take: "Admin Take" title: "Account history" unknown: "Unknown Type" @@ -68,12 +68,12 @@ bank: withdraw: description: "withdraw amount from your island account" parameters: - success: "&a Success! Your new island bank balance is [number]." - alert: '&a [name] withdrew [number] from the island bank.' + success: " Success! Your new island bank balance is [number]." + alert: ' [name] withdrew [number] from the island bank.' protection: flags: BANK_ACCESS: description: |- - &f Allow acces to - &f the island bank + Allow acces to + the island bank name: "Island Bank Access" diff --git a/src/main/resources/locales/es.yml b/src/main/resources/locales/es.yml index 6b6a5b1..a902b4e 100644 --- a/src/main/resources/locales/es.yml +++ b/src/main/resources/locales/es.yml @@ -5,7 +5,7 @@ bank: give: parameters: " " description: agrega cierta cantidad a la cuenta de la isla del jugador - success: "&a ¡Éxito! El saldo del banco de la isla de [name] ahora es [number]." + success: " ¡Éxito! El saldo del banco de la isla de [name] ahora es [number]." take: parameters: " " description: quita cierta cantidad a la cuenta de la isla del jugador @@ -15,16 +15,16 @@ bank: set: parameters: " " description: establece la cuenta de la isla del jugador a cierta cantidad - success: "&a La cuenta de la isla de [name] fue establecida a [number]." + success: " La cuenta de la isla de [name] fue establecida a [number]." statement: parameters: "" description: ver extracto bancario de la isla para el jugador balance: description: muestra el saldo bancario de su isla - island-balance: "&a Saldo del banco de la isla es [number]." + island-balance: " Saldo del banco de la isla es [number]." baltop: description: mostrar clasificaciones de equilibrio - description-syntax: "&d [number]" + description-syntax: " [number]" highest: Ordenar por más alto lowest: Ordenar por el más bajo name-syntax: "& d [name]" @@ -32,23 +32,23 @@ bank: deposit: description: depositar cantidad en su cuenta de la isla parameters: "" - success: "&a ¡Éxito! Su nuevo saldo en el banco de la isla es [number]." - alert: "&a [name] ha depositado [number] en el banco de la isla." + success: " ¡Éxito! Su nuevo saldo en el banco de la isla es [number]." + alert: " [name] ha depositado [number] en el banco de la isla." errors: - bank-error: "&c Error al cargar la información de la cuenta bancaria. Vuelve a + bank-error: " Error al cargar la información de la cuenta bancaria. Vuelve a intentarlo más tarde." - low-balance: "&c ¡El saldo del banco de su isla no es lo suficientemente alto!" - too-low: "&c El saldo de la isla es demasiado bajo." - must-be-a-number: "&c La cantidad debe ser un número" - no-rank: "&c Tu rango no es lo suficientemente alto para usar el banco." - too-much: "&c No tiene esa cantidad para depositar." - value-must-be-positive: "&c La cantidad debe ser positiva." - scientific: "&c No se admite la notación científica." - too-long: "&c El valor debe tener menos de 10 dígitos" + low-balance: " ¡El saldo del banco de su isla no es lo suficientemente alto!" + too-low: " El saldo de la isla es demasiado bajo." + must-be-a-number: " La cantidad debe ser un número" + no-rank: " Tu rango no es lo suficientemente alto para usar el banco." + too-much: " No tiene esa cantidad para depositar." + value-must-be-positive: " La cantidad debe ser positiva." + scientific: " No se admite la notación científica." + too-long: " El valor debe tener menos de 10 dígitos" statement: balance: name: "& 9 Equilibrio:" - description: "&6 [number]" + description: " [number]" deposit: Depositar description: muestra el historial de tu banco de la isla give: Admin Dar @@ -57,10 +57,10 @@ bank: oldest: Ordenar por más antiguo set: Admin Establecer syntax: | - &9 [date] - &9 [time] - &7 [name] - &6 [number] + [date] + [time] + [name] + [number] take: Admin Tomar title: Historial de cuenta unknown: Tipo desconocido @@ -70,12 +70,12 @@ bank: withdraw: description: retirar cantidad de su cuenta de la isla parameters: "" - success: "&a ¡Éxito! Su nuevo saldo en el banco de la isla es [number]." - alert: "&a [name] ha depositado [number] en el banco de la isla." + success: " ¡Éxito! Su nuevo saldo en el banco de la isla es [number]." + alert: " [name] ha depositado [number] en el banco de la isla." protection: flags: BANK_ACCESS: description: |- - &f Permitir el acceso - &f al banco de la isla + Permitir el acceso + al banco de la isla name: Acceso al banco de la isla diff --git a/src/main/resources/locales/fr.yml b/src/main/resources/locales/fr.yml index b77ec60..01479ca 100644 --- a/src/main/resources/locales/fr.yml +++ b/src/main/resources/locales/fr.yml @@ -5,7 +5,7 @@ bank: give: parameters: " " description: ajouter un montant au compte de l'île du joueur - success: "&a Succès! Le solde bancaire de l'île de [name] est désormais de [number]." + success: " Succès! Le solde bancaire de l'île de [name] est désormais de [number]." take: parameters: " " description: prendre le montant du compte de l'île du joueur @@ -15,40 +15,40 @@ bank: set: parameters: " " description: définir le montant sur le compte de l'île du joueur - success: "&a compte de [name] défini sur [number]." + success: " compte de [name] défini sur [number]." statement: parameters: "" description: voir le relevé bancaire de l'île pour le joueur balance: description: affiche le solde bancaire de votre île - island-balance: "&a solde bancaire de l'île est [number]." + island-balance: " solde bancaire de l'île est [number]." baltop: description: afficher les classements d'équilibre - description-syntax: "&d[number]" + description-syntax: "[number]" highest: Trier par le plus élevé lowest: Trier par le plus bas - name-syntax: "&d [name]" + name-syntax: " [name]" title: Principaux soldes deposit: description: déposer le montant sur votre compte insulaire parameters: "" - success: "&a Succès! Le nouveau solde bancaire de votre île est de [number]." - alert: "&a [name] a déposé [number] à la banque de l'île." + success: " Succès! Le nouveau solde bancaire de votre île est de [number]." + alert: " [name] a déposé [number] à la banque de l'île." errors: - bank-error: "&c Erreur lors du chargement des informations du compte bancaire + bank-error: " Erreur lors du chargement des informations du compte bancaire - veuillez réessayer plus tard" - low-balance: "&c Le solde bancaire de votre île n'est pas assez élevé!" - too-low: "&c L'équilibre de l'île est trop faible." - must-be-a-number: "&c Le montant doit être un nombre" - no-rank: "&c Votre rang n'est pas assez élevé pour utiliser la banque." - too-much: "&c Vous n'avez pas ce montant à déposer." - value-must-be-positive: "&c Le montant doit être positif." - scientific: "&c La notation scientifique n'est pas prise en charge." - too-long: "&c La valeur doit être inférieure à 10 chiffres" + low-balance: " Le solde bancaire de votre île n'est pas assez élevé!" + too-low: " L'équilibre de l'île est trop faible." + must-be-a-number: " Le montant doit être un nombre" + no-rank: " Votre rang n'est pas assez élevé pour utiliser la banque." + too-much: " Vous n'avez pas ce montant à déposer." + value-must-be-positive: " Le montant doit être positif." + scientific: " La notation scientifique n'est pas prise en charge." + too-long: " La valeur doit être inférieure à 10 chiffres" statement: balance: - name: "&9 Le solde :" - description: "&6 [number]" + name: " Le solde :" + description: " [number]" deposit: Dépôt description: montrer l'histoire de votre banque insulaire give: Admin Donner @@ -57,10 +57,10 @@ bank: oldest: Trier par plus ancien set: Admin Valeur Définir syntax: | - &9 [date] - &9 [time] - &7 [name] - &6 [number] + [date] + [time] + [name] + [number] take: Admin Prend title: Historique du compte unknown: Type inconnu @@ -70,12 +70,12 @@ bank: withdraw: description: retirer le montant de votre compte insulaire parameters: "" - success: "&a Succès! Le nouveau solde bancaire de votre île est de [number]." - alert: "&a [name] a retiré [number] de la banque de l'île." + success: " Succès! Le nouveau solde bancaire de votre île est de [number]." + alert: " [name] a retiré [number] de la banque de l'île." protection: flags: BANK_ACCESS: description: |- - &f Autoriser l'accès à - &f la rive de l'île + Autoriser l'accès à + la rive de l'île name: Accès à la banque de l'île diff --git a/src/main/resources/locales/id.yml b/src/main/resources/locales/id.yml index 7de9054..5b6d3ef 100644 --- a/src/main/resources/locales/id.yml +++ b/src/main/resources/locales/id.yml @@ -5,7 +5,7 @@ bank: give: parameters: " " description: menambah jumlah saldo ke rekening pulau pemain - success: "&a Sukses! Saldo bank pulau [name] sekarang [number]." + success: " Sukses! Saldo bank pulau [name] sekarang [number]." take: parameters: " " description: mengambil jumlah saldo dari rekening pulau pemain @@ -15,39 +15,39 @@ bank: set: parameters: " " description: mengatur jumlah saldo di rekening pulau pemain - success: "&a Rekening [name] diatur menjadi [number]." + success: " Rekening [name] diatur menjadi [number]." statement: parameters: "" description: melihat rekening koran pulau untuk pemain balance: description: menunjukkan saldo bank pulau kamu - island-balance: "&a Saldo bank pulau adalah [number]." + island-balance: " Saldo bank pulau adalah [number]." baltop: description: menunjukkan peringkat saldo - description-syntax: "&d [number]" + description-syntax: " [number]" highest: Urutkan dari Tertinggi lowest: Urutkan dari Terendah - name-syntax: "&d [name]" + name-syntax: " [name]" title: Saldo Teratas deposit: description: menyetor jumlah saldo ke rekening pulau kamu parameters: "" - success: "&a Sukses! Saldo bank pulau kamu yang baru adalah [number]." - alert: "&a [name] menyetor [number] ke bank pulau." + success: " Sukses! Saldo bank pulau kamu yang baru adalah [number]." + alert: " [name] menyetor [number] ke bank pulau." errors: - bank-error: "&c Kesalahan memuat info rekening bank - silahkan coba lagi nanti" - low-balance: "&c Saldo bank pulau kamu tidak cukup tinggi!" - too-low: "&c Saldo pulau terlalu rendah." - must-be-a-number: "&c Jumlah harus berupa angka" - no-rank: "&c Rank kamu tidak cukup tinggi untuk menggunakan bank." - too-much: "&c Kamu tidak punya jumlah tersebut untuk disetor." - value-must-be-positive: "&c Jumlah harus positif." - scientific: "&c Notasi ilmiah tidak didukung." - too-long: "&c Nilai harus kurang dari 10 digit" + bank-error: " Kesalahan memuat info rekening bank - silahkan coba lagi nanti" + low-balance: " Saldo bank pulau kamu tidak cukup tinggi!" + too-low: " Saldo pulau terlalu rendah." + must-be-a-number: " Jumlah harus berupa angka" + no-rank: " Rank kamu tidak cukup tinggi untuk menggunakan bank." + too-much: " Kamu tidak punya jumlah tersebut untuk disetor." + value-must-be-positive: " Jumlah harus positif." + scientific: " Notasi ilmiah tidak didukung." + too-long: " Nilai harus kurang dari 10 digit" statement: balance: - name: "&9 Saldo:" - description: "&6 [number]" + name: " Saldo:" + description: " [number]" deposit: Setor description: menunjukkan sejarah bank pulau kamu give: Admin Memberi @@ -56,10 +56,10 @@ bank: oldest: Urut dari terlama set: Admin Mengubah syntax: | - &9 [date] - &9 [time] - &7 [name] - &6 [number] + [date] + [time] + [name] + [number] take: Admin Mengambil title: Sejarah rekening unknown: Tipe Tidak Diketahui @@ -69,12 +69,12 @@ bank: withdraw: description: menarik jumlah saldo dari rekening pulau kamu parameters: "" - success: "&a Sukses! Saldo bank pulau kamu yang baru adalah [number]." - alert: "&a [name] menarik [number] dari bank pulau." + success: " Sukses! Saldo bank pulau kamu yang baru adalah [number]." + alert: " [name] menarik [number] dari bank pulau." protection: flags: BANK_ACCESS: description: |- - &f Mengizinkan akses ke - &f bank pulau + Mengizinkan akses ke + bank pulau name: Akses Bank Pulau diff --git a/src/main/resources/locales/it.yml b/src/main/resources/locales/it.yml index 6824d43..51890fb 100644 --- a/src/main/resources/locales/it.yml +++ b/src/main/resources/locales/it.yml @@ -5,7 +5,7 @@ bank: give: parameters: " " description: aggiungi importo al conto dell'isola del giocatore - success: "&aFatto! Il saldo bancario dell'isola di [nome] è ora [numero]." + success: "Fatto! Il saldo bancario dell'isola di [nome] è ora [numero]." take: parameters: " " description: preleva l'importo dal conto dell'isola del giocatore @@ -15,40 +15,40 @@ bank: set: parameters: " " description: imposta l'importo nel conto dell'isola del giocatore - success: "&aIl bilancio di [name] è stato impostato su [number]." + success: "Il bilancio di [name] è stato impostato su [number]." statement: parameters: "" description: visualizza l'estratto conto dell'isola per il giocatore balance: description: mostra il bilancio della tua isola - island-balance: "&aIl bilancio dell'isola è [number]." + island-balance: "Il bilancio dell'isola è [number]." baltop: description: mostra la classifica dei bilanci - description-syntax: "&d [number]" + description-syntax: " [number]" highest: Ordina per più alto lowest: Ordina per più basso - name-syntax: "&d [name]" + name-syntax: " [name]" title: I bilanci più alti deposit: description: deposita l'importo nella banca dell'isola parameters: "" - success: "&Fatto! Il tuo nuovo saldo bancario sull'isola è [number]." - alert: "&a[name] ha depositato [number] nella banca dell'isola." + success: "atto! Il tuo nuovo saldo bancario sull'isola è [number]." + alert: "[name] ha depositato [number] nella banca dell'isola." errors: - bank-error: "&c Errore durante il caricamento dei dati del conto bancario: riprova + bank-error: " Errore durante il caricamento dei dati del conto bancario: riprova più tardi" - low-balance: "&c Il saldo della tua isola non è abbastanza alto!" - too-low: "&c Il saldo dell'isola è troppo basso." - must-be-a-number: "&c L'importo deve essere un numero" - no-rank: "&c Il tuo grado non è sufficientemente alto per utilizzare la banca." - too-much: "&c Non hai quell'importo da depositare." - value-must-be-positive: "&c L'importo deve essere positivo." - scientific: "&c La notazione scientifica non è supportata." - too-long: "&c Il valore deve essere inferiore a 10 cifre" + low-balance: " Il saldo della tua isola non è abbastanza alto!" + too-low: " Il saldo dell'isola è troppo basso." + must-be-a-number: " L'importo deve essere un numero" + no-rank: " Il tuo grado non è sufficientemente alto per utilizzare la banca." + too-much: " Non hai quell'importo da depositare." + value-must-be-positive: " L'importo deve essere positivo." + scientific: " La notazione scientifica non è supportata." + too-long: " Il valore deve essere inferiore a 10 cifre" statement: balance: - name: "&9 Saldo:" - description: "&6 [number]" + name: " Saldo:" + description: " [number]" deposit: Deposito description: mostra la cronologia della banca della tua isola give: Regalo amministratore @@ -57,10 +57,10 @@ bank: oldest: Ordina per più vecchio set: Impostazione amministratore syntax: | - &9 [date] - &9 [time] - &7 [name] - &6 [number] + [date] + [time] + [name] + [number] take: Presa amministrativa title: Cronologia del conto unknown: Tipo sconosciuto @@ -70,12 +70,12 @@ bank: withdraw: description: prelevare l'importo dal conto dell'isola parameters: "" - success: "&Fatto! Il tuo nuovo saldo bancario sull'isola è [number]." + success: "atto! Il tuo nuovo saldo bancario sull'isola è [number]." alert: "&un [name] ritirò [number] dalla banca dell'isola." protection: flags: BANK_ACCESS: description: |- - &f Consenti accesso a - &f la banca dell'isola + Consenti accesso a + la banca dell'isola name: Accesso alla banca dell'isola diff --git a/src/main/resources/locales/ja.yml b/src/main/resources/locales/ja.yml index 37d33e9..e455aa6 100644 --- a/src/main/resources/locales/ja.yml +++ b/src/main/resources/locales/ja.yml @@ -5,7 +5,7 @@ bank: give: parameters: "<プレーヤー> <金額>" description: プレイヤーのアイランドアカウントに金額を追加する - success: "&a成功！ [name]の島の銀行残高は[number]になりました。" + success: "成功！ [name]の島の銀行残高は[number]になりました。" take: parameters: "<プレーヤー> <金額>" description: プレイヤーのアイランドアカウントから金額を取得します @@ -15,38 +15,38 @@ bank: set: parameters: "<プレーヤー> <金額>" description: プレイヤーのアイランドアカウントに金額を設定する - success: "&a[name]のアカウントが[number]に設定されています。" + success: "[name]のアカウントが[number]に設定されています。" statement: parameters: "<プレイヤー>" description: プレイヤーのアイランドバンクステートメントを表示 balance: description: 島の銀行の残高を表示します - island-balance: "&a島の銀行残高は[number]です。" + island-balance: "島の銀行残高は[number]です。" baltop: description: バランスランキングを表示する - description-syntax: "&d[number]" + description-syntax: "[number]" highest: 最高で並べ替え lowest: 最低で並べ替え - name-syntax: "&d[name]" + name-syntax: "[name]" title: トップバランス deposit: description: 島の口座に入金金額 parameters: "<金額>" - success: "&a成功！新しい島の銀行の残高は[number]です。" + success: "成功！新しい島の銀行の残高は[number]です。" errors: - bank-error: "&c銀行口座情報の読み込み中にエラーが発生しました-後でもう一度お試しください" - low-balance: "&cあなたの島の銀行の残高は十分に高くありません！" + bank-error: "銀行口座情報の読み込み中にエラーが発生しました-後でもう一度お試しください" + low-balance: "あなたの島の銀行の残高は十分に高くありません！" too-low: "＆cアイランドバランスが低すぎます。" - must-be-a-number: "&c金額は数値である必要があります" - no-rank: "&cあなたのランクは銀行を使うのに十分高くありません。" - too-much: "&cデポジットする金額がありません。" - value-must-be-positive: "&c金額は正でなければなりません。" + must-be-a-number: "金額は数値である必要があります" + no-rank: "あなたのランクは銀行を使うのに十分高くありません。" + too-much: "デポジットする金額がありません。" + value-must-be-positive: "金額は正でなければなりません。" scientific: "＆c科学的記数法はサポートされていません。" - too-long: "&c値は10桁未満である必要があります" + too-long: "値は10桁未満である必要があります" statement: balance: - name: "&9 銀行預金残高:" - description: "&6 [number]" + name: " 銀行預金残高:" + description: " [number]" deposit: 預り金 description: 島の銀行の歴史を表示する give: 管理者が与える @@ -54,7 +54,7 @@ bank: latest: 最新のもので並べ替え oldest: 最も古いもので並べ替え set: 管理者セット - syntax: "&9 [date] \n&9 [time] \n&7 [name] \n&6 [number]" + syntax: " [date] \n [time] \n [name] \n [number]" take: 管理者テイク title: アカウント履歴 unknown: 不明なタイプ @@ -64,11 +64,11 @@ bank: withdraw: description: アイランドアカウントから金額を引き出す parameters: "<金額>" - success: "&a成功！新しい島の銀行の残高は[number]です。" + success: "成功！新しい島の銀行の残高は[number]です。" protection: flags: BANK_ACCESS: description: |- - &f島の銀行への - &fアクセスを許可する + 島の銀行への + アクセスを許可する name: アイランドバンクアクセス diff --git a/src/main/resources/locales/ko.yml b/src/main/resources/locales/ko.yml index 82b2781..df48982 100644 --- a/src/main/resources/locales/ko.yml +++ b/src/main/resources/locales/ko.yml @@ -5,7 +5,7 @@ bank: give: parameters: "<플레이어> <금액>" description: 플레이어의 섬 은행에 입금합니다. - success: "&a성공적으로 지급되었습니다! [name]님의 섬 은행 잔고는 [number]원 입니다." + success: "성공적으로 지급되었습니다! [name]님의 섬 은행 잔고는 [number]원 입니다." take: parameters: "<플레이어> <금액>" description: 플레이어 섬 은행에서 출금합니다. @@ -15,39 +15,39 @@ bank: set: parameters: "<플레이어> <금액>" description: 플레이어의 섬 은행 잔고를 설정합니다. - success: "&a[name]님의 섬 은행 잔고가[number]원으로 설정되었습니다." + success: "[name]님의 섬 은행 잔고가[number]원으로 설정되었습니다." statement: parameters: "<플레이어>" description: 플레이어에 대한 섬 은행 명세서를 확인합니다. balance: description: 섬 은행 잔고를 확인합니다. - island-balance: "&a섬 은행 잔고는 [number]원입니다." + island-balance: "섬 은행 잔고는 [number]원입니다." baltop: description: 섬 은행 순위를 확인합니다. - description-syntax: "&d[number]" + description-syntax: "[number]" highest: 오름차순 정렬 lowest: 내림차순 정렬 - name-syntax: "&d[name]" + name-syntax: "[name]" title: 섬 은행 순위 deposit: description: 자신의 섬 은행에 입금합니다. parameters: "<금액>" - success: "&a성공적으로 입금되었습니다! 현재 섬 은행 잔고는 [number]입니다." - alert: "&a[name]님이 [number]원을 입금하였습니다." + success: "성공적으로 입금되었습니다! 현재 섬 은행 잔고는 [number]입니다." + alert: "[name]님이 [number]원을 입금하였습니다." errors: - bank-error: "&c은행 정보를 불러오는 동안 오류가 발생했습니다. 나중에 다시 시도하십시오." - low-balance: "&c섬 은행 잔고가 충분하지 않습니다!" - too-low: "&c섬 은행 잔고가 너무 낮습니다." - must-be-a-number: "&c금액은 숫자여야 합니다." - no-rank: "&c랭크가 낮아 은행을 이용할 수 없습니다." - too-much: "&c섬 은행에 입금할 금액이 없습니다." - value-must-be-positive: "&c금액은 양수여야 합니다." - scientific: "&c과학적 표기법은 지원되지 않습니다." - too-long: "&c값은 10자리 미만이어야 합니다" + bank-error: "은행 정보를 불러오는 동안 오류가 발생했습니다. 나중에 다시 시도하십시오." + low-balance: "섬 은행 잔고가 충분하지 않습니다!" + too-low: "섬 은행 잔고가 너무 낮습니다." + must-be-a-number: "금액은 숫자여야 합니다." + no-rank: "랭크가 낮아 은행을 이용할 수 없습니다." + too-much: "섬 은행에 입금할 금액이 없습니다." + value-must-be-positive: "금액은 양수여야 합니다." + scientific: "과학적 표기법은 지원되지 않습니다." + too-long: "값은 10자리 미만이어야 합니다" statement: balance: - name: "&9은행 잔고:" - description: "&6[number]" + name: "은행 잔고:" + description: "[number]" deposit: 예금 description: 섬 은행 기록을 확인합니다. give: 관리자 입금 @@ -56,10 +56,10 @@ bank: oldest: 지난순 set: 관리자 설정 syntax: | - &9[date] - &9[time] - &7[name] - &6[number] + [date] + [time] + [name] + [number] take: 관리자 출금 title: 계정 내역 unknown: 알 수 없는 유형 @@ -69,12 +69,12 @@ bank: withdraw: description: 섬 은행에서 금액을 인출합니다. parameters: "<금액>" - success: "&a성공적으로 출금하였습니다! 현재 섬 은행 잔고는 [number]입니다." - alert: "&a[name]님이 [number]원을 출금하였습니다." + success: "성공적으로 출금하였습니다! 현재 섬 은행 잔고는 [number]입니다." + alert: "[name]님이 [number]원을 출금하였습니다." protection: flags: BANK_ACCESS: description: |- - &f섬의 은행 접근을 - &f허가합니다. + 섬의 은행 접근을 + 허가합니다. name: 섬 은행 접근 diff --git a/src/main/resources/locales/uk.yml b/src/main/resources/locales/uk.yml index 2748950..c2824d6 100644 --- a/src/main/resources/locales/uk.yml +++ b/src/main/resources/locales/uk.yml @@ -5,7 +5,7 @@ bank: give: parameters: " " description: додати суму на рахунок острова гравця - success: "&a Успіх! Баланс острівного банку [name] тепер становить [number]." + success: " Успіх! Баланс острівного банку [name] тепер становить [number]." take: parameters: " " description: взяти суму з острівного рахунку гравця @@ -21,34 +21,34 @@ bank: description: переглянути виписку з банківського рахунку острова для гравця balance: description: показує баланс вашого острівного банку - island-balance: "&a Баланс банку острова [number]." + island-balance: " Баланс банку острова [number]." baltop: description: показати рейтинг балансу - description-syntax: "&d [number]" + description-syntax: " [number]" highest: Сортувати за найвищим lowest: Сортувати за найнижчим - name-syntax: "&d [name]" + name-syntax: " [name]" title: Топ баланси deposit: description: внесіть суму на свій острівний рахунок parameters: "" - success: "&a Успіх! Ваш новий баланс в острівному банку становить [number]." - alert: "&a [name] вніс [number] в острівний банк." + success: " Успіх! Ваш новий баланс в острівному банку становить [number]." + alert: " [name] вніс [number] в острівний банк." errors: - bank-error: "&c Помилка завантаження інформації про банківський рахунок - спробуйте + bank-error: " Помилка завантаження інформації про банківський рахунок - спробуйте пізніше" - low-balance: "&c Баланс вашого острівного банку недостатньо високий!" - too-low: "&c Баланс острова занадто низький." - must-be-a-number: "&c Сума має бути числом" - no-rank: "&c Ваш ранг недостатньо високий, щоб користуватися банком." - too-much: "&c У вас немає такої суми для депозиту." - value-must-be-positive: "&c Сума має бути додатною." - scientific: "&c Наукова нотація не підтримується." - too-long: "&c Значення має бути меншим за 10 цифр" + low-balance: " Баланс вашого острівного банку недостатньо високий!" + too-low: " Баланс острова занадто низький." + must-be-a-number: " Сума має бути числом" + no-rank: " Ваш ранг недостатньо високий, щоб користуватися банком." + too-much: " У вас немає такої суми для депозиту." + value-must-be-positive: " Сума має бути додатною." + scientific: " Наукова нотація не підтримується." + too-long: " Значення має бути меншим за 10 цифр" statement: balance: - name: "&9 Баланс:" - description: "&6 [number]" + name: " Баланс:" + description: " [number]" deposit: Депозит description: показати історію вашого острівного банку give: Адмін видати @@ -57,10 +57,10 @@ bank: oldest: Сортувати за найстарішим set: Адмін встановити syntax: | - &9 [date] - &9 [time] - &7 [name] - &6 [number] + [date] + [time] + [name] + [number] take: Адмін забрати title: Історія облікового запису unknown: Невідомий тип @@ -70,12 +70,12 @@ bank: withdraw: description: зняти суму зі свого острівного рахунку parameters: "" - success: "&a Успіх! Ваш новий баланс у острівному банку становить [number]." - alert: "&a [name] зняв [number] з острівного банку." + success: " Успіх! Ваш новий баланс у острівному банку становить [number]." + alert: " [name] зняв [number] з острівного банку." protection: flags: BANK_ACCESS: description: |- - &f Дозволити доступ до - &f острівний банк + Дозволити доступ до + острівний банк name: Доступ до банку острова diff --git a/src/main/resources/locales/vi.yml b/src/main/resources/locales/vi.yml index 841538e..3dd45b9 100644 --- a/src/main/resources/locales/vi.yml +++ b/src/main/resources/locales/vi.yml @@ -5,7 +5,7 @@ bank: give: parameters: " " description: thêm số tiền vào tài khoản đảo của người chơi - success: "&a Thành công! Số dư ngân hàng đảo của [name] hiện là [number]." + success: " Thành công! Số dư ngân hàng đảo của [name] hiện là [number]." take: parameters: " " description: lấy số tiền từ tài khoản đảo của người chơi @@ -15,39 +15,39 @@ bank: set: parameters: " " description: đặt số tiền trong tài khoản đảo của người chơi - success: " &a Tài khoản của [name] được đặt thành [number]." + success: " Tài khoản của [name] được đặt thành [number]." statement: parameters: "" description: xem đảo sao kê ngân hàng cho người chơi balance: description: hiển thị số dư ngân hàng đảo của bạn - island-balance: "&a Số dư ngân hàng đảo là [number]." + island-balance: " Số dư ngân hàng đảo là [number]." baltop: description: hiển thị thứ hạng ngân hàng - description-syntax: "&d [number]" + description-syntax: " [number]" highest: Sắp xếp theo Cao nhất lowest: Sắp xếp theo Thấp nhất - name-syntax: "&d [name]" + name-syntax: " [name]" title: Số dư hàng đầu deposit: description: số tiền gửi vào tài khoản đảo của bạn parameters: "" - success: "&a Thành công! Số dư ngân hàng đảo mới của bạn là [number]." - alert: "&a [name] đã gửi [number] vào ngân hàng của đảo." + success: " Thành công! Số dư ngân hàng đảo mới của bạn là [number]." + alert: " [name] đã gửi [number] vào ngân hàng của đảo." errors: - bank-error: "&c Lỗi khi tải thông tin tài khoản ngân hàng - vui lòng thử lại sau" - low-balance: "&c Số dư ngân hàng đảo của bạn không đủ cao!" - too-low: "&c Số tiền của đảo quá thấp." - must-be-a-number: "&c Số tiền phải là một số" - no-rank: "&c Xếp hạng của bạn không đủ cao để sử dụng ngân hàng." - too-much: "&c Bạn không có số tiền đó để gửi." - value-must-be-positive: "&c Số tiền phải là số dương." - scientific: "&c Ký hiệu khoa học không được hỗ trợ." - too-long: "&c Giá trị phải nhỏ hơn 10 chữ số" + bank-error: " Lỗi khi tải thông tin tài khoản ngân hàng - vui lòng thử lại sau" + low-balance: " Số dư ngân hàng đảo của bạn không đủ cao!" + too-low: " Số tiền của đảo quá thấp." + must-be-a-number: " Số tiền phải là một số" + no-rank: " Xếp hạng của bạn không đủ cao để sử dụng ngân hàng." + too-much: " Bạn không có số tiền đó để gửi." + value-must-be-positive: " Số tiền phải là số dương." + scientific: " Ký hiệu khoa học không được hỗ trợ." + too-long: " Giá trị phải nhỏ hơn 10 chữ số" statement: balance: - name: "&9 Số dư:" - description: "&6 [number]" + name: " Số dư:" + description: " [number]" deposit: Tiền gửi description: hiển thị lịch sử ngân hàng đảo của bạn give: Quản trị viên cho @@ -56,10 +56,10 @@ bank: oldest: Sắp xếp theo cũ nhất set: Bộ quản trị syntax: |- - &9 [date] - &9 [time] - &7 [name] - &6 [number] + [date] + [time] + [name] + [number] take: quản trị viên lấy tiền title: Lịch sử tài khoản unknown: Loại không xác định @@ -69,12 +69,12 @@ bank: withdraw: description: rút số tiền từ tài khoản đảo của bạn parameters: "" - success: "&a Thành công! Số dư ngân hàng đảo mới của bạn là [number]." - alert: "&a [name] đã rút [number] khỏi ngân hàng của đảo." + success: " Thành công! Số dư ngân hàng đảo mới của bạn là [number]." + alert: " [name] đã rút [number] khỏi ngân hàng của đảo." protection: flags: BANK_ACCESS: description: |- - &f Cho phép truy cập vào - &f ngân hàng của đảo + Cho phép truy cập vào + ngân hàng của đảo name: Truy cập ngân hàng đảo diff --git a/src/main/resources/locales/zh-CN.yml b/src/main/resources/locales/zh-CN.yml index ff67f87..d8f2356 100644 --- a/src/main/resources/locales/zh-CN.yml +++ b/src/main/resources/locales/zh-CN.yml @@ -5,7 +5,7 @@ bank: give: parameters: "<玩家> <金额>" description: 向玩家的空岛银行增加金钱 - success: "&a成功！ [name] 的岛屿银行余额现在是 [number]" + success: "成功！ [name] 的岛屿银行余额现在是 [number]" take: parameters: "<玩家> <金额>" description: 从玩家的岛屿账户中取出金钱 @@ -15,39 +15,39 @@ bank: set: parameters: "<玩家> <金额>" description: 设置玩家岛屿账户的金额 - success: "&a [name] 的帐户金额设置为[number]" + success: " [name] 的帐户金额设置为[number]" statement: parameters: "<玩家>" description: 查看玩家的岛上银行帐单 balance: description: 显示您的岛屿银行余额 - island-balance: "&a岛银行的余额为[number]。" + island-balance: "岛银行的余额为[number]。" baltop: description: 显示余额排名 - description-syntax: "&d[number]" + description-syntax: "[number]" highest: 降序排序 lowest: 升序排序 - name-syntax: "&d[name]" + name-syntax: "[name]" title: 最高余额 deposit: description: 将金额存入您的岛屿账户 parameters: "<金额>" success: "＆成功！您的新岛银行余额为[number]。" - alert: "&a [name]向岛屿银行存入了[number]。" + alert: " [name]向岛屿银行存入了[number]。" errors: bank-error: "＆c加载银行帐户信息时出错-请稍后重试" low-balance: "＆c您的岛屿银行余额不足！" - too-low: "&c 空岛余额太少" + too-low: " 空岛余额太少" must-be-a-number: "＆c金额必须是数字" no-rank: "＆c您的等级不够高，无法使用银行。" too-much: "＆c您没有足够的钱来存入。" value-must-be-positive: "＆c金额必须为正数。" - scientific: "&c 不支持科学记数法。" - too-long: "&c 值必须小于 10 位" + scientific: " 不支持科学记数法。" + too-long: " 值必须小于 10 位" statement: balance: - name: "&9 银行存款余额:" - description: "&6 [number]" + name: " 银行存款余额:" + description: " [number]" deposit: 存入 description: 显示您的岛屿银行历史 give: 管理员给予 @@ -55,7 +55,7 @@ bank: latest: 按最新排序 oldest: 按最旧排序 set: 管理员设置 - syntax: "&9 [date] \n&9 [time] \n&7 [name]\n &6 [number]" + syntax: " [date] \n [time] \n [name]\n [number]" take: 管理员拿走 title: 账户历史 unknown: 未知类型 @@ -65,10 +65,10 @@ bank: withdraw: description: 从您的岛屿账户中提款 parameters: "<金额>" - success: "&a成功！您的新岛银行余额为[number]。" - alert: "&a [name]从岛屿银行取出了[number]。" + success: "成功！您的新岛银行余额为[number]。" + alert: " [name]从岛屿银行取出了[number]。" protection: flags: BANK_ACCESS: - description: "&f允许使用空岛银行" + description: "允许使用空岛银行" name: 空岛银行权限 From 36a943f4509bd88309cb4993baff8d29e86e86c0 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 17:02:41 -0700 Subject: [PATCH 14/31] Update build version from 1.9.1 to 1.10.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 22c446f..c0cebff 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ -LOCAL - 1.9.1 + 1.10.0 BentoBoxWorld_Bank bentobox-world https://sonarcloud.io From 67e3cafae1e8b643534f7f3eac66778128f6a193 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 17:15:35 -0700 Subject: [PATCH 15/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- CLAUDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CLAUDE.md b/CLAUDE.md index 1654f4d..fc376d7 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -14,7 +14,7 @@ mvn test # Run tests only mvn verify # Build + tests + coverage ``` -Output JAR goes to `target/`. The build requires Java 17+. +Output JAR goes to `target/`. The build requires Java 21+. ## Testing From f36bd957c2733b3ad60b6dc0c3b73aaeeec0ac3f Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 17:15:53 -0700 Subject: [PATCH 16/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- CLAUDE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index fc376d7..568164f 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -42,8 +42,8 @@ Output JAR goes to `target/`. The build requires Java 21+. ## Key Dependencies (provided at runtime, not bundled) -- Spigot API 1.21.3 -- BentoBox 2.7.1-SNAPSHOT +- Paper API 1.21.x +- BentoBox 3.14.0-SNAPSHOT - Vault API 1.7 ## Localization From 2c75579f95088c9b170d2c0bcd9621c4ed2e5294 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 17:16:14 -0700 Subject: [PATCH 17/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/main/resources/locales/it.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/locales/it.yml b/src/main/resources/locales/it.yml index 51890fb..23db4d2 100644 --- a/src/main/resources/locales/it.yml +++ b/src/main/resources/locales/it.yml @@ -32,7 +32,7 @@ bank: deposit: description: deposita l'importo nella banca dell'isola parameters: "" - success: "atto! Il tuo nuovo saldo bancario sull'isola è [number]." + success: "Fatto! Il tuo nuovo saldo bancario sull'isola è [number]." alert: "[name] ha depositato [number] nella banca dell'isola." errors: bank-error: " Errore durante il caricamento dei dati del conto bancario: riprova From 13535b3a85dbff8e4818598437cb675f6464e61e Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 17:16:42 -0700 Subject: [PATCH 18/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- CLAUDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CLAUDE.md b/CLAUDE.md index 568164f..65dd0bf 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -18,7 +18,7 @@ Output JAR goes to `target/`. The build requires Java 21+. ## Testing -- JUnit 4 with PowerMock (required to mock Bukkit/BentoBox static methods) +- JUnit 5 (Jupiter) with Mockito (incl. static mocking) and MockBukkit - Run a single test: `mvn test -Dtest=BankManagerTest` - Tests are in `src/test/java/world/bentobox/bank/` mirroring main source structure - JaCoCo coverage reports: `target/site/jacoco/` From 9c77e8375fd16ae3512c269996eeae9f6f7cb35a Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 17:16:56 -0700 Subject: [PATCH 19/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/main/resources/locales/en-US.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 52b1f71..306171a 100644 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -74,6 +74,6 @@ protection: flags: BANK_ACCESS: description: |- - Allow acces to + Allow access to the island bank name: "Island Bank Access" From e3aa1c307297b4b695a0cb42a2ed9ef742f5ad75 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 17:17:16 -0700 Subject: [PATCH 20/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/main/resources/locales/it.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/locales/it.yml b/src/main/resources/locales/it.yml index 23db4d2..4e293b9 100644 --- a/src/main/resources/locales/it.yml +++ b/src/main/resources/locales/it.yml @@ -5,7 +5,7 @@ bank: give: parameters: " " description: aggiungi importo al conto dell'isola del giocatore - success: "Fatto! Il saldo bancario dell'isola di [nome] è ora [numero]." + success: "Fatto! Il saldo bancario dell'isola di [name] è ora [number]." take: parameters: " " description: preleva l'importo dal conto dell'isola del giocatore From 7eb580cf110d0c524eb6d3d122ac7b69c2835e05 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 17:17:56 -0700 Subject: [PATCH 21/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/main/resources/locales/it.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/locales/it.yml b/src/main/resources/locales/it.yml index 4e293b9..9950392 100644 --- a/src/main/resources/locales/it.yml +++ b/src/main/resources/locales/it.yml @@ -70,7 +70,7 @@ bank: withdraw: description: prelevare l'importo dal conto dell'isola parameters: "" - success: "atto! Il tuo nuovo saldo bancario sull'isola è [number]." + success: "Fatto! Il tuo nuovo saldo bancario sull'isola è [number]." alert: "&un [name] ritirò [number] dalla banca dell'isola." protection: flags: From 758057f68ad815a2e2144338474a6051950f5596 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 17:18:26 -0700 Subject: [PATCH 22/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .../java/world/bentobox/bank/commands/user/DepositCommand.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/world/bentobox/bank/commands/user/DepositCommand.java b/src/main/java/world/bentobox/bank/commands/user/DepositCommand.java index 3059607..9f9ba48 100644 --- a/src/main/java/world/bentobox/bank/commands/user/DepositCommand.java +++ b/src/main/java/world/bentobox/bank/commands/user/DepositCommand.java @@ -75,6 +75,8 @@ private void notifyMembers(User user, Money amount) { if (!addon.getSettings().isSendBankAlert()) return; Island island = addon.getIslands().getIsland(getWorld(), user); + if (island == null) return; + final Set members = island.getMemberSet(RanksManager.MEMBER_RANK); for (UUID member : members) { final Player player = Bukkit.getPlayer(member); From 27a00883580c164c067f4f8cb1071e40e05b789c Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 17:19:25 -0700 Subject: [PATCH 23/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .../java/world/bentobox/bank/PhManager.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/world/bentobox/bank/PhManager.java b/src/main/java/world/bentobox/bank/PhManager.java index 49dd993..b2d42b0 100644 --- a/src/main/java/world/bentobox/bank/PhManager.java +++ b/src/main/java/world/bentobox/bank/PhManager.java @@ -147,15 +147,18 @@ private String formatTransaction(AccountHistory history) { * @return display name */ private String getTxTypeDisplay(TxType type) { - switch (type) { - case DEPOSIT: return "Deposited"; - case WITHDRAW: return "Withdrew"; - case GIVE: return "Received"; - case TAKE: return "Lost"; - case SET: return "Set"; - case INTEREST: return "Earned"; - default: return "Unknown"; + if (type == null) { + return "Unknown"; } + return switch (type) { + case DEPOSIT -> "Deposited"; + case WITHDRAW -> "Withdrew"; + case GIVE -> "Received"; + case TAKE -> "Lost"; + case SET -> "Set"; + case INTEREST -> "Earned"; + default -> "Unknown"; + }; } /** From 05a416030cf06710a9f3459033912f55f6e07d50 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 17:19:49 -0700 Subject: [PATCH 24/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .../java/world/bentobox/bank/BankManager.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/world/bentobox/bank/BankManager.java b/src/main/java/world/bentobox/bank/BankManager.java index 7ca899d..aff4046 100644 --- a/src/main/java/world/bentobox/bank/BankManager.java +++ b/src/main/java/world/bentobox/bank/BankManager.java @@ -340,16 +340,25 @@ public AccountHistory getLatestHistory(Island island) { if (island == null) return null; try { BankAccounts account = getAccount(island.getUniqueId()); + // Keep behavior consistent with getHistory(): apply interest before reading history + this.getBalancePlusInterest(account); + Map history = account.getHistory(); if (history.isEmpty()) return null; + Long latestKey = Collections.max(history.keySet()); String value = history.get(latestKey); - String[] split = value.split(":"); - if (split.length == 3) { - TxType type = Enums.getIfPresent(TxType.class, split[1]).or(TxType.UNKNOWN); + if (value == null) return null; + + String[] split = value.split(":", 3); + if (split.length != 3) return null; + + TxType type = Enums.getIfPresent(TxType.class, split[1]).or(TxType.UNKNOWN); + try { return new AccountHistory(latestKey, split[0], Double.parseDouble(split[2]), type); + } catch (NumberFormatException e) { + return null; } - return null; } catch (IOException e) { return null; } From 45911dbb65d339d2cab7d04f8ca31b09e8116017 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 18:27:24 -0700 Subject: [PATCH 25/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/main/java/world/bentobox/bank/PhManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/world/bentobox/bank/PhManager.java b/src/main/java/world/bentobox/bank/PhManager.java index b2d42b0..3582ba3 100644 --- a/src/main/java/world/bentobox/bank/PhManager.java +++ b/src/main/java/world/bentobox/bank/PhManager.java @@ -126,7 +126,9 @@ String getVisitedIslandBalance(GameModeAddon gm, User user, boolean formatted, b */ String getLatestTransaction(User user, World world) { if (user == null || !user.isPlayer()) return ""; - Island island = addon.getIslands().getIsland(world, user); + World actualWorld = world == null ? null : world.bentobox.bentobox.util.Util.getWorld(world); + if (actualWorld == null) return ""; + Island island = addon.getIslands().getIsland(actualWorld, user); if (island == null) return ""; return formatTransaction(bankManager.getLatestHistory(island)); } From 61eb12924ad5d89cc33232f283d22bad3da7bf34 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 18:27:52 -0700 Subject: [PATCH 26/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/main/java/world/bentobox/bank/BankManager.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/world/bentobox/bank/BankManager.java b/src/main/java/world/bentobox/bank/BankManager.java index aff4046..7648902 100644 --- a/src/main/java/world/bentobox/bank/BankManager.java +++ b/src/main/java/world/bentobox/bank/BankManager.java @@ -346,9 +346,11 @@ public AccountHistory getLatestHistory(Island island) { Map history = account.getHistory(); if (history.isEmpty()) return null; - Long latestKey = Collections.max(history.keySet()); - String value = history.get(latestKey); - if (value == null) return null; + java.util.Map.Entry latest = ((java.util.NavigableMap) history).lastEntry(); + if (latest == null || latest.getValue() == null) return null; + + Long latestKey = latest.getKey(); + String value = latest.getValue(); String[] split = value.split(":", 3); if (split.length != 3) return null; From 7133433ffa3c4d7b64b6647b82623f50b2da4daf Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 18:28:12 -0700 Subject: [PATCH 27/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0cebff..93f7bbb 100644 --- a/pom.xml +++ b/pom.xml @@ -239,7 +239,8 @@ ${java.version} true - + + org.apache.maven.plugins maven-surefire-plugin 3.5.5 From 2b1923cb43f2105e3a8dc9cf8a11db90bd2b31fb Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 18:28:27 -0700 Subject: [PATCH 28/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/main/resources/locales/de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/locales/de.yml b/src/main/resources/locales/de.yml index c8373ce..a70f704 100644 --- a/src/main/resources/locales/de.yml +++ b/src/main/resources/locales/de.yml @@ -32,7 +32,7 @@ bank: deposit: description: Betrag auf Ihr Inselkonto einzahlen parameters: "" - success: "in Erfolg! Ihr neuer Kontostand auf der Insel beträgt [number]." + success: "Ein Erfolg! Ihr neuer Kontostand auf der Insel beträgt [number]." errors: bank-error: " Fehler beim Laden der Bankkontoinformationen - bitte versuchen Sie es später erneut" From 472a8e01a257a60d5cce0efffca0ac9afc7ea3e2 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 12 Jun 2026 18:28:37 -0700 Subject: [PATCH 29/31] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/main/resources/locales/de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/locales/de.yml b/src/main/resources/locales/de.yml index a70f704..907e524 100644 --- a/src/main/resources/locales/de.yml +++ b/src/main/resources/locales/de.yml @@ -69,7 +69,7 @@ bank: withdraw: description: Betrag von Ihrem Inselkonto abheben parameters: "" - success: "in Erfolg! Ihr neuer Kontostand auf der Insel beträgt [number]." + success: "Ein Erfolg! Ihr neuer Kontostand auf der Insel beträgt [number]." protection: flags: BANK_ACCESS: From 9ef07aa98744d27db2b8194dd3d4f35d4a91a909 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 13 Jun 2026 22:33:19 -0700 Subject: [PATCH 30/31] Fix compilation error in PhManager.getLatestTransaction A prior automated edit inlined the fully-qualified name world.bentobox.bentobox.util.Util.getWorld(world), but the method parameter `world` shadowed the package root, so the compiler parsed `world.bentobox` as field access on the World variable and failed with "cannot find symbol variable bentobox". Revert to the original direct island lookup via getIsland(world, user), which is what the getLatestTransaction tests expect. This fixes the Jenkins compile failure and the 4 PhManagerTest errors (and their cascading "Already mocking" failures) the broken Util call caused. Co-Authored-By: Claude Opus 4.8 (1M context) --- src/main/java/world/bentobox/bank/PhManager.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/world/bentobox/bank/PhManager.java b/src/main/java/world/bentobox/bank/PhManager.java index 3582ba3..429132e 100644 --- a/src/main/java/world/bentobox/bank/PhManager.java +++ b/src/main/java/world/bentobox/bank/PhManager.java @@ -125,10 +125,8 @@ String getVisitedIslandBalance(GameModeAddon gm, User user, boolean formatted, b * @return formatted latest transaction string, e.g., "tastybento Deposited $500.0", or empty string if none */ String getLatestTransaction(User user, World world) { - if (user == null || !user.isPlayer()) return ""; - World actualWorld = world == null ? null : world.bentobox.bentobox.util.Util.getWorld(world); - if (actualWorld == null) return ""; - Island island = addon.getIslands().getIsland(actualWorld, user); + if (user == null || !user.isPlayer() || world == null) return ""; + Island island = addon.getIslands().getIsland(world, user); if (island == null) return ""; return formatTransaction(bankManager.getLatestHistory(island)); } From 10ba0a7eb3726686038efd42e592284653f23064 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 14 Jun 2026 07:25:49 -0700 Subject: [PATCH 31/31] Address PR #66 review: localize latest-transaction placeholder, harden history parsing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - PhManager: the _latest_transaction placeholder now localizes transaction type names via the existing bank.statement.* locale keys (reused from StatementTab) instead of returning hardcoded English. User is threaded through formatTransaction/getTxTypeDisplay. - BankManager: extract shared parseEntry() helper so getHistory() and getLatestHistory() parse stored entries identically. getLatestHistory no longer casts the history Map to NavigableMap — that cast risked a ClassCastException when Gson deserializes the map from the database into a non-TreeMap; instead find the latest key via Collections.max. - PhManagerTest: stub user.getTranslation for the statement keys and assert on the localized output. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../java/world/bentobox/bank/BankManager.java | 48 +++++++++---------- .../java/world/bentobox/bank/PhManager.java | 35 +++++++------- .../world/bentobox/bank/PhManagerTest.java | 14 +++++- 3 files changed, 54 insertions(+), 43 deletions(-) diff --git a/src/main/java/world/bentobox/bank/BankManager.java b/src/main/java/world/bentobox/bank/BankManager.java index 7648902..ec1d097 100644 --- a/src/main/java/world/bentobox/bank/BankManager.java +++ b/src/main/java/world/bentobox/bank/BankManager.java @@ -318,19 +318,31 @@ public List getHistory(Island island) { BankAccounts account = getAccount(island.getUniqueId()); // Calculate interest this.getBalancePlusInterest(account); - return account.getHistory().entrySet().stream().map(en -> { - String[] split = en.getValue().split(":"); - if (split.length == 3) { - TxType type = Enums.getIfPresent(TxType.class, split[1]).or(TxType.UNKNOWN); - return new AccountHistory(en.getKey(), split[0], Double.parseDouble(split[2]), type); - } - return null; - }).filter(Objects::nonNull).toList(); + return account.getHistory().entrySet().stream().map(en -> parseEntry(en.getKey(), en.getValue())) + .filter(Objects::nonNull).toList(); } catch (IOException e) { return Collections.emptyList(); } } + /** + * Parse a single stored history entry ({@code name:type:amount}) into an {@link AccountHistory}. + * @param key - timestamp key + * @param value - stored value + * @return parsed {@link AccountHistory} or null if the value is malformed + */ + private AccountHistory parseEntry(Long key, String value) { + if (value == null) return null; + String[] split = value.split(":"); + if (split.length != 3) return null; + TxType type = Enums.getIfPresent(TxType.class, split[1]).or(TxType.UNKNOWN); + try { + return new AccountHistory(key, split[0], Double.parseDouble(split[2]), type); + } catch (NumberFormatException e) { + return null; + } + } + /** * Get the latest transaction history entry for an island * @param island - island @@ -343,24 +355,12 @@ public AccountHistory getLatestHistory(Island island) { // Keep behavior consistent with getHistory(): apply interest before reading history this.getBalancePlusInterest(account); + // Find the most recent entry by timestamp key. Don't assume the concrete Map type: + // when loaded from the database Gson may not preserve the TreeMap, so avoid casting to NavigableMap. Map history = account.getHistory(); if (history.isEmpty()) return null; - - java.util.Map.Entry latest = ((java.util.NavigableMap) history).lastEntry(); - if (latest == null || latest.getValue() == null) return null; - - Long latestKey = latest.getKey(); - String value = latest.getValue(); - - String[] split = value.split(":", 3); - if (split.length != 3) return null; - - TxType type = Enums.getIfPresent(TxType.class, split[1]).or(TxType.UNKNOWN); - try { - return new AccountHistory(latestKey, split[0], Double.parseDouble(split[2]), type); - } catch (NumberFormatException e) { - return null; - } + Long latestKey = Collections.max(history.keySet()); + return parseEntry(latestKey, history.get(latestKey)); } catch (IOException e) { return null; } diff --git a/src/main/java/world/bentobox/bank/PhManager.java b/src/main/java/world/bentobox/bank/PhManager.java index 429132e..1a43fc3 100644 --- a/src/main/java/world/bentobox/bank/PhManager.java +++ b/src/main/java/world/bentobox/bank/PhManager.java @@ -128,37 +128,38 @@ String getLatestTransaction(User user, World world) { if (user == null || !user.isPlayer() || world == null) return ""; Island island = addon.getIslands().getIsland(world, user); if (island == null) return ""; - return formatTransaction(bankManager.getLatestHistory(island)); + return formatTransaction(user, bankManager.getLatestHistory(island)); } /** * Format an AccountHistory entry as "[Name] [TxType] [Amount]" + * @param user - user, used to localise the transaction type * @param history - the account history entry * @return formatted string or empty string if null */ - private String formatTransaction(AccountHistory history) { + private String formatTransaction(User user, AccountHistory history) { if (history == null) return ""; - return history.getName() + " " + getTxTypeDisplay(history.getType()) + " " + addon.getVault().format(history.getAmount()); + return history.getName() + " " + getTxTypeDisplay(user, history.getType()) + " " + addon.getVault().format(history.getAmount()); } /** - * Get display-friendly name for transaction type + * Get the localised, display-friendly name for a transaction type. Reuses the + * same {@code bank.statement.*} locale keys as the statement panel. + * @param user - user whose locale is used * @param type - transaction type - * @return display name + * @return localised display name */ - private String getTxTypeDisplay(TxType type) { - if (type == null) { - return "Unknown"; - } - return switch (type) { - case DEPOSIT -> "Deposited"; - case WITHDRAW -> "Withdrew"; - case GIVE -> "Received"; - case TAKE -> "Lost"; - case SET -> "Set"; - case INTEREST -> "Earned"; - default -> "Unknown"; + private String getTxTypeDisplay(User user, TxType type) { + String key = switch (type == null ? TxType.UNKNOWN : type) { + case DEPOSIT -> "deposit"; + case WITHDRAW -> "withdrawal"; + case GIVE -> "give"; + case TAKE -> "take"; + case SET -> "set"; + case INTEREST -> "interest"; + default -> "unknown"; }; + return user.getTranslation("bank.statement." + key); } /** diff --git a/src/test/java/world/bentobox/bank/PhManagerTest.java b/src/test/java/world/bentobox/bank/PhManagerTest.java index 6819ce8..e9ebbdc 100644 --- a/src/test/java/world/bentobox/bank/PhManagerTest.java +++ b/src/test/java/world/bentobox/bank/PhManagerTest.java @@ -106,6 +106,16 @@ public void setUp() { when(plm.getName(any())).thenAnswer(arg -> arg.getArgument(0, UUID.class).toString()); when(user.isPlayer()).thenReturn(true); when(im.getIsland(any(World.class), any(User.class))).thenReturn(island); + // Localised transaction type names (see bank.statement.* in the locale files) + when(user.getTranslation(anyString())).thenAnswer(arg -> switch (arg.getArgument(0, String.class)) { + case "bank.statement.deposit" -> "Deposit"; + case "bank.statement.withdrawal" -> "Withdrawal"; + case "bank.statement.interest" -> "Interest"; + case "bank.statement.give" -> "Admin Give"; + case "bank.statement.take" -> "Admin Take"; + case "bank.statement.set" -> "Admin Set"; + default -> "Unknown Type"; + }); pm = new PhManager(addon, bm); } @@ -312,7 +322,7 @@ void testCheckCacheOutOfBounds() { void testGetLatestTransactionDeposit() { AccountHistory ah = new AccountHistory(System.currentTimeMillis(), "tastybento", 500.0, TxType.DEPOSIT); when(bm.getLatestHistory(eq(island))).thenReturn(ah); - assertEquals("tastybento Deposited $500.0", pm.getLatestTransaction(user, world)); + assertEquals("tastybento Deposit $500.0", pm.getLatestTransaction(user, world)); } /** @@ -322,7 +332,7 @@ void testGetLatestTransactionDeposit() { void testGetLatestTransactionWithdraw() { AccountHistory ah = new AccountHistory(System.currentTimeMillis(), "tastybento", 200.0, TxType.WITHDRAW); when(bm.getLatestHistory(eq(island))).thenReturn(ah); - assertEquals("tastybento Withdrew $200.0", pm.getLatestTransaction(user, world)); + assertEquals("tastybento Withdrawal $200.0", pm.getLatestTransaction(user, world)); } /**