Change the creation of jail method in the tests.

This commit is contained in:
graywolf336 2015-02-17 09:54:46 -06:00
parent 0d9ed022f3
commit 1bb36ec66d
4 changed files with 15 additions and 11 deletions

View File

@ -45,7 +45,7 @@ public class BenchmarkTest extends AbstractBenchmark {
assertTrue(creator.setup()); assertTrue(creator.setup());
main = creator.getMain(); main = creator.getMain();
assertNotNull("The JailMain class is null.", main); assertNotNull("The JailMain class is null.", main);
assertTrue("The adding of a jail failed.", creator.addJail()); assertTrue("The adding of a jail failed.", creator.addJail("testingJail"));
assertFalse("There are no jails.", main.getJailManager().getJails().isEmpty()); assertFalse("There are no jails.", main.getJailManager().getJails().isEmpty());
for(int i = 0; i < 1000; i++) { for(int i = 0; i < 1000; i++) {

View File

@ -36,6 +36,7 @@ public class TestJailAPI {
assertTrue(creator.setup()); assertTrue(creator.setup());
main = creator.getMain(); main = creator.getMain();
assertNotNull("The JailMain class is null.", main); assertNotNull("The JailMain class is null.", main);
assertTrue("The adding of a jail failed.", creator.addJail("TestJailAPI"));
} }
@AfterClass @AfterClass

View File

@ -37,7 +37,7 @@ public class TestJailVote {
assertTrue(creator.setup()); assertTrue(creator.setup());
main = creator.getMain(); main = creator.getMain();
assertNotNull("The JailMain class is null.", main); assertNotNull("The JailMain class is null.", main);
assertTrue("The adding of a jail failed.", creator.addJail()); assertTrue("The adding of a jail failed.", creator.addJail("TestJailVote"));
} }
@AfterClass @AfterClass

View File

@ -15,6 +15,7 @@ import java.io.File;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random;
import java.util.UUID; import java.util.UUID;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -51,6 +52,7 @@ import com.graywolf336.jail.beans.Jail;
@PrepareForTest({ CraftItemFactory.class }) @PrepareForTest({ CraftItemFactory.class })
public class TestInstanceCreator { public class TestInstanceCreator {
private Random r;
private JailMain main; private JailMain main;
private Server mockServer; private Server mockServer;
private Player mockPlayer; private Player mockPlayer;
@ -65,6 +67,7 @@ public class TestInstanceCreator {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public boolean setup() { public boolean setup() {
r = new Random();
try { try {
pluginDirectory.mkdirs(); pluginDirectory.mkdirs();
Assert.assertTrue(pluginDirectory.exists()); Assert.assertTrue(pluginDirectory.exists());
@ -346,18 +349,18 @@ public class TestInstanceCreator {
} }
} }
public boolean addJail() { public boolean addJail(String name) {
if(main.getJailManager().getJails().isEmpty()) { if(main.getJailManager().isValidJail(name)) {
Jail j = new Jail(main, "testingJail"); return false;
}else {
Jail j = new Jail(main, name);
j.setWorld("world"); j.setWorld("world");
j.setMaxPoint(new int[] { 9, 63, -238 }); j.setMaxPoint(new int[] { r.nextInt(), r.nextInt(256), r.nextInt() });
j.setMinPoint(new int[] { 23, 70, -242 }); j.setMinPoint(new int[] { r.nextInt(), r.nextInt(54), r.nextInt() });
j.setTeleportIn(new Location(main.getServer().getWorld("world"), 11.469868464778077, 65.0, -239.27944647045672, Float.valueOf("38.499817"), Float.valueOf("2.0000453"))); j.setTeleportIn(new Location(main.getServer().getWorld("world"), r.nextInt(), r.nextInt(256), r.nextInt(), Float.valueOf("38.499817"), Float.valueOf("2.0000453")));
j.setTeleportFree(new Location(main.getServer().getWorld("world"), 27.947015843504765, 65.0, -218.8108042076112, Float.valueOf("90.54981"), Float.valueOf("12.500043"))); j.setTeleportFree(new Location(main.getServer().getWorld("world"), r.nextInt(), r.nextInt(256), r.nextInt(), Float.valueOf("90.54981"), Float.valueOf("12.500043")));
main.getJailManager().addJail(j, false); main.getJailManager().addJail(j, false);
return true; return true;
}else {
return false;
} }
} }