Fix Travis builds of master branch

1 files changed, 41 insertions, 8 deletions

diff --git a/Essentials/test/net/ess3/EssentialsTest.java b/Essentials/test/net/ess3/EssentialsTest.java
index cedfa3cb6..f8d9a27b7 100644
--- a/Essentials/test/net/ess3/EssentialsTest.java
+++ b/Essentials/test/net/ess3/EssentialsTest.java
@@ -1,12 +1,13 @@
 package net.ess3;
 
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
 import java.util.logging.Logger;
+import junit.framework.TestCase;
+import net.ess3.api.IPlugin;
+import org.apache.commons.io.FileUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
@@ -14,9 +15,9 @@ import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
-import junit.framework.TestCase;
-import net.ess3.api.IPlugin;
-import org.apache.commons.io.FileUtils;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
@@ -29,6 +30,7 @@ public abstract class EssentialsTest extends TestCase
 	protected final Logger logger;
 	protected final Essentials ess;
 	protected final List<Player> playerList;
+	private File folder;
 
 	public EssentialsTest(final String testName)
 	{
@@ -85,16 +87,47 @@ public abstract class EssentialsTest extends TestCase
 		plugin = mock(IPlugin.class);
 
 
-		File folder = FileUtils.getTempDirectory();
+		folder = FileUtils.getTempDirectory();
+		folder = new File(folder, "Essentials-" + System.currentTimeMillis());
 		when(plugin.getDataFolder()).thenReturn(folder);
 		when(world.getName()).thenReturn("world");
-
 		ess = new Essentials(server, logger, plugin);
+	}
+
+	protected void createFolder()
+	{
+		logger.log(Level.INFO, "Creating folder for testing: {0}", folder.getAbsolutePath());
+		if (!folder.mkdir() || !folder.isDirectory())
+		{
+			throw new IllegalStateException();
+		}
+	}
+
+	protected void cleanup()
+	{
+		logger.log(Level.INFO, "Deleting folder {0}", folder.getAbsolutePath());
+		FileUtils.deleteQuietly(folder);
+	}
+
+	@Override
+	public void setUp() throws Exception
+	{
+		super.setUp();
+		createFolder();
+
 		ess.getI18n().updateLocale("en_US");
 		Essentials.testing = true;
 		ess.onEnable();
 	}
 
+	@Override
+	public void tearDown() throws Exception
+	{
+		super.tearDown();
+		ess.onDisable();
+		cleanup();
+	}
+
 	protected void addPlayer(String name)
 	{
 		Player player = mock(Player.class);