Skip to content

Fix closeable resource leaks in Junit tests #797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lilgreenbird (lilgreenbird) merged 16 commits into from
Sep 21, 2018
Merged

Fix closeable resource leaks in Junit tests #797

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
69fad37
tests cleanup
lilgreenbird Aug 30, 2018
893d09e
resolved conflict
lilgreenbird Aug 30, 2018
4a3e6f8
Merge branch 'dev' into dev
lilgreenbird Aug 30, 2018
ded037b
fixed typo
lilgreenbird Aug 30, 2018
7d79eea
fixes
lilgreenbird Aug 30, 2018
bdea814
fixes
lilgreenbird Aug 30, 2018
a50d513
fixed
lilgreenbird Aug 30, 2018
a640351
review comments
lilgreenbird Aug 31, 2018
524143d
review updates
lilgreenbird Sep 4, 2018
6837404
review update
lilgreenbird Sep 5, 2018
6b43e4c
more review changes
lilgreenbird Sep 12, 2018
f5a97de
more try-with-resources changes
lilgreenbird Sep 14, 2018
6b10eec
more
lilgreenbird Sep 17, 2018
e1038ba
spacing change only
lilgreenbird Sep 17, 2018
fad3cdb
use shared statement in Abstract test again, this will be removed in …
lilgreenbird Sep 18, 2018
b4060e6
try-with-resources for Stream types
lilgreenbird Sep 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/AESetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,17 @@
import org.junit.runner.RunWith;
import org.opentest4j.TestAbortedException;

import com.microsoft.sqlserver.jdbc.RandomData;
import com.microsoft.sqlserver.jdbc.SQLServerColumnEncryptionJavaKeyStoreProvider;
import com.microsoft.sqlserver.jdbc.SQLServerColumnEncryptionKeyStoreProvider;
import com.microsoft.sqlserver.jdbc.SQLServerConnection;
import com.microsoft.sqlserver.jdbc.SQLServerPreparedStatement;
import com.microsoft.sqlserver.jdbc.SQLServerStatement;
import com.microsoft.sqlserver.jdbc.SQLServerStatementColumnEncryptionSetting;
import com.microsoft.sqlserver.jdbc.TestResource;
import com.microsoft.sqlserver.jdbc.TestUtils;
import com.microsoft.sqlserver.testframework.AbstractTest;
import com.microsoft.sqlserver.testframework.DBConnection;
import com.microsoft.sqlserver.testframework.Utils;
import com.microsoft.sqlserver.testframework.util.RandomData;
import com.microsoft.sqlserver.testframework.util.Util;

import microsoft.sql.DateTimeOffset;

