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

Fix tests (due to new Bukkit/GeoIP updates)

Browse Source
This commit is contained in:
ljacqu
2024-04-27 11:04:07 +02:00
parent 6eec2c8634
commit e69016aba5
6 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/process/unregister/AsynchronousUnregisterTest.java
+1 -1
View File
@@ -115,6 +115,7 @@ public class AsynchronousUnregisterTest {
given(service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)).willReturn(true);
given(service.getProperty(RestrictionSettings.TIMEOUT)).willReturn(21);
setBukkitServiceToScheduleSyncTaskFromOptionallyAsyncTask(bukkitService);
given(bukkitService.createBlindnessEffect(21 * 20)).willReturn(mock(PotionEffect.class));
// when
asynchronousUnregister.unregister(player, userPassword);
@@ -127,7 +128,6 @@ public class AsynchronousUnregisterTest {
verify(teleportationService).teleportOnJoin(player);
verifyCalledUnregisterEventFor(player);
verify(commandManager).runCommandsOnUnregister(player);
verify(player).addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 21 * 20, 2));
}
@Test
src/test/java/fr/xephi/authme/service/GeoIpServiceTest.java
+16 -12
View File
@@ -3,9 +3,14 @@ package fr.xephi.authme.service;
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.maxmind.geoip2.DatabaseReader;
import com.maxmind.geoip2.model.CountryResponse;
import com.maxmind.geoip2.record.Continent;
import com.maxmind.geoip2.record.Country;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.ProtectionSettings;
@@ -58,12 +63,7 @@ public class GeoIpServiceTest {
// given
InetAddress ip = InetAddress.getByName("123.45.67.89");
String countryCode = "XX";
Country country = mock(Country.class);
given(country.getIsoCode()).willReturn(countryCode);
CountryResponse response = mock(CountryResponse.class);
given(response.getCountry()).willReturn(country);
CountryResponse response = createCountryResponse(countryCode, "Unknown");
given(lookupService.country(ip)).willReturn(response);
given(settings.getProperty(ProtectionSettings.ENABLE_GEOIP)).willReturn(true);
@@ -93,12 +93,7 @@ public class GeoIpServiceTest {
// given
InetAddress ip = InetAddress.getByName("24.45.167.89");
String countryName = "Ecuador";
Country country = mock(Country.class);
given(country.getName()).willReturn(countryName);
CountryResponse response = mock(CountryResponse.class);
given(response.getCountry()).willReturn(country);
CountryResponse response = createCountryResponse("EC", countryName);
given(lookupService.country(ip)).willReturn(response);
given(settings.getProperty(ProtectionSettings.ENABLE_GEOIP)).willReturn(true);
@@ -136,4 +131,13 @@ public class GeoIpServiceTest {
assertThat(result, equalTo("N/A"));
verifyNoInteractions(lookupService);
}
private static CountryResponse createCountryResponse(String countryCode, String countryName) {
List<String> locales = Collections.singletonList("en");
Continent continent = new Continent(locales, "XX", 1L, Collections.emptyMap());
Map<String, String> countryNames = ImmutableMap.of("en", countryName);
Country country = new Country(locales, 100, 3L, false, countryCode, countryNames);
return new CountryResponse(continent, country, null, country, null, null);
}
}