Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-07-09 21:24:54 +02:00
Code Issues Projects Releases Wiki Activity

[RevertMe] Remove essentials hook (currently unavailable using maven)

Browse Source
This commit is contained in:
Gabriele C 2016-09-07 16:04:20 +02:00
parent 41cd7dd28b
commit f63871600a
3 changed files with 105 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -393,11 +393,12 @@
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url> <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
</repository> </repository>
<!-- Essentials Repo --> <!-- Essentials Repo NOTE: Offline atm
<repository> <repository>
<id>ess-repo</id> <id>ess-repo</id>
<url>http://repo.ess3.net/content/groups/essentials</url> <url>http://repo.ess3.net/content/groups/essentials</url>
</repository> </repository>
-->
<!-- CombatTagPlus Repo --> <!-- CombatTagPlus Repo -->
<repository> <repository>
@ -717,7 +718,7 @@
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Essentials plugin --> <!-- Essentials plugin NOTE: Unavailable atm
<dependency> <dependency>
<groupId>net.ess3</groupId> <groupId>net.ess3</groupId>
<artifactId>Essentials</artifactId> <artifactId>Essentials</artifactId>
@ -734,6 +735,7 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
-->
<!-- Anti-PvPLogging plugin, https://github.com/MinelinkNetwork/CombatTagPlus --> <!-- Anti-PvPLogging plugin, https://github.com/MinelinkNetwork/CombatTagPlus -->
<dependency> <dependency>

31
src/main/java/fr/xephi/authme/hooks/PluginHooks.java
View File