Expand Down Expand Up @@ -84,8 +83,9 @@ public class AESetup extends AbstractTest {
*/
@BeforeAll
public static void setUpConnection() throws TestAbortedException, Exception {
assumeTrue(13 <= new DBConnection(connectionString).getServerVersion(),
TestResource.getResource("R_Incompat_SQLServerVersion"));
try (DBConnection con = new DBConnection(connectionString)) {
assumeTrue(13 <= con.getServerVersion(), TestResource.getResource("R_Incompat_SQLServerVersion"));
}

String AETestConenctionString = connectionString + ";sendTimeAsDateTime=false";
readFromFile(javaKeyStoreInputFile, "Alias name");
Expand All @@ -96,7 +96,7 @@ public static void setUpConnection() throws TestAbortedException, Exception {
dropCMK(stmt);
}

keyPath = Utils.getCurrentClassPath() + jksName;
keyPath = TestUtils.getCurrentClassPath() + jksName;
storeProvider = new SQLServerColumnEncryptionJavaKeyStoreProvider(keyPath, secretstrJks.toCharArray());
stmtColEncSetting = SQLServerStatementColumnEncryptionSetting.Enabled;

Expand All @@ -123,7 +123,7 @@ public static void dropAll() throws SQLException {
dropTables(stmt);
dropCEK(stmt);
dropCMK(stmt);
Util.close(null, stmt, con);
TestUtils.close(null, stmt, con);
}

/**
Expand All @@ -135,7 +135,7 @@ public static void dropAll() throws SQLException {
* @throws IOException
*/
private static void readFromFile(String inputFile, String lookupValue) throws IOException {
filePath = Utils.getCurrentClassPath();
filePath = TestUtils.getCurrentClassPath();
try {
File f = new File(filePath + inputFile);
assumeTrue(f.exists(), TestResource.getResource("R_noKeyStore"));
Expand Down Expand Up @@ -702,7 +702,7 @@ private static void createCEK(SQLServerColumnEncryptionKeyStoreProvider storePro
String cekSql = null;
byte[] key = storeProvider.encryptColumnEncryptionKey(javaKeyAliases, "RSA_OAEP", valuesDefault);
cekSql = "CREATE COLUMN ENCRYPTION KEY " + cekName + " WITH VALUES " + "(COLUMN_MASTER_KEY = " + cmkName
+ ", ALGORITHM = 'RSA_OAEP', ENCRYPTED_VALUE = 0x" + Util.bytesToHexString(key, key.length) + ")" + ";";
+ ", ALGORITHM = 'RSA_OAEP', ENCRYPTED_VALUE = 0x" + TestUtils.bytesToHexString(key, key.length) + ")" + ";";
stmt.execute(cekSql);
}

Expand All @@ -712,10 +712,10 @@ private static void createCEK(SQLServerColumnEncryptionKeyStoreProvider storePro
* @throws SQLException
*/
protected static void dropTables(SQLServerStatement statement) throws SQLException {
Utils.dropTableIfExists(numericTable, statement);
Utils.dropTableIfExists(charTable, statement);
Utils.dropTableIfExists(binaryTable, statement);
Utils.dropTableIfExists(dateTable, statement);
TestUtils.dropTableIfExists(numericTable, statement);
TestUtils.dropTableIfExists(charTable, statement);
TestUtils.dropTableIfExists(binaryTable, statement);
TestUtils.dropTableIfExists(dateTable, statement);
}

/**
Expand All @@ -728,7 +728,7 @@ protected static void populateBinaryNormalCase(LinkedList<byte[]> byteValues) th
String sql = "insert into " + binaryTable + " values( " + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?"
+ ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// binary20
Expand Down Expand Up @@ -790,7 +790,7 @@ protected static void populateBinarySetObject(LinkedList<byte[]> byteValues) thr
String sql = "insert into " + binaryTable + " values( " + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?"
+ ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// binary(20)
Expand Down Expand Up @@ -852,7 +852,7 @@ protected static void populateBinarySetObjectWithJDBCType(LinkedList<byte[]> byt
String sql = "insert into " + binaryTable + " values( " + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?"
+ ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// binary(20)
Expand Down Expand Up @@ -913,7 +913,7 @@ protected static void populateBinaryNullCase() throws SQLException {
String sql = "insert into " + binaryTable + " values( " + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?"
+ ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// binary
Expand Down Expand Up @@ -950,7 +950,7 @@ protected static void populateCharNormalCase(String[] charValues) throws SQLExce
String sql = "insert into " + charTable + " values( " + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?,"
+ "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?" + ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// char
Expand Down Expand Up @@ -1016,7 +1016,7 @@ protected static void populateCharSetObject(String[] charValues) throws SQLExcep
String sql = "insert into " + charTable + " values( " + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?,"
+ "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?" + ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// char
Expand Down Expand Up @@ -1078,7 +1078,7 @@ protected static void populateCharSetObjectWithJDBCTypes(String[] charValues) th
String sql = "insert into " + charTable + " values( " + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?,"
+ "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?" + ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// char
Expand Down Expand Up @@ -1139,7 +1139,7 @@ protected static void populateCharNullCase() throws SQLException {
String sql = "insert into " + charTable + " values( " + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?,"
+ "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?" + ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// char
Expand Down Expand Up @@ -1192,7 +1192,7 @@ protected static void populateDateNormalCase(LinkedList<Object> dateValues) thro
String sql = "insert into " + dateTable + " values( " + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?,"
+ "?,?,?" + ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// date
Expand Down Expand Up @@ -1238,7 +1238,7 @@ protected static void populateDateNormalCase(LinkedList<Object> dateValues) thro
protected static void populateDateScaleNormalCase(LinkedList<Object> dateValues) throws SQLException {
String sql = "insert into " + scaleDateTable + " values( " + "?,?,?," + "?,?,?," + "?,?,?" + ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// datetime2(2)
Expand Down Expand Up @@ -1275,7 +1275,7 @@ protected static void populateDateSetObject(LinkedList<Object> dateValues, Strin
String sql = "insert into " + dateTable + " values( " + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?,"
+ "?,?,?" + ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// date
Expand Down Expand Up @@ -1341,7 +1341,7 @@ protected void populateDateSetObjectNull() throws SQLException {
String sql = "insert into " + dateTable + " values( " + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?,"
+ "?,?,?" + ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// date
Expand Down Expand Up @@ -1387,7 +1387,7 @@ protected static void populateDateNullCase() throws SQLException {
String sql = "insert into " + dateTable + " values( " + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?,"
+ "?,?,?" + ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// date
Expand Down Expand Up @@ -1435,7 +1435,7 @@ protected static void populateNumeric(String[] values) throws SQLException {
+ "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?,"
+ "?,?,?," + "?,?,?" + ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// bit
Expand Down Expand Up @@ -1543,7 +1543,7 @@ protected static void populateNumericSetObject(String[] values) throws SQLExcept
+ "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?,"
+ "?,?,?," + "?,?,?" + ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// bit
Expand Down Expand Up @@ -1651,7 +1651,7 @@ protected static void populateNumericSetObjectWithJDBCTypes(String[] values) thr
+ "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?,"
+ "?,?,?," + "?,?,?" + ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// bit
Expand Down Expand Up @@ -1758,7 +1758,7 @@ protected static void populateNumericSetObjectNull() throws SQLException {
+ "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?,"
+ "?,?,?," + "?,?,?" + ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// bit
Expand Down Expand Up @@ -1858,7 +1858,7 @@ protected static void populateNumericNullCase(String[] values) throws SQLExcepti

+ ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// bit
Expand Down Expand Up @@ -1957,7 +1957,7 @@ protected static void populateNumericNormalCase(String[] numericValues) throws S

+ ")";

try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) Util.getPreparedStmt(con, sql,
try (SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {

// bit
Expand Down Expand Up @@ -2085,6 +2085,6 @@ private static void dropCMK(SQLServerStatement stmt) throws SQLException {
* @throws TestAbortedException
*/
protected static void skipTestForJava7() throws TestAbortedException, SQLException {
assumeTrue(Util.supportJDBC42(con)); // With Java 7, skip tests for JDBCType.
assumeTrue(TestUtils.supportJDBC42(con)); // With Java 7, skip tests for JDBCType.
}
}
Loading