Merge branch 'features/JAL-2110_crossRefDuplications' into merge_JAL-2110

[jalview.git] / test / jalview / fts / service / pdb / PDBFTSRestClientTest.java

diff --git a/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java b/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java
index 39d9aa5..ed248bb 100644 (file)
--- a/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java
+++ b/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java
@@ -26,7 +26,6 @@ import static org.testng.AssertJUnit.assertTrue;
 import jalview.fts.api.FTSDataColumnI;
 import jalview.fts.core.FTSRestRequest;
 import jalview.fts.core.FTSRestResponse;
-import jalview.fts.service.pdb.PDBFTSRestClient;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ -60,7 +59,7 @@ public class PDBFTSRestClientTest
   {
   }
 
-  @AfterMethod
+  @AfterMethod(alwaysRun = true)
   public void tearDown() throws Exception
   {
   }
@@ -134,7 +133,7 @@ public class PDBFTSRestClientTest
     }
 
     String expectedResult = "molecule_type,pdb_id,genus,gene_name,title";
-    String actualResult = PDBFTSRestClient
+    String actualResult = PDBFTSRestClient.getInstance()
             .getDataColumnsFieldsAsCommaDelimitedString(wantedFields);
 
     assertEquals("", expectedResult, actualResult);
@@ -192,7 +191,7 @@ public class PDBFTSRestClientTest
   }
 
   @Test(
-    groups = { "External", "Network" },
+    groups = { "External" },
     expectedExceptions = Exception.class)
   public void testForExpectedRuntimeException() throws Exception
   {
@@ -207,6 +206,7 @@ public class PDBFTSRestClientTest
     PDBFTSRestClient.getInstance().executeRequest(request);
   }
 
+    // JBP: Is this actually external ?  Looks like it is mocked
   @Test(groups = { "External" })
   public void parsePDBJsonResponseTest()
   {