Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-12-20 23:57:34 +01:00
Code Issues Projects Releases Wiki Activity

Minor: pass null as migration service in tests if no migration should occur

Browse Source
This commit is contained in:
ljacqu 2016-11-19 11:04:12 +01:00
parent 3ce6d06f1c
commit 5b51ecb0dd
4 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/java/fr/xephi/authme/AuthMeInitializationTest.java
View File

@ -34,7 +34,6 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Logger; import java.util.logging.Logger;
import static fr.xephi.authme.settings.TestSettingsMigrationServices.alwaysFulfilled;
import static fr.xephi.authme.settings.properties.AuthMeSettingsRetriever.buildConfigurationData; import static fr.xephi.authme.settings.properties.AuthMeSettingsRetriever.buildConfigurationData;
import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.nullValue;
@ -90,7 +89,7 @@ public class AuthMeInitializationTest {
public void shouldInitializeAllServices() { public void shouldInitializeAllServices() {
// given // given
Settings settings = Settings settings =
new Settings(dataFolder, mock(PropertyResource.class), alwaysFulfilled(), buildConfigurationData()); new Settings(dataFolder, mock(PropertyResource.class), null, buildConfigurationData());
Injector injector = new InjectorBuilder().addDefaultHandlers("fr.xephi.authme").create(); Injector injector = new InjectorBuilder().addDefaultHandlers("fr.xephi.authme").create();
injector.provide(DataFolder.class, dataFolder); injector.provide(DataFolder.class, dataFolder);

3
src/test/java/fr/xephi/authme/settings/SettingsIntegrationTest.java
View File

@ -121,8 +121,7 @@ public class SettingsIntegrationTest {
// given // given
File configFile = temporaryFolder.newFile(); File configFile = temporaryFolder.newFile();
PropertyResource resource = new YamlFileResource(configFile); PropertyResource resource = new YamlFileResource(configFile);
Settings settings = new Settings(testPluginFolder, resource, Settings settings = new Settings(testPluginFolder, resource, null, CONFIG_DATA);
TestSettingsMigrationServices.alwaysFulfilled(), CONFIG_DATA);
// when // when
assertThat(settings.getProperty(TestConfiguration.RATIO_ORDER), equalTo(TestEnum.SECOND)); // default value assertThat(settings.getProperty(TestConfiguration.RATIO_ORDER), equalTo(TestEnum.SECOND)); // default value

6
src/test/java/fr/xephi/authme/settings/SettingsTest.java
View File

@ -55,8 +55,7 @@ public class SettingsTest {
PropertyResource resource = mock(PropertyResource.class); PropertyResource resource = mock(PropertyResource.class);
given(resource.getBoolean(RegistrationSettings.USE_WELCOME_MESSAGE.getPath())).willReturn(true); given(resource.getBoolean(RegistrationSettings.USE_WELCOME_MESSAGE.getPath())).willReturn(true);
Settings settings = new Settings(testPluginFolder, resource, Settings settings = new Settings(testPluginFolder, resource, null, CONFIG_DATA);
TestSettingsMigrationServices.alwaysFulfilled(), CONFIG_DATA);
// when // when
String[] result = settings.getWelcomeMessage(); String[] result = settings.getWelcomeMessage();
@ -75,8 +74,7 @@ public class SettingsTest {
Files.write(emailFile.toPath(), emailMessage.getBytes()); Files.write(emailFile.toPath(), emailMessage.getBytes());
PropertyResource resource = mock(PropertyResource.class); PropertyResource resource = mock(PropertyResource.class);
Settings settings = new Settings(testPluginFolder, resource, Settings settings = new Settings(testPluginFolder, resource, null, CONFIG_DATA);
TestSettingsMigrationServices.alwaysFulfilled(), CONFIG_DATA);
// when // when
String result = settings.getPasswordEmailMessage(); String result = settings.getPasswordEmailMessage();

21
src/test/java/fr/xephi/authme/settings/TestSettingsMigrationServices.java
View File

@ -1,21 +0,0 @@
package fr.xephi.authme.settings;
import com.github.authme.configme.migration.MigrationService;
/**
* Provides {@link MigrationService} implementations for testing.
*/
public final class TestSettingsMigrationServices {
private TestSettingsMigrationServices() {
}
/**
* Returns a settings migration service which always answers that all data is up-to-date.
*
* @return test settings migration service
*/
public static MigrationService alwaysFulfilled() {
return (propertyResource, knownProperties) -> false;
}
}