Merge branch 'develop' into patch/JAL-4281_idwidthandannotHeight_in_project

[jalview.git] / test / jalview / fts / threedbeacons / TDBeaconsFTSRestClientTest.java

diff --git a/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java b/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java
index aaf91ef..40e29d3 100644 (file)
--- a/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java
+++ b/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java
@@ -39,14 +39,20 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import jalview.datamodel.Sequence;
+import jalview.fts.api.FTSData;
 import jalview.fts.api.FTSDataColumnI;
 import jalview.fts.api.FTSDataColumnI.FTSDataColumnGroupI;
 import jalview.fts.core.FTSRestClient;
 import jalview.fts.core.FTSRestRequest;
 import jalview.fts.core.FTSRestResponse;
 import jalview.fts.service.pdb.PDBFTSRestClientTest;
+import jalview.fts.service.threedbeacons.TDB_FTSData;
 import jalview.fts.service.threedbeacons.TDBeaconsFTSRestClient;
 import jalview.gui.JvOptionPane;
+import jalview.gui.structurechooser.PDBStructureChooserQuerySource;
+import jalview.gui.structurechooser.TDBResultAnalyser;
+import jalview.gui.structurechooser.ThreeDBStructureChooserQuerySource;
 
 public class TDBeaconsFTSRestClientTest
 {
@@ -300,7 +306,9 @@ public class TDBeaconsFTSRestClientTest
 
   private static String[][] mocks = { { "P38398.json", null },
       { "P01308.json", null },
-      { "P0DTD1.json", null }
+      { "P0DTD1.json", null },
+      { "P27787.json", null },
+      { "Q99814.json", null }
 
       // , { "P0DTD3.json", "{}" } actually results in 404, but {} is in body
   };
@@ -318,6 +326,11 @@ public class TDBeaconsFTSRestClientTest
       mocks[2][1] = PDBFTSRestClientTest.readJsonStringFromFile(
               "test/jalview/fts/threedbeacons/p0dtd1_tdb_fts_query_resp.txt");
 
+      mocks[3][1] = PDBFTSRestClientTest.readJsonStringFromFile(
+              "test/jalview/fts/threedbeacons/p27787_tdb_fts_query_resp.txt");
+      mocks[4][1] = PDBFTSRestClientTest.readJsonStringFromFile(
+              "test/jalview/fts/threedbeacons/q99814_tdb_fts_query_resp.txt");
+
     } catch (IOException e)
     {
       Assert.fail("Couldn't read mock response data", e);
@@ -360,6 +373,9 @@ public class TDBeaconsFTSRestClientTest
     URL tdb_req = new URL(prod_url + mockRequest);
     byte[] resp = tdb_req.openStream().readAllBytes();
     String tresp = new String(resp, StandardCharsets.UTF_8);
+    // this simple test fails for responses containing multi-chain structures -
+    // since chain order in the json elements is arbitrary and varies between
+    // queries.
     assertEquals(_mockResponse.trim(), tresp.trim());
   }
 
@@ -484,4 +500,5 @@ public class TDBeaconsFTSRestClientTest
     System.out.println("Search summary : \n" + response.getSearchSummary());
     // System.out.println(response.getSearchSummary().size());
   }
+  
 }