JAL-3253 jalview.bin.Instance streamlining

[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 6122d6d..ae6853b 100644 (file)
--- 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<Integer, int[]> expectedMapping = new HashMap<Integer, int[]>();
+  HashMap<Integer, int[]> 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<Atom> atoms = new ArrayList<Atom>();
+    ArrayList<Atom> 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);
   }