Fix refactor errors

src/test/java/fr/xephi/authme/geoip/GeoIpManagerTest.java

@@ -2,7 +2,6 @@ package fr.xephi.authme.geoip;
 
 import com.maxmind.geoip.Country;
 import com.maxmind.geoip.LookupService;
-import fr.xephi.authme.geoip.GeoLiteAPI;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -23,12 +22,12 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
 /**
- * Test for {@link GeoLiteAPI}.
+ * Test for {@link GeoIpManager}.
  */
 @RunWith(MockitoJUnitRunner.class)
 public class GeoIpManagerTest {
 
-    private GeoLiteAPI geoLiteApi;
+    private GeoIpManager geoIpManager;
     private File dataFolder;
     @Mock
     private LookupService lookupService;
@@ -39,7 +38,7 @@ public class GeoIpManagerTest {
     @Before
     public void initializeGeoLiteApi() throws IOException {
         dataFolder = temporaryFolder.newFolder();
-        geoLiteApi = new GeoLiteAPI(dataFolder, lookupService);
+        geoIpManager = new GeoIpManager(dataFolder, lookupService);
     }
 
     @Test
@@ -52,7 +51,7 @@ public class GeoIpManagerTest {
         given(lookupService.getCountry(ip)).willReturn(country);
 
         // when
-        String result = geoLiteApi.getCountryCode(ip);
+        String result = geoIpManager.getCountryCode(ip);
 
         // then
         assertThat(result, equalTo(countryCode));
@@ -65,7 +64,7 @@ public class GeoIpManagerTest {
         String ip = "127.0.0.1";
 
         // when
-        String result = geoLiteApi.getCountryCode(ip);
+        String result = geoIpManager.getCountryCode(ip);
 
         // then
         assertThat(result, equalTo("--"));
@@ -82,7 +81,7 @@ public class GeoIpManagerTest {
         given(lookupService.getCountry(ip)).willReturn(country);
 
         // when
-        String result = geoLiteApi.getCountryName(ip);
+        String result = geoIpManager.getCountryName(ip);
 
         // then
         assertThat(result, equalTo(countryName));
@@ -95,7 +94,7 @@ public class GeoIpManagerTest {
         String ip = "127.0.0.1";
 
         // when
-        String result = geoLiteApi.getCountryName(ip);
+        String result = geoIpManager.getCountryName(ip);
 
         // then
         assertThat(result, equalTo("N/A"));

src/test/java/fr/xephi/authme/service/ValidationServiceTest.java

@@ -5,11 +5,10 @@ import ch.jalu.injector.testing.DelayedInjectionRunner;
 import ch.jalu.injector.testing.InjectDelayed;
 import com.google.common.base.Strings;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.geoip.GeoLiteAPI;
+import fr.xephi.authme.geoip.GeoIpManager;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerStatePermission;
-import fr.xephi.authme.service.ValidationService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.EmailSettings;
 import fr.xephi.authme.settings.properties.ProtectionSettings;
@@ -46,7 +45,7 @@ public class ValidationServiceTest {
     @Mock
     private PermissionsManager permissionsManager;
     @Mock
-    private GeoLiteAPI geoLiteApi;
+    private GeoIpManager geoIpManager;
 
     @BeforeInjecting
     public void createService() {
@@ -267,7 +266,7 @@ public class ValidationServiceTest {
 
         // then
         assertThat(result, equalTo(true));
-        verifyZeroInteractions(geoLiteApi);
+        verifyZeroInteractions(geoIpManager);
     }
 
     @Test
@@ -276,14 +275,14 @@ public class ValidationServiceTest {
         given(settings.getProperty(ProtectionSettings.COUNTRIES_WHITELIST)).willReturn(asList("ch", "it"));
         given(settings.getProperty(ProtectionSettings.COUNTRIES_BLACKLIST)).willReturn(Collections.<String>emptyList());
         String ip = "127.0.0.1";
-        given(geoLiteApi.getCountryCode(ip)).willReturn("CH");
+        given(geoIpManager.getCountryCode(ip)).willReturn("CH");
 
         // when
         boolean result = validationService.isCountryAdmitted(ip);
 
         // then
         assertThat(result, equalTo(true));
-        verify(geoLiteApi).getCountryCode(ip);
+        verify(geoIpManager).getCountryCode(ip);
     }
 
     @Test
@@ -292,14 +291,14 @@ public class ValidationServiceTest {
         given(settings.getProperty(ProtectionSettings.COUNTRIES_WHITELIST)).willReturn(asList("ch", "it"));
         given(settings.getProperty(ProtectionSettings.COUNTRIES_BLACKLIST)).willReturn(Collections.<String>emptyList());
         String ip = "123.45.67.89";
-        given(geoLiteApi.getCountryCode(ip)).willReturn("BR");
+        given(geoIpManager.getCountryCode(ip)).willReturn("BR");
 
         // when
         boolean result = validationService.isCountryAdmitted(ip);
 
         // then
         assertThat(result, equalTo(false));
-        verify(geoLiteApi).getCountryCode(ip);
+        verify(geoIpManager).getCountryCode(ip);
     }
 
     @Test
@@ -308,14 +307,14 @@ public class ValidationServiceTest {
         given(settings.getProperty(ProtectionSettings.COUNTRIES_WHITELIST)).willReturn(Collections.<String>emptyList());
         given(settings.getProperty(ProtectionSettings.COUNTRIES_BLACKLIST)).willReturn(asList("ch", "it"));
         String ip = "127.0.0.1";
-        given(geoLiteApi.getCountryCode(ip)).willReturn("BR");
+        given(geoIpManager.getCountryCode(ip)).willReturn("BR");
 
         // when
         boolean result = validationService.isCountryAdmitted(ip);
 
         // then
         assertThat(result, equalTo(true));
-        verify(geoLiteApi).getCountryCode(ip);
+        verify(geoIpManager).getCountryCode(ip);
     }
 
     @Test
@@ -324,14 +323,14 @@ public class ValidationServiceTest {
         given(settings.getProperty(ProtectionSettings.COUNTRIES_WHITELIST)).willReturn(Collections.<String>emptyList());
         given(settings.getProperty(ProtectionSettings.COUNTRIES_BLACKLIST)).willReturn(asList("ch", "it"));
         String ip = "123.45.67.89";
-        given(geoLiteApi.getCountryCode(ip)).willReturn("IT");
+        given(geoIpManager.getCountryCode(ip)).willReturn("IT");
 
         // when
         boolean result = validationService.isCountryAdmitted(ip);
 
         // then
         assertThat(result, equalTo(false));
-        verify(geoLiteApi).getCountryCode(ip);
+        verify(geoIpManager).getCountryCode(ip);
     }
 
     private static void assertErrorEquals(ValidationResult validationResult, MessageKey messageKey, String... args) {

src/test/java/fr/xephi/authme/util/PlayerUtilsTest.java

@@ -15,7 +15,7 @@ import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 
 /**
- * Test for {@link Utils}.
+ * Test for {@link PlayerUtils}.
  */
 public class PlayerUtilsTest {