@ -1,7 +1,7 @@
package fr.xephi.authme.hooks; package fr.xephi.authme.hooks;
import ch.jalu.injector.annotations.NoFieldScan; import ch.jalu.injector.annotations.NoFieldScan;
import com.earth2me.essentials.Essentials; //import com.earth2me.essentials.Essentials;
import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MVWorldManager; import com.onarandombox.MultiverseCore.api.MVWorldManager;
import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.ConsoleLogger;
@ -22,7 +22,7 @@ import java.io.File;
public class PluginHooks { public class PluginHooks {
private final PluginManager pluginManager; private final PluginManager pluginManager;
private Essentials essentials; //private Essentials essentials;
private MultiverseCore multiverse; private MultiverseCore multiverse;
private CombatTagPlus combatTagPlus; private CombatTagPlus combatTagPlus;
@ -46,9 +46,9 @@ public class PluginHooks {
* @param socialSpyStatus The social spy status (enabled/disabled) to set * @param socialSpyStatus The social spy status (enabled/disabled) to set
*/ */
public void setEssentialsSocialSpyStatus(Player player, boolean socialSpyStatus) { public void setEssentialsSocialSpyStatus(Player player, boolean socialSpyStatus) {
if (essentials != null) { //if (essentials != null) {
essentials.getUser(player).setSocialSpyEnabled(socialSpyStatus); // essentials.getUser(player).setSocialSpyEnabled(socialSpyStatus);
} //}
} }
/** /**
@ -57,9 +57,9 @@ public class PluginHooks {
* @return The Essentials data folder, or null if unavailable * @return The Essentials data folder, or null if unavailable
*/ */
public File getEssentialsDataFolder() { public File getEssentialsDataFolder() {
if (essentials != null) { //if (essentials != null) {
return essentials.getDataFolder(); // return essentials.getDataFolder();
} //}
return null; return null;
} }
@ -104,7 +104,8 @@ public class PluginHooks {
// "Is plugin available" methods // "Is plugin available" methods
// ------ // ------
public boolean isEssentialsAvailable() { public boolean isEssentialsAvailable() {
return essentials != null; //return essentials != null;
return false;
} }
public boolean isMultiverseAvailable() { public boolean isMultiverseAvailable() {
@ -119,11 +120,11 @@ public class PluginHooks {
// Hook methods // Hook methods
// ------ // ------
public void tryHookToEssentials() { public void tryHookToEssentials() {
try { //try {
essentials = getPlugin(pluginManager, "Essentials", Essentials.class); // essentials = getPlugin(pluginManager, "Essentials", Essentials.class);
} catch (Exception | NoClassDefFoundError ignored) { //} catch (Exception | NoClassDefFoundError ignored) {
essentials = null; // essentials = null;
} //}
} }
public void tryHookToCombatPlus() { public void tryHookToCombatPlus() {
@ -146,7 +147,7 @@ public class PluginHooks {
// Unhook methods // Unhook methods
// ------ // ------
public void unhookEssentials() { public void unhookEssentials() {
essentials = null; //essentials = null;
} }
public void unhookCombatPlus() { public void unhookCombatPlus() {
combatTagPlus = null; combatTagPlus = null;

170
src/test/java/fr/xephi/authme/hooks/PluginHooksTest.java
View File

@ -1,18 +1,18 @@
package fr.xephi.authme.hooks; package fr.xephi.authme.hooks;
import com.earth2me.essentials.Essentials; //import com.earth2me.essentials.Essentials;
import com.earth2me.essentials.User; //import com.earth2me.essentials.User;
import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MVWorldManager; import com.onarandombox.MultiverseCore.api.MVWorldManager;
import com.onarandombox.MultiverseCore.api.MultiverseWorld; import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import fr.xephi.authme.ReflectionTestUtils; //import fr.xephi.authme.ReflectionTestUtils;
import fr.xephi.authme.TestHelper; import fr.xephi.authme.TestHelper;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; //import org.bukkit.plugin.java.JavaPlugin;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
@ -34,7 +34,7 @@ import static org.mockito.Mockito.verify;
public class PluginHooksTest { public class PluginHooksTest {
/** The plugin name of Essentials. */ /** The plugin name of Essentials. */
private static final String ESSENTIALS = "Essentials"; //private static final String ESSENTIALS = "Essentials";
/** The plugin name of Multiverse-Core. */ /** The plugin name of Multiverse-Core. */
private static final String MULTIVERSE = "Multiverse-Core"; private static final String MULTIVERSE = "Multiverse-Core";
@ -43,35 +43,35 @@ public class PluginHooksTest {
TestHelper.setupLogger(); TestHelper.setupLogger();
} }
@Test // @Test
public void shouldHookIntoEssentials() { // public void shouldHookIntoEssentials() {
// given // // given
PluginManager pluginManager = mock(PluginManager.class); // PluginManager pluginManager = mock(PluginManager.class);
PluginHooks pluginHooks = new PluginHooks(pluginManager); // PluginHooks pluginHooks = new PluginHooks(pluginManager);
setPluginAvailable(pluginManager, ESSENTIALS, Essentials.class); // setPluginAvailable(pluginManager, ESSENTIALS, Essentials.class);
assertThat(pluginHooks.isEssentialsAvailable(), equalTo(false)); // assertThat(pluginHooks.isEssentialsAvailable(), equalTo(false));
//
// when // // when
pluginHooks.tryHookToEssentials(); // pluginHooks.tryHookToEssentials();
//
// then // // then
assertThat(pluginHooks.isEssentialsAvailable(), equalTo(true)); // assertThat(pluginHooks.isEssentialsAvailable(), equalTo(true));
} // }
// Note ljacqu 20160312: Cannot test with Multiverse or CombatTagPlus because their classes are declared final // Note ljacqu 20160312: Cannot test with Multiverse or CombatTagPlus because their classes are declared final
@Test // @Test
public void shouldHookIntoEssentialsAtInitialization() { // public void shouldHookIntoEssentialsAtInitialization() {
// given // // given
PluginManager pluginManager = mock(PluginManager.class); // PluginManager pluginManager = mock(PluginManager.class);
setPluginAvailable(pluginManager, ESSENTIALS, Essentials.class); // setPluginAvailable(pluginManager, ESSENTIALS, Essentials.class);
//
// when // // when
PluginHooks pluginHooks = new PluginHooks(pluginManager); // PluginHooks pluginHooks = new PluginHooks(pluginManager);
//
// then // // then
assertThat(pluginHooks.isEssentialsAvailable(), equalTo(true)); // assertThat(pluginHooks.isEssentialsAvailable(), equalTo(true));
} // }
@Test @Test
public void shouldHookIntoMultiverseAtInitialization() { public void shouldHookIntoMultiverseAtInitialization() {
@ -86,24 +86,24 @@ public class PluginHooksTest {
assertThat(pluginHooks.isMultiverseAvailable(), equalTo(true)); assertThat(pluginHooks.isMultiverseAvailable(), equalTo(true));
} }
@Test // @Test
public void shouldReturnEssentialsDataFolder() { // public void shouldReturnEssentialsDataFolder() {
// given // // given
Essentials ess = mock(Essentials.class); // Essentials ess = mock(Essentials.class);
File essDataFolder = new File("test/data-folder"); // File essDataFolder = new File("test/data-folder");
// Need to set the data folder with reflections because getDataFolder() is declared final // // Need to set the data folder with reflections because getDataFolder() is declared final
ReflectionTestUtils.setField(JavaPlugin.class, ess, "dataFolder", essDataFolder); // ReflectionTestUtils.setField(JavaPlugin.class, ess, "dataFolder", essDataFolder);
//
PluginManager pluginManager = mock(PluginManager.class); // PluginManager pluginManager = mock(PluginManager.class);
setPluginAvailable(pluginManager, ESSENTIALS, ess); // setPluginAvailable(pluginManager, ESSENTIALS, ess);
PluginHooks pluginHooks = new PluginHooks(pluginManager); // PluginHooks pluginHooks = new PluginHooks(pluginManager);
//
// when // // when
File dataFolder = pluginHooks.getEssentialsDataFolder(); // File dataFolder = pluginHooks.getEssentialsDataFolder();
//
// then // // then
assertThat(dataFolder, equalTo(essDataFolder)); // assertThat(dataFolder, equalTo(essDataFolder));
} // }
@Test @Test
public void shouldReturnNullForUnhookedEssentials() { public void shouldReturnNullForUnhookedEssentials() {
@ -118,26 +118,26 @@ public class PluginHooksTest {
assertThat(result, nullValue()); assertThat(result, nullValue());
} }
@Test // @Test
public void shouldSetSocialSpyStatus() { // public void shouldSetSocialSpyStatus() {
// given // // given
Player player = mock(Player.class); // Player player = mock(Player.class);
//
Essentials ess = mock(Essentials.class); // Essentials ess = mock(Essentials.class);
User user = mock(User.class); // User user = mock(User.class);
given(ess.getUser(player)).willReturn(user); // given(ess.getUser(player)).willReturn(user);
//
PluginManager pluginManager = mock(PluginManager.class); // PluginManager pluginManager = mock(PluginManager.class);
setPluginAvailable(pluginManager, ESSENTIALS, ess); // setPluginAvailable(pluginManager, ESSENTIALS, ess);
PluginHooks pluginHooks = new PluginHooks(pluginManager); // PluginHooks pluginHooks = new PluginHooks(pluginManager);
//
// when // // when
pluginHooks.setEssentialsSocialSpyStatus(player, true); // pluginHooks.setEssentialsSocialSpyStatus(player, true);
//
// then // // then
verify(ess).getUser(player); // verify(ess).getUser(player);
verify(user).setSocialSpyEnabled(true); // verify(user).setSocialSpyEnabled(true);
} // }
@Test @Test
public void shouldNotDoAnythingForUnhookedEssentials() { public void shouldNotDoAnythingForUnhookedEssentials() {
@ -148,22 +148,22 @@ public class PluginHooksTest {
pluginHooks.setEssentialsSocialSpyStatus(mock(Player.class), false); pluginHooks.setEssentialsSocialSpyStatus(mock(Player.class), false);
} }
@Test // @Test
public void shouldUnhookEssentialsAndMultiverse() { // public void shouldUnhookEssentialsAndMultiverse() {
// given // // given
PluginManager pluginManager = mock(PluginManager.class); // PluginManager pluginManager = mock(PluginManager.class);
setPluginAvailable(pluginManager, ESSENTIALS, Essentials.class); // setPluginAvailable(pluginManager, ESSENTIALS, Essentials.class);
setPluginAvailable(pluginManager, MULTIVERSE, MultiverseCore.class); // setPluginAvailable(pluginManager, MULTIVERSE, MultiverseCore.class);
PluginHooks pluginHooks = new PluginHooks(pluginManager); // PluginHooks pluginHooks = new PluginHooks(pluginManager);
//
// when // // when
pluginHooks.unhookEssentials(); // pluginHooks.unhookEssentials();
pluginHooks.unhookMultiverse(); // pluginHooks.unhookMultiverse();
//
// then // // then
assertThat(pluginHooks.isEssentialsAvailable(), equalTo(false)); // assertThat(pluginHooks.isEssentialsAvailable(), equalTo(false));
assertThat(pluginHooks.isMultiverseAvailable(), equalTo(false)); // assertThat(pluginHooks.isMultiverseAvailable(), equalTo(false));
} // }
@Test @Test
public void shouldHandlePluginRetrievalError() { public void shouldHandlePluginRetrievalError() {