Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add 1.14 compatibility

Browse Source
This commit is contained in:
Gabriele C
2019-04-23 17:18:42 +02:00
parent 85194fa94d
commit 5b97841699
11 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java
+1
View File
@@ -786,6 +786,7 @@ public class PlayerListenerTest {
// given
HumanEntity player = mock(Player.class);
InventoryView transaction = mock(InventoryView.class);
given(settings.getProperty(RestrictionSettings.UNRESTRICTED_INVENTORIES)).willReturn(Collections.emptySet());
given(transaction.getPlayer()).willReturn(player);
InventoryOpenEvent event = new InventoryOpenEvent(transaction);
given(event.getPlayer()).willReturn(player);
src/test/java/fr/xephi/authme/mail/EmailServiceTest.java
+2 -4
View File
@@ -7,10 +7,10 @@ import fr.xephi.authme.TestHelper;
import fr.xephi.authme.initialization.DataFolder;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.EmailSettings;
import fr.xephi.authme.settings.properties.PluginSettings;
import fr.xephi.authme.settings.properties.SecuritySettings;
import org.apache.commons.mail.EmailException;
import org.apache.commons.mail.HtmlEmail;
import org.bukkit.Server;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
@@ -46,8 +46,6 @@ public class EmailServiceTest {
@Mock
private Settings settings;
@Mock
private Server server;
@Mock
private SendMailSsl sendMailSsl;
@DataFolder
private File dataFolder;
@@ -63,7 +61,7 @@ public class EmailServiceTest {
@BeforeInjecting
public void initFields() throws IOException {
dataFolder = temporaryFolder.newFolder();
given(server.getServerName()).willReturn("serverName");
given(settings.getProperty(PluginSettings.SERVER_NAME)).willReturn("serverName");
given(settings.getProperty(EmailSettings.MAIL_ACCOUNT)).willReturn("mail@example.org");
given(settings.getProperty(EmailSettings.MAIL_PASSWORD)).willReturn("pass1234");
given(sendMailSsl.hasAllInformation()).willReturn(true);
src/test/java/fr/xephi/authme/settings/WelcomeMessageConfigurationTest.java
+3 -3
View File
@@ -9,6 +9,7 @@ import fr.xephi.authme.initialization.DataFolder;
import fr.xephi.authme.service.BukkitService;
import fr.xephi.authme.service.CommonService;
import fr.xephi.authme.service.GeoIpService;
import fr.xephi.authme.settings.properties.PluginSettings;
import fr.xephi.authme.settings.properties.RegistrationSettings;
import org.bukkit.Server;
import org.bukkit.World;
@@ -96,7 +97,7 @@ public class WelcomeMessageConfigurationTest {
given(player.getName()).willReturn("Bobby");
TestHelper.mockPlayerIp(player, "123.45.66.77");
given(geoIpService.getCountryName("123.45.66.77")).willReturn("Syldavia");
given(server.getServerName()).willReturn("CrazyServer");
given(service.getProperty(PluginSettings.SERVER_NAME)).willReturn("CrazyServer");
// when
List<String> result = welcomeMessageConfiguration.getWelcomeMessage(player);
@@ -106,8 +107,7 @@ public class WelcomeMessageConfigurationTest {
assertThat(result.get(0), equalTo("Hello Bobby, your IP is 123.45.66.77"));
assertThat(result.get(1), equalTo("Your country is Syldavia."));
assertThat(result.get(2), equalTo("Welcome to CrazyServer!"));
verify(server, only()).getServerName();
verifyZeroInteractions(playerCache);
verifyZeroInteractions(server, playerCache);
}
@Test