Skip to content

Commit 124b438

Browse files
authored
Merge pull request #69 from ediel-queiroz/test/set-postgres-check-test-configuration
Set up a check test configuration for PostgresSavepointTests
2 parents 582395b + 04a86b5 commit 124b438

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

documents/code-contributions/setup_and_testing_ojp_source.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
Navigate to the ojp-jdbc-driver folder first:
2727
```bash
2828
cd ojp-jdbc-driver
29-
mvn test -DdisablePostgresTests -DdisableMySQLTests -DdisableMariaDBTests
29+
mvn test -DdisablePostgresTests -DdisableMySQLTests -DdisableMariaDBTests -DdisableCockroachDBTests -DdisablePostgresXATests
3030
```
3131
**Note:** With the disable flags only H2 integration tests will run, to run the full set of integration tests you have to run all the databases locally, follow the instructions at [Run Local Databases](../../documents/environment-setup/run-local-databases.md)
3232

ojp-jdbc-driver/src/test/java/openjproxy/jdbc/SavepointTests.java renamed to ojp-jdbc-driver/src/test/java/openjproxy/jdbc/PostgresSavepointTests.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import lombok.SneakyThrows;
44
import org.junit.jupiter.api.AfterEach;
5+
import org.junit.jupiter.api.BeforeAll;
56
import org.junit.jupiter.params.ParameterizedTest;
67
import org.junit.jupiter.params.provider.CsvFileSource;
78

@@ -13,13 +14,22 @@
1314

1415
import static org.junit.jupiter.api.Assertions.assertEquals;
1516
import static org.junit.jupiter.api.Assertions.assertTrue;
17+
import static org.junit.jupiter.api.Assumptions.assumeFalse;
1618

17-
public class SavepointTests {
19+
public class PostgresSavepointTests {
1820

21+
private static boolean isTestDisabled;
1922
private Connection connection;
2023

24+
@BeforeAll
25+
public static void checkTestConfiguration() {
26+
isTestDisabled = Boolean.parseBoolean(System.getProperty("disablePostgresTests", "false"));
27+
}
28+
2129
@SneakyThrows
2230
public void setUp(String driverClass, String url, String user, String pwd) throws SQLException {
31+
assumeFalse(isTestDisabled, "PostgreSQL tests are disabled");
32+
2333
connection = DriverManager.getConnection(url, user, pwd);
2434
connection.setAutoCommit(false);
2535
connection.createStatement().execute(

0 commit comments

Comments
 (0)