Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 293-translate-help-messages

Browse Source
This commit is contained in:
ljacqu
2016-10-09 15:39:50 +02:00
parent 5928aee097 fc08e9dbd1
commit 76e6d757da
38 changed files with 493 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/api/NewAPITest.java
+3 -3
View File
@@ -5,7 +5,7 @@ import fr.xephi.authme.ReflectionTestUtils;
import fr.xephi.authme.data.auth.PlayerAuth;
import fr.xephi.authme.data.auth.PlayerCache;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.hooks.PluginHooks;
import fr.xephi.authme.service.PluginHookService;
import fr.xephi.authme.process.Management;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.service.ValidationService;
@@ -46,7 +46,7 @@ public class NewAPITest {
@Mock
private AuthMe authMe;
@Mock
private PluginHooks pluginHooks;
private PluginHookService pluginHookService;
@Mock
private ValidationService validationService;
@Mock
@@ -86,7 +86,7 @@ public class NewAPITest {
public void shouldReturnIfPlayerIsNpc() {
// given
Player player = mock(Player.class);
given(pluginHooks.isNpc(player)).willReturn(true);
given(pluginHookService.isNpc(player)).willReturn(true);
// when
boolean result = api.isNPC(player);
src/test/java/fr/xephi/authme/listener/ListenerServiceTest.java
+5 -5
View File
@@ -5,7 +5,7 @@ import ch.jalu.injector.testing.DelayedInjectionRunner;
import ch.jalu.injector.testing.InjectDelayed;
import fr.xephi.authme.data.auth.PlayerCache;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.hooks.PluginHooks;
import fr.xephi.authme.service.PluginHookService;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.RegistrationSettings;
import fr.xephi.authme.service.ValidationService;
@@ -41,7 +41,7 @@ public class ListenerServiceTest {
private DataSource dataSource;
@Mock
private PluginHooks pluginHooks;
private PluginHookService pluginHookService;
@Mock
private PlayerCache playerCache;
@@ -161,14 +161,14 @@ public class ListenerServiceTest {
Player player = mockPlayerWithName(playerName);
EntityEvent event = mock(EntityEvent.class);
given(event.getEntity()).willReturn(player);
given(pluginHooks.isNpc(player)).willReturn(true);
given(pluginHookService.isNpc(player)).willReturn(true);
// when
boolean result = listenerService.shouldCancelEvent(event);
// then
assertThat(result, equalTo(false));
verify(pluginHooks).isNpc(player);
verify(pluginHookService).isNpc(player);
}
@Test
@@ -215,7 +215,7 @@ public class ListenerServiceTest {
assertThat(result, equalTo(true));
verify(playerCache).isAuthenticated(playerName);
verifyZeroInteractions(dataSource);
verify(pluginHooks).isNpc(player);
verify(pluginHookService).isNpc(player);
}
private static Player mockPlayerWithName(String name) {
src/test/java/fr/xephi/authme/listener/ServerListenerTest.java
+10 -10
View File
@@ -1,7 +1,7 @@
package fr.xephi.authme.listener;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.hooks.PluginHooks;
import fr.xephi.authme.service.PluginHookService;
import fr.xephi.authme.listener.protocollib.ProtocolLibService;
import fr.xephi.authme.permission.PermissionsManager;
import fr.xephi.authme.settings.SpawnLoader;
@@ -41,7 +41,7 @@ public class ServerListenerTest {
private PermissionsManager permissionsManager;
@Mock
private PluginHooks pluginHooks;
private PluginHookService pluginHookService;
@Mock
private ProtocolLibService protocolLibService;
@@ -59,7 +59,7 @@ public class ServerListenerTest {
checkEnableHandling(ESSENTIALS, new Runnable() {
@Override
public void run() {
verify(pluginHooks).tryHookToEssentials();
verify(pluginHookService).tryHookToEssentials();
}
});
checkEnableHandling(ESSENTIALS_SPAWN, new Runnable() {
@@ -71,13 +71,13 @@ public class ServerListenerTest {
checkEnableHandling(MULTIVERSE, new Runnable() {
@Override
public void run() {
verify(pluginHooks).tryHookToMultiverse();
verify(pluginHookService).tryHookToMultiverse();
}
});
checkEnableHandling(COMBAT_TAG, new Runnable() {
@Override
public void run() {
verify(pluginHooks).tryHookToCombatPlus();
verify(pluginHookService).tryHookToCombatPlus();
}
});
checkEnableHandling(PROTOCOL_LIB, new Runnable() {
@@ -99,7 +99,7 @@ public class ServerListenerTest {
checkDisableHandling(ESSENTIALS, new Runnable() {
@Override
public void run() {
verify(pluginHooks).unhookEssentials();
verify(pluginHookService).unhookEssentials();
}
});
checkDisableHandling(ESSENTIALS_SPAWN, new Runnable() {
@@ -111,13 +111,13 @@ public class ServerListenerTest {
checkDisableHandling(MULTIVERSE, new Runnable() {
@Override
public void run() {
verify(pluginHooks).unhookMultiverse();
verify(pluginHookService).unhookMultiverse();
}
});
checkDisableHandling(COMBAT_TAG, new Runnable() {
@Override
public void run() {
verify(pluginHooks).unhookCombatPlus();
verify(pluginHookService).unhookCombatPlus();
}
});
checkDisableHandling(PROTOCOL_LIB, new Runnable() {
@@ -164,8 +164,8 @@ public class ServerListenerTest {
}
private void verifyNoMoreInteractionsAndReset() {
verifyNoMoreInteractions(permissionsManager, pluginHooks, protocolLibService, spawnLoader);
reset(permissionsManager, pluginHooks, protocolLibService, spawnLoader);
verifyNoMoreInteractions(permissionsManager, pluginHookService, protocolLibService, spawnLoader);
reset(permissionsManager, pluginHookService, protocolLibService, spawnLoader);
}
private static <T extends PluginEvent> T mockEventWithPluginName(Class<T> eventClass, String name) {
src/test/java/fr/xephi/authme/geoip/GeoIpManagerTest.java → src/test/java/fr/xephi/authme/service/GeoIpServiceTest.java
+10 -9
View File
@@ -1,7 +1,8 @@
package fr.xephi.authme.geoip;
package fr.xephi.authme.service;
import com.maxmind.geoip.Country;
import com.maxmind.geoip.LookupService;
import fr.xephi.authme.service.GeoIpService;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -22,12 +23,12 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
/**
* Test for {@link GeoIpManager}.
* Test for {@link GeoIpService}.
*/
@RunWith(MockitoJUnitRunner.class)
public class GeoIpManagerTest {
public class GeoIpServiceTest {
private GeoIpManager geoIpManager;
private GeoIpService geoIpService;
private File dataFolder;
@Mock
private LookupService lookupService;
@@ -38,7 +39,7 @@ public class GeoIpManagerTest {
@Before
public void initializeGeoLiteApi() throws IOException {
dataFolder = temporaryFolder.newFolder();
geoIpManager = new GeoIpManager(dataFolder, lookupService);
geoIpService = new GeoIpService(dataFolder, lookupService);
}
@Test
@@ -51,7 +52,7 @@ public class GeoIpManagerTest {
given(lookupService.getCountry(ip)).willReturn(country);
// when
String result = geoIpManager.getCountryCode(ip);
String result = geoIpService.getCountryCode(ip);
// then
assertThat(result, equalTo(countryCode));
@@ -64,7 +65,7 @@ public class GeoIpManagerTest {
String ip = "127.0.0.1";
// when
String result = geoIpManager.getCountryCode(ip);
String result = geoIpService.getCountryCode(ip);
// then
assertThat(result, equalTo("--"));
@@ -81,7 +82,7 @@ public class GeoIpManagerTest {
given(lookupService.getCountry(ip)).willReturn(country);
// when
String result = geoIpManager.getCountryName(ip);
String result = geoIpService.getCountryName(ip);
// then
assertThat(result, equalTo(countryName));
@@ -94,7 +95,7 @@ public class GeoIpManagerTest {
String ip = "127.0.0.1";
// when
String result = geoIpManager.getCountryName(ip);
String result = geoIpService.getCountryName(ip);
// then
assertThat(result, equalTo("N/A"));
src/test/java/fr/xephi/authme/hooks/PluginHooksTest.java → src/test/java/fr/xephi/authme/service/PluginHookServiceTest.java
+35 -34
View File
@@ -1,10 +1,11 @@
package fr.xephi.authme.hooks;
package fr.xephi.authme.service;
import com.earth2me.essentials.Essentials;
import com.earth2me.essentials.User;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MVWorldManager;
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import fr.xephi.authme.service.PluginHookService;
import fr.xephi.authme.ReflectionTestUtils;
import fr.xephi.authme.TestHelper;
import org.bukkit.Location;
@@ -29,9 +30,9 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
/**
* Test for {@link PluginHooks}.
* Test for {@link PluginHookService}.
*/
public class PluginHooksTest {
public class PluginHookServiceTest {
/** The plugin name of Essentials. */
private static final String ESSENTIALS = "Essentials";
@@ -47,15 +48,15 @@ public class PluginHooksTest {
public void shouldHookIntoEssentials() {
// given
PluginManager pluginManager = mock(PluginManager.class);
PluginHooks pluginHooks = new PluginHooks(pluginManager);
PluginHookService pluginHookService = new PluginHookService(pluginManager);
setPluginAvailable(pluginManager, ESSENTIALS, Essentials.class);
assertThat(pluginHooks.isEssentialsAvailable(), equalTo(false));
assertThat(pluginHookService.isEssentialsAvailable(), equalTo(false));
// when
pluginHooks.tryHookToEssentials();
pluginHookService.tryHookToEssentials();
// then
assertThat(pluginHooks.isEssentialsAvailable(), equalTo(true));
assertThat(pluginHookService.isEssentialsAvailable(), equalTo(true));
}
// Note ljacqu 20160312: Cannot test with Multiverse or CombatTagPlus because their classes are declared final
@@ -67,10 +68,10 @@ public class PluginHooksTest {
setPluginAvailable(pluginManager, ESSENTIALS, Essentials.class);
// when
PluginHooks pluginHooks = new PluginHooks(pluginManager);
PluginHookService pluginHookService = new PluginHookService(pluginManager);
// then
assertThat(pluginHooks.isEssentialsAvailable(), equalTo(true));
assertThat(pluginHookService.isEssentialsAvailable(), equalTo(true));
}
@Test
@@ -80,10 +81,10 @@ public class PluginHooksTest {
setPluginAvailable(pluginManager, MULTIVERSE, MultiverseCore.class);
// when
PluginHooks pluginHooks = new PluginHooks(pluginManager);
PluginHookService pluginHookService = new PluginHookService(pluginManager);
// then
assertThat(pluginHooks.isMultiverseAvailable(), equalTo(true));
assertThat(pluginHookService.isMultiverseAvailable(), equalTo(true));
}
@Test
@@ -96,10 +97,10 @@ public class PluginHooksTest {
PluginManager pluginManager = mock(PluginManager.class);
setPluginAvailable(pluginManager, ESSENTIALS, ess);
PluginHooks pluginHooks = new PluginHooks(pluginManager);
PluginHookService pluginHookService = new PluginHookService(pluginManager);
// when
File dataFolder = pluginHooks.getEssentialsDataFolder();
File dataFolder = pluginHookService.getEssentialsDataFolder();
// then
assertThat(dataFolder, equalTo(essDataFolder));
@@ -109,10 +110,10 @@ public class PluginHooksTest {
public void shouldReturnNullForUnhookedEssentials() {
// given
PluginManager pluginManager = mock(PluginManager.class);
PluginHooks pluginHooks = new PluginHooks(pluginManager);
PluginHookService pluginHookService = new PluginHookService(pluginManager);
// when
File result = pluginHooks.getEssentialsDataFolder();
File result = pluginHookService.getEssentialsDataFolder();
// then
assertThat(result, nullValue());
@@ -129,10 +130,10 @@ public class PluginHooksTest {
PluginManager pluginManager = mock(PluginManager.class);
setPluginAvailable(pluginManager, ESSENTIALS, ess);
PluginHooks pluginHooks = new PluginHooks(pluginManager);
PluginHookService pluginHookService = new PluginHookService(pluginManager);
// when
pluginHooks.setEssentialsSocialSpyStatus(player, true);
pluginHookService.setEssentialsSocialSpyStatus(player, true);
// then
verify(ess).getUser(player);
@@ -142,10 +143,10 @@ public class PluginHooksTest {
@Test
public void shouldNotDoAnythingForUnhookedEssentials() {
// given
PluginHooks pluginHooks = new PluginHooks(mock(PluginManager.class));
PluginHookService pluginHookService = new PluginHookService(mock(PluginManager.class));
// when/then
pluginHooks.setEssentialsSocialSpyStatus(mock(Player.class), false);
pluginHookService.setEssentialsSocialSpyStatus(mock(Player.class), false);
}
@Test
@@ -154,15 +155,15 @@ public class PluginHooksTest {
PluginManager pluginManager = mock(PluginManager.class);
setPluginAvailable(pluginManager, ESSENTIALS, Essentials.class);
setPluginAvailable(pluginManager, MULTIVERSE, MultiverseCore.class);
PluginHooks pluginHooks = new PluginHooks(pluginManager);
PluginHookService pluginHookService = new PluginHookService(pluginManager);
// when
pluginHooks.unhookEssentials();
pluginHooks.unhookMultiverse();
pluginHookService.unhookEssentials();
pluginHookService.unhookMultiverse();
// then
assertThat(pluginHooks.isEssentialsAvailable(), equalTo(false));
assertThat(pluginHooks.isMultiverseAvailable(), equalTo(false));
assertThat(pluginHookService.isEssentialsAvailable(), equalTo(false));
assertThat(pluginHookService.isMultiverseAvailable(), equalTo(false));
}
@Test
@@ -173,23 +174,23 @@ public class PluginHooksTest {
doThrow(IllegalStateException.class).when(pluginManager).getPlugin(anyString());
// when
PluginHooks pluginHooks = new PluginHooks(pluginManager);
PluginHookService pluginHookService = new PluginHookService(pluginManager);
// then
assertThat(pluginHooks.isEssentialsAvailable(), equalTo(false));
assertThat(pluginHooks.isMultiverseAvailable(), equalTo(false));
assertThat(pluginHooks.isCombatTagPlusAvailable(), equalTo(false));
assertThat(pluginHookService.isEssentialsAvailable(), equalTo(false));
assertThat(pluginHookService.isMultiverseAvailable(), equalTo(false));
assertThat(pluginHookService.isCombatTagPlusAvailable(), equalTo(false));
}
@Test
public void shouldReturnNullForUnavailableMultiverse() {
// given
PluginManager pluginManager = mock(PluginManager.class);
PluginHooks pluginHooks = new PluginHooks(pluginManager);
PluginHookService pluginHookService = new PluginHookService(pluginManager);
World world = mock(World.class);
// when
Location result = pluginHooks.getMultiverseSpawn(world);
Location result = pluginHookService.getMultiverseSpawn(world);
// then
assertThat(result, nullValue());
@@ -211,10 +212,10 @@ public class PluginHooksTest {
PluginManager pluginManager = mock(PluginManager.class);
setPluginAvailable(pluginManager, MULTIVERSE, multiverse);
PluginHooks pluginHooks = new PluginHooks(pluginManager);
PluginHookService pluginHookService = new PluginHookService(pluginManager);
// when
Location spawn = pluginHooks.getMultiverseSpawn(world);
Location spawn = pluginHookService.getMultiverseSpawn(world);
// then
assertThat(spawn, equalTo(location));
@@ -234,10 +235,10 @@ public class PluginHooksTest {
MultiverseCore multiverse = mock(MultiverseCore.class);
setPluginAvailable(pluginManager, MULTIVERSE, multiverse);
given(multiverse.getMVWorldManager()).willReturn(mvWorldManager);
PluginHooks pluginHooks = new PluginHooks(pluginManager);
PluginHookService pluginHookService = new PluginHookService(pluginManager);
// when
Location spawn = pluginHooks.getMultiverseSpawn(world);
Location spawn = pluginHookService.getMultiverseSpawn(world);
// then
assertThat(spawn, nullValue());
src/test/java/fr/xephi/authme/service/ValidationServiceTest.java
+10 -11
View File
@@ -5,7 +5,6 @@ import ch.jalu.injector.testing.DelayedInjectionRunner;
import ch.jalu.injector.testing.InjectDelayed;
import com.google.common.base.Strings;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.geoip.GeoIpManager;
import fr.xephi.authme.message.MessageKey;
import fr.xephi.authme.permission.PermissionsManager;
import fr.xephi.authme.permission.PlayerStatePermission;
@@ -45,7 +44,7 @@ public class ValidationServiceTest {
@Mock
private PermissionsManager permissionsManager;
@Mock
private GeoIpManager geoIpManager;
private GeoIpService geoIpService;
@BeforeInjecting
public void createService() {
@@ -266,7 +265,7 @@ public class ValidationServiceTest {
// then
assertThat(result, equalTo(true));
verifyZeroInteractions(geoIpManager);
verifyZeroInteractions(geoIpService);
}
@Test
@@ -275,14 +274,14 @@ public class ValidationServiceTest {
given(settings.getProperty(ProtectionSettings.COUNTRIES_WHITELIST)).willReturn(asList("ch", "it"));
given(settings.getProperty(ProtectionSettings.COUNTRIES_BLACKLIST)).willReturn(Collections.<String>emptyList());
String ip = "127.0.0.1";
given(geoIpManager.getCountryCode(ip)).willReturn("CH");
given(geoIpService.getCountryCode(ip)).willReturn("CH");
// when
boolean result = validationService.isCountryAdmitted(ip);
// then
assertThat(result, equalTo(true));
verify(geoIpManager).getCountryCode(ip);
verify(geoIpService).getCountryCode(ip);
}
@Test
@@ -291,14 +290,14 @@ public class ValidationServiceTest {
given(settings.getProperty(ProtectionSettings.COUNTRIES_WHITELIST)).willReturn(asList("ch", "it"));
given(settings.getProperty(ProtectionSettings.COUNTRIES_BLACKLIST)).willReturn(Collections.<String>emptyList());
String ip = "123.45.67.89";
given(geoIpManager.getCountryCode(ip)).willReturn("BR");
given(geoIpService.getCountryCode(ip)).willReturn("BR");
// when
boolean result = validationService.isCountryAdmitted(ip);
// then
assertThat(result, equalTo(false));
verify(geoIpManager).getCountryCode(ip);
verify(geoIpService).getCountryCode(ip);
}
@Test
@@ -307,14 +306,14 @@ public class ValidationServiceTest {
given(settings.getProperty(ProtectionSettings.COUNTRIES_WHITELIST)).willReturn(Collections.<String>emptyList());
given(settings.getProperty(ProtectionSettings.COUNTRIES_BLACKLIST)).willReturn(asList("ch", "it"));
String ip = "127.0.0.1";
given(geoIpManager.getCountryCode(ip)).willReturn("BR");
given(geoIpService.getCountryCode(ip)).willReturn("BR");
// when
boolean result = validationService.isCountryAdmitted(ip);
// then
assertThat(result, equalTo(true));
verify(geoIpManager).getCountryCode(ip);
verify(geoIpService).getCountryCode(ip);
}
@Test
@@ -323,14 +322,14 @@ public class ValidationServiceTest {
given(settings.getProperty(ProtectionSettings.COUNTRIES_WHITELIST)).willReturn(Collections.<String>emptyList());
given(settings.getProperty(ProtectionSettings.COUNTRIES_BLACKLIST)).willReturn(asList("ch", "it"));
String ip = "123.45.67.89";
given(geoIpManager.getCountryCode(ip)).willReturn("IT");
given(geoIpService.getCountryCode(ip)).willReturn("IT");
// when
boolean result = validationService.isCountryAdmitted(ip);
// then
assertThat(result, equalTo(false));
verify(geoIpManager).getCountryCode(ip);
verify(geoIpService).getCountryCode(ip);
}
private static void assertErrorEquals(ValidationResult validationResult, MessageKey messageKey, String... args) {
src/test/java/fr/xephi/authme/settings/SpawnLoaderTest.java
+2 -2
View File
@@ -6,7 +6,7 @@ import ch.jalu.injector.testing.InjectDelayed;
import com.google.common.io.Files;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.hooks.PluginHooks;
import fr.xephi.authme.service.PluginHookService;
import fr.xephi.authme.initialization.DataFolder;
import fr.xephi.authme.settings.properties.RestrictionSettings;
import org.bukkit.Location;
@@ -42,7 +42,7 @@ public class SpawnLoaderTest {
private DataSource dataSource;
@Mock
private PluginHooks pluginHooks;
private PluginHookService pluginHookService;
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();