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

Disable GeoIP with config: remove field, fix tests

Browse Source
This commit is contained in:
ljacqu
2023-09-24 18:23:55 +02:00
parent 65a272d6cb
commit 9b93e0e4b6
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/service/GeoIpServiceTest.java
+23 -7
View File
@@ -3,12 +3,8 @@ package fr.xephi.authme.service;
import com.maxmind.db.GeoIp2Provider;
import com.maxmind.db.model.Country;
import com.maxmind.db.model.CountryResponse;
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.ProtectionSettings;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -17,14 +13,18 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
/**
* Test for {@link GeoIpService}.
@@ -65,6 +65,7 @@ public class GeoIpServiceTest {
CountryResponse response = mock(CountryResponse.class);
given(response.getCountry()).willReturn(country);
given(lookupService.getCountry(ip)).willReturn(response);
given(settings.getProperty(ProtectionSettings.ENABLE_GEOIP)).willReturn(true);
// when
String result = geoIpService.getCountryCode(ip.getHostAddress());
@@ -99,6 +100,7 @@ public class GeoIpServiceTest {
CountryResponse response = mock(CountryResponse.class);
given(response.getCountry()).willReturn(country);
given(lookupService.getCountry(ip)).willReturn(response);
given(settings.getProperty(ProtectionSettings.ENABLE_GEOIP)).willReturn(true);
// when
String result = geoIpService.getCountryName(ip.getHostAddress());
@@ -120,4 +122,18 @@ public class GeoIpServiceTest {
assertThat(result, equalTo("LocalHost"));
verify(lookupService, never()).getCountry(ip);
}
@Test
public void shouldNotLookUpCountryNameIfDisabled() throws Exception {
// given
InetAddress ip = InetAddress.getByName("24.45.167.89");
given(settings.getProperty(ProtectionSettings.ENABLE_GEOIP)).willReturn(false);
// when
String result = geoIpService.getCountryName(ip.getHostAddress());
// then
assertThat(result, equalTo("N/A"));
verifyNoInteractions(lookupService);
}
}