X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2FPDBSequenceFetcherTest.java;h=a5bca344a394f7993c0bec11498009d798c6a8af;hb=447c5c1b22bd12a78730640321264fb38c39ec7b;hp=9efcef2434e6429521c333f3a275f8377927cb8b;hpb=f18ea3ce4e450b363c5092a340d26bbed18e43a1;p=jalview.git diff --git a/test/jalview/ws/PDBSequenceFetcherTest.java b/test/jalview/ws/PDBSequenceFetcherTest.java index 9efcef2..a5bca34 100644 --- a/test/jalview/ws/PDBSequenceFetcherTest.java +++ b/test/jalview/ws/PDBSequenceFetcherTest.java @@ -57,12 +57,12 @@ public class PDBSequenceFetcherTest { Cache.loadProperties("test/jalview/io/testProps.jvprops"); // ensure 'add annotation from structure' is selected - Cache.applicationProperties.setProperty("STRUCT_FROM_PDB", + Cache.setPropertyNoSave("STRUCT_FROM_PDB", Boolean.TRUE.toString()); - Cache.applicationProperties.setProperty("ADD_SS_ANN", + Cache.setPropertyNoSave("ADD_SS_ANN", Boolean.TRUE.toString()); - sf = new SequenceFetcher(false); + sf = SequenceFetcher.getInstance(); } /** @@ -76,7 +76,7 @@ public class PDBSequenceFetcherTest @Test(groups = { "Network" }, enabled = true) public void testRnaSeqRetrieve() throws Exception { - Cache.applicationProperties.setProperty("PDB_DOWNLOAD_FORMAT", "PDB"); + Cache.setPropertyNoSave("PDB_DOWNLOAD_FORMAT", "PDB"); List sps = sf.getSourceProxy("PDB"); AlignmentI response = sps.get(0).getSequenceRecords("2GIS"); assertTrue(response != null); @@ -132,6 +132,7 @@ public class PDBSequenceFetcherTest private void testRetrieveProteinSeqFromPDB() throws Exception { List sps = sf.getSourceProxy("PDB"); + StringBuilder errors = new StringBuilder(); for (TestRetrieveObject str : toRetrieve) { AlignmentI response = sps.get(0).getSequenceRecords(str.id); @@ -174,11 +175,11 @@ public class PDBSequenceFetcherTest lastp = sq.findPosition(col - 1); } } - if (errors.length() > 0) - { - Assert.fail(errors.toString()); - } } } + if (errors.length() > 0) + { + Assert.fail(errors.toString()); + } } }