Merge pull request #1386 from AuthMe/1367-mysql-notNull-toggle

Improve MySQL not null toggle / authme debug commands output
This commit is contained in:
ljacqu
2017-10-28 18:49:23 +02:00
committed by GitHub
13 changed files with 93 additions and 45 deletions
@@ -12,6 +12,7 @@ import fr.xephi.authme.initialization.HasCleanup;
import fr.xephi.authme.initialization.Reloadable;
import fr.xephi.authme.initialization.SettingsDependent;
import fr.xephi.authme.initialization.factory.SingletonStore;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.junit.Before;
import org.junit.Test;
@@ -80,7 +81,9 @@ public class DataStatisticsTest {
ArgumentCaptor<String> stringCaptor = ArgumentCaptor.forClass(String.class);
verify(sender, atLeastOnce()).sendMessage(stringCaptor.capture());
assertThat(stringCaptor.getAllValues(), containsInAnyOrder(
"Singleton Java classes: 7 (Reloadable: 4 / SettingsDependent: 3 / HasCleanup: 2)",
ChatColor.BLUE + "AuthMe statistics",
"Singleton Java classes: 7",
"(Reloadable: 4 / SettingsDependent: 3 / HasCleanup: 2)",
"LimboPlayers in memory: 1",
"Total players in DB: 219",
"PlayerCache size: 12 (= logged in players)"));
@@ -4,6 +4,7 @@ import fr.xephi.authme.initialization.factory.Factory;
import fr.xephi.authme.permission.DebugSectionPermissions;
import fr.xephi.authme.permission.PermissionNode;
import fr.xephi.authme.permission.PermissionsManager;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.junit.Before;
import org.junit.Test;
@@ -85,11 +86,12 @@ public class DebugCommandTest {
verify(permissionsManager, atLeast(MIN_DEBUG_SECTIONS)).hasPermission(eq(sender), any(DebugSectionPermissions.class));
ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
verify(sender, times(3)).sendMessage(strCaptor.capture());
verify(sender, times(4)).sendMessage(strCaptor.capture());
assertThat(strCaptor.getAllValues(), contains(
containsString("Sections available to you"),
equalTo(ChatColor.BLUE + "AuthMe debug utils"),
equalTo("Sections available to you:"),
containsString("stats: Outputs general data statistics"),
containsString("valid: Check if email / password is valid")));
containsString("valid: Checks if your config.yml allows a password / email")));
}
@Test
@@ -106,8 +108,9 @@ public class DebugCommandTest {
verify(permissionsManager, atLeast(MIN_DEBUG_SECTIONS)).hasPermission(eq(sender), any(DebugSectionPermissions.class));
ArgumentCaptor<String> strCaptor = ArgumentCaptor.forClass(String.class);
verify(sender, times(2)).sendMessage(strCaptor.capture());
verify(sender, times(3)).sendMessage(strCaptor.capture());
assertThat(strCaptor.getAllValues(), contains(
equalTo(ChatColor.BLUE + "AuthMe debug utils"),
equalTo("Sections available to you:"),
containsString("You don't have permission to view any debug section")));
}