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

Minor - fix checkTestMocks task and rename PlayerDataTaskManager

Browse Source 
- Fix tool task to scan test folder
- Rename PlayerDataTaskManager to LimboPlayerTaskManager to match its test class
This commit is contained in:
ljacqu
2016-10-06 20:29:50 +02:00
parent 4b2ad51354
commit 71f3b86383
11 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java
+2 -2
View File
@@ -13,7 +13,7 @@ import fr.xephi.authme.settings.properties.DatabaseSettings;
import fr.xephi.authme.settings.properties.HooksSettings;
import fr.xephi.authme.settings.properties.PluginSettings;
import fr.xephi.authme.settings.properties.RestrictionSettings;
import fr.xephi.authme.task.PlayerDataTaskManager;
import fr.xephi.authme.task.LimboPlayerTaskManager;
import fr.xephi.authme.service.BukkitService;
import org.bukkit.entity.Player;
import org.junit.BeforeClass;
@@ -58,7 +58,7 @@ public class AsynchronousLoginTest {
@Mock
private ProcessService processService;
@Mock
private PlayerDataTaskManager playerDataTaskManager;
private LimboPlayerTaskManager limboPlayerTaskManager;
@Mock
private BukkitService bukkitService;
@Mock
src/test/java/fr/xephi/authme/process/unregister/AsynchronousUnregisterTest.java
+4 -4
View File
@@ -13,7 +13,7 @@ import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.security.crypts.HashedPassword;
import fr.xephi.authme.settings.properties.RegistrationSettings;
import fr.xephi.authme.settings.properties.RestrictionSettings;
import fr.xephi.authme.task.PlayerDataTaskManager;
import fr.xephi.authme.task.LimboPlayerTaskManager;
import fr.xephi.authme.service.BukkitService;
import fr.xephi.authme.service.TeleportationService;
import org.bukkit.command.CommandSender;
@@ -55,7 +55,7 @@ public class AsynchronousUnregisterTest {
@Mock
private LimboCache limboCache;
@Mock
private PlayerDataTaskManager playerDataTaskManager;
private LimboPlayerTaskManager limboPlayerTaskManager;
@Mock
private TeleportationService teleportationService;
@Mock
@@ -85,7 +85,7 @@ public class AsynchronousUnregisterTest {
// then
verify(service).send(player, MessageKey.WRONG_PASSWORD);
verify(passwordSecurity).comparePassword(userPassword, password, name);
verifyZeroInteractions(dataSource, playerDataTaskManager, limboCache, authGroupHandler, teleportationService);
verifyZeroInteractions(dataSource, limboPlayerTaskManager, limboCache, authGroupHandler, teleportationService);
verify(player, only()).getName();
}
@@ -175,7 +175,7 @@ public class AsynchronousUnregisterTest {
verify(dataSource).removeAuth(name);
verify(playerCache).removePlayer(name);
verify(authGroupHandler).setGroup(player, AuthGroupType.UNREGISTERED);
verifyZeroInteractions(teleportationService, playerDataTaskManager);
verifyZeroInteractions(teleportationService, limboPlayerTaskManager);
verify(bukkitService, never()).runTask(any(Runnable.class));
}
src/test/java/fr/xephi/authme/task/LimboPlayerTaskManagerTest.java
+10 -10
View File
@@ -28,13 +28,13 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
/**
* Test for {@link PlayerDataTaskManager}.
* Test for {@link LimboPlayerTaskManager}.
*/
@RunWith(MockitoJUnitRunner.class)
public class LimboPlayerTaskManagerTest {
@InjectMocks
private PlayerDataTaskManager playerDataTaskManager;
private LimboPlayerTaskManager limboPlayerTaskManager;
@Mock
private Messages messages;
@@ -70,7 +70,7 @@ public class LimboPlayerTaskManagerTest {
given(settings.getProperty(RegistrationSettings.USE_EMAIL_REGISTRATION)).willReturn(true);
// when
playerDataTaskManager.registerMessageTask(name, false);
limboPlayerTaskManager.registerMessageTask(name, false);
// then
verify(limboPlayer).setMessageTask(bukkiTask);
@@ -85,7 +85,7 @@ public class LimboPlayerTaskManagerTest {
given(settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL)).willReturn(5);
// when
playerDataTaskManager.registerMessageTask(name, true);
limboPlayerTaskManager.registerMessageTask(name, true);
// then
verify(limboCache).getPlayerData(name);
@@ -104,7 +104,7 @@ public class LimboPlayerTaskManagerTest {
given(settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL)).willReturn(0);
// when
playerDataTaskManager.registerMessageTask(name, true);
limboPlayerTaskManager.registerMessageTask(name, true);
// then
verifyZeroInteractions(limboPlayer, bukkitService);
@@ -128,7 +128,7 @@ public class LimboPlayerTaskManagerTest {
given(settings.getProperty(RegistrationSettings.USE_EMAIL_REGISTRATION)).willReturn(true);
// when
playerDataTaskManager.registerMessageTask(name, false);
limboPlayerTaskManager.registerMessageTask(name, false);
// then
verify(limboPlayer).setMessageTask(bukkiTask);
@@ -149,7 +149,7 @@ public class LimboPlayerTaskManagerTest {
given(bukkitService.runTaskLater(any(TimeoutTask.class), anyLong())).willReturn(bukkitTask);
// when
playerDataTaskManager.registerTimeoutTask(player);
limboPlayerTaskManager.registerTimeoutTask(player);
// then
verify(limboPlayer).setTimeoutTask(bukkitTask);
@@ -167,7 +167,7 @@ public class LimboPlayerTaskManagerTest {
given(settings.getProperty(RestrictionSettings.TIMEOUT)).willReturn(27);
// when
playerDataTaskManager.registerTimeoutTask(player);
limboPlayerTaskManager.registerTimeoutTask(player);
// then
verifyZeroInteractions(bukkitService, messages);
@@ -184,7 +184,7 @@ public class LimboPlayerTaskManagerTest {
given(settings.getProperty(RestrictionSettings.TIMEOUT)).willReturn(0);
// when
playerDataTaskManager.registerTimeoutTask(player);
limboPlayerTaskManager.registerTimeoutTask(player);
// then
verifyZeroInteractions(limboPlayer, bukkitService);
@@ -205,7 +205,7 @@ public class LimboPlayerTaskManagerTest {
given(bukkitService.runTaskLater(any(TimeoutTask.class), anyLong())).willReturn(bukkitTask);
// when
playerDataTaskManager.registerTimeoutTask(player);
limboPlayerTaskManager.registerTimeoutTask(player);
// then
verify(existingTask).cancel();