Close #449 Rename NewSetting class to Settings :)

This commit is contained in:
ljacqu
2016-07-23 15:50:40 +02:00
parent bcc31afb90
commit 19de5a0525
74 changed files with 248 additions and 248 deletions
@@ -4,7 +4,7 @@ import ch.jalu.injector.Injector;
import ch.jalu.injector.InjectorBuilder;
import fr.xephi.authme.security.crypts.EncryptionMethod;
import fr.xephi.authme.security.crypts.HashedPassword;
import fr.xephi.authme.settings.NewSetting;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.HooksSettings;
import fr.xephi.authme.settings.properties.SecuritySettings;
import fr.xephi.authme.util.StringUtils;
@@ -29,11 +29,11 @@ public class HashAlgorithmIntegrationTest {
@BeforeClass
public static void setUpConfigAndInjector() {
NewSetting settings = mock(NewSetting.class);
Settings settings = mock(Settings.class);
given(settings.getProperty(HooksSettings.BCRYPT_LOG2_ROUND)).willReturn(8);
given(settings.getProperty(SecuritySettings.DOUBLE_MD5_SALT_LENGTH)).willReturn(16);
injector = new InjectorBuilder().addDefaultHandlers("fr.xephi.authme").create();
injector.register(NewSetting.class, settings);
injector.register(Settings.class, settings);
}
@Test
@@ -9,7 +9,7 @@ import fr.xephi.authme.events.PasswordEncryptionEvent;
import fr.xephi.authme.security.crypts.EncryptionMethod;
import fr.xephi.authme.security.crypts.HashedPassword;
import fr.xephi.authme.security.crypts.JOOMLA;
import fr.xephi.authme.settings.NewSetting;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.HooksSettings;
import fr.xephi.authme.settings.properties.SecuritySettings;
import org.bukkit.event.Event;
@@ -45,7 +45,7 @@ public class PasswordSecurityTest {
private Injector injector;
@Mock
private NewSetting settings;
private Settings settings;
@Mock
private PluginManager pluginManager;
@@ -81,7 +81,7 @@ public class PasswordSecurityTest {
}
}).when(pluginManager).callEvent(any(Event.class));
injector = new InjectorBuilder().addDefaultHandlers("!! impossible package !!").create();
injector.register(NewSetting.class, settings);
injector.register(Settings.class, settings);
injector.register(DataSource.class, dataSource);
injector.register(PluginManager.class, pluginManager);
}
@@ -1,7 +1,7 @@
package fr.xephi.authme.security.crypts;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.settings.NewSetting;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.HooksSettings;
import org.junit.BeforeClass;
@@ -27,8 +27,8 @@ public class BcryptTest extends AbstractEncryptionMethodTest {
);
}
private static NewSetting mockSettings() {
NewSetting settings = mock(NewSetting.class);
private static Settings mockSettings() {
Settings settings = mock(Settings.class);
given(settings.getProperty(HooksSettings.BCRYPT_LOG2_ROUND)).willReturn(8);
return settings;
}
@@ -1,6 +1,6 @@
package fr.xephi.authme.security.crypts;
import fr.xephi.authme.settings.NewSetting;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.SecuritySettings;
import static org.mockito.BDDMockito.given;
@@ -19,8 +19,8 @@ public class SALTED2MD5Test extends AbstractEncryptionMethodTest {
new HashedPassword("ad25606eae5b760c8a2469d65578ac39", "04eee598")); // âË_3(íù*)
}
private static NewSetting mockSettings() {
NewSetting settings = mock(NewSetting.class);
private static Settings mockSettings() {
Settings settings = mock(Settings.class);
given(settings.getProperty(SecuritySettings.DOUBLE_MD5_SALT_LENGTH)).willReturn(8);
return settings;
}