1 files changed, 28 insertions, 16 deletions

diff --git a/Essentials/test/com/earth2me/essentials/UserTest.java b/Essentials/test/com/earth2me/essentials/UserTest.java
index 734846c39..6b7a651c3 100644
--- a/Essentials/test/com/earth2me/essentials/UserTest.java
+++ b/Essentials/test/com/earth2me/essentials/UserTest.java
@@ -1,18 +1,31 @@
 package com.earth2me.essentials;
 
+import java.io.IOException;
 import junit.framework.TestCase;
-import net.minecraft.server.WorldServer;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.plugin.InvalidDescriptionException;
 
 
 public class UserTest extends TestCase
 {
 	private OfflinePlayer base1;
+	private Essentials ess;
 
 	public UserTest(String testName)
 	{
 		super(testName);
+		ess = new Essentials();
+		try
+		{
+			ess.setupForTesting();
+		}
+		catch (InvalidDescriptionException ex)
+		{
+			fail("InvalidDescriptionException");
+		}
+		catch (IOException ex)
+		{
+			fail("IOException");
+		}
 		base1 = new OfflinePlayer("TestPlayer1");
 	}
 
@@ -36,26 +49,25 @@ public class UserTest extends TestCase
 	public void testUpdate()
 	{
 		should("update an existing player with the same name, rather than creating a new player");
-		User.get(base1);
-		int size1 = User.size();
+		ess.getUser(base1);
+		//int size1 = User.size();
 		OfflinePlayer base1alt = new OfflinePlayer(base1.getName());
-		assertEquals(base1alt, User.get(base1alt).getBase());
-		assertTrue(size1 == User.size());
+		assertEquals(base1alt, ess.getUser(base1alt).getBase());
+		//assertTrue(size1 == User.size());
 	}
 
 	/*public void testHome() throws Exception
 	{
-		should("return the home set by setHome");
-		Location home = new Location(null, 1, 2, 3, 4, 5);
-		User user = User.get(base1);
-		user.setHome(home);
-		assertEquals(user.getHome(), home);
+	should("return the home set by setHome");
+	Location home = new Location(null, 1, 2, 3, 4, 5);
+	User user = User.get(base1);
+	user.setHome(home);
+	assertEquals(user.getHome(), home);
 	}*/
-
 	public void testMoney()
 	{
 		should("properly set, take, give, and get money");
-		User user = User.get(base1);
+		User user = ess.getUser(base1);
 		double i;
 		user.setMoney(i = 100.5);
 		user.takeMoney(50);
@@ -64,11 +76,11 @@ public class UserTest extends TestCase
 		i += 25;
 		assertEquals(user.getMoney(), i);
 	}
-	
+
 	public void testGetGroup()
 	{
 		should("return the default group");
-		User user = User.get(base1);
+		User user = ess.getUser(base1);
 		assertEquals(user.getGroup(), "default");
 	}
 }