Changeset: 13ac41e0442f for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/13ac41e0442f
Modified Files:
src/test/java/org/monetdb/jdbc/TLSTests.java
src/test/java/org/monetdb/testinfra/Config.java
Branch: mvn
Log Message:
Skip TLS tests if TLSTester not configured
diffs (43 lines):
diff --git a/src/test/java/org/monetdb/jdbc/TLSTests.java
b/src/test/java/org/monetdb/jdbc/TLSTests.java
--- a/src/test/java/org/monetdb/jdbc/TLSTests.java
+++ b/src/test/java/org/monetdb/jdbc/TLSTests.java
@@ -12,6 +12,7 @@
package org.monetdb.jdbc;
import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.io.TempDir;
import org.monetdb.testinfra.Config;
import org.monetdb.mcl.net.Parameter;
@@ -29,6 +30,7 @@ import static org.junit.jupiter.api.Asse
import static org.monetdb.testinfra.Assertions.assertSQLException;
@Tag("tls")
+@EnabledIf("org.monetdb.testinfra.Config#isTLSTesterConfigured")
public class TLSTests {
@TempDir
File tmpDir;
@@ -45,7 +47,7 @@ public class TLSTests {
private String query;
@BeforeAll
- public static void checkEnabled() throws IOException {
+ public static void checkConfig() throws IOException {
Config.getTesterHost();
Config.getTesterPort();
TLSTests me = new TLSTests();
diff --git a/src/test/java/org/monetdb/testinfra/Config.java
b/src/test/java/org/monetdb/testinfra/Config.java
--- a/src/test/java/org/monetdb/testinfra/Config.java
+++ b/src/test/java/org/monetdb/testinfra/Config.java
@@ -95,6 +95,11 @@ public class Config {
return Boolean.parseBoolean(lookup(SKIP_SLOW_PROPERTY,
SKIP_SLOW_ENVVAR, "false"));
}
+ public static boolean isTLSTesterConfigured() {
+ String addr = getTLSTester();
+ return addr != null && !addr.isEmpty();
+ }
+
private static String getTLSTester() {
return lookup(TLSTESTER_PROPERTY, TLSTESTER_ENVVAR, null);
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
