Attempt to fix Travis build failures by switching test truststore bas…

…ed on JVM version
wiremock · Mar 16, 2019 · 739999f · 739999f
1 parent bad5c7f
commit 739999f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ jdk:
   - openjdk8
 
 install:
-  - sudo apt-get upgrade -y openjdk-7-jdk
   - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 8.12.0
   - JAVA_HOME=$(jdk_switcher home openjdk8) ./gradlew classes testClasses -x generateApiDocs
 

diff --git a/src/test/java/com/github/tomakehurst/wiremock/common/KeyStoreSettingsTest.java b/src/test/java/com/github/tomakehurst/wiremock/common/KeyStoreSettingsTest.java
@@ -19,23 +19,22 @@
 
 import java.security.KeyStore;
 
-import static com.github.tomakehurst.wiremock.testsupport.TestFiles.TRUST_STORE_PASSWORD;
-import static com.github.tomakehurst.wiremock.testsupport.TestFiles.filePath;
+import static com.github.tomakehurst.wiremock.testsupport.TestFiles.*;
 import static org.junit.Assert.assertNotNull;
 
 public class KeyStoreSettingsTest {
 
     @Test
     public void loadsTrustStoreFromClasspath() {
-        KeyStoreSettings trustStoreSettings = new KeyStoreSettings("test-truststore.pkcs12", TRUST_STORE_PASSWORD);
+        KeyStoreSettings trustStoreSettings = new KeyStoreSettings(TRUST_STORE_NAME, TRUST_STORE_PASSWORD);
 
         KeyStore keyStore = trustStoreSettings.loadStore();
         assertNotNull(keyStore);
     }
 
     @Test
     public void loadsTrustStoreFromFilesystem() {
-        KeyStoreSettings trustStoreSettings = new KeyStoreSettings(filePath("test-truststore.pkcs12"), TRUST_STORE_PASSWORD);
+        KeyStoreSettings trustStoreSettings = new KeyStoreSettings(TRUST_STORE_PATH, TRUST_STORE_PASSWORD);
 
         KeyStore keyStore = trustStoreSettings.loadStore();
         assertNotNull(keyStore);

diff --git a/src/test/java/com/github/tomakehurst/wiremock/testsupport/TestFiles.java b/src/test/java/com/github/tomakehurst/wiremock/testsupport/TestFiles.java
@@ -27,9 +27,16 @@
 public class TestFiles {
 
     public static final String TRUST_STORE_PASSWORD = "mytruststorepassword";
-    public static final String TRUST_STORE_PATH = filePath("test-truststore.pkcs12");
+    public static final String TRUST_STORE_NAME = getTrustStoreRelativeName();
+    public static final String TRUST_STORE_PATH = filePath(TRUST_STORE_NAME);
     public static final String KEY_STORE_PATH = filePath("test-keystore");
 
+    private static String getTrustStoreRelativeName() {
+        return System.getProperty("java.specification.version").equals("1.7") ?
+                "test-truststore.jks" :
+                "test-truststore.pkcs12";
+    }
+
     public static String defaultTestFilesRoot() {
         return filePath("test-file-root");
     }

diff --git a/src/test/resources/test-truststore.jks b/src/test/resources/test-truststore.jks