Put test classes where they belong

5 files changed, 6 insertions, 9 deletions

diff --git a/Essentials/test/com/earth2me/essentials/EconomyTest.java b/Essentials/test/com/earth2me/essentials/EconomyTest.java
index b7157dd15..44d388c3b 100644
--- a/Essentials/test/com/earth2me/essentials/EconomyTest.java
+++ b/Essentials/test/com/earth2me/essentials/EconomyTest.java
@@ -2,7 +2,6 @@ package com.earth2me.essentials;
 
 import com.earth2me.essentials.api.NoLoanPermittedException;
 import com.earth2me.essentials.api.UserDoesNotExistException;
-import com.earth2me.essentials.craftbukkit.DummyOfflinePlayer;
 import com.earth2me.essentials.user.User;
 import java.io.IOException;
 import junit.framework.TestCase;
@@ -35,7 +34,7 @@ public class EconomyTest extends TestCase
 		{
 			fail("IOException");
 		}
-		server.addPlayer(new User(new DummyOfflinePlayer(PLAYERNAME), ess));
+		server.addPlayer(new User(new FakeOfflinePlayer(PLAYERNAME), ess));
 	}
 
 	// only one big test, since we use static instances
diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/DummyOfflinePlayer.java b/Essentials/test/com/earth2me/essentials/FakeOfflinePlayer.java
index 66adf7b6f..01dd470ca 100644
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/DummyOfflinePlayer.java
+++ b/Essentials/test/com/earth2me/essentials/FakeOfflinePlayer.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.craftbukkit;
+package com.earth2me.essentials;
 
 import java.util.Map;
 import org.bukkit.Bukkit;
@@ -7,11 +7,11 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 
-public class DummyOfflinePlayer implements OfflinePlayer
+public class FakeOfflinePlayer implements OfflinePlayer
 {
 	private final transient String name;
 
-	public DummyOfflinePlayer(String name)
+	public FakeOfflinePlayer(String name)
 	{
 		this.name = name;
 	}
diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java
index be63e4a22..4b677a98c 100644
--- a/Essentials/test/com/earth2me/essentials/FakeServer.java
+++ b/Essentials/test/com/earth2me/essentials/FakeServer.java
@@ -1,7 +1,6 @@
 package com.earth2me.essentials;
 
 import com.avaje.ebean.config.ServerConfig;
-import com.earth2me.essentials.craftbukkit.FakeWorld;
 import java.io.File;
 import java.util.*;
 import java.util.concurrent.Callable;
diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java b/Essentials/test/com/earth2me/essentials/FakeWorld.java
index f91a119e2..7a2377f5a 100644
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java
+++ b/Essentials/test/com/earth2me/essentials/FakeWorld.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.craftbukkit;
+package com.earth2me.essentials;
 
 import java.io.File;
 import java.util.Collection;
diff --git a/Essentials/test/com/earth2me/essentials/UserTest.java b/Essentials/test/com/earth2me/essentials/UserTest.java
index 69873437d..6cffcb4f3 100644
--- a/Essentials/test/com/earth2me/essentials/UserTest.java
+++ b/Essentials/test/com/earth2me/essentials/UserTest.java
@@ -1,7 +1,6 @@
 package com.earth2me.essentials;
 
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.craftbukkit.DummyOfflinePlayer;
 import com.earth2me.essentials.user.User;
 import java.io.IOException;
 import junit.framework.TestCase;
@@ -33,7 +32,7 @@ public class UserTest extends TestCase
 		{
 			fail("IOException");
 		}
-		base1 = new User(new DummyOfflinePlayer("testPlayer1"), ess);
+		base1 = new User(new FakeOfflinePlayer("testPlayer1"), ess);
 		server.addPlayer(base1);
 		ess.getUser(base1);
 	}