JAL-1479 updated SIFTS FTP download URL, added improvement to ensure that new SIFTS...

[jalview.git] / test / jalview / ws / sifts / SiftsClientTest.java

diff --git a/test/jalview/ws/sifts/SiftsClientTest.java b/test/jalview/ws/sifts/SiftsClientTest.java
index 24c6751..28113d6 100644 (file)
--- a/test/jalview/ws/sifts/SiftsClientTest.java
+++ b/test/jalview/ws/sifts/SiftsClientTest.java
@@ -26,6 +26,7 @@ import jalview.datamodel.SequenceI;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
 import java.io.PrintStream;
 import java.util.HashMap;
 
@@ -41,6 +42,11 @@ public class SiftsClientTest
 {
   private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
 
+  public static final String DEFAULT_SIFTS_DOWNLOAD_DIR = System
+          .getProperty("user.home")
+          + File.separatorChar
+          + ".sifts_downloads" + File.separatorChar;
+
   private String testPDBId = "1a70";
 
   private SiftsClient siftsClient = null;
@@ -69,9 +75,13 @@ public class SiftsClientTest
   {
     // SIFTs entries are updated weekly - so use saved SIFTs file to enforce
     // test reproducibility
+    SiftsSettings.setSiftDownloadDirectory(jalview.bin.Cache.getDefault(
+            "sifts_download_dir", DEFAULT_SIFTS_DOWNLOAD_DIR));
+
     File testSiftsFile = new File("test/jalview/io/" + testPDBId
             + ".xml.gz");
     PDBfile pdbFile = new PDBfile(false, false, false);
+    pdbFile.setId(testPDBId);
     siftsClient = new SiftsClient(pdbFile, testSiftsFile);
   }
 
@@ -113,9 +123,16 @@ public class SiftsClientTest
     // Assert that file isn't yet downloaded - if already downloaded, assert it
     // is deleted
     Assert.assertTrue(SiftsClient.deleteSiftsFileByPDBId(testPDBId));
-    File siftsFile = SiftsClient.downloadSiftsFile(testPDBId);
-    FileAssert.assertFile(siftsFile);
-    SiftsClient.downloadSiftsFile(testPDBId);
+    File siftsFile;
+    try
+    {
+      siftsFile = SiftsClient.downloadSiftsFile(testPDBId);
+      FileAssert.assertFile(siftsFile);
+      SiftsClient.downloadSiftsFile(testPDBId);
+    } catch (IOException e)
+    {
+      e.printStackTrace();
+    }
   }
 
   @Test(groups = { "Functional" })