JAL-3829 more testing wit tdbeacons data columns and FTSclient

[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 ed248bb..61d2427 100644 (file)
--- a/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java
+++ b/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java
@@ -26,6 +26,7 @@ import static org.testng.AssertJUnit.assertTrue;
 import jalview.fts.api.FTSDataColumnI;
 import jalview.fts.core.FTSRestRequest;
 import jalview.fts.core.FTSRestResponse;
+import jalview.gui.JvOptionPane;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ -42,6 +43,7 @@ import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -54,6 +56,13 @@ import com.sun.jersey.api.client.config.DefaultClientConfig;
 public class PDBFTSRestClientTest
 {
 
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   @BeforeMethod(alwaysRun = true)
   public void setUp() throws Exception
   {
@@ -72,13 +81,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"));
@@ -86,6 +93,8 @@ public class PDBFTSRestClientTest
     {
       e1.printStackTrace();
     }
+    System.out.println("wantedFields >>" + wantedFields);
+
 
     FTSRestRequest request = new FTSRestRequest();
     request.setAllowEmptySeq(false);
@@ -117,13 +126,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 +154,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 +195,7 @@ public class PDBFTSRestClientTest
     assertEquals(expectedErrorMsg, parsedErrorResponse);
   }
 
-  @Test(
-    groups = { "External" },
-    expectedExceptions = Exception.class)
+  @Test(groups = { "External" }, expectedExceptions = Exception.class)
   public void testForExpectedRuntimeException() throws Exception
   {
     List<FTSDataColumnI> wantedFields = new ArrayList<FTSDataColumnI>();
@@ -206,7 +209,7 @@ public class PDBFTSRestClientTest
     PDBFTSRestClient.getInstance().executeRequest(request);
   }
 
-    // JBP: Is this actually external ?  Looks like it is mocked
+  // JBP: Is this actually external ? Looks like it is mocked
   @Test(groups = { "External" })
   public void parsePDBJsonResponseTest()
   {
@@ -215,13 +218,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"));
@@ -247,6 +248,7 @@ public class PDBFTSRestClientTest
     assertTrue(response.getSearchSummary() != null);
     assertTrue(response.getNumberOfItemsFound() == 931);
     assertTrue(response.getSearchSummary().size() == 14);
+    System.out.println("Search summary : " + response.getSearchSummary());
   }
 
   @Test(groups = { "Functional" })
@@ -259,13 +261,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)
     {
@@ -273,11 +273,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)
     {