From d91b174f9633f370313ed8751fbe2c2a2638ac4f Mon Sep 17 00:00:00 2001 From: snowleo Date: Mon, 1 Apr 2013 20:32:37 +0200 Subject: Actually fix stuff and not break it --- Essentials/test/net/ess3/EconomyTest.java | 4 ++-- Essentials/test/net/ess3/EssentialsTest.java | 5 +++-- Essentials/test/net/ess3/UserTest.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Essentials/test/net/ess3/EconomyTest.java b/Essentials/test/net/ess3/EconomyTest.java index 1abfb0a2e..37d84846a 100644 --- a/Essentials/test/net/ess3/EconomyTest.java +++ b/Essentials/test/net/ess3/EconomyTest.java @@ -39,7 +39,7 @@ public class EconomyTest extends EssentialsTest try { - assertTrue("Player exists", ess.getEconomy().playerExists(PLAYERNAME)); + assertTrue("Player exists (1)", ess.getEconomy().playerExists(PLAYERNAME)); ess.getEconomy().resetBalance(PLAYERNAME); assertEquals("Player has no money", 0.0, ess.getEconomy().getMoney(PLAYERNAME)); ess.getEconomy().setMoney(PLAYERNAME, 10.0); @@ -65,7 +65,7 @@ public class EconomyTest extends EssentialsTest //test Exceptions try { - assertTrue("Player exists", ess.getEconomy().playerExists(PLAYERNAME)); + assertTrue("Player exists (2)", ess.getEconomy().playerExists(PLAYERNAME)); ess.getEconomy().resetBalance(PLAYERNAME); assertEquals("Reset balance", 0.0, ess.getEconomy().getMoney(PLAYERNAME)); ess.getEconomy().setMoney(PLAYERNAME, -5.0); diff --git a/Essentials/test/net/ess3/EssentialsTest.java b/Essentials/test/net/ess3/EssentialsTest.java index f8d9a27b7..f01e14a5a 100644 --- a/Essentials/test/net/ess3/EssentialsTest.java +++ b/Essentials/test/net/ess3/EssentialsTest.java @@ -28,7 +28,7 @@ public abstract class EssentialsTest extends TestCase protected final IPlugin plugin; protected final World world; protected final Logger logger; - protected final Essentials ess; + protected Essentials ess; protected final List playerList; private File folder; @@ -91,7 +91,7 @@ public abstract class EssentialsTest extends TestCase 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() @@ -115,6 +115,7 @@ public abstract class EssentialsTest extends TestCase super.setUp(); createFolder(); + ess = new Essentials(server, logger, plugin); ess.getI18n().updateLocale("en_US"); Essentials.testing = true; ess.onEnable(); diff --git a/Essentials/test/net/ess3/UserTest.java b/Essentials/test/net/ess3/UserTest.java index ba26e1c6e..6457ef637 100644 --- a/Essentials/test/net/ess3/UserTest.java +++ b/Essentials/test/net/ess3/UserTest.java @@ -5,14 +5,14 @@ import net.ess3.api.IUser; public class UserTest extends EssentialsTest { - private final IUser base1; + //private final IUser base1; public UserTest(String testName) { super(testName); addPlayer("testPlayer1"); - base1 = ess.getUserMap().getUser("testPlayer1"); + //base1 = ess.getUserMap().getUser("testPlayer1"); } private void should(String what) //TODO: unused/implement this? -- cgit v1.2.3