JAL-2136 merged develop into branch to fix build failure

[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 7f8adc9..fc07749 100644 (file)
--- a/test/jalview/ws/sifts/SiftsClientTest.java
+++ b/test/jalview/ws/sifts/SiftsClientTest.java
@@ -32,6 +32,7 @@ import jalview.datamodel.SequenceI;
 import jalview.gui.JvOptionPane;
 import jalview.io.DataSourceType;
 import jalview.structure.StructureMapping;
+import jalview.structure.StructureMappingClient.StructureMappingException;
 import jalview.xml.binding.sifts.Entry.Entity;
 
 import java.io.File;
@@ -294,7 +295,6 @@ public class SiftsClientTest
         Assert.assertEquals(actualMapping.get(pair.getKey()),
                 pair.getValue());
       }
-
     } catch (Exception e)
     {
       e.printStackTrace();
@@ -332,18 +332,18 @@ public class SiftsClientTest
 
   @Test(
 groups = { "Network" },
-    expectedExceptions = SiftsException.class)
+    expectedExceptions = StructureMappingException.class)
   private void populateAtomPositionsNullTest1()
-          throws IllegalArgumentException, SiftsException
+          throws IllegalArgumentException, StructureMappingException
   {
     siftsClient.populateAtomPositions(null, null);
   }
 
   @Test(
 groups = { "Network" },
-    expectedExceptions = SiftsException.class)
+    expectedExceptions = StructureMappingException.class)
   private void populateAtomPositionsNullTest2()
-          throws IllegalArgumentException, SiftsException
+          throws IllegalArgumentException, StructureMappingException
   {
     siftsClient.populateAtomPositions("A", null);
   }
@@ -392,10 +392,11 @@ groups = { "Network" },
   }
 
   @Test(groups = { "Network" })
-  public void getSiftsStructureMappingTest() throws SiftsException
+  public void getSiftsStructureMappingTest()
+          throws StructureMappingException, Exception
   {
     Assert.assertTrue(SiftsSettings.isMapWithSifts());
-    StructureMapping strucMapping = siftsClient.getSiftsStructureMapping(
+    StructureMapping strucMapping = siftsClient.getStructureMapping(
             testSeq, testPDBId, "A");
     String expectedMappingOutput = "\nSequence ⟷ Structure mapping details\n"
             + "Method: SIFTS\n\n"