test: skip PKCS12KeyTest when enable_ssl_tests is not set

pgjdbc · Feb 12, 2020 · 6730f3f · 6730f3f
1 parent 1e4f475
commit 6730f3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pgjdbc/src/test/java/org/postgresql/test/ssl/PKCS12KeyTest.java b/pgjdbc/src/test/java/org/postgresql/test/ssl/PKCS12KeyTest.java
@@ -10,6 +10,7 @@
 import org.postgresql.test.jdbc2.BaseTest4;
 
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -30,6 +31,11 @@ protected void updateProperties(Properties props) {
     Properties prop = TestUtil.loadPropertyFiles("ssltest.properties");
     props.put(TestUtil.DATABASE_PROP, "hostssldb");
     PGProperty.SSL_MODE.set(props, "prefer");
+    String enableSslTests = prop.getProperty("enable_ssl_tests");
+    Assume.assumeTrue(
+        "Skipping the test as enable_ssl_tests is not set",
+        Boolean.parseBoolean(enableSslTests)
+    );
 
     File certDirFile = TestUtil.getFile(prop.getProperty("certdir"));
     String certdir = certDirFile.getAbsolutePath();

diff --git a/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java b/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java
@@ -117,7 +117,7 @@ enum ClientRootCertificate {
   public static Iterable<Object[]> data() {
     Properties prop = TestUtil.loadPropertyFiles("ssltest.properties");
     String enableSslTests = prop.getProperty("enable_ssl_tests");
-    if (!Boolean.valueOf(enableSslTests)) {
+    if (!Boolean.parseBoolean(enableSslTests)) {
       System.out.println("enableSslTests is " + enableSslTests + ", skipping SSL tests");
       return Collections.emptyList();
     }