Commit 7c22e717 authored by Madhura Bhave's avatar Madhura Bhave

Polish "Deprecate EmbeddedDatabaseConnection#HSQL"

See gh-23565
parent d5a1421b
...@@ -52,7 +52,7 @@ class DataSourceHealthIndicatorTests { ...@@ -52,7 +52,7 @@ class DataSourceHealthIndicatorTests {
@BeforeEach @BeforeEach
void init() { void init() {
EmbeddedDatabaseConnection db = EmbeddedDatabaseConnection.HSQL; EmbeddedDatabaseConnection db = EmbeddedDatabaseConnection.HSQLDB;
this.dataSource = new SingleConnectionDataSource(db.getUrl("testdb") + ";shutdown=true", "sa", "", false); this.dataSource = new SingleConnectionDataSource(db.getUrl("testdb") + ";shutdown=true", "sa", "", false);
this.dataSource.setDriverClassName(db.getDriverClassName()); this.dataSource.setDriverClassName(db.getDriverClassName());
} }
......
...@@ -163,7 +163,7 @@ class LiquibaseEndpointTests { ...@@ -163,7 +163,7 @@ class LiquibaseEndpointTests {
private DataSource createEmbeddedDatabase() { private DataSource createEmbeddedDatabase() {
return new EmbeddedDatabaseBuilder().generateUniqueName(true) return new EmbeddedDatabaseBuilder().generateUniqueName(true)
.setType(EmbeddedDatabaseConnection.HSQL.getType()).build(); .setType(EmbeddedDatabaseConnection.HSQLDB.getType()).build();
} }
private SpringLiquibase createSpringLiquibase(String changeLog, DataSource dataSource) { private SpringLiquibase createSpringLiquibase(String changeLog, DataSource dataSource) {
......
...@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; ...@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*/ */
@JdbcTest @JdbcTest
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.AUTO_CONFIGURED, @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.AUTO_CONFIGURED,
connection = EmbeddedDatabaseConnection.HSQL) connection = EmbeddedDatabaseConnection.HSQLDB)
class JdbcTestWithAutoConfigureTestDatabaseReplaceAutoConfiguredIntegrationTests { class JdbcTestWithAutoConfigureTestDatabaseReplaceAutoConfiguredIntegrationTests {
@Autowired @Autowired
......
...@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; ...@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Stephane Nicoll * @author Stephane Nicoll
*/ */
@JdbcTest @JdbcTest
@AutoConfigureTestDatabase(connection = EmbeddedDatabaseConnection.HSQL) @AutoConfigureTestDatabase(connection = EmbeddedDatabaseConnection.HSQLDB)
class JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests { class JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests {
@Autowired @Autowired
......
...@@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; ...@@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Stephane Nicoll * @author Stephane Nicoll
*/ */
@JdbcTest @JdbcTest
@AutoConfigureTestDatabase(connection = EmbeddedDatabaseConnection.HSQL) @AutoConfigureTestDatabase(connection = EmbeddedDatabaseConnection.HSQLDB)
@TestPropertySource(properties = "spring.test.database.replace=ANY") @TestPropertySource(properties = "spring.test.database.replace=ANY")
class JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests { class JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests {
......
...@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; ...@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Stephane Nicoll * @author Stephane Nicoll
*/ */
@JdbcTest @JdbcTest
@AutoConfigureTestDatabase(connection = EmbeddedDatabaseConnection.HSQL) @AutoConfigureTestDatabase(connection = EmbeddedDatabaseConnection.HSQLDB)
@TestPropertySource(properties = "spring.test.database.replace=AUTO_CONFIGURED") @TestPropertySource(properties = "spring.test.database.replace=AUTO_CONFIGURED")
class JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAutoConfiguredIntegrationTests { class JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAutoConfiguredIntegrationTests {
......
...@@ -35,6 +35,7 @@ import org.springframework.util.ClassUtils; ...@@ -35,6 +35,7 @@ import org.springframework.util.ClassUtils;
* @author Phillip Webb * @author Phillip Webb
* @author Dave Syer * @author Dave Syer
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Nidhi Desai
* @since 1.0.0 * @since 1.0.0
* @see #get(ClassLoader) * @see #get(ClassLoader)
*/ */
...@@ -58,6 +59,7 @@ public enum EmbeddedDatabaseConnection { ...@@ -58,6 +59,7 @@ public enum EmbeddedDatabaseConnection {
/** /**
* HSQL Database Connection. * HSQL Database Connection.
* @deprecated since 2.4.0 in favor of {@link EmbeddedDatabaseConnection#HSQLDB}.
*/ */
@Deprecated @Deprecated
HSQL(EmbeddedDatabaseType.HSQL, DatabaseDriver.HSQLDB.getDriverClassName(), "org.hsqldb.jdbcDriver", HSQL(EmbeddedDatabaseType.HSQL, DatabaseDriver.HSQLDB.getDriverClassName(), "org.hsqldb.jdbcDriver",
......
...@@ -25,6 +25,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException ...@@ -25,6 +25,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
* Tests for {@link EmbeddedDatabaseConnection}. * Tests for {@link EmbeddedDatabaseConnection}.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Nidhi Desai
*/ */
class EmbeddedDatabaseConnectionTests { class EmbeddedDatabaseConnectionTests {
...@@ -40,27 +41,26 @@ class EmbeddedDatabaseConnectionTests { ...@@ -40,27 +41,26 @@ class EmbeddedDatabaseConnectionTests {
.isEqualTo("jdbc:derby:memory:myderbydb;create=true"); .isEqualTo("jdbc:derby:memory:myderbydb;create=true");
} }
@Deprecated
@Test @Test
@Deprecated
void hsqlCustomDatabaseName() { void hsqlCustomDatabaseName() {
assertThat(EmbeddedDatabaseConnection.HSQL.getUrl("myhsql")).isEqualTo("jdbc:hsqldb:mem:myhsql"); assertThat(EmbeddedDatabaseConnection.HSQL.getUrl("myhsql")).isEqualTo("jdbc:hsqldb:mem:myhsql");
} }
@Deprecated
@Test @Test
@Deprecated
void getUrlWithNullDatabaseName() { void getUrlWithNullDatabaseName() {
assertThatIllegalArgumentException().isThrownBy(() -> EmbeddedDatabaseConnection.HSQL.getUrl(null)) assertThatIllegalArgumentException().isThrownBy(() -> EmbeddedDatabaseConnection.HSQL.getUrl(null))
.withMessageContaining("DatabaseName must not be empty"); .withMessageContaining("DatabaseName must not be empty");
} }
@Deprecated
@Test @Test
@Deprecated
void getUrlWithEmptyDatabaseName() { void getUrlWithEmptyDatabaseName() {
assertThatIllegalArgumentException().isThrownBy(() -> EmbeddedDatabaseConnection.HSQL.getUrl(" ")) assertThatIllegalArgumentException().isThrownBy(() -> EmbeddedDatabaseConnection.HSQL.getUrl(" "))
.withMessageContaining("DatabaseName must not be empty"); .withMessageContaining("DatabaseName must not be empty");
} }
// HSQLDB connection tests added
@Test @Test
void hsqldbCustomDatabaseName() { void hsqldbCustomDatabaseName() {
assertThat(EmbeddedDatabaseConnection.HSQLDB.getUrl("myhsqldb")).isEqualTo("jdbc:hsqldb:mem:myhsqldb"); assertThat(EmbeddedDatabaseConnection.HSQLDB.getUrl("myhsqldb")).isEqualTo("jdbc:hsqldb:mem:myhsqldb");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment