diff --git a/pom.xml b/pom.xml
index 7ed9460..6c0c92d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
2.0.2
1.14.4-R0.1-SNAPSHOT
- 1.13.1
+ 1.14.0-SNAPSHOT
1.5.0
${build.version}-SNAPSHOT
diff --git a/src/main/java/world/bentobox/warps/WarpSignsManager.java b/src/main/java/world/bentobox/warps/WarpSignsManager.java
index f631ec3..1295c24 100644
--- a/src/main/java/world/bentobox/warps/WarpSignsManager.java
+++ b/src/main/java/world/bentobox/warps/WarpSignsManager.java
@@ -257,7 +257,7 @@ public class WarpSignsManager {
* 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
index 155753f..0e86108 100644
--- 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.UUID;
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 @@ import world.bentobox.warps.objects.WarpsData;
*
*/
@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 class WarpSignsManagerTest {
// 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) 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
index 1a0f840..7ded115 100644
--- 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.assertEquals;
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.Test;
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.bentobox.util.Util;
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 class WarpSignsListenerTest {
when(addon.getPlugin()).thenReturn(plugin);
User.setPlugin(plugin);
LocalesManager lm = mock(LocalesManager.class);
- when(lm.get(any(), any())).thenAnswer(new Answer(){
-
- @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 class WarpSignsListenerTest {
when(iwm.getAddon(any())).thenReturn(Optional.empty());
when(iwm.inWorld(any(World.class))).thenReturn(true);
+ Answer 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 answer = invocation -> invocation.getArgument(1, String.class);
when(lm.get(any(User.class), anyString())).thenAnswer(answer);
when(plugin.getLocalesManager()).thenReturn(lm);