Datasource integration tests - fix split by newline

- Make split of SQL file aware that new lines may be \r\n
- Remove split of new lines in MySQL as it's not necessary
This commit is contained in:
ljacqu 2016-02-24 20:37:26 +01:00
parent 1d1605314a
commit 95e3943be0
2 changed files with 5 additions and 7 deletions

View File

@ -30,8 +30,8 @@ public class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest {
/** Mock of a settings instance. */ /** Mock of a settings instance. */
private static NewSetting settings; private static NewSetting settings;
/** Collection of SQL statements to execute for initialization of a test. */ /** SQL statement to execute before running a test. */
private static String[] sqlInitialize; private static String sqlInitialize;
/** Connection to the H2 test database. */ /** Connection to the H2 test database. */
private HikariDataSource hikariSource; private HikariDataSource hikariSource;
@ -56,7 +56,7 @@ public class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest {
ConsoleLoggerTestInitializer.setupLogger(); ConsoleLoggerTestInitializer.setupLogger();
Path sqlInitFile = TestHelper.getJarPath("/datasource-integration/sql-initialize.sql"); Path sqlInitFile = TestHelper.getJarPath("/datasource-integration/sql-initialize.sql");
sqlInitialize = new String(Files.readAllBytes(sqlInitFile)).split(";\\n"); sqlInitialize = new String(Files.readAllBytes(sqlInitFile));
} }
@Before @Before
@ -73,9 +73,7 @@ public class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest {
try (Statement st = connection.createStatement()) { try (Statement st = connection.createStatement()) {
st.execute("DROP TABLE IF EXISTS authme"); st.execute("DROP TABLE IF EXISTS authme");
for (String statement : sqlInitialize) { st.execute(sqlInitialize);
st.execute(statement);
}
} }
hikariSource = ds; hikariSource = ds;
} }

View File

@ -57,7 +57,7 @@ public class SQLiteIntegrationTest extends AbstractDataSourceIntegrationTest {
Path sqlInitFile = TestHelper.getJarPath("/datasource-integration/sql-initialize.sql"); Path sqlInitFile = TestHelper.getJarPath("/datasource-integration/sql-initialize.sql");
// Note ljacqu 20160221: It appears that we can only run one statement per Statement.execute() so we split // Note ljacqu 20160221: It appears that we can only run one statement per Statement.execute() so we split
// the SQL file by ";\n" as to get the individual statements // the SQL file by ";\n" as to get the individual statements
sqlInitialize = new String(Files.readAllBytes(sqlInitFile)).split(";\\n"); sqlInitialize = new String(Files.readAllBytes(sqlInitFile)).split(";(\\r?)\\n");
} }
@Before @Before