X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fsifts%2FSiftsClientTest.java;h=ae6853bd7de52fde492c7fb4eba47b5db8b174ad;hb=5efdb9bc69c081f0283a193f270f52cc01fe2cc2;hp=6122d6d0ba61332b8d4b9faabac1ec8f71236892;hpb=59d2feb135a7da8e92b68491f177159913c60244;p=jalview.git diff --git a/test/jalview/ws/sifts/SiftsClientTest.java b/test/jalview/ws/sifts/SiftsClientTest.java index 6122d6d..ae6853b 100644 --- a/test/jalview/ws/sifts/SiftsClientTest.java +++ b/test/jalview/ws/sifts/SiftsClientTest.java @@ -78,7 +78,7 @@ public class SiftsClientTest int u = SiftsClient.UNASSIGNED; - HashMap expectedMapping = new HashMap(); + HashMap expectedMapping = new HashMap<>(); @BeforeTest(alwaysRun = true) public void populateExpectedMapping() throws SiftsException @@ -189,7 +189,6 @@ public class SiftsClientTest Cache.loadProperties("test/jalview/io/testProps.jvprops"); // SIFTs entries are updated weekly - so use saved SIFTs file to enforce // test reproducibility - new SiftsSettings(); SiftsSettings.setSiftDownloadDirectory(jalview.bin.Cache.getDefault( "sifts_download_dir", DEFAULT_SIFTS_DOWNLOAD_DIR)); SiftsSettings.setMapWithSifts(true); @@ -305,13 +304,13 @@ public class SiftsClientTest @Test(groups = { "Network" }) private void getAtomIndexTest() { - ArrayList atoms = new ArrayList(); + ArrayList atoms = new ArrayList<>(); Atom atom = new Atom(u, u, u); atom.resNumber = 43; atom.atomIndex = 7; atoms.add(atom); int actualAtomIndex = siftsClient.getAtomIndex(1, atoms); - Assert.assertEquals(actualAtomIndex, siftsClient.UNASSIGNED); + Assert.assertEquals(actualAtomIndex, SiftsClient.UNASSIGNED); actualAtomIndex = siftsClient.getAtomIndex(43, atoms); Assert.assertEquals(actualAtomIndex, 7); }