Skip to content

Commit dce66ee

Browse files
authored
closed test resource after use in FilterTypesTest.java (#682)
1 parent 7471311 commit dce66ee

1 file changed

Lines changed: 25 additions & 20 deletions

File tree

src/test/java/com/teragrep/pth_10/steps/teragrep/bloomfilter/FilterTypesTest.java

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@
5454
import org.junit.jupiter.api.BeforeEach;
5555
import org.junit.jupiter.api.Test;
5656

57-
import java.sql.Connection;
58-
import java.sql.DriverManager;
59-
import java.sql.ResultSet;
57+
import java.sql.*;
6058
import java.util.ArrayList;
6159
import java.util.Arrays;
6260
import java.util.List;
@@ -76,14 +74,19 @@ public final class FilterTypesTest {
7674
@BeforeEach
7775
public void setup() {
7876
Assertions.assertDoesNotThrow(() -> {
79-
conn.prepareStatement("DROP ALL OBJECTS").execute(); // h2 clear database
77+
try (PreparedStatement stmt = conn.prepareStatement("DROP ALL OBJECTS")) {
78+
stmt.execute(); // h2 clear database
79+
}
8080
});
8181
String createFilterType = "CREATE TABLE `filtertype` ("
8282
+ "`id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,"
8383
+ "`expectedElements` bigint(20) NOT NULL," + "`targetFpp` DOUBLE UNSIGNED NOT NULL,"
8484
+ "`pattern` VARCHAR(255) NOT NULL)";
8585
Assertions.assertDoesNotThrow(() -> {
86-
conn.prepareStatement(createFilterType).execute();
86+
try (PreparedStatement stmt = conn.prepareStatement(createFilterType)) {
87+
stmt.execute();
88+
}
89+
8790
});
8891

8992
}
@@ -144,22 +147,24 @@ public void testWriteFilterTypesToDatabase() {
144147
Assertions.assertDoesNotThrow(() -> new FilterTypes(config).saveToDatabase(regex));
145148

146149
Assertions.assertDoesNotThrow(() -> {
147-
ResultSet result = conn.prepareStatement("SELECT * FROM filtertype").executeQuery();
148-
int loops = 0;
149-
List<Long> expectedSizeList = new ArrayList<>();
150-
List<Double> fppList = new ArrayList<>();
151-
while (result.next()) {
152-
expectedSizeList.add(result.getLong(2));
153-
fppList.add(result.getDouble(3));
154-
Assertions.assertEquals(regex, result.getString(4));
155-
loops++;
150+
try (PreparedStatement stmt = conn.prepareStatement("SELECT * FROM filtertype")) {
151+
ResultSet result = stmt.executeQuery();
152+
int loops = 0;
153+
List<Long> expectedSizeList = new ArrayList<>();
154+
List<Double> fppList = new ArrayList<>();
155+
while (result.next()) {
156+
expectedSizeList.add(result.getLong(2));
157+
fppList.add(result.getDouble(3));
158+
Assertions.assertEquals(regex, result.getString(4));
159+
loops++;
160+
}
161+
Assertions.assertEquals(3, loops);
162+
Assertions.assertEquals(3, expectedSizeList.size());
163+
Assertions.assertEquals(3, fppList.size());
164+
Assertions.assertEquals(Arrays.asList(1000L, 2000L, 3000L), expectedSizeList);
165+
Assertions.assertEquals(Arrays.asList(0.01, 0.02, 0.03), fppList);
166+
result.close();
156167
}
157-
Assertions.assertEquals(3, loops);
158-
Assertions.assertEquals(3, expectedSizeList.size());
159-
Assertions.assertEquals(3, fppList.size());
160-
Assertions.assertEquals(Arrays.asList(1000L, 2000L, 3000L), expectedSizeList);
161-
Assertions.assertEquals(Arrays.asList(0.01, 0.02, 0.03), fppList);
162-
result.close();
163168
});
164169
}
165170

0 commit comments

Comments
 (0)