diff --git a/pom.xml b/pom.xml
index f5fd401..173b09f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,24 @@
world.bentobox
warps
- 1.5.2-SNAPSHOT
+ ${revision}
WelcomeWarpSigns
WelcomeWarpSigns is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like ASkyBlock or AcidIsland.
https://github.com/BentoBoxWorld/addon-welcomewarpsigns
2018
+
+
+ tastybento
+ tastybento@bentobox.world
+ -8
+
+ Lead Developer
+
+
+
+
scm:git:https://github.com/BentoBoxWorld/addon-welcomewarpsigns.git
scm:git:git@github.com:BentoBoxWorld/addon-welcomewarpsigns.git
@@ -41,12 +52,89 @@
- UTF-8
- UTF-8
- 1.8
- 1.7.4
+ UTF-8
+ UTF-8
+ 1.8
+
+ 2.0.2
+
+ 1.13.2-R0.1-SNAPSHOT
+ 1.6.0-SNAPSHOT
+ 1.5.0
+
+ ${build.version}-SNAPSHOT
+
+ -LOCAL
+
+ 1.6.0
+
+
+
+
+
+ ci
+
+
+ env.BUILD_NUMBER
+
+
+
+
+ -b${env.BUILD_NUMBER}
+
+
+
+
+
+
+
+ master
+
+
+ env.GIT_BRANCH
+ origin/master
+
+
+
+
+ ${build.version}
+
+
+
+
+
+ sonar
+
+ https://sonarcloud.io
+ tastybento-github
+
+
+
+
+ org.sonarsource.scanner.maven
+ sonar-maven-plugin
+ 3.4.1.1168
+
+
+ verify
+
+ sonar
+
+
+
+
+
+
+
+
+
spigot-repo
@@ -63,44 +151,57 @@
-
- org.spigotmc
- spigot-api
- 1.14.1-R0.1-SNAPSHOT
- provided
-
-
- org.mockito
- mockito-all
- 1.10.19
- test
-
-
- org.powermock
- powermock-module-junit4
- ${powermock.version}
- test
-
-
- org.powermock
- powermock-api-mockito
- ${powermock.version}
- test
-
-
- world.bentobox
- bentobox
- 1.5.0
-
+
+
+ org.spigotmc
+ spigot-api
+ ${spigot.version}
+ provided
+
+
+
+ org.mockito
+ mockito-core
+ 3.0.0
+ test
+
+
+ org.powermock
+ powermock-module-junit4
+ ${powermock.version}
+ test
+
+
+ org.powermock
+ powermock-api-mockito2
+ ${powermock.version}
+ test
+
+
+ world.bentobox
+ bentobox
+ ${bentobox.version}
+ provided
+
world.bentobox
level
- 1.5.0
+ ${level.version}
provided
+
+
+
+
+
+
+ ${project.name}-${revision}${build.number}
+
clean package
@@ -113,134 +214,112 @@
false
-
-
- org.apache.maven.plugins
- maven-clean-plugin
- 3.1.0
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 3.1.0
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.7.0
-
- ${java.version}
- ${java.version}
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.22.0
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 3.1.0
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 3.0.1
-
- public
- false
- -Xdoclint:none
-
-
-
- attach-javadocs
-
- jar
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 3.0.1
-
-
- attach-sources
-
- jar-no-fork
-
-
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 3.1.1
-
- false
-
-
-
- org.apache.maven.plugins
- maven-install-plugin
- 2.5.2
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
- 2.8.2
-
-
- org.jacoco
- jacoco-maven-plugin
- 0.8.1
-
- true
-
-
-
- pre-unit-test
-
- prepare-agent
-
-
-
- post-unit-test
-
- report
-
-
-
-
-
+
+
+ org.apache.maven.plugins
+ maven-clean-plugin
+ 3.1.0
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 3.1.0
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.7.0
+
+ ${java.version}
+ ${java.version}
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.22.0
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 3.1.0
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 3.0.1
+
+ public
+ false
+ -Xdoclint:none
+
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ 3.0.1
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.1.1
+
+ false
+
+
+
+ org.apache.maven.plugins
+ maven-install-plugin
+ 2.5.2
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+ 2.8.2
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ 0.8.3
+
+ true
+
+
+ **/*Names*
+
+
+
+
+ pre-unit-test
+
+ prepare-agent
+
+
+
+ post-unit-test
+
+ report
+
+
+
+
+
-
-
-
- sonar
-
- https://sonarcloud.io
- bentobox-world
-
-
-
-
- org.sonarsource.scanner.maven
- sonar-maven-plugin
- 5.1
-
-
- verify
-
- sonar
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml
index bca4d96..b602371 100755
--- a/src/main/resources/addon.yml
+++ b/src/main/resources/addon.yml
@@ -1,6 +1,6 @@
name: WelcomeWarps
main: world.bentobox.warps.Warp
-version: ${version}
+version: ${version}${build.number}
authors: tastybento
diff --git a/src/test/java/world/bentobox/warps/WarpPanelManagerTest.java b/src/test/java/world/bentobox/warps/WarpPanelManagerTest.java
index 9cdd3a3..b555f2e 100644
--- a/src/test/java/world/bentobox/warps/WarpPanelManagerTest.java
+++ b/src/test/java/world/bentobox/warps/WarpPanelManagerTest.java
@@ -1,6 +1,3 @@
-/**
- *
- */
package world.bentobox.warps;
import static org.mockito.Mockito.mock;
@@ -26,6 +23,7 @@ import org.bukkit.inventory.meta.ItemMeta;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -39,18 +37,24 @@ import world.bentobox.bentobox.managers.PlayersManager;
import world.bentobox.warps.config.Settings;
/**
- * @author ben
+ * @author tastybento
*
*/
@RunWith(PowerMockRunner.class)
@PrepareForTest({Bukkit.class})
public class WarpPanelManagerTest {
+ @Mock
private WarpSignsManager wsm;
+ @Mock
private Warp addon;
+ @Mock
private Player player;
+ @Mock
private User user;
+ @Mock
private World world;
+ @Mock
private Inventory top;
private UUID uuid;
@@ -59,8 +63,6 @@ public class WarpPanelManagerTest {
*/
@Before
public void setUp() throws Exception {
- addon = mock(Warp.class);
- wsm = mock(WarpSignsManager.class);
when(addon.getWarpSignsManager()).thenReturn(wsm);
// Fill with 200 fake warps (I'm banking on them all being different, but there could be a clash)
List list = new ArrayList<>();
@@ -73,18 +75,15 @@ public class WarpPanelManagerTest {
when(wsm.getSortedWarps(any())).thenReturn(list);
- user = mock(User.class);
- player = mock(Player.class);
+ // User and player
when(user.getPlayer()).thenReturn(player);
- when(user.getTranslation(Mockito.anyVararg())).thenAnswer(new Answer() {
+ when(user.getTranslation(Mockito.any())).thenAnswer(new Answer() {
@Override
public String answer(InvocationOnMock invocation) throws Throwable {
- return invocation.getArgumentAt(0, String.class);
+ return invocation.getArgument(0, String.class);
}});
- // World
- world = mock(World.class);
// BentoBox
BentoBox plugin = mock(BentoBox.class);
@@ -100,7 +99,7 @@ public class WarpPanelManagerTest {
when(itemF.getItemMeta(any())).thenReturn(imeta);
when(Bukkit.getItemFactory()).thenReturn(itemF);
- top = mock(Inventory.class);
+ // Inventory
when(top.getSize()).thenReturn(9);
when(Bukkit.createInventory(any(), Mockito.anyInt(), any())).thenReturn(top);
diff --git a/src/test/java/world/bentobox/warps/WarpSignsListenerTest.java b/src/test/java/world/bentobox/warps/WarpSignsListenerTest.java
index ed1ed99..5bf8f3c 100644
--- a/src/test/java/world/bentobox/warps/WarpSignsListenerTest.java
+++ b/src/test/java/world/bentobox/warps/WarpSignsListenerTest.java
@@ -51,6 +51,10 @@ import world.bentobox.bentobox.managers.PlaceholdersManager;
import world.bentobox.bentobox.util.Util;
import world.bentobox.warps.config.Settings;
+/**
+ * @author tastybento
+ *
+ */
@RunWith(PowerMockRunner.class)
@PrepareForTest({Bukkit.class, Util.class, NamespacedKey.class, Tag.class})
public class WarpSignsListenerTest {
@@ -133,7 +137,7 @@ public class WarpSignsListenerTest {
@Override
public String answer(InvocationOnMock invocation) throws Throwable {
- return invocation.getArgumentAt(1, String.class);
+ return invocation.getArgument(1, String.class);
}});
when(plugin.getLocalesManager()).thenReturn(lm);
@@ -160,7 +164,7 @@ public class WarpSignsListenerTest {
when(Util.getWorld(any())).thenReturn(world);
// Locales
- Answer answer = invocation -> invocation.getArgumentAt(1, String.class);
+ Answer answer = invocation -> invocation.getArgument(1, String.class);
when(lm.get(any(User.class), anyString())).thenAnswer(answer);
when(plugin.getLocalesManager()).thenReturn(lm);