22911a0bb9
- Drop initialization of all columns on table create in favor of checking each column individually. This is slower but guarantees that each column is only defined once in the code. Columns are only created once so having clean code outweighs performance. - Write more datasource integration tests
102 lines
3.5 KiB
Java
102 lines
3.5 KiB
Java
package fr.xephi.authme.datasource;
|
|
|
|
import com.zaxxer.hikari.HikariConfig;
|
|
import com.zaxxer.hikari.HikariDataSource;
|
|
import fr.xephi.authme.TestHelper;
|
|
import fr.xephi.authme.settings.NewSetting;
|
|
import fr.xephi.authme.settings.domain.Property;
|
|
import fr.xephi.authme.settings.properties.DatabaseSettings;
|
|
import org.junit.After;
|
|
import org.junit.Before;
|
|
import org.junit.BeforeClass;
|
|
import org.mockito.invocation.InvocationOnMock;
|
|
import org.mockito.stubbing.Answer;
|
|
|
|
import java.io.IOException;
|
|
import java.nio.file.Files;
|
|
import java.nio.file.Path;
|
|
import java.sql.Connection;
|
|
import java.sql.SQLException;
|
|
import java.sql.Statement;
|
|
|
|
import static org.mockito.Matchers.any;
|
|
import static org.mockito.Mockito.mock;
|
|
import static org.mockito.Mockito.when;
|
|
|
|
/**
|
|
* Integration test for {@link MySQL}.
|
|
*/
|
|
public class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest {
|
|
|
|
/** Mock of a settings instance. */
|
|
private static NewSetting settings;
|
|
/** SQL statement to execute before running a test. */
|
|
private static String sqlInitialize;
|
|
/** Connection to the H2 test database. */
|
|
private HikariDataSource hikariSource;
|
|
|
|
/**
|
|
* Set up the settings mock to return specific values for database settings and load {@link #sqlInitialize}.
|
|
*/
|
|
@SuppressWarnings({ "unchecked", "rawtypes" })
|
|
@BeforeClass
|
|
public static void initializeSettings() throws IOException, ClassNotFoundException {
|
|
// Check that we have an H2 driver
|
|
Class.forName("org.h2.jdbcx.JdbcDataSource");
|
|
|
|
settings = mock(NewSetting.class);
|
|
when(settings.getProperty(any(Property.class))).thenAnswer(new Answer() {
|
|
@Override
|
|
public Object answer(InvocationOnMock invocation) throws Throwable {
|
|
return ((Property) invocation.getArguments()[0]).getDefaultValue();
|
|
}
|
|
});
|
|
set(DatabaseSettings.MYSQL_DATABASE, "h2_test");
|
|
set(DatabaseSettings.MYSQL_TABLE, "authme");
|
|
TestHelper.setupLogger();
|
|
|
|
Path sqlInitFile = TestHelper.getJarPath(TestHelper.PROJECT_ROOT + "datasource/sql-initialize.sql");
|
|
sqlInitialize = new String(Files.readAllBytes(sqlInitFile));
|
|
}
|
|
|
|
@Before
|
|
public void initializeConnectionAndTable() throws SQLException {
|
|
HikariConfig config = new HikariConfig();
|
|
config.setDataSourceClassName("org.h2.jdbcx.JdbcDataSource");
|
|
config.setConnectionTestQuery("VALUES 1");
|
|
config.addDataSourceProperty("URL", "jdbc:h2:mem:test");
|
|
config.addDataSourceProperty("user", "sa");
|
|
config.addDataSourceProperty("password", "sa");
|
|
HikariDataSource ds = new HikariDataSource(config);
|
|
Connection connection = ds.getConnection();
|
|
|
|
try (Statement st = connection.createStatement()) {
|
|
st.execute("DROP TABLE IF EXISTS authme");
|
|
st.execute(sqlInitialize);
|
|
}
|
|
hikariSource = ds;
|
|
}
|
|
|
|
@After
|
|
public void closeConnection() {
|
|
silentClose(hikariSource);
|
|
}
|
|
|
|
@Override
|
|
protected DataSource getDataSource(String saltColumn) {
|
|
when(settings.getProperty(DatabaseSettings.MYSQL_COL_SALT)).thenReturn(saltColumn);
|
|
return new MySQL(settings, hikariSource);
|
|
}
|
|
|
|
private static <T> void set(Property<T> property, T value) {
|
|
when(settings.getProperty(property)).thenReturn(value);
|
|
}
|
|
|
|
private static void silentClose(HikariDataSource con) {
|
|
if (con != null && !con.isClosed()) {
|
|
con.close();
|
|
}
|
|
}
|
|
|
|
}
|