X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Ffts%2Fservice%2Fpdb%2FPDBFTSRestClientTest.java;h=8faec5846e4f4c255e34d533929c1fed5b33a986;hb=528c0f1815bc67b54618ad5b16c2162946974caf;hp=d6203c694107f2c3db912e9fb30984ebf3dde7a9;hpb=007af0c9001900071f6d8e9214143f79e10f4938;p=jalview.git

diff --git a/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java b/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java
index d6203c6..8faec58 100644
--- a/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java
+++ b/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java
@@ -59,7 +59,7 @@ public class PDBFTSRestClientTest
   {
   }
 
-  @AfterMethod
+  @AfterMethod(alwaysRun = true)
   public void tearDown() throws Exception
   {
   }
@@ -72,13 +72,11 @@ public class PDBFTSRestClientTest
     {
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("molecule_type"));
-      wantedFields
-.add(PDBFTSRestClient.getInstance()
+      wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("pdb_id"));
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("genus"));
-      wantedFields
-.add(PDBFTSRestClient.getInstance()
+      wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("gene_name"));
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("title"));
@@ -117,13 +115,11 @@ public class PDBFTSRestClientTest
     {
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("molecule_type"));
-      wantedFields
-.add(PDBFTSRestClient.getInstance()
+      wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("pdb_id"));
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("genus"));
-      wantedFields
-.add(PDBFTSRestClient.getInstance()
+      wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("gene_name"));
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("title"));
@@ -147,13 +143,11 @@ public class PDBFTSRestClientTest
     {
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("molecule_type"));
-      wantedFields
-.add(PDBFTSRestClient.getInstance()
+      wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("pdb_id"));
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("genus"));
-      wantedFields
-.add(PDBFTSRestClient.getInstance()
+      wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("gene_name"));
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("title"));
@@ -190,9 +184,7 @@ public class PDBFTSRestClientTest
     assertEquals(expectedErrorMsg, parsedErrorResponse);
   }
 
-  @Test(
-    groups = { "External", "Network" },
-    expectedExceptions = Exception.class)
+  @Test(groups = { "External" }, expectedExceptions = Exception.class)
   public void testForExpectedRuntimeException() throws Exception
   {
     List<FTSDataColumnI> wantedFields = new ArrayList<FTSDataColumnI>();
@@ -206,6 +198,7 @@ public class PDBFTSRestClientTest
     PDBFTSRestClient.getInstance().executeRequest(request);
   }
 
+  // JBP: Is this actually external ? Looks like it is mocked
   @Test(groups = { "External" })
   public void parsePDBJsonResponseTest()
   {
@@ -214,13 +207,11 @@ public class PDBFTSRestClientTest
     {
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("molecule_type"));
-      wantedFields
-.add(PDBFTSRestClient.getInstance()
+      wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("pdb_id"));
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("genus"));
-      wantedFields
-.add(PDBFTSRestClient.getInstance()
+      wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("gene_name"));
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("title"));
@@ -258,13 +249,11 @@ public class PDBFTSRestClientTest
               .getDataColumnByNameOrCode("molecule_type"));
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("genus"));
-      wantedFields
-.add(PDBFTSRestClient.getInstance()
+      wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("gene_name"));
       wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("title"));
-      wantedFields
-.add(PDBFTSRestClient.getInstance()
+      wantedFields.add(PDBFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("pdb_id"));
     } catch (Exception e)
     {
@@ -272,11 +261,9 @@ public class PDBFTSRestClientTest
     }
     try
     {
-      assertEquals(5,
- PDBFTSRestClient.getInstance()
+      assertEquals(5, PDBFTSRestClient.getInstance()
               .getPrimaryKeyColumIndex(wantedFields, true));
-      assertEquals(4,
- PDBFTSRestClient.getInstance()
+      assertEquals(4, PDBFTSRestClient.getInstance()
               .getPrimaryKeyColumIndex(wantedFields, false));
     } catch (Exception e)
     {