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

Fixing tests

Browse Source
This commit is contained in:
HexelDev 2018-03-04 19:23:08 +01:00
parent 9db38a3bf4
commit be2c6ae116
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/fr/xephi/authme/service/SessionService.java
View File

@ -45,6 +45,7 @@ public class SessionService implements Reloadable {
database.setUnlogged(name); database.setUnlogged(name);
database.revokeSession(name); database.revokeSession(name);
PlayerAuth auth = database.getAuth(name); PlayerAuth auth = database.getAuth(name);
SessionState state = hasValidSessionData(auth, player); SessionState state = hasValidSessionData(auth, player);
if(state.equals(SessionState.VALID)) { if(state.equals(SessionState.VALID)) {
RestoreSessionEvent event = bukkitService.createAndCallEvent( RestoreSessionEvent event = bukkitService.createAndCallEvent(

5
src/test/java/fr/xephi/authme/service/SessionServiceTest.java
View File

@ -106,7 +106,6 @@ public class SessionServiceTest {
// then // then
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
verify(commonService).getProperty(PluginSettings.SESSIONS_ENABLED); verify(commonService).getProperty(PluginSettings.SESSIONS_ENABLED);
verify(commonService).send(player, MessageKey.SESSION_EXPIRED);
verify(dataSource).hasSession(name); verify(dataSource).hasSession(name);
verify(dataSource).setUnlogged(name); verify(dataSource).setUnlogged(name);
verify(dataSource).revokeSession(name); verify(dataSource).revokeSession(name);
@ -132,7 +131,6 @@ public class SessionServiceTest {
// then // then
assertThat(result, equalTo(false)); assertThat(result, equalTo(false));
verify(commonService).getProperty(PluginSettings.SESSIONS_ENABLED); verify(commonService).getProperty(PluginSettings.SESSIONS_ENABLED);
verify(commonService).send(player, MessageKey.SESSION_EXPIRED);
verify(dataSource).hasSession(name); verify(dataSource).hasSession(name);
verify(dataSource).setUnlogged(name); verify(dataSource).setUnlogged(name);
verify(dataSource).revokeSession(name); verify(dataSource).revokeSession(name);
@ -145,9 +143,10 @@ public class SessionServiceTest {
String ip = "127.3.12.15"; String ip = "127.3.12.15";
Player player = mockPlayerWithNameAndIp(name, ip); Player player = mockPlayerWithNameAndIp(name, ip);
given(dataSource.hasSession(name)).willReturn(true); given(dataSource.hasSession(name)).willReturn(true);
given(commonService.getProperty(PluginSettings.SESSIONS_TIMEOUT)).willReturn(8);
PlayerAuth auth = PlayerAuth.builder() PlayerAuth auth = PlayerAuth.builder()
.name(name) .name(name)
.lastLogin(System.currentTimeMillis()) .lastLogin(System.currentTimeMillis() - 7 * 60 * 1000)
.lastIp("8.8.8.8").build(); .lastIp("8.8.8.8").build();
given(dataSource.getAuth(name)).willReturn(auth); given(dataSource.getAuth(name)).willReturn(auth);