#792 Add missing tests / fix CodeClimate issues

src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java

@@ -4,8 +4,6 @@ import ch.jalu.configme.properties.Property;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import fr.xephi.authme.TestHelper;
-import fr.xephi.authme.datasource.mysqlextensions.MySqlExtension;
-import fr.xephi.authme.datasource.mysqlextensions.MySqlExtensionsFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 import org.junit.After;
@@ -19,7 +17,6 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -30,8 +27,6 @@ public class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest {
 
     /** Mock of a settings instance. */
     private static Settings settings;
-    /** Mock of extensions factory. */
-    private static MySqlExtensionsFactory extensionsFactory;
     /** SQL statement to execute before running a test. */
     private static String sqlInitialize;
     /** Connection to the H2 test database. */
@@ -47,8 +42,6 @@ public class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest {
 
         settings = mock(Settings.class);
         TestHelper.returnDefaultsForAllProperties(settings);
-        extensionsFactory = mock(MySqlExtensionsFactory.class);
-        when(extensionsFactory.buildExtension(any(Columns.class))).thenReturn(mock(MySqlExtension.class));
         set(DatabaseSettings.MYSQL_DATABASE, "h2_test");
         set(DatabaseSettings.MYSQL_TABLE, "authme");
         TestHelper.setRealLogger();
@@ -83,7 +76,7 @@ public class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest {
     @Override
     protected DataSource getDataSource(String saltColumn) {
         when(settings.getProperty(DatabaseSettings.MYSQL_COL_SALT)).thenReturn(saltColumn);
-        return new MySQL(settings, hikariSource, extensionsFactory);
+        return MySqlTestUtil.createMySql(settings, hikariSource);
     }
 
     private static <T> void set(Property<T> property, T value) {

src/test/java/fr/xephi/authme/datasource/MySqlTestUtil.java

@@ -0,0 +1,30 @@
+package fr.xephi.authme.datasource;
+
+import com.zaxxer.hikari.HikariDataSource;
+import fr.xephi.authme.datasource.mysqlextensions.MySqlExtension;
+import fr.xephi.authme.datasource.mysqlextensions.MySqlExtensionsFactory;
+import fr.xephi.authme.settings.Settings;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Test util for the MySQL data source.
+ */
+public final class MySqlTestUtil {
+
+    private MySqlTestUtil() {
+    }
+
+    public static MySQL createMySql(Settings settings, HikariDataSource hikariDataSource) {
+        MySqlExtensionsFactory extensionsFactory = mock(MySqlExtensionsFactory.class);
+        given(extensionsFactory.buildExtension(any())).willReturn(mock(MySqlExtension.class));
+        return createMySql(settings, hikariDataSource, extensionsFactory);
+    }
+
+    public static MySQL createMySql(Settings settings, HikariDataSource hikariDataSource,
+                                    MySqlExtensionsFactory extensionsFactory) {
+        return new MySQL(settings, hikariDataSource, extensionsFactory);
+    }
+}