Skip to content

Commit a1a3040

Browse files
authored
Closed test connection resource after use (#502)
* test resource closed after use in FilterTypesTest class, removed unnecessary semicolon * Removed unnecessary assertion
1 parent 2262472 commit a1a3040

1 file changed

Lines changed: 13 additions & 7 deletions

File tree

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@
4949
import com.typesafe.config.ConfigFactory;
5050
import nl.jqno.equalsverifier.EqualsVerifier;
5151
import org.apache.spark.util.sketch.BloomFilter;
52+
import org.junit.jupiter.api.AfterEach;
5253
import org.junit.jupiter.api.Assertions;
5354
import org.junit.jupiter.api.BeforeEach;
5455
import org.junit.jupiter.api.Test;
5556

5657
import java.sql.Connection;
58+
import java.sql.DriverManager;
5759
import java.sql.ResultSet;
5860
import java.util.ArrayList;
5961
import java.util.Arrays;
@@ -65,15 +67,14 @@
6567

6668
class FilterTypesTest {
6769

68-
Connection conn;
69-
final String username = "sa";
70-
final String password = "";
71-
final String connectionUrl = "jdbc:h2:mem:test;MODE=MariaDB;DATABASE_TO_LOWER=TRUE;CASE_INSENSITIVE_IDENTIFIERS=TRUE";
70+
private final String username = "sa";
71+
private final String password = "";
72+
private final String connectionUrl = "jdbc:h2:mem:test;MODE=MariaDB;DATABASE_TO_LOWER=TRUE;CASE_INSENSITIVE_IDENTIFIERS=TRUE";
73+
private final Connection conn = Assertions
74+
.assertDoesNotThrow(() -> DriverManager.getConnection(connectionUrl, username, password));
7275

7376
@BeforeEach
7477
public void setup() {
75-
Config config = ConfigFactory.parseProperties(defaultProperties());
76-
this.conn = new LazyConnection(config).get();
7778
Assertions.assertDoesNotThrow(() -> {
7879
conn.prepareStatement("DROP ALL OBJECTS").execute(); // h2 clear database
7980
});
@@ -90,6 +91,11 @@ public void setup() {
9091

9192
}
9293

94+
@AfterEach
95+
public void teardown() {
96+
Assertions.assertDoesNotThrow(conn::close);
97+
}
98+
9399
@Test
94100
public void testSortedMapMethod() {
95101
Config config = ConfigFactory.parseProperties(defaultProperties());
@@ -136,12 +142,12 @@ public void testWriteFilterTypesToDatabase() {
136142
Assertions.assertEquals(3, fppList.size());
137143
Assertions.assertEquals(Arrays.asList(1000L, 2000L, 3000L), expectedSizeList);
138144
Assertions.assertEquals(Arrays.asList(0.01, 0.02, 0.03), fppList);
145+
result.close();
139146
});
140147
}
141148

142149
@Test
143150
public void testEquals() {
144-
;
145151
Config config = ConfigFactory.parseProperties(defaultProperties());
146152
FilterTypes filterTypes1 = new FilterTypes(config);
147153
FilterTypes filterTypes2 = new FilterTypes(config);

0 commit comments

Comments
 (0)