#1531 Move spigot detection to BukkitService (#1534)

This commit is contained in:
ljacqu
2018-03-19 23:08:48 +01:00
committed by HexelDev
parent 250bd0d148
commit a1a909c01d
4 changed files with 43 additions and 29 deletions
@@ -1,18 +1,21 @@
package fr.xephi.authme.settings;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ReflectionTestUtils;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.security.HashAlgorithm;
import fr.xephi.authme.service.BukkitService;
import fr.xephi.authme.settings.properties.EmailSettings;
import fr.xephi.authme.settings.properties.HooksSettings;
import fr.xephi.authme.settings.properties.PluginSettings;
import fr.xephi.authme.settings.properties.RestrictionSettings;
import fr.xephi.authme.settings.properties.SecuritySettings;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import java.util.Optional;
import java.util.logging.Logger;
import static org.mockito.ArgumentMatchers.anyString;
@@ -27,12 +30,18 @@ import static org.mockito.internal.verification.VerificationModeFactory.times;
@RunWith(MockitoJUnitRunner.class)
public class SettingsWarnerTest {
@InjectMocks
private SettingsWarner settingsWarner;
@Mock
private Settings settings;
@Mock
private AuthMe authMe;
@Mock
private BukkitService bukkitService;
@Test
public void shouldLogWarnings() {
// given
@@ -43,12 +52,14 @@ public class SettingsWarnerTest {
given(settings.getProperty(PluginSettings.SESSIONS_ENABLED)).willReturn(true);
given(settings.getProperty(PluginSettings.SESSIONS_TIMEOUT)).willReturn(-5);
given(settings.getProperty(SecuritySettings.PASSWORD_HASH)).willReturn(HashAlgorithm.BCRYPT);
given(settings.getProperty(HooksSettings.BUNGEECORD)).willReturn(false);
given(bukkitService.isBungeeCordConfiguredForSpigot()).willReturn(Optional.of(true));
// when
createSettingsWarner().logWarningsForMisconfigurations();
settingsWarner.logWarningsForMisconfigurations();
// then
verify(logger, times(3)).warning(anyString());
verify(logger, times(4)).warning(anyString());
}
@Test
@@ -59,18 +70,12 @@ public class SettingsWarnerTest {
given(settings.getProperty(EmailSettings.PORT25_USE_TLS)).willReturn(false);
given(settings.getProperty(PluginSettings.SESSIONS_ENABLED)).willReturn(false);
given(settings.getProperty(SecuritySettings.PASSWORD_HASH)).willReturn(HashAlgorithm.MD5);
given(bukkitService.isBungeeCordConfiguredForSpigot()).willReturn(Optional.empty());
// when
createSettingsWarner().logWarningsForMisconfigurations();
settingsWarner.logWarningsForMisconfigurations();
// then
verifyZeroInteractions(logger);
}
private SettingsWarner createSettingsWarner() {
SettingsWarner warner = new SettingsWarner();
ReflectionTestUtils.setField(warner, "settings", settings);
ReflectionTestUtils.setField(warner, "authMe", authMe);
return warner;
}
}