Fixes tests

BentoBoxWorld · Jun 2, 2020 · 8f38353 · 8f38353
1 parent 6d4b7c2
commit 8f38353
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
         <powermock.version>2.0.2</powermock.version>
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.14.4-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>1.13.1</bentobox.version>
+        <bentobox.version>1.14.0-SNAPSHOT</bentobox.version>
         <level.version>1.5.0</level.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>

diff --git a/src/main/java/world/bentobox/warps/WarpSignsManager.java b/src/main/java/world/bentobox/warps/WarpSignsManager.java
@@ -257,7 +257,7 @@ public void removeWarp(World world, UUID uuid) {
      * Saves the warp lists to the database
      */
     public void saveWarpList() {
-        handler.saveObject(warpsData.save(worldsWarpList));
+        handler.saveObjectAsync(warpsData.save(worldsWarpList));
         addon.getWarpPanelManager().saveCache();
     }
 

diff --git a/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java b/src/test/java/world/bentobox/warps/WarpSignsManagerTest.java
@@ -21,6 +21,7 @@
 import java.util.logging.Logger;
 
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
@@ -67,7 +68,7 @@
  *
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({Bukkit.class, Util.class, DatabaseSetup.class})
+@PrepareForTest({Bukkit.class, Util.class, DatabaseSetup.class, ChatColor.class})
 public class WarpSignsManagerTest {
 
     @Mock
@@ -135,11 +136,12 @@ public void setUp() throws Exception {
 
         // Player
         when(player.getUniqueId()).thenReturn(uuid);
+        User.setPlugin(plugin);
         User.getInstance(player);
 
         // Locales
         LocalesManager lm = mock(LocalesManager.class);
-        when(lm.get(Mockito.any(), Mockito.any())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(1, String.class));
+        when(lm.get(Mockito.any(), Mockito.any())).thenReturn(null);
         when(plugin.getLocalesManager()).thenReturn(lm);
         // Return the same string
         PlaceholdersManager phm = mock(PlaceholdersManager.class);

diff --git a/src/test/java/world/bentobox/warps/listeners/WarpSignsListenerTest.java b/src/test/java/world/bentobox/warps/listeners/WarpSignsListenerTest.java
@@ -5,12 +5,12 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+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 static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -37,7 +37,6 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -53,7 +52,6 @@
 import world.bentobox.warps.Warp;
 import world.bentobox.warps.WarpSignsManager;
 import world.bentobox.warps.config.Settings;
-import world.bentobox.warps.listeners.WarpSignsListener;
 
 /**
  * @author tastybento
@@ -140,12 +138,7 @@ public void setUp() throws Exception {
         when(addon.getPlugin()).thenReturn(plugin);
         User.setPlugin(plugin);
         LocalesManager lm = mock(LocalesManager.class);
-        when(lm.get(any(), any())).thenAnswer(new Answer<String>(){
-
-            @Override
-            public String answer(InvocationOnMock invocation) throws Throwable {
-                return invocation.getArgument(1, String.class);
-            }});
+        when(lm.get(any(), any())).thenReturn(null);
         when(plugin.getLocalesManager()).thenReturn(lm);
 
         // Lines
@@ -167,12 +160,14 @@ public String answer(InvocationOnMock invocation) throws Throwable {
         when(iwm.getAddon(any())).thenReturn(Optional.empty());
         when(iwm.inWorld(any(World.class))).thenReturn(true);
 
+        Answer<String> answer = invocation -> invocation.getArgument(1, String.class);
+
         // Util
         PowerMockito.mockStatic(Util.class);
         when(Util.getWorld(any())).thenReturn(world);
+        when(Util.stripSpaceAfterColorCodes(anyString())).thenAnswer(invocation -> invocation.getArgument(0, String.class));
 
         // Locales
-        Answer<String> answer = invocation -> invocation.getArgument(1, String.class);
         when(lm.get(any(User.class), anyString())).thenAnswer(answer);
         when(plugin.getLocalesManager()).thenReturn(lm);