From ca0cbe6caf49aa87483b92a3fc368b755608c062 Mon Sep 17 00:00:00 2001 From: ljacqu Date: Thu, 14 Apr 2016 12:28:19 +0200 Subject: [PATCH] Code householding - Move console initialization for tests into TestHelper - Remove unused properties in legacy Settings - Add issue number to TODO comments where applicable --- src/main/java/fr/xephi/authme/AuthMe.java | 10 +-- .../xephi/authme/datasource/DataSource.java | 62 ++++++++++++------- .../authme/listener/AuthMeEntityListener.java | 2 +- .../fr/xephi/authme/settings/Settings.java | 5 +- .../authme/ConsoleLoggerTestInitializer.java | 20 ------ src/test/java/fr/xephi/authme/TestHelper.java | 21 +++---- .../ChangePasswordAdminCommandTest.java | 4 +- .../authme/RegisterAdminCommandTest.java | 3 +- .../executable/authme/ReloadCommandTest.java | 4 +- .../converter/ForceFlatToSqliteTest.java | 3 +- .../AbstractResourceClosingTest.java | 4 +- .../datasource/MySqlIntegrationTest.java | 3 +- .../datasource/SQLiteIntegrationTest.java | 4 +- .../xephi/authme/hooks/PluginHooksTest.java | 4 +- .../output/MessagesIntegrationTest.java | 3 +- .../process/email/AsyncAddEmailTest.java | 4 +- .../authme/security/crypts/BcryptTest.java | 4 +- .../crypts/CryptPBKDF2DjangoTest.java | 4 +- .../authme/security/crypts/IPB4Test.java | 4 +- .../authme/security/crypts/XFBCRYPTTest.java | 4 +- .../settings/NewSettingIntegrationTest.java | 3 +- .../xephi/authme/settings/NewSettingTest.java | 4 +- .../java/fr/xephi/authme/util/UtilsTest.java | 4 +- 23 files changed, 82 insertions(+), 101 deletions(-) delete mode 100644 src/test/java/fr/xephi/authme/ConsoleLoggerTestInitializer.java diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 38d06a0b0..d001cd4b6 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -106,23 +106,25 @@ public class AuthMe extends JavaPlugin { private static Server server; /* * Maps and stuff - * TODO: Clean up and Move into a manager */ + // TODO #601: Integrate CaptchaManager public final ConcurrentHashMap sessions = new ConcurrentHashMap<>(); public final ConcurrentHashMap captcha = new ConcurrentHashMap<>(); public final ConcurrentHashMap cap = new ConcurrentHashMap<>(); /* * Public Instances - * TODO #432: Encapsulation */ public NewAPI api; + // TODO #655: Encapsulate mail public SendMailSSL mail; + // TODO #656: Encapsulate data manager public DataManager dataManager; /* - * Plugin Hooks - * TODO: Move into modules + * Private instances + * TODO #432: Move instantiation and management of these services */ + // TODO #604: Encapsulate ProtocolLib members public AuthMeInventoryPacketAdapter inventoryProtector; public AuthMeTabCompletePacketAdapter tabComplete; public AuthMeTablistPacketAdapter tablistHider; diff --git a/src/main/java/fr/xephi/authme/datasource/DataSource.java b/src/main/java/fr/xephi/authme/datasource/DataSource.java index 9db25555b..4c844a838 100644 --- a/src/main/java/fr/xephi/authme/datasource/DataSource.java +++ b/src/main/java/fr/xephi/authme/datasource/DataSource.java @@ -122,69 +122,85 @@ public interface DataSource { void close(); /** - * Method purgeBanned. + * Purge all given players, i.e. delete all players whose name is in the list. * - * @param banned List of String + * @param banned the list of players to delete */ void purgeBanned(List banned); /** - * Method getType. + * Return the data source type. * - * @return DataSourceType + * @return the data source type */ DataSourceType getType(); /** - * Method isLogged. + * Query the datasource whether the player is logged in or not. * - * @param user String - * - * @return boolean + * @param user The name of the player to verify + * @return True if logged in, false otherwise */ boolean isLogged(String user); /** - * Method setLogged. + * Set a player as logged in. * - * @param user String + * @param user The name of the player to change */ void setLogged(String user); /** - * Method setUnlogged. + * Set a player as unlogged (not logged in). * - * @param user String + * @param user The name of the player to change */ void setUnlogged(String user); + /** + * Set all players who are marked as logged in as NOT logged in. + */ void purgeLogged(); /** - * Method getAccountsRegistered. + * Return all players which are logged in. * - * @return int + * @return All logged in players + */ + List getLoggedPlayers(); + + /** + * Return the number of registered accounts. + * + * @return Total number of accounts */ int getAccountsRegistered(); + /** + * Update a player's real name (capitalization). + * + * @param user The name of the user (lowercase) + * @param realName The real name of the user (proper casing) + * @return True upon success, false upon failure + */ boolean updateRealName(String user, String realName); + /** + * Update a player's IP address. + * + * @param user The name of the user (lowercase) + * @param ip The IP address to save + * @return True upon success, false upon failure + */ boolean updateIp(String user, String ip); /** - * Method getAllAuths. + * Return all players of the database. * - * @return List of PlayerAuth + * @return List of all players */ List getAllAuths(); - /** - * Method getLoggedPlayers. - * - * @return List of PlayerAuth - */ - List getLoggedPlayers(); - /** * Reload the data source. */ diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java index 50b0e61ca..897607eea 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java @@ -33,7 +33,7 @@ public class AuthMeEntityListener implements Listener { } } - // TODO #360: npc status can be used to bypass security!!! + // Note #360: npc status can be used to bypass security!!! @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) public void onEntityDamage(EntityDamageEvent event) { if (shouldCancelEvent(event)) { diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index 2f470c723..ca5ddc3be 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -24,7 +24,6 @@ import java.util.regex.Pattern; public final class Settings { public static final File PLUGIN_FOLDER = Wrapper.getInstance().getDataFolder(); - public static final File MODULE_FOLDER = new File(PLUGIN_FOLDER, "modules"); public static final File CACHE_FOLDER = new File(PLUGIN_FOLDER, "cache"); public static List allowCommands; public static List getJoinPermissions; @@ -62,7 +61,7 @@ public final class Settings { spawnPriority, crazyloginFileName, sendPlayerTo; public static int getWarnMessageInterval, getSessionTimeout, getRegistrationTimeout, getMaxNickLength, getMinNickLength, - getPasswordMinLen, getMovementRadius, getNonActivatedGroup, passwordMaxLength, + getMovementRadius, getNonActivatedGroup, maxLoginTry, captchaLength, saltLength, bCryptLog2Rounds, getMaxLoginPerIp, getMaxJoinPerIp; protected static FileConfiguration configFile; @@ -88,7 +87,6 @@ public final class Settings { isChatAllowed = load(RestrictionSettings.ALLOW_CHAT); getMaxNickLength = configFile.getInt("settings.restrictions.maxNicknameLength", 20); getMinNickLength = configFile.getInt("settings.restrictions.minNicknameLength", 3); - getPasswordMinLen = configFile.getInt("settings.security.minPasswordLength", 4); getNickRegex = configFile.getString("settings.restrictions.allowedNicknameCharacters", "[a-zA-Z0-9_?]*"); nickPattern = Pattern.compile(getNickRegex); isAllowRestrictedIp = load(RestrictionSettings.ENABLE_RESTRICTED_USERS); @@ -120,7 +118,6 @@ public final class Settings { denyTabcompleteBeforeLogin = load(RestrictionSettings.DENY_TABCOMPLETE_BEFORE_LOGIN); hideTablistBeforeLogin = load(RestrictionSettings.HIDE_TABLIST_BEFORE_LOGIN); - passwordMaxLength = load(SecuritySettings.MAX_PASSWORD_LENGTH); backupWindowsPath = configFile.getString("BackupSystem.MysqlWindowsPath", "C:\\Program Files\\MySQL\\MySQL Server 5.1\\"); isStopEnabled = configFile.getBoolean("Security.SQLProblem.stopServer", true); reloadSupport = configFile.getBoolean("Security.ReloadCommand.useReloadCommandSupport", true); diff --git a/src/test/java/fr/xephi/authme/ConsoleLoggerTestInitializer.java b/src/test/java/fr/xephi/authme/ConsoleLoggerTestInitializer.java deleted file mode 100644 index cfa871e3e..000000000 --- a/src/test/java/fr/xephi/authme/ConsoleLoggerTestInitializer.java +++ /dev/null @@ -1,20 +0,0 @@ -package fr.xephi.authme; - -import org.mockito.Mockito; - -import java.util.logging.Logger; - -/** - * Test initializer for {@link ConsoleLogger}. - */ -public class ConsoleLoggerTestInitializer { - - private ConsoleLoggerTestInitializer() { - } - - public static Logger setupLogger() { - Logger logger = Mockito.mock(Logger.class); - ConsoleLogger.setLogger(logger); - return logger; - } -} diff --git a/src/test/java/fr/xephi/authme/TestHelper.java b/src/test/java/fr/xephi/authme/TestHelper.java index 5f1db10d1..fe55de5f7 100644 --- a/src/test/java/fr/xephi/authme/TestHelper.java +++ b/src/test/java/fr/xephi/authme/TestHelper.java @@ -3,11 +3,13 @@ package fr.xephi.authme; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.util.BukkitService; import org.mockito.ArgumentCaptor; +import org.mockito.Mockito; import java.io.File; import java.net.URL; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.logging.Logger; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.verify; @@ -68,20 +70,6 @@ public final class TestHelper { runnable.run(); } - /** - * Execute a {@link Runnable} passed to a mock's {@link BukkitService#scheduleSyncDelayedTask(Runnable)} method. - * Note that calling this method expects that there be a runnable sent to the method and will fail - * otherwise. - * - * @param service The mock service - */ - public static void runSyncDelayedTask(BukkitService service) { - ArgumentCaptor captor = ArgumentCaptor.forClass(Runnable.class); - verify(service).scheduleSyncDelayedTask(captor.capture()); - Runnable runnable = captor.getValue(); - runnable.run(); - } - /** * Execute a {@link Runnable} passed to a mock's {@link BukkitService#scheduleSyncDelayedTask(Runnable, long)} * method. Note that calling this method expects that there be a runnable sent to the method and will fail @@ -96,4 +84,9 @@ public final class TestHelper { runnable.run(); } + public static Logger setupLogger() { + Logger logger = Mockito.mock(Logger.class); + ConsoleLogger.setLogger(logger); + return logger; + } } diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommandTest.java index 93c6c6ff2..b4f42886e 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommandTest.java @@ -1,6 +1,6 @@ package fr.xephi.authme.command.executable.authme; -import fr.xephi.authme.ConsoleLoggerTestInitializer; +import fr.xephi.authme.TestHelper; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.command.CommandService; @@ -36,7 +36,7 @@ public class ChangePasswordAdminCommandTest { @BeforeClass public static void setUpLogger() { - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } @Test diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommandTest.java index 6ec548520..66b7d6c44 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommandTest.java @@ -1,6 +1,5 @@ package fr.xephi.authme.command.executable.authme; -import fr.xephi.authme.ConsoleLoggerTestInitializer; import fr.xephi.authme.TestHelper; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.command.CommandService; @@ -43,7 +42,7 @@ public class RegisterAdminCommandTest { @BeforeClass public static void setUpLogger() { - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } @Test diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/ReloadCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/ReloadCommandTest.java index a0ed7706e..99600c895 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/ReloadCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/ReloadCommandTest.java @@ -1,7 +1,7 @@ package fr.xephi.authme.command.executable.authme; import fr.xephi.authme.AuthMe; -import fr.xephi.authme.ConsoleLoggerTestInitializer; +import fr.xephi.authme.TestHelper; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.output.MessageKey; @@ -24,7 +24,7 @@ public class ReloadCommandTest { @BeforeClass public static void setUpLogger() { - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } @Test diff --git a/src/test/java/fr/xephi/authme/converter/ForceFlatToSqliteTest.java b/src/test/java/fr/xephi/authme/converter/ForceFlatToSqliteTest.java index 17d4fb062..6f6082cee 100644 --- a/src/test/java/fr/xephi/authme/converter/ForceFlatToSqliteTest.java +++ b/src/test/java/fr/xephi/authme/converter/ForceFlatToSqliteTest.java @@ -1,7 +1,6 @@ package fr.xephi.authme.converter; import com.google.common.io.Files; -import fr.xephi.authme.ConsoleLoggerTestInitializer; import fr.xephi.authme.TestHelper; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; @@ -37,7 +36,7 @@ public class ForceFlatToSqliteTest { @BeforeClass public static void setup() { - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } @Before diff --git a/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java b/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java index 69bb0512f..75908e3e2 100644 --- a/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java +++ b/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java @@ -4,7 +4,7 @@ import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import fr.xephi.authme.ConsoleLoggerTestInitializer; +import fr.xephi.authme.TestHelper; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.security.crypts.HashedPassword; @@ -107,7 +107,7 @@ public abstract class AbstractResourceClosingTest { return ((Property) invocation.getArguments()[0]).getDefaultValue(); } }); - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } /** Initialize the dataSource implementation to test based on a mock connection. */ diff --git a/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java b/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java index 88c6601c7..ec90dab09 100644 --- a/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java @@ -2,7 +2,6 @@ package fr.xephi.authme.datasource; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import fr.xephi.authme.ConsoleLoggerTestInitializer; import fr.xephi.authme.TestHelper; import fr.xephi.authme.settings.NewSetting; import fr.xephi.authme.settings.domain.Property; @@ -53,7 +52,7 @@ public class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest { }); set(DatabaseSettings.MYSQL_DATABASE, "h2_test"); set(DatabaseSettings.MYSQL_TABLE, "authme"); - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); Path sqlInitFile = TestHelper.getJarPath("/datasource-integration/sql-initialize.sql"); sqlInitialize = new String(Files.readAllBytes(sqlInitFile)); diff --git a/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java b/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java index 1ec9d9901..3cfe9eb26 100644 --- a/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java @@ -1,6 +1,5 @@ package fr.xephi.authme.datasource; -import fr.xephi.authme.ConsoleLoggerTestInitializer; import fr.xephi.authme.TestHelper; import fr.xephi.authme.settings.NewSetting; import fr.xephi.authme.settings.domain.Property; @@ -52,8 +51,7 @@ public class SQLiteIntegrationTest extends AbstractDataSourceIntegrationTest { }); set(DatabaseSettings.MYSQL_DATABASE, "sqlite-test"); set(DatabaseSettings.MYSQL_TABLE, "authme"); - set(DatabaseSettings.MYSQL_COL_SALT, "salt"); - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); Path sqlInitFile = TestHelper.getJarPath("/datasource-integration/sql-initialize.sql"); // Note ljacqu 20160221: It appears that we can only run one statement per Statement.execute() so we split diff --git a/src/test/java/fr/xephi/authme/hooks/PluginHooksTest.java b/src/test/java/fr/xephi/authme/hooks/PluginHooksTest.java index be12afce1..e8475d9cb 100644 --- a/src/test/java/fr/xephi/authme/hooks/PluginHooksTest.java +++ b/src/test/java/fr/xephi/authme/hooks/PluginHooksTest.java @@ -2,8 +2,8 @@ package fr.xephi.authme.hooks; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; -import fr.xephi.authme.ConsoleLoggerTestInitializer; import fr.xephi.authme.ReflectionTestUtils; +import fr.xephi.authme.TestHelper; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; @@ -29,7 +29,7 @@ public class PluginHooksTest { @BeforeClass public static void setLogger() { - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } @Test diff --git a/src/test/java/fr/xephi/authme/output/MessagesIntegrationTest.java b/src/test/java/fr/xephi/authme/output/MessagesIntegrationTest.java index 399553657..2037280ba 100644 --- a/src/test/java/fr/xephi/authme/output/MessagesIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/output/MessagesIntegrationTest.java @@ -1,7 +1,6 @@ package fr.xephi.authme.output; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.ConsoleLoggerTestInitializer; import fr.xephi.authme.TestHelper; import fr.xephi.authme.util.WrapperMock; import org.bukkit.command.CommandSender; @@ -36,7 +35,7 @@ public class MessagesIntegrationTest { @BeforeClass public static void setup() { WrapperMock.createInstance(); - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } /** diff --git a/src/test/java/fr/xephi/authme/process/email/AsyncAddEmailTest.java b/src/test/java/fr/xephi/authme/process/email/AsyncAddEmailTest.java index 3d6ccee77..9f92a5c82 100644 --- a/src/test/java/fr/xephi/authme/process/email/AsyncAddEmailTest.java +++ b/src/test/java/fr/xephi/authme/process/email/AsyncAddEmailTest.java @@ -1,6 +1,6 @@ package fr.xephi.authme.process.email; -import fr.xephi.authme.ConsoleLoggerTestInitializer; +import fr.xephi.authme.TestHelper; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; @@ -37,7 +37,7 @@ public class AsyncAddEmailTest { @BeforeClass public static void setUp() { - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } @Test diff --git a/src/test/java/fr/xephi/authme/security/crypts/BcryptTest.java b/src/test/java/fr/xephi/authme/security/crypts/BcryptTest.java index 6ee291143..2c27e00a0 100644 --- a/src/test/java/fr/xephi/authme/security/crypts/BcryptTest.java +++ b/src/test/java/fr/xephi/authme/security/crypts/BcryptTest.java @@ -1,6 +1,6 @@ package fr.xephi.authme.security.crypts; -import fr.xephi.authme.ConsoleLoggerTestInitializer; +import fr.xephi.authme.TestHelper; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.util.WrapperMock; import org.junit.BeforeClass; @@ -14,7 +14,7 @@ public class BcryptTest extends AbstractEncryptionMethodTest { public static void setUpSettings() { WrapperMock.createInstance(); Settings.bCryptLog2Rounds = 8; - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } public BcryptTest() { diff --git a/src/test/java/fr/xephi/authme/security/crypts/CryptPBKDF2DjangoTest.java b/src/test/java/fr/xephi/authme/security/crypts/CryptPBKDF2DjangoTest.java index 7175d2101..1da3c5b91 100644 --- a/src/test/java/fr/xephi/authme/security/crypts/CryptPBKDF2DjangoTest.java +++ b/src/test/java/fr/xephi/authme/security/crypts/CryptPBKDF2DjangoTest.java @@ -1,6 +1,6 @@ package fr.xephi.authme.security.crypts; -import fr.xephi.authme.ConsoleLoggerTestInitializer; +import fr.xephi.authme.TestHelper; import org.junit.BeforeClass; /** @@ -10,7 +10,7 @@ public class CryptPBKDF2DjangoTest extends AbstractEncryptionMethodTest { @BeforeClass public static void setupLogger() { - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } public CryptPBKDF2DjangoTest() { diff --git a/src/test/java/fr/xephi/authme/security/crypts/IPB4Test.java b/src/test/java/fr/xephi/authme/security/crypts/IPB4Test.java index 58c6f5704..1b7ac3f1f 100644 --- a/src/test/java/fr/xephi/authme/security/crypts/IPB4Test.java +++ b/src/test/java/fr/xephi/authme/security/crypts/IPB4Test.java @@ -1,6 +1,6 @@ package fr.xephi.authme.security.crypts; -import fr.xephi.authme.ConsoleLoggerTestInitializer; +import fr.xephi.authme.TestHelper; import fr.xephi.authme.util.WrapperMock; import org.junit.BeforeClass; @@ -12,7 +12,7 @@ public class IPB4Test extends AbstractEncryptionMethodTest { @BeforeClass public static void setUpSettings() { WrapperMock.createInstance(); - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } public IPB4Test() { diff --git a/src/test/java/fr/xephi/authme/security/crypts/XFBCRYPTTest.java b/src/test/java/fr/xephi/authme/security/crypts/XFBCRYPTTest.java index ed49ccd71..96c30d1c0 100644 --- a/src/test/java/fr/xephi/authme/security/crypts/XFBCRYPTTest.java +++ b/src/test/java/fr/xephi/authme/security/crypts/XFBCRYPTTest.java @@ -1,6 +1,6 @@ package fr.xephi.authme.security.crypts; -import fr.xephi.authme.ConsoleLoggerTestInitializer; +import fr.xephi.authme.TestHelper; import fr.xephi.authme.util.WrapperMock; import org.junit.BeforeClass; @@ -12,7 +12,7 @@ public class XFBCRYPTTest extends AbstractEncryptionMethodTest { @BeforeClass public static void setup() { WrapperMock.createInstance(); - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } public XFBCRYPTTest() { diff --git a/src/test/java/fr/xephi/authme/settings/NewSettingIntegrationTest.java b/src/test/java/fr/xephi/authme/settings/NewSettingIntegrationTest.java index 81ad29803..1ee5a50c0 100644 --- a/src/test/java/fr/xephi/authme/settings/NewSettingIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/settings/NewSettingIntegrationTest.java @@ -2,7 +2,6 @@ package fr.xephi.authme.settings; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; -import fr.xephi.authme.ConsoleLoggerTestInitializer; import fr.xephi.authme.TestHelper; import fr.xephi.authme.settings.domain.Property; import fr.xephi.authme.settings.properties.TestConfiguration; @@ -48,7 +47,7 @@ public class NewSettingIntegrationTest { @BeforeClass public static void setUpLogger() { - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } @Before diff --git a/src/test/java/fr/xephi/authme/settings/NewSettingTest.java b/src/test/java/fr/xephi/authme/settings/NewSettingTest.java index fb050862d..e53a66d23 100644 --- a/src/test/java/fr/xephi/authme/settings/NewSettingTest.java +++ b/src/test/java/fr/xephi/authme/settings/NewSettingTest.java @@ -1,6 +1,6 @@ package fr.xephi.authme.settings; -import fr.xephi.authme.ConsoleLoggerTestInitializer; +import fr.xephi.authme.TestHelper; import fr.xephi.authme.settings.domain.Property; import fr.xephi.authme.settings.properties.RegistrationSettings; import fr.xephi.authme.settings.properties.TestConfiguration; @@ -48,7 +48,7 @@ public class NewSettingTest { @BeforeClass public static void setUpLogger() { - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } @Before diff --git a/src/test/java/fr/xephi/authme/util/UtilsTest.java b/src/test/java/fr/xephi/authme/util/UtilsTest.java index a1e9a6a13..38b536f0d 100644 --- a/src/test/java/fr/xephi/authme/util/UtilsTest.java +++ b/src/test/java/fr/xephi/authme/util/UtilsTest.java @@ -1,8 +1,8 @@ package fr.xephi.authme.util; import fr.xephi.authme.AuthMe; -import fr.xephi.authme.ConsoleLoggerTestInitializer; import fr.xephi.authme.ReflectionTestUtils; +import fr.xephi.authme.TestHelper; import fr.xephi.authme.settings.Settings; import org.bukkit.entity.Player; import org.junit.Before; @@ -37,7 +37,7 @@ public class UtilsTest { public static void setUpMocks() { WrapperMock wrapperMock = WrapperMock.createInstance(); authMeMock = wrapperMock.getAuthMe(); - ConsoleLoggerTestInitializer.setupLogger(); + TestHelper.setupLogger(); } @Before