From 60fa60372dda6996ac7ce2642ed2198f77f2741b Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sun, 26 May 2024 17:27:41 -0700
Subject: [PATCH] Fix tests

---
 .../bentobox/managers/PlayersManager.java     | 25 +++++------
 .../bentobox/managers/PlayersManagerTest.java | 42 +++++++++++++++++--
 2 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java b/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java
index 92f3814c1..59f793db8 100644
--- a/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java
@@ -67,28 +67,29 @@ public class PlayersManager {
      */
     @Nullable
     public Players getPlayer(UUID uuid){
-        if (!playerCache.containsKey(uuid)) {
-            playerCache.put(uuid, addPlayer(uuid));
-        }
-        return playerCache.get(uuid);
+        return playerCache.computeIfAbsent(uuid, this::addPlayer);
     }
 
     /**
-     * Adds a player to the database. If the UUID does not exist, a new player is made
-     * @param playerUUID - the player's UUID
+     * Adds a player to the database. If the UUID does not exist, a new player is created.
+     *
+     * @param playerUUID the player's UUID, must not be null
+     * @return the loaded or newly created player
+     * @throws NullPointerException if playerUUID is null
      */
     private Players addPlayer(@NonNull UUID playerUUID) {
-        Objects.requireNonNull(playerUUID);
-        // If the player is in the database, load it, otherwise create a new player
+        Objects.requireNonNull(playerUUID, "Player UUID must not be null");
+
+        // If the player exists in the database, load it; otherwise, create and save a new player
         if (handler.objectExists(playerUUID.toString())) {
             Players player = handler.loadObject(playerUUID.toString());
             if (player != null) {
                 return player;
             }
         }
-        Players player = new Players(plugin, playerUUID);
-        handler.saveObject(player);
-        return player;
+        Players newPlayer = new Players(plugin, playerUUID);
+        handler.saveObjectAsync(newPlayer);
+        return newPlayer;
     }
 
     /**
@@ -158,7 +159,7 @@ public class PlayersManager {
             return "";
         }
         getPlayer(playerUUID);
-        return playerCache.get(playerUUID).getPlayerName();
+        return Objects.requireNonNullElse(playerCache.get(playerUUID).getPlayerName(), "");
     }
 
     /**
diff --git a/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java
index 973a2ac07..17b56cb7d 100644
--- a/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java
+++ b/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java
@@ -195,7 +195,17 @@ public class PlayersManagerTest {
         when(olp.getUniqueId()).thenReturn(uuid);
         when(olp.getName()).thenReturn("tastybento");
         PowerMockito.mockStatic(Bukkit.class);
-        when(Bukkit.getOfflinePlayer(Mockito.any(UUID.class))).thenReturn(olp);
+        when(Bukkit.getOfflinePlayer(any(UUID.class))).thenAnswer(invocation -> {
+            UUID inputUUID = invocation.getArgument(0);
+            if (inputUUID.equals(uuid)) {
+                return olp;
+            } else {
+                OfflinePlayer differentOlp = mock(OfflinePlayer.class);
+                when(differentOlp.getUniqueId()).thenReturn(inputUUID);
+                when(differentOlp.getName()).thenReturn("");
+                return differentOlp;
+            }
+        });
 
         // Player has island to begin with
         IslandsManager im = mock(IslandsManager.class);
@@ -385,10 +395,34 @@ public class PlayersManagerTest {
      * {@link world.bentobox.bentobox.managers.PlayersManager#getName(java.util.UUID)}.
      */
     @Test
-    public void testGetName() {
+    public void testGetNameNull() throws InstantiationException, IllegalAccessException, InvocationTargetException,
+            ClassNotFoundException, NoSuchMethodException, IntrospectionException {
+        // Null UUID
         assertTrue(pm.getName(null).isEmpty());
-        String name = pm.getName(uuid);
-        assertEquals("tastybento", name);
+    }
+
+    /**
+     * Test method for
+     * {@link world.bentobox.bentobox.managers.PlayersManager#getName(java.util.UUID)}.
+     */
+    @Test
+    public void testGetNameKnown() throws InstantiationException, IllegalAccessException, InvocationTargetException,
+            ClassNotFoundException, NoSuchMethodException, IntrospectionException {
+        pm.setPlayerName(user);
+        // Known UUID
+        assertEquals("tastybento", pm.getName(uuid));
+    }
+
+    /**
+     * Test method for
+     * {@link world.bentobox.bentobox.managers.PlayersManager#getName(java.util.UUID)}.
+     */
+    @Test
+    public void testGetNameUnknown() throws InstantiationException, IllegalAccessException, InvocationTargetException,
+            ClassNotFoundException, NoSuchMethodException, IntrospectionException {
+        // Unknown UUID - nothing in database
+        when(handler.objectExists(anyString())).thenReturn(false);
+
         assertEquals("", pm.getName(UUID.randomUUID()));
     }