Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-01-02 06:28:13 +01:00
Code Issues Projects Releases Wiki Activity

Finished IslandCacheTest.

Browse Source
This commit is contained in:
tastybento 2018-04-24 14:22:33 -07:00
parent bf5a30e7a1
commit 135f35131c
3 changed files with 136 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/us/tastybento/bskyblock/managers/IslandsManager.java
View File

@ -318,7 +318,7 @@ public class IslandsManager {
* This includes the full island space, not just the protected area
*
* @param location - the location
* @return Island object
* @return Optional Island object
*/
public Optional<Island> getIslandAt(Location location) {
if (location == null) {

41
src/main/java/us/tastybento/bskyblock/managers/island/IslandCache.java
View File

@ -114,12 +114,6 @@ public class IslandCache {
*/
public boolean deleteIslandFromCache(Island island) {
if (!islandsByLocation.remove(island.getCenter(), island)) {
if (plugin == null)
System.out.println("plugin = null");
if (plugin.getLogger() == null)
System.out.println("plugin.logger = null");
plugin.getLogger().severe("Could not remove island from cache!");
return false;
}
Iterator<Entry<UUID, Island>> it = islandsByUUID.entrySet().iterator();
@ -204,20 +198,6 @@ public class IslandCache {
return getIslandAt(location.getBlockX(), location.getBlockZ());
}
/**
* Returns the player's island location.
* Returns an island location OR a team island location
*
* @param playerUUID - the player's UUID
* @return Location of player's island or null if one does not exist
*/
public Location getIslandLocation(UUID playerUUID) {
if (hasIsland(playerUUID)) {
return get(playerUUID).getCenter();
}
return null;
}
/**
* Get name of the island owned by owner
* @param owner - the island owner
@ -262,6 +242,11 @@ public class IslandCache {
&& (islandsByUUID.get(playerUUID).getOwner().equals(playerUUID))) ? true : false;
}
/**
* Removes a player from the cache. If the player has an island, the island owner is removed and membership cleared.
* The island is removed from the islandsByUUID map, but kept in the location map.
* @param playerUUID - player's UUID
*/
public void removePlayer(UUID playerUUID) {
Island island = islandsByUUID.get(playerUUID);
if (island != null) {
@ -273,17 +258,27 @@ public class IslandCache {
island.removeMember(playerUUID);
}
islandsByUUID.remove(playerUUID);
}
public void setIslandName(UUID owner, String name) {
/**
* Sets the island name
* @param owner - owner of island
* @param name - new island name
* @return true if successfull, false if no island for owner
*/
public boolean setIslandName(UUID owner, String name) {
if (islandsByUUID.containsKey(owner)) {
Island island = islandsByUUID.get(owner);
island.setName(name);
return true;
}
return false;
}
/**
* Get the number of islands in the cache
* @return the number of islands
*/
public int size() {
return islandsByLocation.size();
}

163
src/test/java/us/tastybento/bskyblock/managers/island/IslandCacheTest.java
View File

@ -1,15 +1,12 @@
package us.tastybento.bskyblock.managers.island;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.UUID;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.World;
import org.junit.Before;
@ -25,10 +22,12 @@ import us.tastybento.bskyblock.BSkyBlock;
import us.tastybento.bskyblock.database.objects.Island;
import us.tastybento.bskyblock.generators.IslandWorld;
import us.tastybento.bskyblock.managers.IslandsManager;
import us.tastybento.bskyblock.managers.PlayersManager;
import us.tastybento.bskyblock.util.Util;
@RunWith(PowerMockRunner.class)
public class IslandCacheTest {
BSkyBlock plugin;
private static World world;
@ -36,11 +35,13 @@ public class IslandCacheTest {
UUID owner = UUID.randomUUID();
Location location;
@Before
public void setUp() throws Exception {
plugin = mock(BSkyBlock.class);
world = mock(World.class);
// Worlds
IslandWorld iwm = mock(IslandWorld.class);
when(plugin.getIslandWorldManager()).thenReturn(iwm);
@ -52,8 +53,8 @@ public class IslandCacheTest {
IslandsManager im = mock(IslandsManager.class);
when(plugin.getIslands()).thenReturn(im);
island = mock(Island.class);
location = mock(Location.class);
when(location.getWorld()).thenReturn(world);
@ -69,9 +70,9 @@ public class IslandCacheTest {
when(island.getMemberSet()).thenReturn(members.build());
when(island.getMinX()).thenReturn(-200);
when(island.getMinZ()).thenReturn(-200);
}
@Test
public void testIslandCache() {
assertNotNull(new IslandCache(plugin));
@ -94,7 +95,7 @@ public class IslandCacheTest {
// Check if they are added
assertEquals(island, ic.get(playerUUID));
assertNotSame(island, ic.get(UUID.randomUUID()));
}
@Test
@ -111,7 +112,7 @@ public class IslandCacheTest {
@Test
public void testDeleteIslandFromCache() {
IslandCache ic = new IslandCache(plugin);
ic.addIsland(island);
// Check if they are added
@ -121,7 +122,7 @@ public class IslandCacheTest {
assertTrue(result);
assertNull(ic.get(owner));
assertNull(ic.get(location));
// Test removing an island that is not in the cache
World world = mock(World.class);
Island island2 = mock(Island.class);
@ -139,10 +140,9 @@ public class IslandCacheTest {
when(island2.getMemberSet()).thenReturn(members.build());
when(island2.getMinX()).thenReturn(-400);
when(island2.getMinZ()).thenReturn(-400);
// TODO: find a way to mock plugin.getLogger()...
//assertFalse(ic.deleteIslandFromCache(island2));
assertFalse(ic.deleteIslandFromCache(island2));
}
@Test
@ -171,71 +171,142 @@ public class IslandCacheTest {
assertEquals(island, ic.getIslandAt(0,0));
assertNull(ic.getIslandAt(-2000,-2000));
}
/*
* TODO
@Test
public void testGetIslandAtLocation() {
Util.setPlugin(plugin);
@Test
public void testGetIslandAtLocation() {
// Set coords to be in island space
when(island.inIslandSpace(Mockito.any(Integer.class), Mockito.any(Integer.class))).thenReturn(true);
// Set plugin
Util.setPlugin(plugin);
// New cache
IslandCache ic = new IslandCache(plugin);
ic.addIsland(island);
// Check exact match
assertEquals(island, ic.getIslandAt(location));
// Check islands is in world
assertTrue(Util.inWorld(island.getCenter()));
// Check exact match for location
assertEquals(island, ic.getIslandAt(island.getCenter()));
Location location2 = mock(Location.class);
when(location2.getWorld()).thenReturn(world);
when(location2.getBlockX()).thenReturn(10);
when(location2.getBlockY()).thenReturn(10);
when(location2.getBlockZ()).thenReturn(10);
assertEquals(island, ic.getIslandAt(location2));
}
@Test
public void testGetIslandLocation() {
fail("Not yet implemented"); // TODO
assertEquals(island, ic.getIslandAt(location2));
when(island.inIslandSpace(Mockito.any(Integer.class), Mockito.any(Integer.class))).thenReturn(false);
assertNull(ic.getIslandAt(location2));
}
@Test
public void testGetIslandName() {
fail("Not yet implemented"); // TODO
}
PlayersManager pm = mock(PlayersManager.class);
when(plugin.getPlayers()).thenReturn(pm);
// New cache
IslandCache ic = new IslandCache(plugin);
ic.addIsland(island);
// Test with empty name
when(island.getName()).thenReturn("");
// Random player
when(pm.getName(Mockito.any())).thenReturn("tastybento");
assertEquals("tastybento" + ChatColor.RESET, ic.getIslandName(UUID.randomUUID()));
// Island owner
when(pm.getName(owner)).thenReturn("ownersname");
assertEquals("ownersname" + ChatColor.RESET, ic.getIslandName(island.getOwner()));
// Test with null name
when(island.getName()).thenReturn(null);
// Random player
when(pm.getName(Mockito.any())).thenReturn("tastybento");
assertEquals("tastybento" + ChatColor.RESET, ic.getIslandName(UUID.randomUUID()));
// Island owner
when(pm.getName(owner)).thenReturn("ownersname");
assertEquals("ownersname" + ChatColor.RESET, ic.getIslandName(island.getOwner()));
// Test with island name set
when(island.getName()).thenReturn("islandnameset");
// Random player
when(pm.getName(Mockito.any())).thenReturn("tastybento");
assertEquals("tastybento" + ChatColor.RESET, ic.getIslandName(UUID.randomUUID()));
// Island owner
when(pm.getName(owner)).thenReturn("ownersname");
assertEquals("islandnameset" + ChatColor.RESET, ic.getIslandName(island.getOwner()));
}
/*
@Test
public void testGetIslands() {
fail("Not yet implemented"); // TODO
}
*/
@Test
public void testGetMembers() {
fail("Not yet implemented"); // TODO
}
// New cache
IslandCache ic = new IslandCache(plugin);
ic.addIsland(island);
assertTrue(ic.getMembers(null).isEmpty());
assertTrue(ic.getMembers(UUID.randomUUID()).isEmpty());
assertFalse(ic.getMembers(island.getOwner()).isEmpty());
assertEquals(3, ic.getMembers(island.getOwner()).size());
}
@Test
public void testGetTeamLeader() {
fail("Not yet implemented"); // TODO
// New cache
IslandCache ic = new IslandCache(plugin);
ic.addIsland(island);
assertEquals(owner, ic.getTeamLeader(owner));
assertNull(ic.getTeamLeader(null));
assertNull(ic.getTeamLeader(UUID.randomUUID()));
}
@Test
public void testHasIsland() {
fail("Not yet implemented"); // TODO
// New cache
IslandCache ic = new IslandCache(plugin);
ic.addIsland(island);
assertTrue(ic.hasIsland(owner));
assertFalse(ic.hasIsland(UUID.randomUUID()));
assertFalse(ic.hasIsland(null));
}
@Test
public void testRemovePlayer() {
fail("Not yet implemented"); // TODO
// New cache
IslandCache ic = new IslandCache(plugin);
ic.addIsland(island);
assertTrue(ic.hasIsland(owner));
ic.removePlayer(null);
assertTrue(ic.hasIsland(owner));
ic.removePlayer(UUID.randomUUID());
assertTrue(ic.hasIsland(owner));
ic.removePlayer(owner);
assertFalse(ic.hasIsland(owner));
}
@Test
public void testSetIslandName() {
fail("Not yet implemented"); // TODO
// New cache
IslandCache ic = new IslandCache(plugin);
ic.addIsland(island);
assertTrue(ic.setIslandName(owner, "test tes test"));
assertFalse(ic.setIslandName(UUID.randomUUID(), "sadfas"));
assertFalse(ic.setIslandName(null, "sadfas"));
}
@Test
public void testSize() {
fail("Not yet implemented"); // TODO
// New cache
IslandCache ic = new IslandCache(plugin);
ic.addIsland(island);
assertEquals(1, ic.size());
}
*/
}