diff --git a/pom.xml b/pom.xml
index dd17c93..24f5611 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,23 @@
world.bentobox
limits
Limits
- 0.2.3-SNAPSHOT
+ ${revision}
+
An add-on for BentoBox that limits blocks and entities on islands.
https://github.com/BentoBoxWorld/Limits
2018
+
+
+ tastybento
+ tastybento@bentobox.world
+ -8
+
+ Lead Developer
+
+
+
+
scm:git:https://github.com/BentoBoxWorld/Limits.git
scm:git:git@github.com:BentoBoxWorld/Limits.git
@@ -30,9 +42,61 @@
UTF-8
UTF-8
1.8
- 1.7.4
+
+ 2.0.2
+
+ 1.13.2-R0.1-SNAPSHOT
+ 1.6.0-SNAPSHOT
+
+ ${build.version}-SNAPSHOT
+
+ -LOCAL
+
+ 1.6.0
+
+
+
+
+
+ ci
+
+
+ env.BUILD_NUMBER
+
+
+
+
+ -b${env.BUILD_NUMBER}
+
+
+
+
+
+
+
+ master
+
+
+ env.GIT_BRANCH
+ origin/master
+
+
+
+
+ ${build.version}
+
+
+
+
+
+
my-local-repo
@@ -53,16 +117,18 @@
+
org.spigotmc
spigot-api
- 1.13.2-R0.1-SNAPSHOT
+ ${spigot.version}
provided
+
org.mockito
- mockito-all
- 1.10.19
+ mockito-core
+ 3.0.0
test
@@ -73,16 +139,17 @@
org.powermock
- powermock-api-mockito
+ powermock-api-mockito2
${powermock.version}
test
world.bentobox
bentobox
- 1.6.0-SNAPSHOT
+ ${bentobox.version}
provided
+
com.songoda
EpicSpawners-API
@@ -92,6 +159,16 @@
+
+
+
+
+
+
+ ${project.name}-${revision}${build.number}
+
clean package
diff --git a/src/test/java/bentobox/addon/limits/listeners/JoinListenerTest.java b/src/test/java/bentobox/addon/limits/listeners/JoinListenerTest.java
index 4ce9696..1d1f45b 100644
--- a/src/test/java/bentobox/addon/limits/listeners/JoinListenerTest.java
+++ b/src/test/java/bentobox/addon/limits/listeners/JoinListenerTest.java
@@ -67,6 +67,8 @@ public class JoinListenerTest {
private IslandBlockCount ibc;
@Mock
private OfflinePlayer owner;
+ @Mock
+ private Island island;
/**
* @throws java.lang.Exception
@@ -80,7 +82,6 @@ public class JoinListenerTest {
when(addon.getGameModePermPrefix(any())).thenReturn("bskyblock.");
// Island Manager
when(im.hasIsland(any(), any(UUID.class))).thenReturn(true);
- Island island = mock(Island.class);
when(island.getUniqueId()).thenReturn("unique_id");
when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
// Default is that player has island
@@ -105,6 +106,9 @@ public class JoinListenerTest {
when(owner.isOnline()).thenReturn(true);
when(owner.getPlayer()).thenReturn(player);
when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(owner);
+
+ // Island
+ when(island.getOwner()).thenReturn(UUID.randomUUID());
}
/**
@@ -119,7 +123,6 @@ public class JoinListenerTest {
*/
@Test
public void testOnNewIslandWrongReason() {
- Island island = mock(Island.class);
IslandEvent e = new IslandEvent(island, null, false, null, IslandEvent.Reason.BAN);
jl.onNewIsland(e);
verify(island, never()).getWorld();
@@ -130,7 +133,6 @@ public class JoinListenerTest {
*/
@Test
public void testOnNewIslandRegistered() {
- Island island = mock(Island.class);
IslandEvent e = new IslandEvent(island, null, false, null, IslandEvent.Reason.REGISTERED);
jl.onNewIsland(e);
verify(island).getWorld();
@@ -141,7 +143,6 @@ public class JoinListenerTest {
*/
@Test
public void testOnNewIslandResetted() {
- Island island = mock(Island.class);
IslandEvent e = new IslandEvent(island, null, false, null, IslandEvent.Reason.RESETTED);
jl.onNewIsland(e);
verify(island).getWorld();
@@ -153,7 +154,6 @@ public class JoinListenerTest {
@Test
public void testOnNewIslandCreated() {
when(addon.inGameModeWorld(any())).thenReturn(true);
- Island island = mock(Island.class);
IslandEvent e = new IslandEvent(island, null, false, null, IslandEvent.Reason.CREATED);
jl.onNewIsland(e);
verify(island).getWorld();
@@ -167,7 +167,6 @@ public class JoinListenerTest {
public void testOnNewIslandCreatedOffline() {
when(owner.isOnline()).thenReturn(false);
when(addon.inGameModeWorld(any())).thenReturn(true);
- Island island = mock(Island.class);
IslandEvent e = new IslandEvent(island, null, false, null, IslandEvent.Reason.CREATED);
jl.onNewIsland(e);
verify(island).getWorld();
@@ -182,7 +181,6 @@ public class JoinListenerTest {
when(addon.getGameModeName(any())).thenReturn("");
when(addon.getGameModePermPrefix(any())).thenReturn("bskyblock.");
when(addon.inGameModeWorld(any())).thenReturn(true);
- Island island = mock(Island.class);
IslandEvent e = new IslandEvent(island, null, false, null, IslandEvent.Reason.CREATED);
jl.onNewIsland(e);
when(addon.getGameModeName(any())).thenReturn("bskyblock");
@@ -196,7 +194,6 @@ public class JoinListenerTest {
*/
@Test
public void testOnOwnerChange() {
- Island island = mock(Island.class);
TeamSetownerEvent e = mock(TeamSetownerEvent.class);
when(e.getIsland()).thenReturn(island);
when(e.getNewOwner()).thenReturn(UUID.randomUUID());
@@ -379,7 +376,6 @@ public class JoinListenerTest {
*/
@Test
public void testOnUnregisterIslandNotUnregistered() {
- Island island = mock(Island.class);
IslandEvent e = new IslandEvent(island, null, false, null, IslandEvent.Reason.BAN);
jl.onUnregisterIsland(e);
verify(island, never()).getWorld();
@@ -390,7 +386,6 @@ public class JoinListenerTest {
*/
@Test
public void testOnUnregisterIslandNotInWorld() {
- Island island = mock(Island.class);
IslandEvent e = new IslandEvent(island, null, false, null, IslandEvent.Reason.UNREGISTERED);
jl.onUnregisterIsland(e);
verify(island).getWorld();
@@ -406,7 +401,6 @@ public class JoinListenerTest {
Map map = mock(Map.class);
when(ibc.getBlockLimits()).thenReturn(map);
when(addon.inGameModeWorld(any())).thenReturn(true);
- Island island = mock(Island.class);
IslandEvent e = new IslandEvent(island, null, false, null, IslandEvent.Reason.UNREGISTERED);
jl.onUnregisterIsland(e);
verify(island).getWorld();
@@ -425,7 +419,6 @@ public class JoinListenerTest {
Map map = mock(Map.class);
when(ibc.getBlockLimits()).thenReturn(map);
when(addon.inGameModeWorld(any())).thenReturn(true);
- Island island = mock(Island.class);
IslandEvent e = new IslandEvent(island, null, false, null, IslandEvent.Reason.UNREGISTERED);
jl.onUnregisterIsland(e);
verify(island).getWorld();