#792 Add columns for registration IP and registration date
- Add columns for reg date and IP - Rename "ip" to "last IP"
This commit is contained in:
@@ -171,7 +171,7 @@ public class AccountsCommandTest {
|
||||
private static PlayerAuth authWithIp(String ip) {
|
||||
return PlayerAuth.builder()
|
||||
.name("Test")
|
||||
.ip(ip)
|
||||
.lastIp(ip)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package fr.xephi.authme.command.executable.authme;
|
||||
|
||||
import fr.xephi.authme.TestHelper;
|
||||
import fr.xephi.authme.data.auth.PlayerAuth;
|
||||
import fr.xephi.authme.datasource.DataSource;
|
||||
import fr.xephi.authme.service.BukkitService;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
@@ -12,11 +14,12 @@ import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
import static org.hamcrest.Matchers.allOf;
|
||||
import static org.hamcrest.Matchers.both;
|
||||
import static org.hamcrest.Matchers.containsString;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.BDDMockito.given;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.only;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.hamcrest.MockitoHamcrest.argThat;
|
||||
|
||||
@@ -32,19 +35,25 @@ public class GetIpCommandTest {
|
||||
@Mock
|
||||
private BukkitService bukkitService;
|
||||
|
||||
@Mock
|
||||
private DataSource dataSource;
|
||||
|
||||
|
||||
@Test
|
||||
public void shouldGetIpOfPlayer() {
|
||||
// given
|
||||
given(bukkitService.getPlayerExact(anyString())).willReturn(null);
|
||||
given(dataSource.getAuth(anyString())).willReturn(null);
|
||||
CommandSender sender = mock(CommandSender.class);
|
||||
String name = "Testt";
|
||||
|
||||
// when
|
||||
command.executeCommand(sender, Collections.singletonList("Testt"));
|
||||
command.executeCommand(sender, Collections.singletonList(name));
|
||||
|
||||
// then
|
||||
verify(bukkitService).getPlayerExact("Testt");
|
||||
verify(sender).sendMessage(argThat(containsString("not online")));
|
||||
verify(bukkitService).getPlayerExact(name);
|
||||
verify(dataSource).getAuth(name);
|
||||
verify(sender, only()).sendMessage(argThat(containsString("not registered")));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -54,6 +63,8 @@ public class GetIpCommandTest {
|
||||
String ip = "123.34.56.88";
|
||||
Player player = mockPlayer(playerName, ip);
|
||||
given(bukkitService.getPlayerExact(playerName)).willReturn(player);
|
||||
PlayerAuth auth = PlayerAuth.builder().name("t").lastIp("44.33.22.11").registrationIp("77.11.44.88").build();
|
||||
given(dataSource.getAuth(playerName)).willReturn(auth);
|
||||
CommandSender sender = mock(CommandSender.class);
|
||||
|
||||
// when
|
||||
@@ -61,7 +72,29 @@ public class GetIpCommandTest {
|
||||
|
||||
// then
|
||||
verify(bukkitService).getPlayerExact(playerName);
|
||||
verify(sender).sendMessage(argThat(allOf(containsString(playerName), containsString(ip))));
|
||||
verify(dataSource).getAuth(playerName);
|
||||
verify(sender).sendMessage(argThat(both(containsString(playerName)).and(containsString(ip))));
|
||||
verify(sender).sendMessage(argThat(both(containsString("44.33.22.11")).and(containsString("77.11.44.88"))));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldHandleUnregisteredOnlinePlayer() {
|
||||
// given
|
||||
String playerName = "Test";
|
||||
String ip = "44.111.22.33";
|
||||
Player player = mockPlayer(playerName, ip);
|
||||
given(bukkitService.getPlayerExact(playerName)).willReturn(player);
|
||||
given(dataSource.getAuth(anyString())).willReturn(null);
|
||||
CommandSender sender = mock(CommandSender.class);
|
||||
|
||||
// when
|
||||
command.executeCommand(sender, Collections.singletonList(playerName));
|
||||
|
||||
// then
|
||||
verify(bukkitService).getPlayerExact(playerName);
|
||||
verify(dataSource).getAuth(playerName);
|
||||
verify(sender).sendMessage(argThat(both(containsString(playerName)).and(containsString(ip))));
|
||||
verify(sender).sendMessage(argThat(containsString("not registered")));
|
||||
}
|
||||
|
||||
private static Player mockPlayer(String name, String ip) {
|
||||
|
||||
@@ -65,7 +65,7 @@ public class LastLoginCommandTest {
|
||||
(412 * DAY_IN_MSEC + 10 * HOUR_IN_MSEC - 9000);
|
||||
PlayerAuth auth = mock(PlayerAuth.class);
|
||||
given(auth.getLastLogin()).willReturn(lastLogin);
|
||||
given(auth.getIp()).willReturn("123.45.66.77");
|
||||
given(auth.getLastIp()).willReturn("123.45.66.77");
|
||||
given(dataSource.getAuth(player)).willReturn(auth);
|
||||
CommandSender sender = mock(CommandSender.class);
|
||||
|
||||
@@ -94,7 +94,7 @@ public class LastLoginCommandTest {
|
||||
- (412 * DAY_IN_MSEC + 10 * HOUR_IN_MSEC - 9000);
|
||||
PlayerAuth auth = mock(PlayerAuth.class);
|
||||
given(auth.getLastLogin()).willReturn(lastLogin);
|
||||
given(auth.getIp()).willReturn("123.45.66.77");
|
||||
given(auth.getLastIp()).willReturn("123.45.66.77");
|
||||
given(dataSource.getAuth(name)).willReturn(auth);
|
||||
|
||||
// when
|
||||
|
||||
Reference in New Issue
Block a user