test: Cleaned up statement creation/closing

redis-field-engineering · Mar 1, 2023 · 891ef63 · 891ef63
1 parent dba2c40
commit 891ef63
Showing 1 changed file with 27 additions and 16 deletions.
diff --git a/...is-smart-cache-jdbc/src/test/java/com/redis/smartcache/jdbc/AbstractIntegrationTests.java b/...is-smart-cache-jdbc/src/test/java/com/redis/smartcache/jdbc/AbstractIntegrationTests.java
@@ -116,40 +116,51 @@ protected void testSimpleStatement(JdbcDatabaseContainer<?> databaseContainer, S
 
 	protected void testUpdateAndGetResultSet(JdbcDatabaseContainer<?> databaseContainer, String sql) throws Exception {
 		test(databaseContainer, c -> {
-			Statement statement = c.createStatement();
-			statement.execute(sql);
-			return statement.getResultSet();
+			try (Statement statement = c.createStatement()) {
+				statement.execute(sql);
+				return statement.getResultSet();
+			}
 		});
 	}
 
 	protected void testPreparedStatement(JdbcDatabaseContainer<?> databaseContainer, String sql, Object... parameters)
 			throws Exception {
 		test(databaseContainer, c -> {
-			PreparedStatement statement = c.prepareStatement(sql);
-			for (int index = 0; index < parameters.length; index++) {
-				statement.setObject(index + 1, parameters[index]);
+			try (PreparedStatement statement = c.prepareStatement(sql)) {
+				for (int index = 0; index < parameters.length; index++) {
+					statement.setObject(index + 1, parameters[index]);
+				}
+				return statement.executeQuery();
 			}
-			return statement.executeQuery();
 		});
 	}
 
+	protected boolean execute(JdbcDatabaseContainer<?> databaseContainer, String sql) throws Exception {
+		try (SmartConnection connection = connection(databaseContainer);
+				Statement statement = connection.createStatement()) {
+			return statement.execute(sql);
+		}
+	}
+
 	protected void testCallableStatement(JdbcDatabaseContainer<?> databaseContainer, String sql, Object... parameters)
 			throws Exception {
 		test(databaseContainer, c -> {
-			CallableStatement statement = c.prepareCall(sql);
-			for (int index = 0; index < parameters.length; index++) {
-				statement.setObject(index + 1, parameters[index]);
+			try (CallableStatement statement = c.prepareCall(sql)) {
+				for (int index = 0; index < parameters.length; index++) {
+					statement.setObject(index + 1, parameters[index]);
+				}
+				return statement.executeQuery();
 			}
-			return statement.executeQuery();
 		});
 	}
 
 	protected void testCallableStatementGetResultSet(JdbcDatabaseContainer<?> databaseContainer, String sql,
 			Object... parameters) throws Exception {
 		test(databaseContainer, c -> {
-			CallableStatement statement = c.prepareCall(sql);
-			statement.execute();
-			return statement.getResultSet();
+			try (CallableStatement statement = c.prepareCall(sql)) {
+				statement.execute();
+				return statement.getResultSet();
+			}
 		});
 	}
 
@@ -172,8 +183,8 @@ private <T extends Statement> void test(JdbcDatabaseContainer<?> databaseContain
 	}
 
 	protected void testResultSetMetaData(JdbcDatabaseContainer<?> databaseContainer, String sql) throws Exception {
-		try (Connection connection = connection(databaseContainer)) {
-			Statement statement = connection.createStatement();
+		try (Connection connection = connection(databaseContainer);
+				Statement statement = connection.createStatement()) {
 			statement.execute(sql);
 			ResultSet resultSet = statement.getResultSet();
 			Assertions.assertNotNull(resultSet);