X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fsifts%2FSiftsClientTest.java;fp=test%2Fjalview%2Fws%2Fsifts%2FSiftsClientTest.java;h=0f5bd4da4fb0a3aafffbbd9376cb26241d6d5de1;hb=faaea5e75f32c615b8f7d5adbd8468118cfb8c3a;hp=b003cb58b318c34fadc9a9906556a75c141482ad;hpb=a77097b69158a4b1d5cc518d6920831cad85ee7c;p=jalview.git diff --git a/test/jalview/ws/sifts/SiftsClientTest.java b/test/jalview/ws/sifts/SiftsClientTest.java index b003cb5..0f5bd4d 100644 --- a/test/jalview/ws/sifts/SiftsClientTest.java +++ b/test/jalview/ws/sifts/SiftsClientTest.java @@ -195,8 +195,10 @@ public class SiftsClientTest SiftsSettings.setCacheThresholdInDays("2"); SiftsSettings.setFailSafePIDThreshold("70"); PDBfile pdbFile; + pdbFile = new PDBfile(false, false, false, "test/jalview/io/" + testPDBId + ".pdb", DataSourceType.FILE); + // TODO: this uses a network connection - we should mock the sifts testPDBId.xml.gz siftsClient = new SiftsClient(pdbFile); } @@ -221,7 +223,7 @@ public class SiftsClientTest long t1 = siftsFile.lastModified(); // re-read file should be returned from cache - siftsFile = SiftsClient.downloadSiftsFile(testPDBId); + siftsFile = SiftsClient.getSiftsFile(testPDBId); FileAssert.assertFile(siftsFile); long t2 = siftsFile.lastModified(); assertEquals(t1, t2); @@ -374,7 +376,7 @@ public class SiftsClientTest { SequenceI invalidTestSeq = new Sequence("testSeq", "ABCDEFGH"); DBRefEntry invalidDBRef = new DBRefEntry(); - invalidDBRef.setAccessionId("BLAR"); + invalidDBRef.setAccessionId("BLAR"); // note no version is set, so also invalid invalidTestSeq.addDBRef(invalidDBRef); siftsClient.getValidSourceDBRef(invalidTestSeq); }